kallithea Changeset - 672f9d36a269

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

kallithea/public/js/base.js

kallithea/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4531,28 +4531,18 @@ form.comment-form { @@
+}
 /** 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;

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -687,13 +687,13 @@ var injectInlineForm = function(tr){ @@
     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){
@@ @@ -707,17 +707,13 @@ var injectInlineForm = function(tr){ @@
         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);

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -57,13 +57,12 @@ @@
 <%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'))
@@ @@ -80,12 +79,13 @@ @@
               ${_('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()}

0 comments (0 inline, 0 general)