Mercurial > kallithea
changeset 5444:8c5d1e94f9ee
changelog: show merges as semi-opaque - they are usually not interesting
TODO: also in other views
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Wed, 26 Aug 2015 17:28:59 +0200 |
parents | 8fcf31ac1105 |
children | 322e17eb356a |
files | kallithea/public/css/style.css kallithea/templates/changelog/changelog.html kallithea/tests/functional/test_changelog.py |
diffstat | 3 files changed, 7 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/public/css/style.css Mon Aug 24 13:31:23 2015 +0200 +++ b/kallithea/public/css/style.css Wed Aug 26 17:28:59 2015 +0200 @@ -2375,6 +2375,10 @@ border-color: #cdcdcd; } +#graph_content #changesets tr.mergerow { + opacity: 0.5; +} + #graph_content #changesets td { overflow: hidden; text-overflow: ellipsis;
--- a/kallithea/templates/changelog/changelog.html Mon Aug 24 13:31:23 2015 +0200 +++ b/kallithea/templates/changelog/changelog.html Wed Aug 26 17:28:59 2015 +0200 @@ -78,7 +78,7 @@ <table id="changesets"> <tbody> %for cnt,cs in enumerate(c.pagination): - <tr id="chg_${cnt+1}" class="container"> + <tr id="chg_${cnt+1}" class="container ${'mergerow' if len(cs.parents) > 1 else ''}"> <td class="checkbox"> %if c.changelog_for_path: ${h.checkbox(cs.raw_id,class_="changeset_range", disabled="disabled")}
--- a/kallithea/tests/functional/test_changelog.py Mon Aug 24 13:31:23 2015 +0200 +++ b/kallithea/tests/functional/test_changelog.py Wed Aug 26 17:28:59 2015 +0200 @@ -8,7 +8,7 @@ response = self.app.get(url(controller='changelog', action='index', repo_name=HG_REPO)) - response.mustcontain('''id="chg_20" class="container"''') + response.mustcontain('''id="chg_20" class="container mergerow"''') response.mustcontain( """<input class="changeset_range" """ """id="7b22a518347bb9bc19679f6af07cd0a61bfe16e7" """ @@ -54,7 +54,7 @@ response = self.app.get(url(controller='changelog', action='index', repo_name=GIT_REPO)) - response.mustcontain('''id="chg_20" class="container"''') + response.mustcontain('''id="chg_20" class="container "''') # why no mergerow for git? response.mustcontain( """<input class="changeset_range" """ """id="95f9a91d775b0084b2368ae7779e44931c849c0e" """