Mercurial > kallithea
changeset 3581:93d912ea8cb1 beta
show forks in contextbar
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 24 Mar 2013 20:46:30 +0100 |
parents | 7b9d4f6bb04e |
children | 1f334a68d057 |
files | rhodecode/public/css/contextbar.css rhodecode/public/css/style.css rhodecode/templates/base/base.html rhodecode/templates/forks/fork.html rhodecode/templates/forks/forks.html |
diffstat | 5 files changed, 22 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/contextbar.css Sun Mar 24 20:24:17 2013 +0100 +++ b/rhodecode/public/css/contextbar.css Sun Mar 24 20:46:30 2013 +0100 @@ -15,6 +15,7 @@ #context-bar a.files { background-image: url("../images/icons/file.png"); } #context-bar a.switch-to { background-image: url("../images/icons/arrow_switch.png"); } #context-bar a.options { background-image: url("../images/icons/table_gear.png"); } +#context-bar a.forks { background-image: url("../images/icons/arrow_divide.png"); } #context-bar a.pull-request { background-image: url("../images/icons/arrow_join.png"); } #context-bar a.branches { background-image: url("../images/icons/arrow_branch.png"); } #context-bar a.tags { background-image: url("../images/icons/tag_blue.png"); }
--- a/rhodecode/public/css/style.css Sun Mar 24 20:24:17 2013 +0100 +++ b/rhodecode/public/css/style.css Sun Mar 24 20:46:30 2013 +0100 @@ -4521,6 +4521,17 @@ -webkit-border-radius: 4px !important; } +#context-pages .forks span, +.menu_link_notifications { + padding: 4px 4px !important; + text-align: center; + color: #888 !important; + background-color: #DEDEDE !important; + border-radius: 4px !important; + -webkit-border-radius: 4px !important; +} + + .notification-header { padding-top: 6px; }
--- a/rhodecode/templates/base/base.html Sun Mar 24 20:24:17 2013 +0100 +++ b/rhodecode/templates/base/base.html Sun Mar 24 20:46:30 2013 +0100 @@ -164,8 +164,15 @@ %endif </ul> </li> + <li ${is_current('showforks')}> + <a href="${h.url('repo_forks_home',repo_name=c.repo_name)}" title="${_('Show Forks')}" class="forks">${_('Forks')} + %if c.repository_forks: + <span>${c.repository_forks}</span> + %endif + </a> + </li> <li ${is_current('showpullrequest')}> - <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests')}" class="pull-request">Pull Requests + <a href="${h.url('pullrequest_show_all',repo_name=c.repo_name)}" title="${_('Show Pull Requests')}" class="pull-request">${_('Pull Requests')} %if c.repository_pull_requests: <span>${c.repository_pull_requests}</span> %endif
--- a/rhodecode/templates/forks/fork.html Sun Mar 24 20:24:17 2013 +0100 +++ b/rhodecode/templates/forks/fork.html Sun Mar 24 20:46:30 2013 +0100 @@ -13,10 +13,8 @@ ${_('fork')} </%def> -<%def name="page_nav()"> - ${self.menu('')} -</%def> <%def name="main()"> +${self.context_bar('showforks')} <div class="box"> <!-- box / title --> <div class="title">
--- a/rhodecode/templates/forks/forks.html Sun Mar 24 20:24:17 2013 +0100 +++ b/rhodecode/templates/forks/forks.html Sun Mar 24 20:46:30 2013 +0100 @@ -9,11 +9,8 @@ ${_('Forks')} </%def> -<%def name="page_nav()"> - ${self.menu('forks')} -</%def> <%def name="main()"> -${self.context_bar('forks')} +${self.context_bar('showforks')} <div class="box"> <!-- box / title --> <div class="title">