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

@@ @@ -41,24 +41,25 @@ @@
             var TRANSLATION_MAP = {
                 'add another comment':'${_("add another comment")}',
                 'Stop following this repository':"${_('Stop following this repository')}",
                 'Start following this repository':"${_('Start following this repository')}",
                 'Group':"${_('Group')}",
                 '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')}",
                 'Selection link': "${_('Selection link')}",
                 'collapse diff': "${_('collapse diff')}",
                 'expand diff': "${_('expand diff')}",
             };
             var _TM = TRANSLATION_MAP;
             var TOGGLE_FOLLOW_URL  = "${h.url('toggle_following')}";
             </script>
             <script type="text/javascript" src="${h.url('/js/yui.2.9.js', ver=c.rhodecode_version)}"></script>
             <!--[if lt IE 9]>
                <script language="javascript" type="text/javascript" src="${h.url('/js/excanvas.min.js')}"></script>

rhodecode/templates/changelog/changelog.html

➞

Show inline comments

@@ @@ -28,28 +28,28 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
     <div class="table">
         % if c.pagination:
             <div id="graph">
                 <div id="graph_nodes">
                     <canvas id="graph_canvas"></canvas>
                 </div>
                 <div id="graph_content">
                     <div class="info_box" style="clear: both;padding: 10px 6px;text-align: right;">
                     <a href="#" class="ui-btn small" id="rev_range_container" style="display:none"></a>
                     <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">
                         ${h.form(h.url.current(),method='get')}
                         <div class="info_box" style="float:left">
                           ${h.submit('set',_('Show'),class_="ui-btn")}
                           ${h.text('size',size=1,value=c.size)}
                           ${_('revisions')}
                         </div>
                         ${h.end_form()}
                     <div style="float:right">${h.select('branch_filter',c.branch_name,c.branch_filters)}</div>
                     </div>
@@ @@ -62,25 +62,25 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                             <span class="tooltip" title="${h.tooltip(h.age(cs.date))}"><a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id)}"><span class="changeset_id">${cs.revision}:<span class="changeset_hash">${h.short_id(cs.raw_id)}</span></span></a></span>
                             </div>
                             <div class="author">
                                 <div class="gravatar">
                                     <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(cs.author),16)}"/>
                                 </div>
                                 <div title="${cs.author}" class="user">${h.shorter(h.person(cs.author),22)}</div>
                             </div>
                             <div class="date">${h.fmt_date(cs.date)}</div>
                         </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">
                                         <div id="changed_total_${cs.raw_id}" style="float:right;" class="changed_total tooltip" title="${h.tooltip(_('Affected number of files, click to show more details'))}">${len(cs.affected_files)}</div>
                                         <div class="comments-container">
                                         %if len(c.comments.get(cs.raw_id,[])) > 0:
                                             <div class="comments-cnt" title="${('comments')}">
                                               <a href="${h.url('changeset_home',repo_name=c.repo_name,revision=cs.raw_id,anchor='comment-%s' % c.comments[cs.raw_id][0].comment_id)}">
                                                <div class="comments-cnt">${len(c.comments[cs.raw_id])}</div>
                                                <img src="${h.url('/images/icons/comments.png')}">
                                               </a>
                                             </div>
@@ @@ -153,37 +153,39 @@ ${_('%s Changelog') % c.repo_name} - ${c @@
                     YUE.on(checkboxes,'click',function(e){
                         var clicked_cb = e.currentTarget;
                         var checked_checkboxes = [];
                         for (pos in checkboxes){
                             if(checkboxes[pos].checked){
                                 checked_checkboxes.push(checkboxes[pos]);
+                            }
+                        }
                         if(YUD.get('open_new_pr')){
                           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'];
+                          }
+                        }
                         if(checked_checkboxes.length>0){
                             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 = _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;
                             YUD.get('rev_range_container').innerHTML = link;
                             YUD.setStyle('rev_range_container','display','');
                             YUD.setStyle('rev_range_clear','display','');
                             YUD.get('open_new_pr').href = pr_tmpl + '?rev_start={0}&rev_end={1}'.format(rev_start,rev_end);
+                        }
                         else{
                             YUD.setStyle('rev_range_container','display','none');

0 comments (0 inline, 0 general)