Changeset - 92220cd013b0
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 10 years ago 2015-10-08 23:21:58
madski@unity3d.com
changeset: remove unused handling of inline-comments-button - probably left over from refactorings
2 files changed with 0 insertions and 5 deletions:
kallithea/public/css/style.css
3
kallithea/templates/changeset/changeset.html
2
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -4253,195 +4253,192 @@ div.comment-inline-form {
 
.comment-inline-form textarea {
 
    width: 100%;
 
    height: 100px;
 
    font-family: Lucida Console, Consolas, Monaco, Inconsolata, Liberation Mono, monospace;
 
}
 

			




	
	
	
		
 
form.comment-inline-form {

			




	
	
	
		
 
    margin-top: 10px;

			




	
	
	
		
 
    margin-left: 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.comment-inline-form-submit {

			




	
	
	
		
 
    margin-top: 5px;

			




	
	
	
		
 
    margin-left: 525px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.file-comments {

			




	
	
	
		
 
    display: none;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.comment-inline-form .comment {

			




	
	
	
		
 
    margin-left: 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.comment-inline-form .comment-help {

			




	
	
	
		
 
    padding: 5px 5px 5px 5px;

			




	
	
	
		
 
    color: #666;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.comment-inline-form .comment-help .preview-btn,

			




	
	
	
		
 
.comment-inline-form .comment-help .edit-btn {

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    margin: -6px 0px 0px 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.comment-inline-form .comment-button {

			




	
	
	
		
 
    padding-top: 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** comment inline **/

			




	
	
	
		
 
.inline-comments {

			




	
	
	
		
 
    padding: 0 20px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments div.rst-block {

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
    overflow: hidden;

			




	
	
	
		
 
    margin: 0;

			




	
	
	
		
 
    padding: 0 20px 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .comment-wrapp {

			




	
	
	
		
 
    max-width: 978px;

			




	
	
	
		
 
    border: 1px solid #ddd;

			




	
	
	
		
 
    border-radius: 4px;

			




	
	
	
		
 
    margin: 3px 3px 5px 5px;

			




	
	
	
		
 
    background-color: #FAFAFA;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .add-button-row {

			




	
	
	
		
 
    padding: 2px 4px 8px 5px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .meta {

			




	
	
	
		
 
    background: #f8f8f8;

			




	
	
	
		
 
    padding: 4px;

			




	
	
	
		
 
    border-bottom: 1px solid #ddd;

			




	
	
	
		
 
    min-height: 20px;

			




	
	
	
		
 
    overflow: auto;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .meta img {

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .meta .user {

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    padding: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .meta .date {

			




	
	
	
		
 
    float: left;

			




	
	
	
		
 
    padding: 3px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comment .text {

			




	
	
	
		
 
    background-color: #FAFAFA;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.inline-comments .comments-number {

			




	
	
	
		
 
    padding: 0px 0px 10px 0px;

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    color: #666;

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.inline-comments-button .add-comment {

			




	
	
	
		
 
    margin: 2px 0px 8px 5px !important

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
input.status_change_radio {

			




	
	
	
		
 
    margin: 2px 0 5px 15px;

			




	
	
	
		
 
    vertical-align: middle;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.notification-paginator {

			




	
	
	
		
 
    padding: 0px 0px 4px 16px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#context-pages .pull-request span,

			




	
	
	
		
 
.menu_link_notifications {

			




	
	
	
		
 
    padding: 4px 4px !important;

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    color: #888 !important;

			




	
	
	
		
 
    background-color: #DEDEDE !important;

			




	
	
	
		
 
    border-radius: 4px !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
#context-pages .forks span,

			




	
	
	
		
 
.menu_link_notifications {

			




	
	
	
		
 
    padding: 4px 4px !important;

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    color: #888 !important;

			




	
	
	
		
 
    background-color: #DEDEDE !important;

			




	
	
	
		
 
    border-radius: 4px !important;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
.notification-header {

			




	
	
	
		
 
    padding-top: 6px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-header .desc {

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
    height: 24px;

			




	
	
	
		
 
    float: left

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-list .container.unread {

			




	
	
	
		
 
    background: none repeat scroll 0 0 rgba(255, 255, 180, 0.6);

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-header .gravatar {

			




	
	
	
		
 
    background: none repeat scroll 0 0 transparent;

			




	
	
	
		
 
    padding: 0px 0px 0px 8px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-list .container .notification-header .desc {

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
    font-size: 17px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-table {

			




	
	
	
		
 
    border: 1px solid #ccc;

			




	
	
	
		
 
    border-radius: 6px 6px 6px 6px;

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
    margin: 0px 20px 0px 20px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-header .delete-notifications {

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    padding-top: 8px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-header .read-notifications {

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    padding-top: 8px;

			




	
	
	
		
 
    cursor: pointer;

			




	
	
	
		
 
}

			




	
	
	
		
 
.notification-subject {

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
    border-bottom: 1px solid #eee;

			




	
	
	
		
 
    padding: 5px 0px 5px 38px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.notification-body {

			




	
	
	
		
 
    clear: both;

			




	
	
	
		
 
    margin: 34px 2px 2px 8px

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/****

			




	
	
	
		
 
PULL REQUESTS

			




	
	
	
		
 
*****/

			




	
	
	
		
 
.pullrequests_section_head {

			




	
	
	
		
 
    padding: 10px 10px 10px 0px;

			




	
	
	
		
 
    margin: 0 20px;

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
    font-weight: bold;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.pr-details-title.closed {

			




	
	
	
		
 
    color: #555;

			




	
	
	
		
 
    background: #eee;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.pr-details-title {

			




	
	
	
		
 
    font-size: 1.6em;

			




	
	
	
		
 
    padding: 5px 0px 5px 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.pr {

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -124,196 +124,194 @@ ${self.repo_context_bar('changelog', c.c

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 
                     <% rev = c.changeset.extra.get('transplant_source', '').encode('hex') %>

			




	
	
	
		
 
                     %if rev:

			




	
	
	
		
 
                     <div>

			




	
	
	
		
 
                       ${_('Transplanted from:')} ${h.link_to(h.short_id(rev),h.url('changeset_home',repo_name=c.repo_name,revision=rev))}

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     %endif

			




	
	
	
		
 

			




	
	
	
		
 
                     % if hasattr(c.changeset, 'successors') and c.changeset.successors:

			




	
	
	
		
 
                     <div class='successors'>

			




	
	
	
		
 
                       <span class='successors_header'>${_('Replaced by:')} </span>

			




	
	
	
		
 
                       % for i, s in enumerate(c.changeset.successors):

			




	
	
	
		
 
                           <%

			




	
	
	
		
 
                           comma = ""

			




	
	
	
		
 
                           if i != len(c.changeset.successors)-1:

			




	
	
	
		
 
                             comma = ", "

			




	
	
	
		
 
                           %>

			




	
	
	
		
 
                         <a class='successors_hash' href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}

			




	
	
	
		
 
                       % endfor

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     % endif

			




	
	
	
		
 

			




	
	
	
		
 
                     % if hasattr(c.changeset, 'precursors') and c.changeset.precursors:

			




	
	
	
		
 
                     <div class='precursors'>

			




	
	
	
		
 
                       <span class='precursors_header'>${_('Preceded by:')} </span>

			




	
	
	
		
 
                       % for i, s in enumerate(c.changeset.precursors):

			




	
	
	
		
 
                           <%

			




	
	
	
		
 
                           comma = ""

			




	
	
	
		
 
                           if i != len(c.changeset.precursors)-1:

			




	
	
	
		
 
                             comma = ", "

			




	
	
	
		
 
                           %>

			




	
	
	
		
 
                           <a class="precursors_hash" href="${h.url('changeset_home',repo_name=c.repo_name, revision=s)}">${s}</a>${comma}

			




	
	
	
		
 
                       % endfor

			




	
	
	
		
 
                     </div>

			




	
	
	
		
 
                     % endif

			




	
	
	
		
 

			




	
	
	
		
 
                     <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">

			




	
	
	
		
 
                            <i class="icon-diff-${change}"></i>

			




	
	
	
		
 
                            <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())}">${_('Show full diff anyway')}</a></h5>

			




	
	
	
		
 
              % endif

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## diff block

			




	
	
	
		
 
    <div class="commentable-diff">

			




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

			




	
	
	
		
 
    ${diff_block.diff_block_js()}

			




	
	
	
		
 
    ${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())}">${_('Show full diff anyway')}</a></h4>

			




	
	
	
		
 
    % endif

			




	
	
	
		
 
    </div>

			




	
	
	
		
 

			




	
	
	
		
 
    ## template for inline comment form

			




	
	
	
		
 
    ${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">

			




	
	
	
		
 
      $(document).ready(function(){

			




	
	
	
		
 
          $('.show-inline-comments').change(function(e){

			




	
	
	
		
 
              var target = e.currentTarget;

			




	
	
	
		
 
              if(target == null){

			




	
	
	
		
 
                  target = this;

			




	
	
	
		
 
              }

			




	
	
	
		
 
              var boxid = $(target).attr('id_for');

			




	
	
	
		
 
              if(target.checked){

			




	
	
	
		
 
                  $('#{0} .inline-comments'.format(boxid)).show();

			




	
	
	
		
 
                  $('#{0} .inline-comments-button'.format(boxid)).show();

			




	
	
	
		
 
              }else{

			




	
	
	
		
 
                  $('#{0} .inline-comments'.format(boxid)).hide();

			




	
	
	
		
 
                  $('#{0} .inline-comments-button'.format(boxid)).hide();

			




	
	
	
		
 
              }

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          $('.code-difftable').on('click', '.add-bubble', function(e){

			




	
	
	
		
 
              show_comment_form($(this));

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          move_comments($(".comments .comments-list-chunk"));

			




	
	
	
		
 

			




	
	
	
		
 
          pyroutes.register('changeset_home',

			




	
	
	
		
 
                            "${h.url('changeset_home', repo_name='%(repo_name)s', revision='%(revision)s')}",

			




	
	
	
		
 
                            ['repo_name', 'revision']);

			




	
	
	
		
 

			




	
	
	
		
 
          //next links

			




	
	
	
		
 
          $('#child_link').on('click', function(e){

			




	
	
	
		
 
              //fetch via ajax what is going to be the next link, if we have

			




	
	
	
		
 
              //>1 links show them to user to choose

			




	
	
	
		
 
              if(!$('#child_link').hasClass('disabled')){

			




	
	
	
		
 
                  $.ajax({

			




	
	
	
		
 
                    url: '${h.url('changeset_children',repo_name=c.repo_name, revision=c.changeset.raw_id)}',

			




	
	
	
		
 
                    success: function(data) {

			




	
	
	
		
 
                      if(data.results.length === 0){

			




	
	
	
		
 
                          $('#child_link').addClass('disabled');

			




	
	
	
		
 
                          $('#child_link').html('${_('No revisions')}');

			




	
	
	
		
 
                      }

			




	
	
	
		
 
                      if(data.results.length === 1){

			




	
	
	
		
 
                          var commit = data.results[0];

			




	
	
	
		
 
                          window.location = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': commit.raw_id});

			




	
	
	
		
 
                      }

			




	
	
	
		
 
                      else if(data.results.length === 2){

			




	
	
	
		
 
                          $('#child_link').addClass('disabled');

			




	
	
	
		
 
                          $('#child_link').addClass('double');

			




	
	
	
		
 
                          var _html = '';

			




	
	
	
		
 
                          _html +='<a title="__title__" href="__url__">__rev__</a> <i style="color:#036185" class="icon-right-open"></i>'

			




	
	
	
		
 
                                  .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))

			




	
	
	
		
 
                                  .replace('__title__', data.results[0].message)

			




	
	
	
		
 
                                  .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id}));

			




	
	
	
		
 
                          _html +='<br/>'

			




	
	
	
		
 
                          _html +='<a title="__title__" href="__url__">__rev__</a> <i style="color:#036185" class="icon-right-open"></i>'

			




	
	
	
		
 
                                  .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))

			




	
	
	
		
 
                                  .replace('__title__', data.results[1].message)

			




	
	
	
		
 
                                  .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[1].raw_id}));

			




	
	
	
		
 
                          $('#child_link').html(_html);

			




	
	
	
		
 
                      }

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                  });

			




	
	
	
		
 
              e.preventDefault();

			




	
	
	
		
 
              }

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          //prev links

			




	
	
	
		
 
          $('#parent_link').on('click', function(e){

			




	
	
	
		
 
              //fetch via ajax what is going to be the next link, if we have

			




	
	
	
		
 
              //>1 links show them to user to choose

			




	
	
	
		
 
              if(!$('#parent_link').hasClass('disabled')){

			




	
	
	
		
 
                  $.ajax({

			




	
	
	
		
 
                    url: '${h.url('changeset_parents',repo_name=c.repo_name, revision=c.changeset.raw_id)}',

			




	
	
	
		
 
                    success: function(data) {

			




	
	
	
		
 
                      if(data.results.length === 0){

			




	
	
	
		
 
                          $('#parent_link').addClass('disabled');

			




	
	
	
		
 
                          $('#parent_link').html('${_('No revisions')}');

			




	
	
	
		
 
                      }

			




	
	
	
		
 
                      if(data.results.length === 1){

			




	
	
	
		
 
                          var commit = data.results[0];

			




	
	
	
		
 
                          window.location = pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': commit.raw_id});

			




	
	
	
		
 
                      }

			




	
	
	
		
 
                      else if(data.results.length === 2){

			




	
	
	
		
 
                          $('#parent_link').addClass('disabled');

			




	
	
	
		
 
                          $('#parent_link').addClass('double');

			




	
	
	
		
 
                          var _html = '';

			




	
	
	
		
 
                          _html +='<i style="color:#036185" class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'

			




	
	
	
		
 
                                  .replace('__rev__','r{0}:{1}'.format(data.results[0].revision, data.results[0].raw_id.substr(0,6)))

			




	
	
	
		
 
                                  .replace('__title__', data.results[0].message)

			




	
	
	
		
 
                                  .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[0].raw_id}));

			




	
	
	
		
 
                          _html +='<br/>'

			




	
	
	
		
 
                          _html +='<i style="color:#036185" class="icon-left-open"></i> <a title="__title__" href="__url__">__rev__</a>'

			




	
	
	
		
 
                                  .replace('__rev__','r{0}:{1}'.format(data.results[1].revision, data.results[1].raw_id.substr(0,6)))

			




	
	
	
		
 
                                  .replace('__title__', data.results[1].message)

			




	
	
	
		
 
                                  .replace('__url__', pyroutes.url('changeset_home', {'repo_name': '${c.repo_name}','revision': data.results[1].raw_id}));

			




	
	
	
		
 
                          $('#parent_link').html(_html);

			




	
	
	
		
 
                      }

			




	
	
	
		
 
                    }

			




	
	
	
		
 
                  });

			




	
	
	
		
 
              e.preventDefault();

			




	
	
	
		
 
              }

			




	
	
	
		
 
          });

			




	
	
	
		
 

			




	
	
	
		
 
          // hack: re-navigate to target after JS is done ... if a target is set and setting href thus won't reload

			




	
	
	
		
 
          if (window.location.hash != "") {

			




	
	
	
		
 
              window.location.href = window.location.href;

			




	
	
	
		
 
          }

			




	
	
	
		
 
      });

			




	
	
	
		
 

			




	
	
	
		
 
    </script>

			




	
	
	
		
 

			




	
	
	
		
 
    </div>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.