diff --git a/kallithea/config/routing.py b/kallithea/config/routing.py --- a/kallithea/config/routing.py +++ b/kallithea/config/routing.py @@ -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', diff --git a/kallithea/controllers/changeset.py b/kallithea/controllers/changeset.py --- a/kallithea/controllers/changeset.py +++ b/kallithea/controllers/changeset.py @@ -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) diff --git a/kallithea/lib/helpers.py b/kallithea/lib/helpers.py --- a/kallithea/lib/helpers.py +++ b/kallithea/lib/helpers.py @@ -1383,21 +1383,6 @@ def urlify_issues(newtext, repository, l return newtext -def rst(source): - return literal('
%s
' % - MarkupRenderer.rst(source)) - - -def rst_w_mentions(source): - """ - Wrapped rst renderer with @mention highlighting - - :param source: - """ - return literal('
%s
' % - MarkupRenderer.rst_with_mentions(source)) - - def _mentions_replace(match_obj): return '@%s' % match_obj.group(1) diff --git a/kallithea/public/css/style.css b/kallithea/public/css/style.css --- a/kallithea/public/css/style.css +++ b/kallithea/public/css/style.css @@ -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; } diff --git a/kallithea/public/js/base.js b/kallithea/public/js/base.js --- a/kallithea/public/js/base.js +++ b/kallithea/public/js/base.js @@ -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); diff --git a/kallithea/templates/base/root.html b/kallithea/templates/base/root.html --- a/kallithea/templates/base/root.html +++ b/kallithea/templates/base/root.html @@ -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']); }); diff --git a/kallithea/templates/changeset/changeset_file_comment.html b/kallithea/templates/changeset/changeset_file_comment.html --- a/kallithea/templates/changeset/changeset_file_comment.html +++ b/kallithea/templates/changeset/changeset_file_comment.html @@ -55,27 +55,19 @@
%if c.authuser.username != 'default': ${h.form('#', class_='inline-form')} -
+
${_('Commenting on line {1}.')} ${_('Comments are in plain text. Use @username inside this text to notify another user.')|n}
-
${_('Submitting ...')}
${h.submit('save', _('Comment'), class_='btn btn-small save-inline-form')} ${h.reset('hide-inline-form', _('Cancel'), class_='btn btn-small hide-inline-form')} -
${_('Preview')}
-
${h.end_form()} %else: @@ -172,17 +164,8 @@ %endif
- -
${h.submit('save', _('Comment'), class_="btn")} -
${_('Preview')}
-
${h.end_form()}
@@ -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(); - }); - });