diff --git a/kallithea/public/css/contextbar.css b/kallithea/public/css/contextbar.css --- a/kallithea/public/css/contextbar.css +++ b/kallithea/public/css/contextbar.css @@ -24,6 +24,28 @@ i[class^='icon-'] { } +/* css classes for diff file status ... it'd be nice if css had a way to + inherit from another class but alas, we must make sure this content is the + same from the icon font file */ + +.icon-diff-M:before { + font-family: 'kallithea'; + content: '\e805'; + color: #d0b44c; +} + +.icon-diff-D:before { + font-family: 'kallithea'; + content: '\e807'; + color: #bd2c00; +} + +.icon-diff-A:before { + font-family: 'kallithea'; + content: '\e806'; + color: #6cc644; +} + #content #context-bar { position: relative; overflow: visible; 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 @@ -2451,30 +2451,21 @@ BIN_FILENODE = 6 .cs_files .cs_added, .cs_files .cs_A { - background: url("../images/icons/page_white_add.png") no-repeat scroll - 3px; height: 16px; - padding-left: 20px; margin-top: 7px; text-align: left; } .cs_files .cs_changed, .cs_files .cs_M { - background: url("../images/icons/page_white_edit.png") no-repeat scroll - 3px; height: 16px; - padding-left: 20px; margin-top: 7px; text-align: left; } .cs_files .cs_removed, .cs_files .cs_D { - background: url("../images/icons/page_white_delete.png") no-repeat - scroll 3px; height: 16px; - padding-left: 20px; margin-top: 7px; text-align: left; } diff --git a/kallithea/public/images/icons/page_white_add.png b/kallithea/public/images/icons/page_white_add.png deleted file mode 100644 index aa23dde3746373b393489bd56b486d59b0c0d124..0000000000000000000000000000000000000000 GIT binary patch literal 0 Hc$@
+ ${h.safe_unicode(path)}
${h.fancy_file_stats(stats)}
diff --git a/kallithea/templates/changeset/changeset_range.html b/kallithea/templates/changeset/changeset_range.html --- a/kallithea/templates/changeset/changeset_range.html +++ b/kallithea/templates/changeset/changeset_range.html @@ -63,6 +63,7 @@ ${self.repo_context_bar('changelog')} %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems():
+ ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))}
${h.fancy_file_stats(stats)}
diff --git a/kallithea/templates/compare/compare_diff.html b/kallithea/templates/compare/compare_diff.html --- a/kallithea/templates/compare/compare_diff.html +++ b/kallithea/templates/compare/compare_diff.html @@ -68,10 +68,13 @@ ${self.repo_context_bar('changelog')} ${_('No files')} %endif %for fid, change, f, stat in c.files: -
-
${h.link_to(h.safe_unicode(f), '#' + fid)}
-
${h.fancy_file_stats(stat)}
-
+
+
+ + ${h.link_to(h.safe_unicode(f), '#' + fid)} +
+
${h.fancy_file_stats(stat)}
+
%endfor
% if c.limited_diff: diff --git a/kallithea/templates/pullrequests/pullrequest_show.html b/kallithea/templates/pullrequests/pullrequest_show.html --- a/kallithea/templates/pullrequests/pullrequest_show.html +++ b/kallithea/templates/pullrequests/pullrequest_show.html @@ -280,7 +280,10 @@ ${self.repo_context_bar('showpullrequest %endif %for fid, change, f, stat in c.files:
-
${h.link_to(h.safe_unicode(f),'#' + fid)}
+
+ + ${h.link_to(h.safe_unicode(f),'#' + fid)} +
${h.fancy_file_stats(stat)}
%endfor diff --git a/kallithea/tests/functional/test_compare_local.py b/kallithea/tests/functional/test_compare_local.py --- a/kallithea/tests/functional/test_compare_local.py +++ b/kallithea/tests/functional/test_compare_local.py @@ -29,17 +29,39 @@ class TestCompareController(TestControll response.mustcontain('11 files changed with 94 insertions and 64 deletions') ## files diff - response.mustcontain('''
docs/api/utils/index.rst
''') - response.mustcontain('''
test_and_report.sh
''') - response.mustcontain('''
.hgignore
''') - response.mustcontain('''
.hgtags
''') - response.mustcontain('''
docs/api/index.rst
''') - response.mustcontain('''
vcs/__init__.py
''') - response.mustcontain('''
vcs/backends/hg.py
''') - response.mustcontain('''
vcs/utils/__init__.py
''') - response.mustcontain('''
vcs/utils/annotate.py
''') - response.mustcontain('''
vcs/utils/diffs.py
''') - response.mustcontain('''
vcs/utils/lazy.py
''') + response.mustcontain('''
+ + docs/api/utils/index.rst''') + response.mustcontain('''
+ + test_and_report.sh''') + response.mustcontain('''
+ + .hgignore''') + response.mustcontain('''
+ + .hgtags''') + response.mustcontain('''
+ + docs/api/index.rst''') + response.mustcontain('''
+ + vcs/__init__.py''') + response.mustcontain('''
+ + vcs/backends/hg.py''') + response.mustcontain('''
+ + vcs/utils/__init__.py''') + response.mustcontain('''
+ + vcs/utils/annotate.py''') + response.mustcontain('''
+ + vcs/utils/diffs.py''') + response.mustcontain('''
+ + vcs/utils/lazy.py''') def test_compare_tag_git(self): self.log_user()