Links as buttons; working on finishing person and name editing

svn: r19526

src/webapp/utils.py

@@ -75,6 +75,7 @@ util_tags = [
     "get_person_from_handle", 
     "event_table",
     "name_table",
+    "surname_table",
     "citation_table",
     "source_table",
     "note_table",
@@ -213,7 +214,8 @@ _ = lambda text: text
 
 def make_button(text, url, *args):
     url = url % args
-    return """[ <a href="%s">%s</a> ] """ % (url, text)
+    #return """[ <a href="%s">%s</a> ] """ % (url, text)
+    return """<input type="button" value="%s" onclick="document.location.href='%s'"/>""" % (text, url)
 
 def event_table(obj, user, action, url=None, *args):
     retval = ""
@@ -283,6 +285,30 @@ def name_table(obj, user, action, url=None, *args):
         retval += nbsp("") # to keep tabs same height
     return retval
 
+def surname_table(obj, user, action, url=None, *args):
+    person_handle = args[0]
+    order = args[1]
+    retval = ""
+    table = Table()
+    table.columns(_("Surname"),)
+    if user.is_authenticated():
+        links = []
+        count = 1
+        name = obj.name_set.filter(order=order)[0]
+        for surname in name.surname_set.all():
+            table.row(surname.surname)
+            links.append(('URL', 
+                          # url is "/person/%s/name/%s/surname"
+                          (url % args) + ("/%s" % count)))
+            count += 1
+        table.links(links)
+    retval += table.get_html()
+    if user.is_authenticated() and url and action == "view":
+        retval += make_button(_("Add surname"), (url + "/add") % args)
+    else:
+        retval += nbsp("") # to keep tabs same height
+    return retval
+
 def source_table(obj, user, action, url=None, *args):
     retval = ""
     table = Table()