Mercurial > kallithea
changeset 3592:549c73bfc206 beta
changelog / compare: adjust titles
Clarify what shows changesets and what more see changesets as revisions that
specify snapshots that are compared.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Fri, 08 Mar 2013 00:50:49 +0100 |
| parents | 2b3a553eaaad |
| children | 716ac7659b90 |
| files | docs/usage/general.rst rhodecode/templates/base/root.html rhodecode/templates/changelog/changelog.html rhodecode/templates/changeset/changeset_range.html rhodecode/templates/compare/compare_diff.html |
| diffstat | 5 files changed, 10 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/usage/general.rst Tue Mar 26 12:59:11 2013 +0100 +++ b/docs/usage/general.rst Fri Mar 08 00:50:49 2013 +0100 @@ -38,7 +38,7 @@ Checkboxes in compare view allow users to view combined compare view. You can only show the range between the first and last checkbox (no cherry pick). Clicking more than one checkbox will activate a link in top saying -`Show selected changes <from-rev> -> <to-rev>` clicking this will bring +`Show selected changesets <from-rev> -> <to-rev>` clicking this will bring compare view. In this view also it's possible to switch to combined compare. Compare view is also available from the journal on pushes having more than
--- a/rhodecode/templates/base/root.html Tue Mar 26 12:59:11 2013 +0100 +++ b/rhodecode/templates/base/root.html Fri Mar 08 00:50:49 2013 +0100 @@ -50,8 +50,8 @@ 'No matching files': "${_('No matching files')}", 'Open new pull request': "${_('Open new pull request')}", 'Open new pull request for selected changesets': "${_('Open new pull request for selected changesets')}", - 'Show selected changes __S -> __E': "${_('Show selected changes __S -> __E')}", - 'Show selected change __S': "${_('Show selected change __S')}", + 'Show selected changesets __S -> __E': "${_('Show selected changesets __S -> __E')}", + 'Show selected changeset __S': "${_('Show selected changeset __S')}", 'Selection link': "${_('Selection link')}", 'Collapse diff': "${_('Collapse diff')}", 'Expand diff': "${_('Expand diff')}"
--- a/rhodecode/templates/changelog/changelog.html Tue Mar 26 12:59:11 2013 +0100 +++ b/rhodecode/templates/changelog/changelog.html Fri Mar 08 00:50:49 2013 +0100 @@ -152,8 +152,8 @@ rev_start+'...'+rev_end); var link = (rev_start == rev_end) - ? _TM['Show selected change __S'] - : _TM['Show selected changes __S -> __E']; + ? _TM['Show selected changeset __S'] + : _TM['Show selected changesets __S -> __E']; link = link.replace('__S',rev_start.substr(0,6)); link = link.replace('__E',rev_end.substr(0,6));
--- a/rhodecode/templates/changeset/changeset_range.html Tue Mar 26 12:59:11 2013 +0100 +++ b/rhodecode/templates/changeset/changeset_range.html Fri Mar 08 00:50:49 2013 +0100 @@ -26,9 +26,11 @@ <div class="table"> <div id="body" class="diffblock"> <div class="code-header cv"> - <h3 class="code-header-title">${_('Compare View')} / ${h.link_to(_('Show combined compare'),h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id))}</h3> + <h3 class="code-header-title">${_('Show changesets')}</h3> <div> - ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -> r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)} + ${h.link_to('r%s:%s -> r%s:%s' % (c.cs_ranges[0].revision, h.short_id(c.cs_ranges[0].raw_id), c.cs_ranges[-1].revision, h.short_id(c.cs_ranges[-1].raw_id)), + h.url('compare_url',repo_name=c.repo_name,org_ref_type='rev',org_ref=getattr(c.cs_ranges[0].parents[0] if c.cs_ranges[0].parents else h.EmptyChangeset(),'raw_id'),other_ref_type='rev',other_ref=c.cs_ranges[-1].raw_id) + )} </div> </div> </div>
--- a/rhodecode/templates/compare/compare_diff.html Tue Mar 26 12:59:11 2013 +0100 +++ b/rhodecode/templates/compare/compare_diff.html Fri Mar 08 00:50:49 2013 +0100 @@ -26,7 +26,7 @@ <div class="table"> <div id="body" class="diffblock"> <div class="code-header cv"> - <h3 class="code-header-title">${_('Compare View')}</h3> + <h3 class="code-header-title">${_('Compare revisions')}</h3> <div> ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -> ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} <a href="${c.swap_url}">[swap]</a> </div>