Mercurial > kallithea

changeset 3601:51da0e019248 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repository pages: cleanup of use of repository context menu
author Mads Kiilerich <madski@unity3d.com>
date Tue, 26 Mar 2013 17:19:52 +0100
parents 727119201a42
children bb1eecda3172
files rhodecode/public/css/style.css rhodecode/templates/base/base.html rhodecode/templates/bookmarks/bookmarks.html rhodecode/templates/changeset/changeset_range.html rhodecode/templates/compare/compare_diff.html rhodecode/templates/files/file_diff.html rhodecode/templates/settings/repo_settings.html rhodecode/templates/tags/tags.html
diffstat 8 files changed, 15 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/style.css	Tue Mar 26 17:16:04 2013 +0100
+++ b/rhodecode/public/css/style.css	Tue Mar 26 17:19:52 2013 +0100
@@ -4690,9 +4690,6 @@
     padding: 3px 3px 11px 3px;
 }
 
-div.diffblock .code-header.cv {
-    height: 34px;
-}
 div.diffblock .code-header-title {
     padding: 0px 0px 10px 5px !important;
     margin: 0 !important;
--- a/rhodecode/templates/base/base.html	Tue Mar 26 17:16:04 2013 +0100
+++ b/rhodecode/templates/base/base.html	Tue Mar 26 17:19:52 2013 +0100
@@ -62,9 +62,9 @@
 </%def>
 
 <%def name="context_bar(current=None)">
-   %if c.repo_name:
+  %if c.repo_name:
     ${repo_context_bar(current)}
-   %endif
+  %endif
 </%def>
 
 <%def name="admin_menu()">
--- a/rhodecode/templates/bookmarks/bookmarks.html	Tue Mar 26 17:16:04 2013 +0100
+++ b/rhodecode/templates/bookmarks/bookmarks.html	Tue Mar 26 17:19:52 2013 +0100
@@ -5,7 +5,6 @@
     ${_('%s Bookmarks') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
-
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_bookmarks" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
     ${_('Bookmarks')}
@@ -14,9 +13,10 @@
 <%def name="page_nav()">
     ${self.menu('bookmarks')}
 </%def>
+
 <%def name="main()">
+${self.context_bar('switch-to')}
 <div class="box">
-${self.context_bar('switch-to')}
     <!-- box / title -->
     <div class="title">
         ${self.breadcrumbs()}
@@ -26,6 +26,7 @@
         <%include file='bookmarks_data.html'/>
     </div>
 </div>
+
 <script type="text/javascript">
 
 // main table sorting
--- a/rhodecode/templates/changeset/changeset_range.html	Tue Mar 26 17:16:04 2013 +0100
+++ b/rhodecode/templates/changeset/changeset_range.html	Tue Mar 26 17:19:52 2013 +0100
@@ -18,6 +18,7 @@
 </%def>
 
 <%def name="main()">
+${self.context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
@@ -25,8 +26,7 @@
     </div>
     <div class="table">
         <div id="body" class="diffblock">
-            <div class="code-header cv">
-                <h3 class="code-header-title">${_('Show changesets')}</h3>
+            <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)
--- a/rhodecode/templates/compare/compare_diff.html	Tue Mar 26 17:16:04 2013 +0100
+++ b/rhodecode/templates/compare/compare_diff.html	Tue Mar 26 17:19:52 2013 +0100
@@ -18,6 +18,7 @@
 </%def>
 
 <%def name="main()">
+${self.context_bar('changelog')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
@@ -25,8 +26,7 @@
     </div>
     <div class="table">
         <div id="body" class="diffblock">
-            <div class="code-header cv">
-                <h3 class="code-header-title">${_('Compare revisions')}</h3>
+            <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>
--- a/rhodecode/templates/files/file_diff.html	Tue Mar 26 17:16:04 2013 +0100
+++ b/rhodecode/templates/files/file_diff.html	Tue Mar 26 17:19:52 2013 +0100
@@ -15,7 +15,9 @@
 <%def name="page_nav()">
     ${self.menu('files')}
 </%def>
+
 <%def name="main()">
+${self.context_bar('files')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
@@ -27,6 +29,7 @@
     ${diff_block.diff_block(c.changes)}
     </div>
 </div>
+
 <script>
 YUE.onDOMReady(function(){
 
--- a/rhodecode/templates/settings/repo_settings.html	Tue Mar 26 17:16:04 2013 +0100
+++ b/rhodecode/templates/settings/repo_settings.html	Tue Mar 26 17:19:52 2013 +0100
@@ -19,7 +19,9 @@
 <%def name="page_nav()">
     ${self.menu('settings')}
 </%def>
+
 <%def name="main()">
+${self.context_bar('options')}
 <div class="box">
     <!-- box / title -->
     <div class="title">
--- a/rhodecode/templates/tags/tags.html	Tue Mar 26 17:16:04 2013 +0100
+++ b/rhodecode/templates/tags/tags.html	Tue Mar 26 17:19:52 2013 +0100
@@ -5,7 +5,6 @@
     ${_('%s Tags') % c.repo_name} &middot; ${c.rhodecode_name}
 </%def>
 
-
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_tags" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
     ${_('Tags')}
@@ -14,6 +13,7 @@
 <%def name="page_nav()">
     ${self.menu('tags')}
 </%def>
+
 <%def name="main()">
 ${self.context_bar('switch-to')}
 <div class="box">