Mercurial > kallithea

changeset 3532:9e677f6d34cb beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing missing icons. Removing the breadcrumb from the box header, so it will only be on the context bar.
author Leonardo <leo@unity3d.com>
date Tue, 05 Mar 2013 10:39:37 +0100
parents 1c2371dc86bd
children 5462bb077b05
files rhodecode/public/css/contextbar.css rhodecode/public/css/style.css 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/files/files.html rhodecode/templates/followers/followers.html rhodecode/templates/forks/forks.html rhodecode/templates/pullrequests/pullrequest_show_all.html rhodecode/templates/search/search.html rhodecode/templates/shortlog/shortlog.html rhodecode/templates/summary/summary.html rhodecode/templates/tags/tags.html
diffstat 15 files changed, 24 insertions(+), 69 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/public/css/contextbar.css	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/public/css/contextbar.css	Tue Mar 05 10:39:37 2013 +0100
@@ -28,6 +28,9 @@
 #context-bar a.ldap 			{ background-image: url("../images/icons/server_key.png"); }
 #context-bar a.defaults			{ background-image: url("../images/icons/wrench.png"); }
 #context-bar a.settings			{ background-image: url("../images/icons/cog_edit.png"); }
+#context-bar a.compare_request  { background-image: url('../images/icons/arrow_inout.png')}
+#context-bar a.locking_del   	{ background-image: url('../images/icons/lock_delete.png')}
+#context-bar a.locking_add   	{ background-image: url('../images/icons/lock_add.png')}
 
 #content #context-bar {
 	position: relative;
--- a/rhodecode/public/css/style.css	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/public/css/style.css	Tue Mar 05 10:39:37 2013 +0100
@@ -1876,11 +1876,11 @@
     border-top: none;
 }
 
-#summary-menu-stats a.followers { background-image: url('../images/icons/heart.png')}
-#summary-menu-stats a.forks     { background-image: url('../images/icons/arrow_divide.png')}
-#summary-menu-stats a.settings  { background-image: url('../images/icons/cog_edit.png')}
-#summary-menu-stats a.feed      { background-image: url('../images/icons/rss_16.png')}
-#summary-menu-stats a.repo-size { background-image: url('../images/icons/server.png')}
+#summary-menu-stats a.followers         { background-image: url('../images/icons/heart.png')}
+#summary-menu-stats a.forks             { background-image: url('../images/icons/arrow_divide.png')}
+#summary-menu-stats a.settings          { background-image: url('../images/icons/cog_edit.png')}
+#summary-menu-stats a.feed              { background-image: url('../images/icons/rss_16.png')}
+#summary-menu-stats a.repo-size         { background-image: url('../images/icons/server.png')}
 
 #summary-menu-stats a {
     display: block;
--- a/rhodecode/templates/admin/repos/repo_edit.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/admin/repos/repo_edit.html	Tue Mar 05 10:39:37 2013 +0100
@@ -6,11 +6,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('edit')}
+  ${_('Edit Repository Settings')}
 </%def>
 
 <%def name="page_nav()">
--- a/rhodecode/templates/base/base.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/base/base.html	Tue Mar 05 10:39:37 2013 +0100
@@ -104,7 +104,7 @@
   <!--- CONTEXT BAR -->
   <div id="context-bar" class="box">
     <div id="context-top">
-      <div id= "breadcrumbs">
+      <div id="breadcrumbs">
         ${h.link_to(_(u'Repositories'),h.url('home'))}
         ยป
         ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
@@ -143,7 +143,7 @@
             <li><a href="#">${_('loading...')}</a></li>
           </ul>
         </li>
-        <li ${is_current('options')}>
+        <li ${is_current('options')}> 
           <a href="#" class="dropdown options"></span>Options</a>
           <ul>
              %if h.HasRepoPermissionAll('repository.admin')(c.repo_name):
--- a/rhodecode/templates/bookmarks/bookmarks.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/bookmarks/bookmarks.html	Tue Mar 05 10:39:37 2013 +0100
@@ -8,11 +8,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_bookmarks" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('bookmarks')}
+    ${_('Bookmarks')}
 </%def>
 
 <%def name="page_nav()">
