kallithea Changeset - 549c73bfc206

Changeset - 549c73bfc206

Parent rev.

Child rev.

[Not reviewed]

beta

0 5 0

Mads Kiilerich - 13 years ago 2013-03-08 00:50:49
madski@unity3d.com

changelog / compare: adjust titles

Clarify what shows changesets and what more see changesets as revisions that
specify snapshots that are compared.

5 files changed with 10 insertions and 8 deletions:

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

0 comments (0 inline, 0 general)

docs/usage/general.rst

➞

Show inline comments

@@ @@ -35,13 +35,13 @@ checkbox the << and >> buttons will only @@
 Compare view from changelog
 ---------------------------
 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
 one changeset

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -47,14 +47,14 @@ @@
                 'members':"${_('members')}",
                 'Loading ...':"${_('Loading ...')}",
                 'Search truncated': "${_('Search truncated')}",
                 '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')}"
             };
             var _TM = TRANSLATION_MAP;

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -149,14 +149,14 @@ ${self.context_bar('changelog')} @@
                         var rev_end = checked_checkboxes[0].name;
                         var rev_start = checked_checkboxes[checked_checkboxes.length-1].name;
                         var url = url_tmpl.replace('__REVRANGE__',
                                 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));
                         YUD.get('rev_range_container').href = url;
                         YUD.get('rev_range_container').innerHTML = link;
                         YUD.setStyle('rev_range_container','display','');

rhodecode/templates/changeset/changeset_range.html

➞

Show inline comments

@@ @@ -23,15 +23,17 @@ @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <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)} -&gt; 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>
         <div id="changeset_compare_view_content">
             <div class="container">
             <table class="compare_view_commits noborder">

rhodecode/templates/compare/compare_diff.html

➞

Show inline comments

@@ @@ -23,13 +23,13 @@ @@
     <div class="title">
         ${self.breadcrumbs()}
     </div>
     <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)} -&gt; ${'%s@%s' % (c.other_repo.repo_name, c.other_ref)}  <a href="${c.swap_url}">[swap]</a>
                 </div>
             </div>
         </div>
         <div id="changeset_compare_view_content">

0 comments (0 inline, 0 general)