Changeset 5427 for main/waeup.sirp/branches

Timestamp:

12 Aug 2010, 13:20:48 (14 years ago)

Author:

Henrik Bettermann

Message:

Show 'Enquiries' tab only for anonymous user. Move 'Search' and 'Contact' to the right user navigation bar.

Location:

main/waeup.sirp/branches/henrik-contactforms/src/waeup/sirp/browser

Files:

• templates/sitelayout.pt (modified) (1 diff)
• viewlets.py (modified) (1 diff)

main/waeup.sirp/branches/henrik-contactforms/src/waeup/sirp/browser/templates/sitelayout.pt

@@ -52 +52 @@
             <ul id="user-navigation"
                 tal:condition="layout/isAuthenticated">
+              <li>
+                <a href="#"
+                   tal:attributes="href python: view.url(context,
+                   '@@search')">Search</a>
+              </li>
+              <li>
+                <a href="#"
+                   tal:attributes="href python: view.url(context,
+                   '@@contactadmin')">Contact</a>
+              </li>
               <li>
                 <a href="#"

main/waeup.sirp/branches/henrik-contactforms/src/waeup/sirp/browser/viewlets.py

@@ -529 +529 @@
         return self.view.application_url('faculties')
 
-class SearchTab(PrimaryNavTab):
-    """Search tab in primary navigation.
-    """
-    grok.order(3)
-    grok.require('waeup.View')
-    grok.template('primarynavtab')
-
-    pnav = 2
-    tab_title = u'Search'
-
-    @property
-    def link_target(self):
-        return self.view.application_url('@@search')
-        
+    
 class ContactTab(PrimaryNavTab):
     """Contact tab in primary navigation.
     """
     grok.order(4)
-    grok.require('waeup.Public')
+    grok.require('waeup.Anonymous')
     grok.template('primarynavtab')
     
     pnav = 3
     def tab_title(self):
-        """Return True if the calling user is authenticated.
+        """Display tab only for anonymous. Authenticated users can call the 
+        form from the user navigation bar.
         """
         userid = self.request.principal.id
         if userid != 'zope.anybody':
-            tt = u'Contact' 
+            tt = u'' 
         else:
             tt = u'Enquiries'