Changeset - a21668fe545b
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
Mads Kiilerich - 11 years ago 2014-07-18 19:22:01
madski@unity3d.com
comments: make preview button more obvious - show it next to other buttons
2 files changed with 31 insertions and 23 deletions:
kallithea/public/js/base.js
4
kallithea/templates/changeset/changeset_file_comment.html
27
23
0 comments (0 inline, 0 general)
kallithea/public/js/base.js
➞
Show inline comments
 
@@ -725,36 +725,40 @@ var injectInlineForm = function(tr){
 
        };
 
        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();

			




	
	
	
		
 
        $('#edit-btn_'+lineno).show();

			




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

			




	
	
	
		
 
        $('#preview-btn_'+lineno).hide();

			




	
	
	
		
 

			




	
	
	
		
 
        var url = pyroutes.url('changeset_comment_preview', {'repo_name': REPO_NAME});

			




	
	
	
		
 
        var post_data = {'text': text};

			




	
	
	
		
 
        ajaxPOST(url, post_data, function(o){

			




	
	
	
		
 
            $('#preview-box_'+lineno).html(o.responseText);

			




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

			




	
	
	
		
 
        })

			




	
	
	
		
 
    })

			




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

			




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

			




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

			




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

			




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

			




	
	
	
		
 
    })

			




	
	
	
		
 

			




	
	
	
		
 
    setTimeout(function(){

			




	
	
	
		
 
        // callbacks

			




	
	
	
		
 
        tooltip_activate();

			




	
	
	
		
 
        MentionsAutoComplete('text_'+lineno, 'mentions_container_'+lineno,

			




	
	
	
		
 
                             _USERS_AC_DATA, _GROUPS_AC_DATA);

			




	
	
	
		
 
        $('#text_'+lineno).focus();

			




	
	
	
		
 
    },10)

			




	
	
	
		
 
};

			




	
	
	
		
 

			




	
	
	
		
 
var deleteComment = function(comment_id){

			




        

    


    
    

    

        

                

                    kallithea/templates/changeset/changeset_file_comment.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -51,53 +51,53 @@

			




	
	
	
		
 
      <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':

			




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

			




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

			




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

			




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

			




	
	
	
		
 
        <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 notify another 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 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 class="comment-help">

			




	
	
	
		
 
            ${_('Comment preview')}

			




	
	
	
		
 
        </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 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 id="preview-btn_{1}" class="preview-btn btn btn-small">${_('Preview')}</div>

			




	
	
	
		
 
        <div id="edit-btn_{1}" class="edit-btn btn btn-small" style="display:none">${_('Edit')}</div>

			




	
	
	
		
 
      </div>

			




	
	
	
		
 
      ${h.end_form()}

			




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

			




	
	
		
 
@@ -134,31 +134,30 @@

			




	
	
	
		
 
          ${comment_block(co)}

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
    %endfor

			




	
	
	
		
 
</div>

			




	
	
	
		
 
</%def>

			




	
	
	
		
 

			




	
	
	
		
 
## MAIN COMMENT FORM

			




	
	
	
		
 
<%def name="comments(post_url, cur_status, is_pr=False, change_status=True)">

			




	
	
	
		
 

			




	
	
	
		
 
<div class="comments">

			




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

			




	
	
	
		
 
    <div class="comment-form ac">

			




	
	
	
		
 
        ${h.form(post_url)}

			




	
	
	
		
 
      ${h.form(post_url)}

			




	
	
	
		
 
        <div id="edit-container" class="clearfix">

			




	
	
	
		
 
            <div class="comment-help">

			




	
	
	
		
 
                ${(_('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" class="preview-btn btn btn-mini">${_('Preview')}</div>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div class="mentions-container" id="mentions_container"></div>

			




	
	
	
		
 
            ${h.textarea('text', class_="comment-block-ta")}

			




	
	
	
		
 
            %if change_status:

			




	
	
	
		
 
              <div id="status_block_container" class="status-block">

			




	
	
	
		
 
                %if is_pr:

			




	
	
	
		
 
                  ${_('Vote for pull request status')}:

			




	
	
	
		
 
                %else:

			




	
	
	
		
 
                  ${_('Set changeset status')}:

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
                <input type="radio" class="status_change_radio" name="changeset_status" id="changeset_status_unchanged" value="" checked="checked" />

			




	
	
	
		
 
                <label for="changeset_status_unchanged">

			




	
	
		
 
@@ -170,57 +169,62 @@

			




	
	
	
		
 
                        <label for="${status}"><img src="${h.url('/images/icons/flag_status_%s.png' % status)}" />${lbl}</label>

			




	
	
	
		
 
                    </span>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                %if is_pr and change_status:

			




	
	
	
		
 
                <input id="save_close" type="checkbox" name="save_close">

			




	
	
	
		
 
                <label id="save_close_label" for="save_close">${_("Close")}</label>

			




	
	
	
		
 
                %endif

			




	
	
	
		
 
              </div>

			




	
	
	
		
 
            %endif

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div id="preview-container" class="clearfix" style="display:none">

			




	
	
	
		
 
           <div class="comment-help">

			




	
	
	
		
 
            <div class="comment-help">

			




	
	
	
		
 
                ${_('Comment preview')}

			




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

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
            <div id="preview-box" class="preview-box"></div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 

			




	
	
	
		
 
        <div class="comment-button">

			




	
	
	
		
 
        ${h.submit('save', _('Comment'), class_="btn")}

			




	
	
	
		
 
            ${h.submit('save', _('Comment'), class_="btn")}

			




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

			




	
	
	
		
 
            <div id="edit-btn" class="edit-btn btn" style="display:none">${_('Edit')}</div>

			




	
	
	
		
 
        </div>

			




	
	
	
		
 
        ${h.end_form()}

			




	
	
	
		
 
      ${h.end_form()}

			




	
	
	
		
 
    </div>

			




	
	
	
		
 
    %endif

			




	
	
	
		
 
</div>

			




	
	
	
		
 

			




	
	
	
		
 
<script>

			




	
	
	
		
 

			




	
	
	
		
 
YUE.onDOMReady(function () {

			




	
	
	
		
 
   MentionsAutoComplete('text', 'mentions_container', _USERS_AC_DATA, _GROUPS_AC_DATA);

			




	
	
	
		
 

			




	
	
	
		
 
   YUE.on('preview-btn', 'click', function(e){

			




	
	
	
		
 
       var _text = YUD.get('text').value;

			




	
	
	
		
 
       if(!_text){

			




	
	
	
		
 
           return

			




	
	
	
		
 
       }

			




	
	
	
		
 
       var post_data = {'text': _text};

			




	
	
	
		
 
       YUD.addClass('preview-box', 'unloaded');

			




	
	
	
		
 
       YUD.get('preview-box').innerHTML = _TM['Loading ...'];

			




	
	
	
		
 
       YUD.setStyle('edit-container', 'display', 'none');

			




	
	
	
		
 
       YUD.setStyle('edit-btn', 'display', '');

			




	
	
	
		
 
       YUD.setStyle('preview-container', 'display', '');

			




	
	
	
		
 
       YUD.setStyle('preview-btn', 'display', 'none');

			




	
	
	
		
 

			




	
	
	
		
 
       var url = pyroutes.url('changeset_comment_preview', {'repo_name': '${c.repo_name}'});

			




	
	
	
		
 
       ajaxPOST(url,post_data,function(o){

			




	
	
	
		
 
           YUD.get('preview-box').innerHTML = o.responseText;

			




	
	
	
		
 
           YUD.removeClass('preview-box', 'unloaded');

			




	
	
	
		
 
       })

			




	
	
	
		
 
   })

			




	
	
	
		
 
   YUE.on('edit-btn', 'click', function(e){

			




	
	
	
		
 
       YUD.setStyle('edit-container', 'display', '');

			




	
	
	
		
 
       YUD.setStyle('edit-btn', 'display', 'none');

			




	
	
	
		
 
       YUD.setStyle('preview-container', 'display', 'none');

			




	
	
	
		
 
       YUD.setStyle('preview-btn', 'display', '');

			




	
	
	
		
 
   })

			




	
	
	
		
 

			




	
	
	
		
 
});

			




	
	
	
		
 
</script>

			




	
	
	
		
 
</%def>

			




        

    



    


    



    



      

      





    
    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.