Changeset - 672f9d36a269
Parent rev.
Child rev.
[Not reviewed]
default
0 3 0
Mads Kiilerich - 11 years ago 2014-07-18 17:01:36
madski@unity3d.com
old style: fix "Submitting ..." overlay
3 files changed with 6 insertions and 20 deletions:
kallithea/public/css/style.css
3
13
kallithea/public/js/base.js
2
6
kallithea/templates/changeset/changeset_file_comment.html
1
1
0 comments (0 inline, 0 general)
kallithea/public/css/style.css
➞
Show inline comments
 
@@ -4513,64 +4513,54 @@ form.comment-form {
 
    padding-top: 5px;
 
}
 

			




	
	
	
		
 
.add-another-button {

			




	
	
	
		
 
    margin-left: 10px;

			




	
	
	
		
 
    margin-top: 10px;

			




	
	
	
		
 
    margin-bottom: 10px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.comment .buttons {

			




	
	
	
		
 
    float: right;

			




	
	
	
		
 
    margin: -1px 0px 0px 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
.show-inline-comments {

			




	
	
	
		
 
    position: relative;

			




	
	
	
		
 
    top: 1px

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
/** comment inline form **/

			




	
	
	
		
 
.comment-inline-form {

			




	
	
	
		
 
    margin: 4px;

			




	
	
	
		
 
}

			




	
	
	
		
 
.comment-inline-form .overlay {

			




	
	
	
		
 
.comment-inline-form .submitting-overlay {

			




	
	
	
		
 
    display: none;

			




	
	
	
		
 
}

			




	
	
	
		
 
.comment-inline-form .overlay.submitting {

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    background: none repeat scroll 0 0 white;

			




	
	
	
		
 
    height: 0;

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    font-size: 16px;

			




	
	
	
		
 
    opacity: 0.5;

			




	
	
	
		
 
    position: absolute;

			




	
	
	
		
 
    text-align: center;

			




	
	
	
		
 
    vertical-align: top;

			




	
	
	
		
 

			




	
	
	
		
 
}

			




	
	
	
		
 
.comment-inline-form .overlay.submitting .overlay-text {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    margin-top: 5%;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.comment-inline-form .clearfix,

			




	
	
	
		
 
.comment-form .clearfix {

			




	
	
	
		
 
    background: #EEE;

			




	
	
	
		
 
    -webkit-border-radius: 4px;

			




	
	
	
		
 
    border-radius: 4px;

			




	
	
	
		
 
    padding: 5px;

			




	
	
	
		
 
    margin: 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
div.comment-inline-form {

			




	
	
	
		
 
    padding: 4px 0px 6px 0px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.comment-inline-form strong {

			




	
	
	
		
 
    display: block;

			




	
	
	
		
 
    margin-bottom: 15px;

			




	
	
	
		
 
}

			




	
	
	
		
 

			




	
	
	
		
 
.comment-inline-form textarea {

			




	
	
	
		
 
    width: 100%;

			




	
	
	
		
 
    height: 100px;

			




	
	
	
		
 
    font-family: 'Monaco', 'Courier', 'Courier New', monospace;

			




        

    


    
    

    

        

                

                    kallithea/public/js/base.js
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -669,73 +669,69 @@ var _createInlineForm = function(parent_

			




	
	
	
		
 
 * Inject inline comment for an given TR. This tr should always be a .line .

			




	
	
	
		
 
 * The form will be inject after any comments.

			




	
	
	
		
 
 */

			




	
	
	
		
 
var injectInlineForm = function(tr){

			




	
	
	
		
 
    $tr = $(tr);

			




	
	
	
		
 
    if(!$tr.hasClass('line')){

			




	
	
	
		
 
        return

			




	
	
	
		
 
    }

			




	
	
	
		
 
    var submit_url = AJAX_COMMENT_URL;

			




	
	
	
		
 
    var $td = $tr.find('.code');

			




	
	
	
		
 
    if($tr.hasClass('form-open') || $tr.hasClass('context') || $td.hasClass('no-comment')){

			




	
	
	
		
 
        return

			




	
	
	
		
 
    }

			




	
	
	
		
 
    $tr.addClass('form-open hl-comment');

			




	
	
	
		
 
    var $node = $tr.parent().parent().parent().find('.full_f_path');

			




	
	
	
		
 
    var f_path = $node.attr('path');

			




	
	
	
		
 
    var lineno = _getLineNo(tr);

			




	
	
	
		
 
    var $form = _createInlineForm(tr, f_path, lineno, submit_url);

			




	
	
	
		
 

			




	
	
	
		
 
    var $parent = $tr;

			




	
	
	
		
 
    while ($parent.next().hasClass('inline-comments')){

			




	
	
	
		
 
        var $parent = $parent.next();

			




	
	
	
		
 
    }

			




	
	
	
		
 
    $form.insertAfter($parent);

			




	
	
	
		
 
    var $overlay = $form.find('.overlay');

			




	
	
	
		
 
    var $overlay = $form.find('.submitting-overlay');

			




	
	
	
		
 
    var $inlineform = $form.find('.inline-form');

			




	
	
	
		
 

			




	
	
	
		
 
    $form.submit(function(e){

			




	
	
	
		
 
        e.preventDefault();

			




	
	
	
		
 

			




	
	
	
		
 
        if(lineno === undefined){

			




	
	
	
		
 
            alert('missing line !');

			




	
	
	
		
 
            return

			




	
	
	
		
 
        }

			




	
	
	
		
 
        if(f_path === undefined){

			




	
	
	
		
 
            alert('missing file path !');

			




	
	
	
		
 
            return

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        var text = $('#text_'+lineno).val();

			




	
	
	
		
 
        if(text == ""){

			




	
	
	
		
 
            return

			




	
	
	
		
 
        }

			




	
	
	
		
 

			




	
	
	
		
 
        if ($overlay.hasClass('overlay')){

			




	
	
	
		
 
            $overlay.css('width', $inlineform.offsetWidth + 'px');

			




	
	
	
		
 
            $overlay.css('height', $inlineform.offsetHeight + 'px');

			




	
	
	
		
 
        }

			




	
	
	
		
 
        $overlay.addClass('submitting');

			




	
	
	
		
 
        $overlay.show();

			




	
	
	
		
 

			




	
	
	
		
 
        var success = function(o){

			




	
	
	
		
 
            $tr.removeClass('form-open');

			




	
	
	
		
 
            $form.remove();

			




	
	
	
		
 
            var json_data = JSON.parse(o.responseText);

			




	
	
	
		
 
            _renderInlineComment(json_data);

			




	
	
	
		
 
        };

			




	
	
	
		
 
        var postData = {

			




	
	
	
		
 
                'text': text,

			




	
	
	
		
 
                'f_path': f_path,

			




	
	
	
		
 
                'line': lineno

			




	
	
	
		
 
        };

			




	
	
	
		
 
        ajaxPOST(submit_url, postData, success);

			




	
	
	
		
 
    });

			




	
	
	
		
 

			




	
	
	
		
 
    $('#preview-btn_'+lineno).click(function(e){

			




	
	
	
		
 
        var text = $('#text_'+lineno).val();

			




	
	
	
		
 
        if(!text){

			




	
	
	
		
 
            return

			




	
	
	
		
 
        }

			




	
	
	
		
 
        $('#preview-box_'+lineno).addClass('unloaded');

			




	
	
	
		
 
        $('#preview-box_'+lineno).html(_TM['Loading ...']);

			




	
	
	
		
 
        $('#edit-container_'+lineno).hide();

			




	
	
	
		
 
        $('#preview-container_'+lineno).show();

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -39,71 +39,71 @@

			




	
	
	
		
 
           <div  style="float:left" class="changeset-status-container">

			




	
	
	
		
 
             <div style="float:left;padding:10px 2px 0px 2px"></div>

			




	
	
	
		
 
             <div title="${_('Changeset status')}" class="changeset-status-lbl"> ${co.status_change[0].status_lbl}</div>

			




	
	
	
		
 
             <div class="changeset-status-ico"><img src="${h.url(str('/images/icons/flag_status_%s.png' % co.status_change[0].status))}" /></div>

			




	
	
	
		
 
           </div>

			




	
	
	
		
 
        %endif

			




	
	
	
		
 

			




	
	
	
		
 
      <a class="permalink" href="#comment-${co.comment_id}">&para;</a>

			




	
	
	
		
 
      %if h.HasPermissionAny('hg.admin')() or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or co.author.user_id == c.authuser.user_id:

			




	
	
	
		
 
          <div onClick="deleteComment(${co.comment_id})" class="buttons delete-comment btn btn-mini">${_('Delete')}</div>

			




	
	
	
		
 
      %endif

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="text">

			




	
	
	
		
 
          ${h.rst_w_mentions(co.text)|n}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
<%def name="comment_inline_form()">

			




	
	
	
		
 
<div id='comment-inline-form-template' style="display:none">

			




	
	
	
		
 
  <div class="comment-inline-form ac">

			




	
	
	
		
 
  %if c.authuser.username != 'default':

			




	
	
	
		
 
    <div class="overlay"><div class="overlay-text">${_('Submitting...')}</div></div>

			




	
	
	
		
 
      ${h.form('#', class_='inline-form')}

			




	
	
	
		
 
      <div id="edit-container_{1}" class="clearfix">

			




	
	
	
		
 
          <div class="comment-help">${_('Commenting on line {1}.')}

			




	
	
	
		
 
          ${(_('Comments parsed using %s syntax with %s support.') % (

			




	
	
	
		
 
                 ('<a href="%s">RST</a>' % h.url('rst_help')),

			




	
	
	
		
 
                   ('<span style="color:#577632" class="tooltip" title="%s">@mention</span>' % _('Use @username inside this text to send notification to this Kallithea user'))

			




	
	
	
		
 
               )

			




	
	
	
		
 
            )|n

			




	
	
	
		
 
           }

			




	
	
	
		
 
          <div id="preview-btn_{1}" class="preview-btn btn btn-mini">${_('Preview')}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
            <div class="mentions-container" id="mentions_container_{1}"></div>

			




	
	
	
		
 
            <textarea id="text_{1}" name="text" class="comment-block-ta yui-ac-input"></textarea>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div id="preview-container_{1}" class="clearfix" style="display:none">

			




	
	
	
		
 
         <div class="comment-help">

			




	
	
	
		
 
              ${_('Comment preview')}

			




	
	
	
		
 
            <div id="edit-btn_{1}" class="edit-btn btn btn-mini">${_('Edit')}</div>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
          <div id="preview-box_{1}" class="preview-box"></div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="comment-button">

			




	
	
	
		
 
      <div class="submitting-overlay">${_('Submitting ...')}</div>

			




	
	
	
		
 
      <input type="hidden" name="f_path" value="{0}">

			




	
	
	
		
 
      <input type="hidden" name="line" value="{1}">

			




	
	
	
		
 
      ${h.submit('save', _('Comment'), class_='btn btn-small save-inline-form')}

			




	
	
	
		
 
      ${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-small hide-inline-form')}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ${h.end_form()}

			




	
	
	
		
 
  %else:

			




	
	
	
		
 
      ${h.form('')}

			




	
	
	
		
 
      <div class="clearfix">

			




	
	
	
		
 
          <div class="comment-help">

			




	
	
	
		
 
            ${_('You need to be logged in to comment.')} <a href="${h.url('login_home',came_from=h.url.current())}">${_('Login now')}</a>

			




	
	
	
		
 
          </div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      <div class="comment-button">

			




	
	
	
		
 
      ${h.reset('hide-inline-form', _('Hide'), class_='btn btn-small hide-inline-form')}

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ${h.end_form()}

			




	
	
	
		
 
  %endif

			




	
	
	
		
 
  </div>

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 

			




	
	
	
		
 
## generates inlines taken from c.comments var

			




        

    



    


    



    



      

      





    
    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.