# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 2013-03-26 22:21:40
# Node ID 2ea981f9da7994eed7b7c0efc1fda70a9b8d2eb9
# Parent  87b0a652b6b191c55edd7f4154e2e16fa0bd799f

templates: enforce more consistency by being less flexible in templates

All pages must define page_nav.

context_bar may only be used on relevant repository pages, and the 'current'
parameter is mandatory.

diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html
--- a/rhodecode/templates/base/base.html
+++ b/rhodecode/templates/base/base.html
@@ -51,20 +51,14 @@
 <!-- END FOOTER -->
 
 ### MAKO DEFS ###
-<%def name="page_nav()">
-    ${self.menu()}
-</%def>
-
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 
-<%def name="context_bar(current=None)">
-  %if c.repo_name:
+<%def name="context_bar(current)">
     ${repo_context_bar(current)}
-  %endif
 </%def>
 
 <%def name="admin_menu()">
diff --git a/rhodecode/templates/forks/forks.html b/rhodecode/templates/forks/forks.html
--- a/rhodecode/templates/forks/forks.html
+++ b/rhodecode/templates/forks/forks.html
@@ -9,6 +9,10 @@
     ${_('Forks')}
 </%def>
 
+<%def name="page_nav()">
+    ${self.menu('repositories')}
+</%def>
+
 <%def name="main()">
 ${self.context_bar('showforks')}
 <div class="box">
diff --git a/rhodecode/templates/pullrequests/pullrequest.html b/rhodecode/templates/pullrequests/pullrequest.html
--- a/rhodecode/templates/pullrequests/pullrequest.html
+++ b/rhodecode/templates/pullrequests/pullrequest.html
@@ -8,6 +8,10 @@
     ${_('New pull request')}
 </%def>
 
+<%def name="page_nav()">
+    ${self.menu('repositories')}
+</%def>
+
 <%def name="main()">
 ${self.context_bar('showpullrequest')}
 <div class="box">
diff --git a/rhodecode/templates/pullrequests/pullrequest_show.html b/rhodecode/templates/pullrequests/pullrequest_show.html
--- a/rhodecode/templates/pullrequests/pullrequest_show.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show.html
@@ -8,6 +8,10 @@
     ${_('Pull request #%s') % c.pull_request.pull_request_id}
 </%def>
 
+<%def name="page_nav()">
+    ${self.menu('repositories')}
+</%def>
+
 <%def name="main()">
 ${self.context_bar('showpullrequest')}
 <div class="box">
diff --git a/rhodecode/templates/pullrequests/pullrequest_show_all.html b/rhodecode/templates/pullrequests/pullrequest_show_all.html
--- a/rhodecode/templates/pullrequests/pullrequest_show_all.html
+++ b/rhodecode/templates/pullrequests/pullrequest_show_all.html
@@ -8,6 +8,10 @@
     ${_('Pull requests')}
 </%def>
 
+<%def name="page_nav()">
+    ${self.menu('repositories')}
+</%def>
+
 <%def name="main()">
 ${self.context_bar('showpullrequest')}
 <div class="box">
diff --git a/rhodecode/templates/search/search.html b/rhodecode/templates/search/search.html
--- a/rhodecode/templates/search/search.html
+++ b/rhodecode/templates/search/search.html
@@ -29,7 +29,9 @@
     %endif
 </%def>
 <%def name="main()">
+%if c.repo_name:
 ${self.context_bar('options')}
+%endif
 <div class="box">
     <!-- box / title -->
     <div class="title">