kallithea Changeset - 2ea981f9da79

Changeset - 2ea981f9da79

Parent rev.

Child rev.

[Not reviewed]

beta

0 6 0

Mads Kiilerich - 13 years ago 2013-03-26 23:21:40
madski@unity3d.com

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.

6 files changed with 19 insertions and 7 deletions:

rhodecode/templates/base/base.html

rhodecode/templates/forks/forks.html

rhodecode/templates/pullrequests/pullrequest.html

rhodecode/templates/pullrequests/pullrequest_show.html

rhodecode/templates/pullrequests/pullrequest_show_all.html

rhodecode/templates/search/search.html

0 comments (0 inline, 0 general)

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -48,26 +48,20 @@ @@
        </div>
    </div>
 </div>
 <!-- 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()">
   <ul class="admin_menu">
       <li>${h.link_to(_('admin journal'),h.url('admin_home'),class_='journal ')}</li>
       <li>${h.link_to(_('repositories'),h.url('repos'),class_='repos')}</li>

rhodecode/templates/forks/forks.html

➞

Show inline comments

@@ @@ -6,12 +6,16 @@ @@
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Forks')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
 ${self.context_bar('showforks')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -5,12 +5,16 @@ @@
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('New pull request')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
 ${self.context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -5,12 +5,16 @@ @@
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('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">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}

rhodecode/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -5,12 +5,16 @@ @@
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Pull requests')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
 ${self.context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}

rhodecode/templates/search/search.html

➞

Show inline comments

@@ @@ -26,13 +26,15 @@ @@
     ${self.menu('repositories')}
     %else:
     ${self.menu('search')}
     %endif
 </%def>
 <%def name="main()">
 %if c.repo_name:
 ${self.context_bar('options')}
 %endif
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->

0 comments (0 inline, 0 general)