diff options
author | Mads Kiilerich <madski@unity3d.com> | 2013-02-01 23:13:10 +0100 |
---|---|---|
committer | Mads Kiilerich <madski@unity3d.com> | 2013-02-01 23:13:10 +0100 |
commit | a8c227acb8fa512dae2f4858dba0a08f4164b3d7 (patch) | |
tree | ebad6a2645349fa8846f4d9d7f70f1999e557ac2 /rhodecode/templates/changelog | |
parent | 29cdb53ca6e8f85caf987149863a2c53698ea0f8 (diff) |
compare: swap org and other when they refer to different repos, ie are pull request style
Pull requests will have a different from/to description - but in a consistent
and slightly better way that can be improved later.
A pull request diff is empathic: "How will this look for the peer I'm proposing to" style.
--HG--
branch : beta
extra : rebase_source : f0a793fbc351157d0472b3fa6a7129d152e3d5a6
Diffstat (limited to 'rhodecode/templates/changelog')
-rw-r--r-- | rhodecode/templates/changelog/changelog.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rhodecode/templates/changelog/changelog.html b/rhodecode/templates/changelog/changelog.html index 1aaa16cd..1eb64074 100644 --- a/rhodecode/templates/changelog/changelog.html +++ b/rhodecode/templates/changelog/changelog.html @@ -37,7 +37,7 @@ ${_('%s Changelog') % c.repo_name} - ${c.rhodecode_name} <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> %if c.rhodecode_db_repo.fork: - <a title="${_('compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.repo_name,org_ref_type='branch',org_ref=request.GET.get('branch') or 'default',other_repo=c.rhodecode_db_repo.fork.repo_name,other_ref_type='branch',other_ref='default')}" class="ui-btn small">${_('Compare fork with parent')}</a> + <a title="${_('compare fork with %s' % c.rhodecode_db_repo.fork.repo_name)}" href="${h.url('compare_url',repo_name=c.rhodecode_db_repo.fork.repo_name,org_ref_type='branch',org_ref='default',other_repo=c.repo_name,other_ref_type='branch',other_ref=request.GET.get('branch') or 'default')}" class="ui-btn small">${_('Compare fork with parent')}</a> %endif %if h.is_hg(c.rhodecode_repo): <a id="open_new_pr" href="${h.url('pullrequest_home',repo_name=c.repo_name)}" class="ui-btn small">${_('open new pull request')}</a> |