##// END OF EJS Templates
changelog / compare: adjust titles...
Mads Kiilerich -
r3592:549c73bf beta
parent child Browse files
Show More
@@ -38,7 +38,7 b' Compare view from changelog'
38 Checkboxes in compare view allow users to view combined compare view. You can
38 Checkboxes in compare view allow users to view combined compare view. You can
39 only show the range between the first and last checkbox (no cherry pick).
39 only show the range between the first and last checkbox (no cherry pick).
40 Clicking more than one checkbox will activate a link in top saying
40 Clicking more than one checkbox will activate a link in top saying
41 `Show selected changes <from-rev> -> <to-rev>` clicking this will bring
41 `Show selected changesets <from-rev> -> <to-rev>` clicking this will bring
42 compare view. In this view also it's possible to switch to combined compare.
42 compare view. In this view also it's possible to switch to combined compare.
43
43
44 Compare view is also available from the journal on pushes having more than
44 Compare view is also available from the journal on pushes having more than
@@ -50,8 +50,8 b''
50 'No matching files': "${_('No matching files')}",
50 'No matching files': "${_('No matching files')}",
51 'Open new pull request': "${_('Open new pull request')}",
51 'Open new pull request': "${_('Open new pull request')}",
52 'Open new pull request for selected changesets': "${_('Open new pull request for selected changesets')}",
52 'Open new pull request for selected changesets': "${_('Open new pull request for selected changesets')}",
53 'Show selected changes __S -> __E': "${_('Show selected changes __S -> __E')}",
53 'Show selected changesets __S -> __E': "${_('Show selected changesets __S -> __E')}",
54 'Show selected change __S': "${_('Show selected change __S')}",
54 'Show selected changeset __S': "${_('Show selected changeset __S')}",
55 'Selection link': "${_('Selection link')}",
55 'Selection link': "${_('Selection link')}",
56 'Collapse diff': "${_('Collapse diff')}",
56 'Collapse diff': "${_('Collapse diff')}",
57 'Expand diff': "${_('Expand diff')}"
57 'Expand diff': "${_('Expand diff')}"
@@ -152,8 +152,8 b''
152 rev_start+'...'+rev_end);
152 rev_start+'...'+rev_end);
153
153
154 var link = (rev_start == rev_end)
154 var link = (rev_start == rev_end)
155 ? _TM['Show selected change __S']
155 ? _TM['Show selected changeset __S']
156 : _TM['Show selected changes __S -> __E'];
156 : _TM['Show selected changesets __S -> __E'];
157
157
158 link = link.replace('__S',rev_start.substr(0,6));
158 link = link.replace('__S',rev_start.substr(0,6));
159 link = link.replace('__E',rev_end.substr(0,6));
159 link = link.replace('__E',rev_end.substr(0,6));
@@ -26,9 +26,11 b''
26 <div class="table">
26 <div class="table">
27 <div id="body" class="diffblock">
27 <div id="body" class="diffblock">
28 <div class="code-header cv">
28 <div class="code-header cv">
29 <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>
29 <h3 class="code-header-title">${_('Show changesets')}</h3>
30 <div>
30 <div>
31 ${_('Changesets')} - r${c.cs_ranges[0].revision}:${h.short_id(c.cs_ranges[0].raw_id)} -&gt; r${c.cs_ranges[-1].revision}:${h.short_id(c.cs_ranges[-1].raw_id)}
31 ${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)),
32 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)
33 )}
32 </div>
34 </div>
33 </div>
35 </div>
34 </div>
36 </div>
@@ -26,7 +26,7 b''
26 <div class="table">
26 <div class="table">
27 <div id="body" class="diffblock">
27 <div id="body" class="diffblock">
28 <div class="code-header cv">
28 <div class="code-header cv">
29 <h3 class="code-header-title">${_('Compare View')}</h3>
29 <h3 class="code-header-title">${_('Compare revisions')}</h3>
30 <div>
30 <div>
31 ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} <a href="${c.swap_url}">[swap]</a>
31 ${'%s@%s' % (c.org_repo.repo_name, c.org_ref)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)} <a href="${c.swap_url}">[swap]</a>
32 </div>
32 </div>
General Comments 0
You need to be logged in to leave comments. Login now