Mercurial > kallithea
changeset 2953:ac83f7a809a6 beta
Add compare button into quick menu
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Tue, 23 Oct 2012 14:25:00 +0200 |
| parents | 029a40c58df7 |
| children | 9282b4f38277 |
| files | rhodecode/public/css/style.css rhodecode/templates/base/base.html |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/public/css/style.css Tue Oct 23 11:09:27 2012 +0200 +++ b/rhodecode/public/css/style.css Tue Oct 23 14:25:00 2012 +0200 @@ -686,6 +686,15 @@ padding: 12px 9px 7px 24px; } +#header #header-inner #quick li ul li a.compare_request,#header #header-inner #quick li ul li a.compare_request:hover + { + background: #FFF url("../images/icons/arrow_inout.png") no-repeat 4px + 9px; + width: 167px; + margin: 0; + padding: 12px 9px 7px 24px; +} + #header #header-inner #quick li ul li a.search,#header #header-inner #quick li ul li a.search:hover { background: #FFF url("../images/icons/search_16.png") no-repeat 4px 9px;
--- a/rhodecode/templates/base/base.html Tue Oct 23 11:09:27 2012 +0200 +++ b/rhodecode/templates/base/base.html Tue Oct 23 14:25:00 2012 +0200 @@ -211,6 +211,9 @@ %if h.is_hg(c.rhodecode_repo): <li>${h.link_to(_('Open new pull request'),h.url('pullrequest_home',repo_name=c.repo_name),class_='pull_request')}</li> %endif + %if c.rhodecode_db_repo.fork: + <li>${h.link_to(_('Compare fork'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref=request.GET.get('branch') or 'default',other_ref_type='branch',other_ref='default',repo=c.rhodecode_db_repo.fork.repo_name),class_='compare_request')}</li> + %endif <li>${h.link_to(_('search'),h.url('search_repo',search_repo=c.repo_name),class_='search')}</li> %if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name) and c.rhodecode_db_repo.enable_locking: