Show More
@@ -50,6 +50,7 b'' | |||||
50 | 'Open new pull request': "${_('Open new pull request')}", |
|
50 | 'Open new pull request': "${_('Open new pull request')}", | |
51 | 'Open new pull request for selected changesets': "${_('Open new pull request for selected changesets')}", |
|
51 | 'Open new pull request for selected changesets': "${_('Open new pull request for selected changesets')}", | |
52 | 'Show selected changes __S -> __E': "${_('Show selected changes __S -> __E')}", |
|
52 | 'Show selected changes __S -> __E': "${_('Show selected changes __S -> __E')}", | |
|
53 | 'Show selected change __S': "${_('Show selected change __S')}", | |||
53 | 'Selection link': "${_('Selection link')}", |
|
54 | 'Selection link': "${_('Selection link')}", | |
54 | 'collapse diff': "${_('collapse diff')}", |
|
55 | 'collapse diff': "${_('collapse diff')}", | |
55 | 'expand diff': "${_('expand diff')}", |
|
56 | 'expand diff': "${_('expand diff')}", |
@@ -37,10 +37,10 b'' | |||||
37 | <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> |
|
37 | <a href="#" class="ui-btn small" id="rev_range_clear" style="display:none">${_('Clear selection')}</a> | |
38 |
|
38 | |||
39 | %if c.rhodecode_db_repo.fork: |
|
39 | %if c.rhodecode_db_repo.fork: | |
40 |
<a title="${_(' |
|
40 | <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> | |
41 | %endif |
|
41 | %endif | |
42 | %if h.is_hg(c.rhodecode_repo): |
|
42 | %if h.is_hg(c.rhodecode_repo): | |
43 |
<a id="open_new_pr" href="${h.url('pullrequest_ |
|
43 | <a id="open_new_pr" href="${h.url('pullrequest_form',repo_name=c.repo_name)}" class="ui-btn small">${_('Open new pull request')}</a> | |
44 | %endif |
|
44 | %endif | |
45 | </div> |
|
45 | </div> | |
46 | <div class="container_header"> |
|
46 | <div class="container_header"> | |
@@ -71,7 +71,7 b'' | |||||
71 | </div> |
|
71 | </div> | |
72 | <div class="mid"> |
|
72 | <div class="mid"> | |
73 | <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> |
|
73 | <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> | |
74 |
<div class="expand"><span class="expandtext">↓ ${_(' |
|
74 | <div class="expand"><span class="expandtext">↓ ${_('Show more')} ↓</span></div> | |
75 | </div> |
|
75 | </div> | |
76 | <div class="right"> |
|
76 | <div class="right"> | |
77 | <div class="changes"> |
|
77 | <div class="changes"> | |
@@ -162,7 +162,6 b'' | |||||
162 | if(checked_checkboxes.length>0){ |
|
162 | if(checked_checkboxes.length>0){ | |
163 | // modify open pull request to show we have selected cs |
|
163 | // modify open pull request to show we have selected cs | |
164 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets']; |
|
164 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request for selected changesets']; | |
165 |
|
||||
166 | }else{ |
|
165 | }else{ | |
167 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; |
|
166 | YUD.get('open_new_pr').innerHTML = _TM['Open new pull request']; | |
168 | } |
|
167 | } | |
@@ -174,7 +173,10 b'' | |||||
174 | var url = url_tmpl.replace('__REVRANGE__', |
|
173 | var url = url_tmpl.replace('__REVRANGE__', | |
175 | rev_start+'...'+rev_end); |
|
174 | rev_start+'...'+rev_end); | |
176 |
|
175 | |||
177 |
var link = |
|
176 | var link = (rev_start == rev_end) | |
|
177 | ? _TM['Show selected change __S'] | |||
|
178 | : _TM['Show selected changes __S -> __E']"; | |||
|
179 | ||||
178 | link = link.replace('__S',rev_start.substr(0,6)); |
|
180 | link = link.replace('__S',rev_start.substr(0,6)); | |
179 | link = link.replace('__E',rev_end.substr(0,6)); |
|
181 | link = link.replace('__E',rev_end.substr(0,6)); | |
180 | YUD.get('rev_range_container').href = url; |
|
182 | YUD.get('rev_range_container').href = url; |
General Comments 0
You need to be logged in to leave comments.
Login now