kallithea Changeset - 872d05f3d7cc

Changeset - 872d05f3d7cc

Parent rev.

Child rev.

[Not reviewed]

default

0 7 0

Mads Kiilerich - 10 years ago 2016-01-20 01:47:11
madski@unity3d.com

comments: drop preview - no need for it without RST

7 files changed with 1 insertions and 123 deletions:

kallithea/config/routing.py

kallithea/controllers/changeset.py

kallithea/lib/helpers.py

kallithea/public/css/style.css

kallithea/public/js/base.js

kallithea/templates/base/root.html

kallithea/templates/changeset/changeset_file_comment.html

0 comments (0 inline, 0 general)

kallithea/config/routing.py

➞

Show inline comments

@@ @@ -653,11 +653,6 @@ def make_map(config): @@
                 controller='changeset', revision='tip', action='comment',
                 conditions=dict(function=check_repo))
     rmap.connect('changeset_comment_preview',
                  '/{repo_name:.*?}/changeset-comment-preview',
                 controller='changeset', action='preview_comment',
                 conditions=dict(function=check_repo, method=["POST"]))
     rmap.connect('changeset_comment_delete',
                  '/{repo_name:.*?}/changeset-comment-delete/{comment_id}',
                 controller='changeset', action='delete_comment',

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -407,18 +407,6 @@ class ChangesetController(BaseRepoContro @@
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     def preview_comment(self):
         if not request.environ.get('HTTP_X_PARTIAL_XHR'):
             raise HTTPBadRequest()
         text = request.POST.get('text')
         if text:
             return h.render_w_mentions(text)
         return ''
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
                                    'repository.admin')
     @jsonify
     def delete_comment(self, repo_name, comment_id):
         co = ChangesetComment.get(comment_id)

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -1383,21 +1383,6 @@ def urlify_issues(newtext, repository, l @@
     return newtext
 def rst(source):
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst(source))
 def rst_w_mentions(source):
     """
     Wrapped rst renderer with @mention highlighting
     :param source:
     """
     return literal('<div class="rst-block">%s</div>' %
                    MarkupRenderer.rst_with_mentions(source))
 def _mentions_replace(match_obj):
     return '<b>@%s</b>' % match_obj.group(1)

kallithea/public/css/style.css

➞

Show inline comments

@@ @@ -4188,19 +4188,6 @@ form.comment-form { @@
     padding: 5px 5px 5px 5px;
     color: #666;
+}
 .comment-form .comment-help .preview-btn,
 .comment-form .comment-help .edit-btn {
     float: right;
     margin: -6px 0px 0px 0px;
+}
 .comment-form .preview-box.unloaded,
 .comment-inline-form .preview-box.unloaded {
     height: 50px;
     text-align: center;
     padding: 20px;
     background-color: #fafafa;
+}
 .comment-form .comment-button {
     padding-top: 5px;
@@ @@ -4217,7 +4204,6 @@ form.comment-form { @@
     margin: -1px 0px 0px 0px;
+}
 .show-inline-comments {
     position: relative;
     top: 1px
@@ @@ -4277,12 +4263,6 @@ form.comment-inline-form { @@
     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;
+}

kallithea/public/js/base.js

➞

Show inline comments

@@ @@ -711,32 +711,6 @@ function _comment_div_append_form($comme @@
         ajaxPOST(AJAX_COMMENT_URL, postData, success);
     });
     $('#preview-btn_'+line_no).click(function(e){
         var text = $('#text_'+line_no).val();
         if(!text){
             return
+        }
         $('#preview-box_'+line_no).addClass('unloaded');
         $('#preview-box_'+line_no).html(_TM['Loading ...']);
         $('#edit-container_'+line_no).hide();
         $('#edit-btn_'+line_no).show();
         $('#preview-container_'+line_no).show();
         $('#preview-btn_'+line_no).hide();
         var url = pyroutes.url('changeset_comment_preview', {'repo_name': REPO_NAME});
         var post_data = {'text': text};
         ajaxPOST(url, post_data, function(html) {
             $('#preview-box_'+line_no).html(html);
             $('#preview-box_'+line_no).removeClass('unloaded');
         })
     })
     $('#edit-btn_'+line_no).click(function(e) {
         $('#edit-container_'+line_no).show();
         $('#edit-btn_'+line_no).hide();
         $('#preview-container_'+line_no).hide();
         $('#preview-btn_'+line_no).show();
     })
     // create event for hide button
     $form.find('.hide-inline-form').click(function(e) {
         comment_div_state($comment_div, f_path, line_no, false);

kallithea/templates/base/root.html

➞

Show inline comments

@@ @@ -97,7 +97,6 @@ @@
               pyroutes.register('toggle_following', "${h.url('toggle_following')}");
               pyroutes.register('changeset_info', "${h.url('changeset_info', repo_name='%(repo_name)s', revision='%(revision)s')}", ['repo_name', 'revision']);
               pyroutes.register('repo_size', "${h.url('repo_size', repo_name='%(repo_name)s')}", ['repo_name']);
               pyroutes.register('changeset_comment_preview', "${h.url('changeset_comment_preview', repo_name='%(repo_name)s')}", ['repo_name']);
               pyroutes.register('repo_refs_data', "${h.url('repo_refs_data', repo_name='%(repo_name)s')}", ['repo_name']);
              });
         </script>

kallithea/templates/changeset/changeset_file_comment.html

➞

Show inline comments

@@ @@ -55,27 +55,19 @@ @@
   <div class="ac">
   %if c.authuser.username != 'default':
     ${h.form('#', class_='inline-form')}
-      <div id="edit-container_{1}" class="clearfix">
       <div class="clearfix">
         <div class="comment-help">${_('Commenting on line {1}.')}
           <span style="color:#577632" class="tooltip">${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}</span>
         </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>
         <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 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()}
   %else:
@@ @@ -172,17 +164,8 @@ @@
             %endif
         </div>
         <div id="preview-container" class="clearfix" style="display:none">
             <div class="comment-help">
                 ${_('Comment preview')}
             </div>
             <div id="preview-box" class="preview-box"></div>
         </div>
         <div class="comment-button">
             ${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()}
     </div>
@@ @@ -211,32 +194,6 @@ $(document).ready(function () { @@
+      }
    });
    $('#preview-btn').click(function(){
        var _text = $('#text').val();
        if(!_text){
            return;
+       }
        var post_data = {'text': _text};
        $('#preview-box').addClass('unloaded');
        $('#preview-box').html(_TM['Loading ...']);
        $('#edit-container').hide();
        $('#edit-btn').show();
        $('#preview-container').show();
        $('#preview-btn').hide();
        var url = pyroutes.url('changeset_comment_preview', {'repo_name': '${c.repo_name}'});
        ajaxPOST(url,post_data,function(html){
            $('#preview-box').html(html);
            $('#preview-box').removeClass('unloaded');
        });
    });
    $('#edit-btn').click(function(){
        $('#edit-container').show();
        $('#edit-btn').hide();
        $('#preview-container').hide();
        $('#preview-btn').show();
    });
 });
 </script>
 </%def>

0 comments (0 inline, 0 general)