Mercurial > kallithea

changeset 6113:7ea933acdb8b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changelog: add phases tags in changelog
author domruf <dominikruf@gmail.com>
date Fri, 24 Jun 2016 20:12:05 +0200
parents 9dfabbf93361
children 27e6594645f1
files kallithea/public/css/style.css kallithea/templates/changelog/changelog.html
diffstat 2 files changed, 15 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/public/css/style.css	Fri Jun 24 19:57:04 2016 +0200
+++ b/kallithea/public/css/style.css	Fri Jun 24 20:12:05 2016 +0200
@@ -2680,10 +2680,11 @@
 .right .logtags {
     line-height: 2.2em;
 }
-.bumpedtag, .divergenttag, .extincttag, .unstabletag, .repotag, .branchtag, .logtags .tagtag, .logtags .booktag {
+.phasetag, .bumpedtag, .divergenttag, .extincttag, .unstabletag, .repotag, .branchtag, .logtags .tagtag, .logtags .booktag {
     margin: 0px 2px;
 }
 
+.phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
@@ -2702,6 +2703,7 @@
     line-height: 1.5em;
 }
 
+#graph_content .phasetag,
 #graph_content .bumpedtag,
 #graph_content .divergenttag,
 #graph_content .extincttag,
@@ -2713,6 +2715,7 @@
     margin-right: 0.5em;
 }
 
+.phasetag,
 .bumpedtag,
 .divergenttag,
 .extincttag,
@@ -2724,6 +2727,7 @@
     float: left;
 }
 
+.right .logtags .phasetag,
 .right .logtags .bumpedtag,
 .right .logtags .divergenttag,
 .right .logtags .extincttag,
@@ -2777,6 +2781,11 @@
     color: #fff;
 }
 
+.phasetag {
+    border-color: #1F14CE;
+    color: #1F14CE;
+}
+
 .logtags .branchtag a:hover,
 .logtags .branchtag a,
 .branchtag a,
--- a/kallithea/templates/changelog/changelog.html	Fri Jun 24 19:57:04 2016 +0200
+++ b/kallithea/templates/changelog/changelog.html	Fri Jun 24 20:12:05 2016 +0200
@@ -150,6 +150,11 @@
                                             Unstable
                                         </div>
                                     %endif
+                                    %if cs.phase:
+                                        <div class="phasetag" title="Phase">
+                                            ${cs.phase}
+                                        </div>
+                                    %endif
                                     %if h.is_hg(c.db_repo_scm_instance):
                                         %for book in cs.bookmarks:
                                             <div class="booktag" title="${_('Bookmark %s') % book}">