kallithea Changeset - 246ab6d8a0f3

Changeset - 246ab6d8a0f3

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Mads Kiilerich - 13 years ago 2013-03-01 00:04:28
madski@unity3d.com

Grafted from: 024de27d58eb

changelog: improve texts and functionality regarding selecting changesets

2 files changed with 8 insertions and 5 deletions:

rhodecode/templates/base/root.html

rhodecode/templates/changelog/changelog.html

0 comments (0 inline, 0 general)

rhodecode/templates/base/root.html

➞

Show inline comments

@@ @@ -50,6 +50,7 @@ @@
                 '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')}",
                 'Selection link': "${_('Selection link')}",
                 'collapse diff': "${_('collapse diff')}",
                 'expand diff': "${_('expand diff')}",

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -37,10 +37,10 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                     <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.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>
+                        <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>
+                    <a id="open_new_pr" href="${h.url('pullrequest_form',repo_name=c.repo_name)}" class="ui-btn small">${_('Open new pull request')}</a>
                     %endif
                     </div>
                     <div class="container_header">
@@ @@ -71,7 +71,7 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                         </div>
                         <div class="mid">
                             <div class="message">${h.urlify_commit(cs.message, c.repo_name,h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id))}</div>
-                            <div class="expand"><span class="expandtext">&darr; ${_('show more')} &darr;</span></div>
+                            <div class="expand"><span class="expandtext">&darr; ${_('Show more')} &darr;</span></div>
                         </div>
                         <div class="right">
                                     <div class="changes">
@@ @@ -162,7 +162,6 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                           if(checked_checkboxes.length>0){
                             // modify open pull request to show we have selected cs
                             YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets'];
                           }else{
                             YUD.get('open_new_pr').innerHTML = _TM['Open new pull request'];
+                          }
@@ @@ -174,7 +173,10 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                             var url = url_tmpl.replace('__REVRANGE__',
                                     rev_start+'...'+rev_end);
                             var link = _TM['Show selected changes __S -> __E'];
                             var link = (rev_start == rev_end)
                               	? _TM['Show selected change __S']
                             	: _TM['Show selected changes __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;

0 comments (0 inline, 0 general)