Changeset 5988 for main/waeup.sirp/trunk/src/waeup/sirp/browser

Timestamp:

27 Apr 2011, 07:43:49 (14 years ago)

Author:

Henrik Bettermann

Message:

Implement title_prefix vocabulary. Remove redundant getName method and replace by the longtitle property.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/browser

Files:

• breadcrumbs.py (modified) (1 diff)
• pages.py (modified) (3 diffs)
• templates/facultycontainerpage.pt (modified) (1 diff)
• templates/facultypage.pt (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/browser/breadcrumbs.py

@@ -121 +121 @@
     @property
     def title(self):
-        prefix = self.context.title_prefix
-        prefix = prefix[0].upper() + prefix[1:]
-        return '%s of %s' % (prefix, self.context.title)
+        return self.context.longtitle()
 
 class DepartmentBreadcrumb(FacultyBreadcrumb):

main/waeup.sirp/trunk/src/waeup/sirp/browser/pages.py

@@ -41 +41 @@
     IWAeUPXMLImporter, IWAeUPXMLExporter, IBatchProcessor)
 from waeup.sirp.university.catalog import search
-from waeup.sirp.utils.helpers import getName
 from waeup.sirp.widgets.interfaces import ITableProvider
 
@@ -905 +904 @@
     grok.name('index')
     pnav = 1
+
     @property
     def title(self):
-        return "%s (%s)" % (getName(self.context), self.context.code)
+        return self.context.longtitle()
 
     #def update(self, code=None, edit=None, delete=None):
@@ -995 +995 @@
     grok.name('index')
     pnav = 1
+    #title = 'xxx'
 
     @property
     def title(self):
-        return "%s (%s)" % (getName(self.context), self.context.code)
+        #import pdb; pdb.set_trace()
+        return self.context.longtitle()
     
     def update(self):

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultycontainerpage.pt

@@ -15 +15 @@
     <tr tal:repeat="value context/values">
       <td> <a tal:attributes="href value/__name__"> <span tal:content="value/code">Name</span></a></td>
-      <td tal:content="value/title">Title</td>
+      <td tal:content="value/longtitle">Title</td>
     </tr>
   </tbody>

main/waeup.sirp/trunk/src/waeup/sirp/browser/templates/facultypage.pt

@@ -15 +15 @@
     <tr tal:repeat="value context/values">
       <td> <a tal:attributes="href value/__name__"> <span tal:content="value/code">Name</span></a></td>
-      <td tal:content="value/title">Title</td>
+      <td tal:content="value/longtitle">Title</td>
       <td class="text-right">
       </td>