kallithea Changeset - 072a37c44f58

Changeset - 072a37c44f58

Parent rev.

Child rev.

[Not reviewed]

default

0 21 0

Mads Kiilerich - 12 years ago 2013-06-12 01:36:35
madski@unity3d.com

Transplanted from: 38dcb236c3f3

templates: drop context_bar, use repo_context_bar directly

21 files changed with 20 insertions and 24 deletions:

rhodecode/templates/admin/repos/repo_edit.html

rhodecode/templates/base/base.html

rhodecode/templates/bookmarks/bookmarks.html

rhodecode/templates/branches/branches.html

rhodecode/templates/changelog/changelog.html

rhodecode/templates/changeset/changeset.html

rhodecode/templates/changeset/changeset_range.html

rhodecode/templates/compare/compare_diff.html

rhodecode/templates/files/file_diff.html

rhodecode/templates/files/files.html

rhodecode/templates/files/files_add.html

rhodecode/templates/files/files_edit.html

rhodecode/templates/followers/followers.html

rhodecode/templates/forks/fork.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

rhodecode/templates/summary/summary.html

rhodecode/templates/tags/tags.html

0 comments (0 inline, 0 general)

rhodecode/templates/admin/repos/repo_edit.html

➞

Show inline comments

@@ @@ -8,25 +8,25 @@ @@
     ${_('Edit repository')} ${c.repo_info.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Settings')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('admin')}
 </%def>
 <%def name="main()">
-${self.context_bar('options')}
+${self.repo_context_bar('options')}
 <div class="box box-left">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo', repo_name=c.repo_info.repo_name),method='put')}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
                 <div class="label">
                     <label for="repo_name">${_('Name')}:</label>

rhodecode/templates/base/base.html

➞

Show inline comments

@@ @@ -55,28 +55,24 @@ @@
    </div>
 </div>
 <!-- END FOOTER -->
 ### MAKO DEFS ###
 <%def name="breadcrumbs()">
     <div class="breadcrumbs">
     ${self.breadcrumbs_links()}
     </div>
 </%def>
 <%def name="context_bar(current)">
     ${repo_context_bar(current)}
 </%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>
       <li>${h.link_to(_('Repository groups'),h.url('repos_groups'),class_='repos_groups')}</li>
       <li>${h.link_to(_('Users'),h.url('users'),class_='users')}</li>
       <li>${h.link_to(_('User groups'),h.url('users_groups'),class_='groups')}</li>
       <li>${h.link_to(_('Permissions'),h.url('edit_permission',id='default'),class_='permissions')}</li>
       <li>${h.link_to(_('LDAP'),h.url('ldap_home'),class_='ldap')}</li>
       <li>${h.link_to(_('Defaults'),h.url('defaults'),class_='defaults')}</li>
       <li class="last">${h.link_to(_('Settings'),h.url('admin_settings'),class_='settings')}</li>
   </ul>

rhodecode/templates/bookmarks/bookmarks.html

➞

Show inline comments

@@ @@ -6,25 +6,25 @@ @@
 </%def>
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_bookmarks" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
     ${_('Bookmarks')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('switch-to')}
+${self.repo_context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     %if c.repo_bookmarks:
     <div class="info_box" id="compare_bookmarks" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="ui-btn small">${_('Compare bookmarks')}</a></div>
     %endif
     <div class="table">
         <%include file='bookmarks_data.html'/>
     </div>

rhodecode/templates/branches/branches.html

➞

Show inline comments

@@ @@ -6,25 +6,25 @@ @@
 </%def>
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_branches" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
     ${_('Branches')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('switch-to')}
+${self.repo_context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     %if c.repo_branches:
     <div class="info_box" id="compare_branches" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="ui-btn small">${_('Compare branches')}</a></div>
     %endif
     <div class="table">
         <%include file='branches_data.html'/>
     </div>

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -15,25 +15,25 @@ ${c.rhodecode_name} @@
     ${_('Changelog')}
     %if c.changelog_for_path:
      - /${c.changelog_for_path}
     %endif
     - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('changelog')}
+${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
         % if c.pagination:
             <div id="graph">
                 <div style="display:${'none' if c.changelog_for_path else ''}">
                     <div class="info_box" style="clear: both;padding: 10px 6px;min-height: 12px;text-align: right;">
                         <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
                         <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a>

rhodecode/templates/changeset/changeset.html

➞

Show inline comments

@@ @@ -6,25 +6,25 @@ @@
     ${_('%s Changeset') % c.repo_name} - ${h.show_id(c.changeset)} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Changeset')} - <span class='hash'>r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}</span>
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('changelog')}
+${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <script>
     var _USERS_AC_DATA = ${c.users_array|n};
     var _GROUPS_AC_DATA = ${c.users_groups_array|n};
     AJAX_COMMENT_URL = "${url('changeset_comment',repo_name=c.repo_name,revision=c.changeset.raw_id)}";
     AJAX_COMMENT_DELETE_URL = "${url('changeset_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";
     </script>
     <div class="table">

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -5,25 +5,25 @@ @@
     ${_('%s Changesets') % c.repo_name} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -&gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -&gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('changelog')}
+${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
         <div id="body" class="diffblock">
             <div class="code-header">
                 <div>
                 ${h.link_to('r%s:%s -> r%s:%s' % (c.cs_ranges[0].revision, h.short_id(c.cs_ranges[0].raw_id), c.cs_ranges[-1].revision, h.short_id(c.cs_ranges[-1].raw_id)),
                     h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id)
                     )}

rhodecode/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -5,25 +5,25 @@ @@
     ${_('%s Compare') % c.repo_name} - ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
   ${_('Compare revisions')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('changelog')}
+${self.repo_context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div class="table">
         <div id="body" class="diffblock">
             <div class="code-header">
                 <div>
                 ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}  <a href="${c.swap_url}">[swap]</a>
                 </div>
             </div>

rhodecode/templates/files/file_diff.html

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
     ${_('%s File Diff') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('File diff')} r${c.changeset_1.revision}:${h.short_id(c.changeset_1.raw_id)} &rarr; r${c.changeset_2.revision}:${h.short_id(c.changeset_2.raw_id)}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('files')}
+${self.repo_context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <div>
     ## diff block
     <%namespace name="diff_block" file="/changeset/diff_block.html"/>
     ${diff_block.diff_block(c.changes)}
     </div>
 </div>

rhodecode/templates/files/files.html

➞

Show inline comments

@@ @@ -11,25 +11,25 @@ @@
 <%def name="breadcrumbs_links()">
     ${_('Files')}
     %if c.file:
         @ ${h.show_id(c.changeset)}
     %endif
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('files')}
+${self.repo_context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;"><a href="#">${_('Branch')}: ${c.changeset.branch}</a></span>
             </li>
         </ul>
     </div>
     <div class="table">
         <div id="files_data">

rhodecode/templates/files/files_add.html

➞

Show inline comments

@@ @@ -11,25 +11,25 @@ @@
 <link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Add file')} @ ${h.show_id(c.cs)}
 </%def>
 <%def name="main()">
-${self.context_bar('files')}
+${self.repo_context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;">
               <a href="#">${_('Branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
     </div>
     <div class="table">

rhodecode/templates/files/files_edit.html

➞

Show inline comments

@@ @@ -11,25 +11,25 @@ @@
 <link rel="stylesheet" type="text/css" href="${h.url('/css/codemirror.css')}"/>
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Edit file')} @ ${h.show_id(c.cs)}
 </%def>
 <%def name="main()">
-${self.context_bar('files')}
+${self.repo_context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
         <ul class="links">
             <li>
               <span style="text-transform: uppercase;">
               <a href="#">${_('Branch')}: ${c.cs.branch}</a></span>
             </li>
         </ul>
     </div>
     <div class="table">

rhodecode/templates/followers/followers.html

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
 <%def name="title()">
     ${_('%s Followers') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Followers')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('followers')}
+${self.repo_context_bar('followers')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
         <div id="followers">
             ${c.followers_data}
         </div>
     </div>
 </div>

rhodecode/templates/forks/fork.html

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
 <%def name="title()">
     ${_('%s Fork') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Fork')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('showforks')}
+${self.repo_context_bar('showforks')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('repo_fork_create_home',repo_name=c.repo_info.repo_name))}
     <div class="form">
         <!-- fields -->
         <div class="fields">
             <div class="field">
               <div class="label">
                   <label for="repo_name">${_('Fork name')}:</label>

rhodecode/templates/forks/forks.html

➞

Show inline comments

@@ @@ -5,25 +5,25 @@ @@
     ${_('%s Forks') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Forks')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('showforks')}
+${self.repo_context_bar('showforks')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     <div class="table">
         <div id="forks">
             ${c.forks_data}
         </div>
     </div>
 </div>

rhodecode/templates/pullrequests/pullrequest.html

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
     ${c.repo_name} ${_('New pull request')}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('New pull request')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('showpullrequest')}
+${self.repo_context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${h.form(url('pullrequest', repo_name=c.repo_name), method='post', id='pull_request_form')}
     <h3>${_('Create new pull request')}</h3>
     <div class="form">
         <!-- fields -->

rhodecode/templates/pullrequests/pullrequest_show.html

➞

Show inline comments

@@ @@ -4,25 +4,25 @@ @@
     ${_('%s Pull Request #%s') % (c.repo_name, c.pull_request.pull_request_id)} &middot; ${c.rhodecode_name}
 </%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')}
+${self.repo_context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <h3 class="${'closed' if c.pull_request.is_closed() else ''}">
         <img src="${h.url('/images/icons/flag_status_%s.png' % str(c.pull_request.last_review_status))}" />
         ${_('Title')}: ${c.pull_request.title}
         %if c.pull_request.is_closed():
             (${_('Closed')})
         %endif

rhodecode/templates/pullrequests/pullrequest_show_all.html

➞

Show inline comments

@@ @@ -4,23 +4,23 @@ @@
     ${_('%s Pull Requests') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 <%def name="breadcrumbs_links()">
     ${_('Pull requests')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('showpullrequest')}
+${self.repo_context_bar('showpullrequest')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     ${c.pullrequest_data}
 </div>
 </%def>

rhodecode/templates/search/search.html

➞

Show inline comments

@@ @@ -21,25 +21,25 @@ @@
   %endif
 </%def>
 <%def name="page_nav()">
     %if c.repo_name:
     ${self.menu('repositories')}
     %else:
     ${self.menu('search')}
     %endif
 </%def>
 <%def name="main()">
 %if c.repo_name:
-${self.context_bar('options')}
+${self.repo_context_bar('options')}
 %endif
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     %if c.repo_name:
         ${h.form(h.url('search_repo',repo_name=c.repo_name),method='get')}
     %else:
         ${h.form(h.url('search'),method='get')}
     %endif

rhodecode/templates/summary/summary.html

➞

Show inline comments

@@ @@ -24,25 +24,25 @@ redirect_hash_branch = function(){ @@
             .replace('__BRANCH__',branch);
+    }
+}
 redirect_hash_branch();
 window.onhashchange = function() {
     redirect_hash_branch();
 };
 </script>
 </%def>
 <%def name="main()">
-${self.context_bar('summary')}
+${self.repo_context_bar('summary')}
     <%
     summary = lambda n:{False:'summary-short'}.get(n)
     %>
     %if c.show_stats:
         <div class="box box-left">
     %else:
         <div class="box">
     %endif
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>

rhodecode/templates/tags/tags.html

➞

Show inline comments

@@ @@ -6,25 +6,25 @@ @@
 </%def>
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_tags" size="15" type="text" name="filter" placeholder="${_('quick filter...')}" value=""/>
     ${_('Tags')}
 </%def>
 <%def name="page_nav()">
     ${self.menu('repositories')}
 </%def>
 <%def name="main()">
-${self.context_bar('switch-to')}
+${self.repo_context_bar('switch-to')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <!-- end box / title -->
     %if c.repo_tags:
     <div class="info_box" id="compare_tags" style="clear: both;padding: 10px 19px;text-align: right;"><a href="#" class="ui-btn small">${_('Compare tags')}</a></div>
     %endif
     <div class="table">
         <%include file='tags_data.html'/>
     </div>

0 comments (0 inline, 0 general)