--- a/rhodecode/templates/branches/branches.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/branches/branches.html	Tue Mar 05 10:39:37 2013 +0100
@@ -7,11 +7,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_branches" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('branches')}
+    ${_('Branches')}
 </%def>
 
 <%def name="page_nav()">
--- a/rhodecode/templates/changelog/changelog.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/changelog/changelog.html	Tue Mar 05 10:39:37 2013 +0100
@@ -7,12 +7,8 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
     <% size = c.size if c.size <= c.total_cs else c.total_cs %>
-    ${_('changelog')} - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
+    ${_('Changelog')} - ${ungettext('showing %d out of %d revision', 'showing %d out of %d revisions', size) % (size, c.total_cs)}
 </%def>
 
 <%def name="page_nav()">
--- a/rhodecode/templates/files/files.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/files/files.html	Tue Mar 05 10:39:37 2013 +0100
@@ -5,11 +5,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('files')}
+    ${_('Files')}
     %if c.file:
         @ r${c.changeset.revision}:${h.short_id(c.changeset.raw_id)}
     %endif
--- a/rhodecode/templates/followers/followers.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/followers/followers.html	Tue Mar 05 10:39:37 2013 +0100
@@ -6,11 +6,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('followers')}
+    ${_('Followers')}
 </%def>
 
 <%def name="page_nav()">
--- a/rhodecode/templates/forks/forks.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/forks/forks.html	Tue Mar 05 10:39:37 2013 +0100
@@ -6,11 +6,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('forks')}
+    ${_('Forks')}
 </%def>
 
 <%def name="page_nav()">
--- a/rhodecode/templates/pullrequests/pullrequest_show_all.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/pullrequests/pullrequest_show_all.html	Tue Mar 05 10:39:37 2013 +0100
@@ -5,11 +5,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('pull requests')}
+    ${_('Pull requests')}
 </%def>
 
 <%def name="main()">
--- a/rhodecode/templates/search/search.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/search/search.html	Tue Mar 05 10:39:37 2013 +0100
@@ -11,13 +11,9 @@
 
 <%def name="breadcrumbs_links()">
   %if c.repo_name:
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('search')}
+    ${_('Search')}
   %else:
-    ${_('search in all repositories')}
+    ${_('Search in all repositories')}
   %endif
   %if c.cur_query:
     &raquo;
--- a/rhodecode/templates/shortlog/shortlog.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/shortlog/shortlog.html	Tue Mar 05 10:39:37 2013 +0100
@@ -7,16 +7,12 @@
 
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
     %if c.file_history:
-        ${h.link_to(_('shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}
+        ${h.link_to(_('Shortlog'),h.url('shortlog_home',repo_name=c.repo_name))}
         &raquo;
         ${c.file_history}
     %else:
-        ${_('shortlog')}
+        ${_('Shortlog')}
     %endif
 </%def>
 
--- a/rhodecode/templates/summary/summary.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/summary/summary.html	Tue Mar 05 10:39:37 2013 +0100
@@ -5,11 +5,7 @@
 </%def>
 
 <%def name="breadcrumbs_links()">
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('summary')}
+    ${_('Summary')}
 </%def>
 
 <%def name="page_nav()">
--- a/rhodecode/templates/tags/tags.html	Mon Mar 04 18:56:02 2013 +0100
+++ b/rhodecode/templates/tags/tags.html	Tue Mar 05 10:39:37 2013 +0100
@@ -8,11 +8,7 @@
 
 <%def name="breadcrumbs_links()">
     <input class="q_filter_box" id="q_filter_tags" size="15" type="text" name="filter" value="${_('quick filter...')}"/>
-    ${h.link_to(_(u'Home'),h.url('/'))}
-    &raquo;
-    ${h.repo_link(c.rhodecode_db_repo.groups_and_repo)}
-    &raquo;
-    ${_('tags')}
+    ${_('Tags')}
 </%def>
 
 <%def name="page_nav()">