Changeset - e46de90d5554
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 12 years ago 2014-07-04 14:12:06
madski@unity3d.com
diff: don't ask for confirmation before showing diff - we already showed a warning
2 files changed with 4 insertions and 4 deletions:
kallithea/templates/changeset/changeset.html
2
2
kallithea/templates/pullrequests/pullrequest_show.html
2
2
0 comments (0 inline, 0 general)
kallithea/templates/changeset/changeset.html
➞
Show inline comments
 
@@ -91,109 +91,109 @@ ${self.repo_context_bar('changelog', c.c
 
                        %if h.is_hg(c.db_repo_scm_instance):
 
                          %for book in c.changeset.bookmarks:
 
                          <span class="booktag" title="${_('Bookmark %s') % book}">
 
                             ${h.link_to(book,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}
 
                          </span>
 
                          %endfor
 
                        %endif
 

			




	
	
	
		
 
                        %for tag in c.changeset.tags:

			




	
	
	
		
 
                         <span class="tagtag"  title="${_('Tag %s') % tag}">

			




	
	
	
		
 
                         ${h.link_to(tag,h.url('changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id))}</span>

			




	
	
	
		
 
                        %endfor

			




	
	
	
		
 

			




	
	
	
		
 
                        %if c.changeset.branch:

			




	
	
	
		
 
                         <span class="branchtag" title="${_('Branch %s') % c.changeset.branch}">

			




	
	
	
		
 
                         ${h.link_to(c.changeset.branch,h.url('changelog_home',repo_name=c.repo_name,branch=c.changeset.branch))}

			




	
	
	
		
 
                         </span>

			




	
	
	
		
 
                        %endif

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
                <div class="left">

			




	
	
	
		
 
                     <div class="author">

			




	
	
	
		
 
                         <div class="gravatar">

			




	
	
	
		
 
                             <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.changeset.author),20)}"/>

			




	
	
	
		
 
                         </div>

			




	
	
	
		
 
                         <span><b>${h.person(c.changeset.author)}</b> - ${h.age(c.changeset.date,True)} ${h.fmt_date(c.changeset.date)}</span><br/>

			




	
	
	
		
 
                         <span>${h.email_or_none(c.changeset.author)}</span><br/>

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     <div class="message">${h.urlify_commit(c.changeset.message, c.repo_name)}</div>

			




	
	
	
		
 
                </div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="changes_txt">

			




	
	
	
		
 
            % if c.limited_diff:

			




	
	
	
		
 
            ${ungettext('%s file changed','%s files changed',len(c.changeset.affected_files)) % (len(c.changeset.affected_files))}:

			




	
	
	
		
 
            % else:

			




	
	
	
		
 
            ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.changeset.affected_files)) % (len(c.changeset.affected_files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="cs_files">

			




	
	
	
		
 
              %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems():

			




	
	
	
		
 
                  <div class="cs_${change}">

			




	
	
	
		
 
                        <div class="node">

			




	
	
	
		
 
                            <a href="#${FID}">${h.safe_unicode(path)}</a>

			




	
	
	
		
 
                        </div>

			




	
	
	
		
 
                    <div class="changes">${h.fancy_file_stats(stats)}</div>

			




	
	
	
		
 
                  </div>

			




	
	
	
		
 
              %endfor

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5>

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    ${diff_block.diff_block(c.changes[c.changeset.raw_id])}

			




	
	
	
		
 

			




	
	
	
		
 
    % if c.limited_diff:

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h4>

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## main comment form and it status

			




	
	
	
		
 
    ${comment.comments(h.url('changeset_comment', repo_name=c.repo_name, revision=c.changeset.raw_id),

			




	
	
	
		
 
                       h.changeset_status(c.db_repo, c.changeset.raw_id))}

			




	
	
	
		
 

			




	
	
	
		
 
    ## FORM FOR MAKING JS ACTION AS CHANGESET COMMENTS

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




	
	
	
		
 
          YUE.on(YUQ('.show-inline-comments'),'change',function(e){

			




	
	
	
		
 
              var show = 'none';

			




	
	
	
		
 
              var target = e.currentTarget;

			




	
	
	
		
 
              if(target == null){

			




	
	
	
		
 
                  target = this;

			




	
	
	
		
 
              }

			




	
	
	
		
 
              if(target.checked){

			




	
	
	
		
 
                  var show = ''

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var boxid = YUD.getAttribute(target,'id_for');

			




	
	
	
		
 
              var comments = YUQ('#{0} .inline-comments'.format(boxid));

			




	
	
	
		
 
              for(c in comments){

			




	
	
	
		
 
                 YUD.setStyle(comments[c],'display',show);

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var btns = YUQ('#{0} .inline-comments-button'.format(boxid));

			




	
	
	
		
 
              for(c in btns){

			




	
	
	
		
 
                  YUD.setStyle(btns[c],'display',show);

			




	
	
	
		
 
               }

			




	
	
	
		
 
          })

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.line'),'click',function(e){

			




	
	
	
		
 
              var tr = e.currentTarget;

			




	
	
	
		
 
              if(tr == null){

			




	
	
	
		
 
                  tr = this;

			




	
	
	
		
 
              }

			




	
	
	
		
 
              injectInlineForm(tr);

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          // inject comments into they proper positions

			




	
	
	
		
 
          var file_comments = YUQ('.inline-comment-placeholder');

			




	
	
	
		
 
          renderInlineComments(file_comments);

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    kallithea/templates/pullrequests/pullrequest_show.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -142,121 +142,121 @@ ${self.repo_context_bar('showpullrequest

			




	
	
	
		
 
               ${h.text('user', class_='yui-ac-input')}

			




	
	
	
		
 
               <span class="help-block">${_('Add or remove reviewer to this pull request.')}</span>

			




	
	
	
		
 
               <div id="reviewers_container"></div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div style="padding:0px 10px">

			




	
	
	
		
 
             <span id="update_pull_request" class="btn btn-mini">${_('Save Changes')}</span>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
       </div>

			




	
	
	
		
 

			




	
	
	
		
 
    <div style="overflow: auto; clear: both">

			




	
	
	
		
 
      ##DIFF

			




	
	
	
		
 
      <div class="table" style="float:left;clear:none">

			




	
	
	
		
 
          <div class="diffblock">

			




	
	
	
		
 
              <div style="padding:5px">

			




	
	
	
		
 
                ${_('Compare view')}

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div id="changeset_compare_view_content">

			




	
	
	
		
 
              ##CS

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">${ungettext('Showing %s commit','Showing %s commits', len(c.cs_ranges)) % len(c.cs_ranges)}</div>

			




	
	
	
		
 
              <%include file="/compare/compare_cs.html" />

			




	
	
	
		
 

			




	
	
	
		
 
              ## FILES

			




	
	
	
		
 
              <div style="font-size:1.1em;font-weight: bold;clear:both;padding-top:10px">

			




	
	
	
		
 

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                  ${ungettext('%s file changed', '%s files changed', len(c.files)) % len(c.files)}

			




	
	
	
		
 
              % else:

			




	
	
	
		
 
                  ${ungettext('%s file changed with %s insertions and %s deletions','%s files changed with %s insertions and %s deletions', len(c.files)) % (len(c.files),c.lines_added,c.lines_deleted)}:

			




	
	
	
		
 
              %endif

			




	
	
	
		
 

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              <div class="cs_files">

			




	
	
	
		
 
                %if not c.files:

			




	
	
	
		
 
                   <span class="empty_data">${_('No files')}</span>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                %for fid, change, f, stat in c.files:

			




	
	
	
		
 
                    <div class="cs_${change}">

			




	
	
	
		
 
                      <div class="node">${h.link_to(h.safe_unicode(f),h.url.current(anchor=fid))}</div>

			




	
	
	
		
 
                      <div class="changes">${h.fancy_file_stats(stat)}</div>

			




	
	
	
		
 
                    </div>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
              % if c.limited_diff:

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h5>

			




	
	
	
		
 
                <h5>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    <script>

			




	
	
	
		
 
    var _USERS_AC_DATA = ${c.users_array|n};

			




	
	
	
		
 
    var _GROUPS_AC_DATA = ${c.user_groups_array|n};

			




	
	
	
		
 
    // TODO: switch this to pyroutes

			




	
	
	
		
 
    AJAX_COMMENT_URL = "${url('pullrequest_comment',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id)}";

			




	
	
	
		
 
    AJAX_COMMENT_DELETE_URL = "${url('pullrequest_comment_delete',repo_name=c.repo_name,comment_id='__COMMENT_ID__')}";

			




	
	
	
		
 

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment', "${url('pullrequest_comment',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

			




	
	
	
		
 
    pyroutes.register('pullrequest_comment_delete', "${url('pullrequest_comment_delete',repo_name='%(repo_name)s',comment_id='%(comment_id)s')}", ['repo_name', 'comment_id']);

			




	
	
	
		
 
    pyroutes.register('pullrequest_update', "${url('pullrequest_update',repo_name='%(repo_name)s',pull_request_id='%(pull_request_id)s')}", ['repo_name', 'pull_request_id']);

			




	
	
	
		
 

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <%namespace name="diff_block" file="/changeset/diff_block.html"/>

			




	
	
	
		
 
    %for fid, change, f, stat in c.files:

			




	
	
	
		
 
      ${diff_block.diff_block_simple([c.changes[fid]])}

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
    % if c.limited_diff:

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a huge diff might take some time and resources")}')">${_('Show full diff')}</a></h4>

			




	
	
	
		
 
      <h4>${_('Changeset was too big and was cut off...')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}">${_('Show full diff anyway')}</a></h4>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    <%namespace name="comment" file="/changeset/changeset_file_comment.html"/>

			




	
	
	
		
 
    ${comment.comment_inline_form()}

			




	
	
	
		
 

			




	
	
	
		
 
    ## render comments and inlines

			




	
	
	
		
 
    ${comment.generate_comments(include_pr=True)}

			




	
	
	
		
 

			




	
	
	
		
 
    % if not c.pull_request.is_closed():

			




	
	
	
		
 
      ## main comment form and it status

			




	
	
	
		
 
      ${comment.comments(h.url('pullrequest_comment', repo_name=c.repo_name,

			




	
	
	
		
 
                                pull_request_id=c.pull_request.pull_request_id),

			




	
	
	
		
 
                         c.current_changeset_status,

			




	
	
	
		
 
                         is_pr=True, change_status=c.allowed_to_change_status)}

			




	
	
	
		
 
    %endif

			




	
	
	
		
 

			




	
	
	
		
 
    <script type="text/javascript">

			




	
	
	
		
 
      YUE.onDOMReady(function(){

			




	
	
	
		
 
          PullRequestAutoComplete('user', 'reviewers_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.show-inline-comments'),'change',function(e){

			




	
	
	
		
 
              var show = 'none';

			




	
	
	
		
 
              var target = e.currentTarget;

			




	
	
	
		
 
              if(target.checked){

			




	
	
	
		
 
                  var show = ''

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var boxid = YUD.getAttribute(target,'id_for');

			




	
	
	
		
 
              var comments = YUQ('#{0} .inline-comments'.format(boxid));

			




	
	
	
		
 
              for(c in comments){

			




	
	
	
		
 
                 YUD.setStyle(comments[c],'display',show);

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var btns = YUQ('#{0} .inline-comments-button'.format(boxid));

			




	
	
	
		
 
              for(c in btns){

			




	
	
	
		
 
                  YUD.setStyle(btns[c],'display',show);

			




	
	
	
		
 
               }

			




	
	
	
		
 
          })

			




	
	
	
		
 

			




	
	
	
		
 
          YUE.on(YUQ('.line'),'click',function(e){

			




	
	
	
		
 
              var tr = e.currentTarget;

			




	
	
	
		
 
              injectInlineForm(tr);

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          // inject comments into they proper positions

			




	
	
	
		
 
          var file_comments = YUQ('.inline-comment-placeholder');

			




	
	
	
		
 
          renderInlineComments(file_comments);

			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        Server instance: clio-10450
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.
            – Support