Mercurial > kallithea
changeset 4633:dbf7341d10b1
file_status: replace with icon-{modified,added,removed}
| author | Sean Farley <sean.michael.farley@gmail.com> |
|---|---|
| date | Sat, 15 Nov 2014 11:21:48 -0800 |
| parents | 19ae5f4ed266 |
| children | fbf75412c609 |
| files | kallithea/public/css/contextbar.css kallithea/public/css/style.css kallithea/public/images/icons/page_white_add.png kallithea/public/images/icons/page_white_delete.png kallithea/public/images/icons/page_white_edit.png kallithea/templates/changeset/changeset.html kallithea/templates/changeset/changeset_range.html kallithea/templates/compare/compare_diff.html kallithea/templates/pullrequests/pullrequest_show.html kallithea/tests/functional/test_compare_local.py |
| diffstat | 10 files changed, 68 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/contextbar.css Tue Jul 15 18:16:03 2014 -0500 +++ b/kallithea/public/css/contextbar.css Sat Nov 15 11:21:48 2014 -0800 @@ -24,6 +24,28 @@ } +/* 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;
--- a/kallithea/public/css/style.css Tue Jul 15 18:16:03 2014 -0500 +++ b/kallithea/public/css/style.css Sat Nov 15 11:21:48 2014 -0800 @@ -2451,30 +2451,21 @@ .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; }
--- a/kallithea/templates/changeset/changeset.html Tue Jul 15 18:16:03 2014 -0500 +++ b/kallithea/templates/changeset/changeset.html Sat Nov 15 11:21:48 2014 -0800 @@ -142,6 +142,7 @@ %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[c.changeset.raw_id].iteritems(): <div class="cs_${change}"> <div class="node"> + <i class="icon-diff-${change}"></i> <a href="#${FID}">${h.safe_unicode(path)}</a> </div> <div class="changes">${h.fancy_file_stats(stats)}</div>
--- a/kallithea/templates/changeset/changeset_range.html Tue Jul 15 18:16:03 2014 -0500 +++ b/kallithea/templates/changeset/changeset_range.html Sat Nov 15 11:21:48 2014 -0800 @@ -63,6 +63,7 @@ %for FID, (cs1, cs2, change, path, diff, stats) in c.changes[cs.raw_id].iteritems(): <div class="cs_${change}"> <div class="node"> + <i class="icon-diff-${change}"></i> ${h.link_to(h.safe_unicode(path),h.url.current(anchor=FID))} </div> <div class="changes">${h.fancy_file_stats(stats)}</div>
--- a/kallithea/templates/compare/compare_diff.html Tue Jul 15 18:16:03 2014 -0500 +++ b/kallithea/templates/compare/compare_diff.html Sat Nov 15 11:21:48 2014 -0800 @@ -68,10 +68,13 @@ <span class="empty_data">${_('No files')}</span> %endif %for fid, change, f, stat in c.files: - <div class="cs_${change}"> - <div class="node">${h.link_to(h.safe_unicode(f), '#' + fid)}</div> - <div class="changes">${h.fancy_file_stats(stat)}</div> - </div> + <div class="cs_${change}"> + <div class="node"> + <i class="icon-diff-${change}"></i> + ${h.link_to(h.safe_unicode(f), '#' + fid)} + </div> + <div class="changes">${h.fancy_file_stats(stat)}</div> + </div> %endfor </div> % if c.limited_diff:
--- a/kallithea/templates/pullrequests/pullrequest_show.html Tue Jul 15 18:16:03 2014 -0500 +++ b/kallithea/templates/pullrequests/pullrequest_show.html Sat Nov 15 11:21:48 2014 -0800 @@ -280,7 +280,10 @@ %endif %for fid, change, f, stat in c.files: <div class="cs_${change}"> - <div class="node">${h.link_to(h.safe_unicode(f),'#' + fid)}</div> + <div class="node"> + <i class="icon-diff-${change}"></i> + ${h.link_to(h.safe_unicode(f),'#' + fid)} + </div> <div class="changes">${h.fancy_file_stats(stat)}</div> </div> %endfor
--- a/kallithea/tests/functional/test_compare_local.py Tue Jul 15 18:16:03 2014 -0500 +++ b/kallithea/tests/functional/test_compare_local.py Sat Nov 15 11:21:48 2014 -0800 @@ -29,17 +29,39 @@ response.mustcontain('11 files changed with 94 insertions and 64 deletions') ## files diff - response.mustcontain('''<div class="node"><a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--e3305437df55">test_and_report.sh</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--c8e92ef85cd1">.hgignore</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--6e08b694d687">.hgtags</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--2c14b00f3393">docs/api/index.rst</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--430ccbc82bdf">vcs/__init__.py</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--9c390eb52cd6">vcs/backends/hg.py</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--ebb592c595c0">vcs/utils/__init__.py</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--7abc741b5052">vcs/utils/annotate.py</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a></div>''') - response.mustcontain('''<div class="node"><a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a></div>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-A"></i> + <a href="#C--1c5cf9e91c12">docs/api/utils/index.rst</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-A"></i> + <a href="#C--e3305437df55">test_and_report.sh</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-M"></i> + <a href="#C--c8e92ef85cd1">.hgignore</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-M"></i> + <a href="#C--6e08b694d687">.hgtags</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-M"></i> + <a href="#C--2c14b00f3393">docs/api/index.rst</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-M"></i> + <a href="#C--430ccbc82bdf">vcs/__init__.py</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-M"></i> + <a href="#C--9c390eb52cd6">vcs/backends/hg.py</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-M"></i> + <a href="#C--ebb592c595c0">vcs/utils/__init__.py</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-M"></i> + <a href="#C--7abc741b5052">vcs/utils/annotate.py</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-M"></i> + <a href="#C--2ef0ef106c56">vcs/utils/diffs.py</a>''') + response.mustcontain('''<div class="node"> + <i class="icon-diff-M"></i> + <a href="#C--3150cb87d4b7">vcs/utils/lazy.py</a>''') def test_compare_tag_git(self): self.log_user()