diff --git a/rhodecode/apps/repository/tests/test_repo_commits.py b/rhodecode/apps/repository/tests/test_repo_commits.py --- a/rhodecode/apps/repository/tests/test_repo_commits.py +++ b/rhodecode/apps/repository/tests/test_repo_commits.py @@ -293,26 +293,13 @@ Added a symlink """ + diffs['svn'], } - def _check_diff_menus(self, response, right_menu=False,): - # diff menus - for elem in ['Show File', 'Unified Diff', 'Side-by-side Diff', - 'Raw Diff', 'Download Diff']: + def _check_new_diff_menus(self, response, right_menu=False,): + # individual file diff menus + for elem in ['Show file before', 'Show file after']: response.mustcontain(elem) # right pane diff menus if right_menu: - for elem in ['Ignore whitespace', 'Increase context', - 'Hide comments']: + for elem in ['Hide whitespace changes', 'Toggle Wide Mode diff', + 'Show full context diff']: response.mustcontain(elem) - - def _check_new_diff_menus(self, response, right_menu=False,): - # diff menus - for elem in ['Show file before', 'Show file after', - 'Raw diff', 'Download diff']: - response.mustcontain(elem) - - # right pane diff menus - if right_menu: - for elem in ['Ignore whitespace', 'Increase context', - 'Hide comments']: - response.mustcontain(elem) diff --git a/rhodecode/lib/diffs.py b/rhodecode/lib/diffs.py --- a/rhodecode/lib/diffs.py +++ b/rhodecode/lib/diffs.py @@ -1145,7 +1145,7 @@ class DiffLimitExceeded(Exception): # NOTE(marcink): if diffs.mako change, probably this # needs a bump to next version -CURRENT_DIFF_VERSION = 'v3' +CURRENT_DIFF_VERSION = 'v4' def _cleanup_cache_file(cached_diff_file): diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less --- a/rhodecode/public/css/code-block.less +++ b/rhodecode/public/css/code-block.less @@ -1098,6 +1098,17 @@ table.cb { .nonl { color: @color5; } + .cb-action { + &:before { + content: " "; + } + &.cb-deletion:before { + content: "- "; + } + &.cb-addition:before { + content: "+ "; + } + } } &> button.cb-comment-box-opener { diff --git a/rhodecode/templates/codeblocks/diffs.mako b/rhodecode/templates/codeblocks/diffs.mako --- a/rhodecode/templates/codeblocks/diffs.mako +++ b/rhodecode/templates/codeblocks/diffs.mako @@ -573,7 +573,7 @@ def get_comments_for(diff_type, comments %if use_comments and line.original.lineno: ${render_add_comment_button()} %endif - ${line.original.action} ${line.original.content or '' | n} + ${line.original.content or '' | n} %if use_comments and line.original.lineno and line_old_comments: ${inline_comments_container(line_old_comments, inline_comments)} @@ -616,7 +616,7 @@ def get_comments_for(diff_type, comments %if use_comments and line.modified.lineno: ${render_add_comment_button()} %endif - ${line.modified.action} ${line.modified.content or '' | n} + ${line.modified.content or '' | n} %if use_comments and line.modified.lineno and line_new_comments: ${inline_comments_container(line_new_comments, inline_comments)} %endif @@ -682,7 +682,7 @@ def get_comments_for(diff_type, comments %if use_comments: ${render_add_comment_button()} %endif - ${action} ${content or '' | n} + ${content or '' | n} %if use_comments and comments: ${inline_comments_container(comments, inline_comments)} %endif @@ -947,7 +947,7 @@ def get_comments_for(diff_type, comments ## Wide diff mode { id: 1, - text: _gettext('Toggle Wide Mode Diff'), + text: _gettext('Toggle Wide Mode diff'), action: function () { updateSticky(); Rhodecode.comments.toggleWideMode(this); @@ -1007,10 +1007,10 @@ def get_comments_for(diff_type, comments window.location = e.choice.url } }); - + }); % endif - \ No newline at end of file +