# HG changeset patch # User Marcin Kuzminski # Date 2013-03-24 19:46:30 # Node ID 93d912ea8cb184b20ab39aa81a9eb49214b12cb0 # Parent 7b9d4f6bb04e2322f3295f7e7153fc778be1fa1e show forks in contextbar diff --git a/rhodecode/public/css/contextbar.css b/rhodecode/public/css/contextbar.css --- a/rhodecode/public/css/contextbar.css +++ b/rhodecode/public/css/contextbar.css @@ -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"); } diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css --- a/rhodecode/public/css/style.css +++ b/rhodecode/public/css/style.css @@ -4521,6 +4521,17 @@ form.comment-inline-form { -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; } diff --git a/rhodecode/templates/base/base.html b/rhodecode/templates/base/base.html --- a/rhodecode/templates/base/base.html +++ b/rhodecode/templates/base/base.html @@ -164,8 +164,15 @@ %endif +
  • + ${_('Forks')} + %if c.repository_forks: + ${c.repository_forks} + %endif + +
  • - Pull Requests + ${_('Pull Requests')} %if c.repository_pull_requests: ${c.repository_pull_requests} %endif diff --git a/rhodecode/templates/forks/fork.html b/rhodecode/templates/forks/fork.html --- a/rhodecode/templates/forks/fork.html +++ b/rhodecode/templates/forks/fork.html @@ -13,10 +13,8 @@ ${_('fork')} -<%def name="page_nav()"> - ${self.menu('')} - <%def name="main()"> +${self.context_bar('showforks')}
    diff --git a/rhodecode/templates/forks/forks.html b/rhodecode/templates/forks/forks.html --- a/rhodecode/templates/forks/forks.html +++ b/rhodecode/templates/forks/forks.html @@ -9,11 +9,8 @@ ${_('Forks')} -<%def name="page_nav()"> - ${self.menu('forks')} - <%def name="main()"> -${self.context_bar('forks')} +${self.context_bar('showforks')}