upstream/mercurial-mirror Commit - r7408:f031a12d

coal/paper/monoblue: show branch names in hgweb graph

Benoit Allard -

r7408:f031a12d default

parent child

templates/coal/graph.tmpl

0 +21 -3

             {header}
             <title>{repo|escape}: revision graph</title>
             <link rel="alternate" type="application/atom+xml"
                href="{url}atom-log" title="Atom feed for {repo|escape}: log">
             <link rel="alternate" type="application/rss+xml"
                href="{url}rss-log" title="RSS feed for {repo|escape}: log">
             <!--[if IE]><script type="text/javascript" src="{staticurl}excanvas.js"></script><![endif]-->
             </head>
             <body>
             <div class="container">
             <div class="menu">
             <div class="logo">
             <a href="http://www.selenic.com/mercurial/">
             <img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
             </div>
             <ul>
             <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
             <li class="active">graph</li>
             <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
             </ul>
             <ul>
             <li><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a></li>
             <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">browse</a></li>
             </ul>
             </div>
             <div class="main">
             <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2>
             <h3>graph</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             <span>find changesets by author, revision,
             files, or words in the commit message</span>
             </form>
             <div class="navigate">
             <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
             <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
             | rev {rev}: {changenav%navgraphentry}
             </div>
             <noscript>The revision graph only works with JavaScript-enabled browsers.</noscript>
             <div id="wrapper">
             <ul id="nodebgs"></ul>
             <canvas id="graph" width="224" height="{canvasheight}"></canvas>
             <ul id="graphnodes"></ul>
             </div>
             <script type="text/javascript" src="{staticurl}graph.js"></script>
             <script type="text/javascript">
             <!-- hide script content
             var data = {jsdata|json};
             var graph = new Graph();
             graph.scale({bg_height});
             graph.edge = function(x0, y0, x1, y1, color) {
             	this.setColor(color, 0.0, 0.65);
             	this.ctx.beginPath();
             	this.ctx.moveTo(x0, y0);
             	this.ctx.lineTo(x1, y1);
             	this.ctx.stroke();
             }
             var revlink = '<li style="_STYLE"><span class="desc">';
             revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
-            revlink += '</span><span class="tag">_TAGS</span>';
+            revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>';
-            revlink += '<span class="info">_DATE ago, by _USER</span></li>';
             graph.vertex = function(x, y, color, parity, cur) {
             	this.ctx.beginPath();
             	color = this.setColor(color, 0.25, 0.75);
             	this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
             	this.ctx.fill();
             	var bg = '<li class="bg parity' + parity + '"></li>';
             	var left = (this.columns + 1) * this.bg_height;
             	var nstyle = 'padding-left: ' + left + 'px;';
             	var item = revlink.replace(/_STYLE/, nstyle);
             	item = item.replace(/_PARITY/, 'parity' + parity);
             	item = item.replace(/_NODEID/, cur[0]);
             	item = item.replace(/_NODEID/, cur[0]);
             	item = item.replace(/_DESC/, cur[3]);
             	item = item.replace(/_USER/, cur[4]);
             	item = item.replace(/_DATE/, cur[5]);
-            	item = item.replace(/_TAGS/, cur[7].join('&nbsp; '));
+            	var tagspan = '';
+            	if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
+            		tagspan = '<span class="logtags">';
+            		if (cur[6][1]) {
+            			tagspan += '<span class="branchhead" title="' + cur[6][0] + '">';
+            			tagspan += cur[6][0] + '</span> ';
+            		} else if (!cur[6][1] && cur[6][0] != 'default') {
+            			tagspan += '<span class="branchname" title="' + cur[6][0] + '">';
+            			tagspan += cur[6][0] + '</span> ';
+            		}
+            		if (cur[7].length) {
+            			for (var t in cur[7]) {
+            				var tag = cur[7][t];
+            				tagspan += '<span class="tag">' + tag + '</span> ';
+            			}
+            		}
+            		tagspan += '</span>';
+            	}
+            	item = item.replace(/_TAGS/, tagspan);
             	return [bg, item];
             }
             graph.render(data);
             // stop hiding script -->
             </script>
             <div class="navigate">
             <a href="{url}graph/{rev}{lessvars%urlparameter}">less</a>
             <a href="{url}graph/{rev}{morevars%urlparameter}">more</a>
             | rev {rev}: {changenav%navgraphentry}
             </div>
             </div>
             </div>
             {footer}

templates/monoblue/graph.tmpl

0 +21 -1

             #header#
                 <title>#repo|escape#: graph</title>
                 <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for #repo|escape#"/>
                 <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for #repo|escape#"/>
                 <!--[if IE]><script type="text/javascript" src="#staticurl#excanvas.js"></script><![endif]-->
             </head>
             <body>
             <div id="container">
                 <div class="page-header">
                     <h1><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / graph</h1>
                     <form action="{url}log">
                         {sessionvars%hiddenformentry}
                         <dl class="search">
                             <dt><label>Search: </label></dt>
                             <dd><input type="text" name="rev" /></dd>
                         </dl>
                     </form>
                     <ul class="page-nav">
                         <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
                         <li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
                         <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
                         <li class="current">graph</li>
                         <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
                         <li><a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a></li>
                     </ul>
                 </div>
                 <h2 class="no-link no-border">graph</h2>
                 <div id="noscript">The revision graph only works with JavaScript-enabled browsers.</div>
                 <div id="wrapper">
                     <ul id="nodebgs"></ul>
                     <canvas id="graph" width="224" height="#canvasheight#"></canvas>
                     <ul id="graphnodes"></ul>
                 </div>
                 <script type="text/javascript" src="#staticurl#graph.js"></script>
                 <script>
                 <!-- hide script content
                 document.getElementById('noscript').style.display = 'none';
                 var data = {jsdata|json};
                 var graph = new Graph();
                 graph.scale({bg_height});
                 graph.edge = function(x0, y0, x1, y1, color) {
                     this.setColor(color, 0.0, 0.65);
                     this.ctx.beginPath();
                     this.ctx.moveTo(x0, y0);
                     this.ctx.lineTo(x1, y1);
                     this.ctx.stroke();
                 }
                 var revlink = '<li style="_STYLE"><span class="desc">';
                 revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>';
-                revlink += '</span><span class="info">_DATE ago, by _USER</span></li>';
+                revlink += '</span>_TAGS<span class="info">_DATE ago, by _USER</span></li>';
                 graph.vertex = function(x, y, color, parity, cur) {
                     this.ctx.beginPath();
                     color = this.setColor(color, 0.25, 0.75);
                     this.ctx.arc(x, y, radius, 0, Math.PI * 2, true);
                     this.ctx.fill();
                     var bg = '<li class="bg parity' + parity + '"></li>';
                     var left = (this.columns + 1) * this.bg_height;
                     var nstyle = 'padding-left: ' + left + 'px;';
                     var item = revlink.replace(/_STYLE/, nstyle);
                     item = item.replace(/_PARITY/, 'parity' + parity);
                     item = item.replace(/_NODEID/, cur[0]);
                     item = item.replace(/_NODEID/, cur[0]);
                     item = item.replace(/_DESC/, cur[3]);
                     item = item.replace(/_USER/, cur[4]);
                     item = item.replace(/_DATE/, cur[5]);
+                    var tagspan = '';
+                    if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
+                        tagspan = '<span class="logtags">';
+                        if (cur[6][1]) {
+                            tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
+                            tagspan += cur[6][0] + '</span> ';
+                        } else if (!cur[6][1] && cur[6][0] != 'default') {
+                            tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">';
+                            tagspan += cur[6][0] + '</span> ';
+                        }
+                        if (cur[7].length) {
+                            for (var t in cur[7]) {
+                                var tag = cur[7][t];
+                                tagspan += '<span class="tagtag">' + tag + '</span> ';
+                            }
+                        }
+                        tagspan += '</span>';
+                    }
+                    item = item.replace(/_TAGS/, tagspan);
                     return [bg, item];
                 }
                 graph.render(data);
                 // stop hiding script -->
                 </script>
                 <div class="page-path">
             #changenav%navgraphentry#
                 </div>
             #footer#

templates/static/style-coal.css

0 +4 0

             body {
               margin: 0;
               padding: 0;
               background: black url(background.png) repeat-x;
               font-family: sans-serif;
             }
             .container {
               padding-right: 150px;
             }
             .main {
               position: relative;
               background: white;
               padding: 2em;
               border-right: 15px solid black;
               border-bottom: 15px solid black;
             }
             #.main {
               width:98%;
             }
             .overflow {
               width: 100%;
               overflow: auto;
             }
             .menu {
               background: #999;
               padding: 10px;
               width: 75px;
               margin: 0;
               font-size: 80%;
               text-align: left;
               position: fixed;
               top: 27px;
               left: auto;
               right: 27px;
             }
             #.menu {
               position: absolute !important;
               top:expression(eval(document.body.scrollTop + 27));
             }
             .menu ul {
               list-style: none;
               padding: 0;
               margin: 10px 0 0 0;
             }
             .menu li {
               margin-bottom: 3px;
               padding: 2px 4px;
               background: white;
               color: black;
               font-weight: normal;
             }
             .menu li.active {
               background: black;
               color: white;
             }
             .menu a { color: black; display: block; }
             .search {
               position: absolute;
               top: .7em;
               right: 2em;
             }
             form.search span {
               display: none;
               position: absolute;
               top: 40px;
               right: 0px;
               width: 190px;
               padding: 5px;
               background: #ffc;
               font-size: 70%;
               border: 1px solid yellow;
               -moz-border-radius: 5px; /* this works only in camino/firefox */
               -webkit-border-radius: 5px; /* this is just for Safari */
             }
             form.search:hover span { display: block; }
             a { text-decoration:none; }
             .age { white-space:nowrap; }
             .date { white-space:nowrap; }
             .indexlinks { white-space:nowrap; }
             .parity0 { background-color: #f0f0f0; }
             .parity1 { background-color: white; }
             .plusline { color: green; }
             .minusline { color: #dc143c; } /* crimson */
             .atline { color: purple; }
             .navigate {
               text-align: right;
               font-size: 60%;
               margin: 1em 0 1em 0;
             }
             .tag {
               color: #999;
               font-size: 70%;
               font-weight: normal;
               margin-left: .5em;
               vertical-align: baseline;
             }
             .branchhead {
               color: #000;
               font-size: 80%;
               font-weight: normal;
               margin-left: .5em;
               vertical-align: baseline;
             }
+            ul#graphnodes .branchhead {
+              font-size: 75%;
+            }
             .branchname {
               color: #000;
               font-size: 60%;
               font-weight: normal;
               margin-left: .5em;
               vertical-align: baseline;
             }
             /* Common */
             pre { margin: 0; }
             h2 { font-size: 120%; border-bottom: 1px solid #999; }
             h2 a { color: #000; }
             h3 {
               margin-top: -.7em;
               font-size: 100%;
             }
             /* log and tags tables */
             .bigtable {
               border-bottom: 1px solid #999;
               border-collapse: collapse;
               font-size: 90%;
               width: 100%;
               font-weight: normal;
               text-align: left;
             }
             .bigtable td {
               padding: 1px 4px 1px 4px;
               vertical-align: top;
             }
             .bigtable th {
               padding: 1px 4px 1px 4px;
               border-bottom: 1px solid #999;
               font-size: smaller;
             }
             .bigtable tr { border: none; }
             .bigtable .age { width: 6em; }
             .bigtable .author { width: 12em; }
             .bigtable .description { }
             .bigtable .node { width: 5em; font-family: monospace;}
             .bigtable .lineno { width: 2em; text-align: right;}
             .bigtable .lineno a { color: #999; font-size: smaller; font-family: monospace;}
             .bigtable .permissions { width: 8em; text-align: left;}
             .bigtable .size { width: 5em; text-align: right; }
             .bigtable .annotate { text-align: right; }
             .bigtable td.annotate { font-size: smaller; }
             .bigtable td.source { font-size: inherit; }
             .source, .sourcefirst, .sourcelast {
               font-family: monospace;
               white-space: pre;
               font-size: 90%;
             }
             .sourcefirst { border-bottom: 1px solid #999; font-weight: bold; font-size: smaller; }
             .sourcelast { border-top: 1px solid #999; }
             .source a { color: #999; font-size: smaller; font-family: monospace;}
             .bottomline { border-bottom: 1px solid #999; }
             .fileline { font-family: monospace; }
             .fileline img { border: 0; }
             /* Changeset entry */
             #changesetEntry {
               border-collapse: collapse;
               font-size: 90%;
               width: 100%;
               margin-bottom: 1em;
             }
             #changesetEntry th {
               padding: 1px 4px 1px 4px;
               width: 4em;
               text-align: right;
               font-weight: normal;
               color: #999;
               margin-right: .5em;
               vertical-align: top;
             }
             div.description {
               border-left: 3px solid #999;
               margin: 1em 0 1em 0;
               padding: .3em;
             }
             div#wrapper {
             	position: relative;
             	border-top: 1px solid black;
             	border-bottom: 1px solid black;
             	margin: 0;
             	padding: 0;
             }
             canvas {
             	position: absolute;
             	z-index: 5;
             	top: -0.7em;
             	margin: 0;
             }
             ul#graphnodes {
             	position: absolute;
             	z-index: 10;
             	top: -1.0em;
             	list-style: none inside none;
             	padding: 0;
             }
             ul#nodebgs {
             	list-style: none inside none;
             	padding: 0;
             	margin: 0;
             	top: -0.7em;
             }
             ul#graphnodes li, ul#nodebgs li {
             	height: 39px;
             }
             ul#graphnodes li .info {
             	display: block;
             	font-size: 70%;
             	position: relative;
             	top: -3px;
             }

templates/static/style-paper.css

0 +4 0

             body {
               margin: 0;
               padding: 0;
               background: white;
               font-family: sans-serif;
             }
             .container {
               padding-left: 115px;
             }
             .main {
               position: relative;
               background: white;
               padding: 2em 2em 2em 0;
             }
             #.main {
               width: 98%;
             }
             .overflow {
               width: 100%;
               overflow: auto;
             }
             .menu {
               width: 90px;
               margin: 0;
               font-size: 80%;
               text-align: left;
               position: absolute;
               top: 20px;
               left: 20px;
               right: auto;
             }
             .menu ul {
               list-style: none;
               padding: 0;
               margin: 10px 0 0 0;
               border-left: 2px solid #999;
             }
             .menu li {
               margin-bottom: 3px;
               padding: 2px 4px;
               background: white;
               color: black;
               font-weight: normal;
             }
             .menu li.active {
               font-weight: bold;
             }
             .menu a { color: black; display: block; }
             .search {
               position: absolute;
               top: .7em;
               right: 2em;
             }
             form.search span {
               display: none;
               position: absolute;
               top: 40px;
               right: 0px;
               width: 190px;
               padding: 5px;
               background: #ffc;
               font-size: 70%;
               border: 1px solid yellow;
               -moz-border-radius: 5px; /* this works only in camino/firefox */
               -webkit-border-radius: 5px; /* this is just for Safari */
             }
             form.search:hover span { display: block; }
             a { text-decoration:none; }
             .age { white-space:nowrap; }
             .date { white-space:nowrap; }
             .indexlinks { white-space:nowrap; }
             .parity0 { background-color: #f0f0f0; }
             .parity1 { background-color: white; }
             .plusline { color: green; }
             .minusline { color: #dc143c; } /* crimson */
             .atline { color: purple; }
             .navigate {
               text-align: right;
               font-size: 60%;
               margin: 1em 0 1em 0;
             }
             .tag {
               color: #999;
               font-size: 70%;
               font-weight: normal;
               margin-left: .5em;
               vertical-align: baseline;
             }
             .branchhead {
               color: #000;
               font-size: 80%;
               font-weight: normal;
               margin-left: .5em;
               vertical-align: baseline;
             }
+            ul#graphnodes .branchhead {
+              font-size: 75%;
+            }
             .branchname {
               color: #000;
               font-size: 60%;
               font-weight: normal;
               margin-left: .5em;
               vertical-align: baseline;
             }
             /* Common */
             pre { margin: 0; }
             h2 { font-size: 120%; border-bottom: 1px solid #999; }
             h2 a { color: #000; }
             h3 {
               margin-top: -.7em;
               font-size: 100%;
             }
             /* log and tags tables */
             .bigtable {
               border-bottom: 1px solid #999;
               border-collapse: collapse;
               font-size: 90%;
               width: 100%;
               font-weight: normal;
               text-align: left;
             }
             .bigtable td {
               padding: 1px 4px 1px 4px;
               vertical-align: top;
             }
             .bigtable th {
               padding: 1px 4px 1px 4px;
               border-bottom: 1px solid #999;
               font-size: smaller;
             }
             .bigtable tr { border: none; }
             .bigtable .age { width: 6em; }
             .bigtable .author { width: 12em; }
             .bigtable .description { }
             .bigtable .node { width: 5em; font-family: monospace;}
             .bigtable .permissions { width: 8em; text-align: left;}
             .bigtable .size { width: 5em; text-align: right; }
             .bigtable .annotate { text-align: right; }
             .bigtable td.annotate { font-size: smaller; }
             .bigtable td.source { font-size: inherit; }
             .source, .sourcefirst, .sourcelast {
               font-family: monospace;
               white-space: pre;
               font-size: 90%;
             }
             .sourcefirst { border-bottom: 1px solid #999; font-weight: bold; font-size: smaller; }
             .sourcelast { border-top: 1px solid #999; }
             .source a { color: #999; font-size: smaller; font-family: monospace;}
             .bottomline { border-bottom: 1px solid #999; }
             .fileline { font-family: monospace; }
             .fileline img { border: 0; }
             /* Changeset entry */
             #changesetEntry {
               border-collapse: collapse;
               font-size: 90%;
               width: 100%;
               margin-bottom: 1em;
             }
             #changesetEntry th {
               padding: 1px 4px 1px 4px;
               width: 4em;
               text-align: right;
               font-weight: normal;
               color: #999;
               margin-right: .5em;
               vertical-align: top;
             }
             div.description {
               border-left: 2px solid #999;
               margin: 1em 0 1em 0;
               padding: .3em;
             }
             /* Graph */
             div#wrapper {
             	position: relative;
             	border-top: 1px solid black;
             	border-bottom: 1px solid black;
             	margin: 0;
             	padding: 0;
             }
             canvas {
             	position: absolute;
             	z-index: 5;
             	top: -0.7em;
             	margin: 0;
             }
             ul#nodebgs {
             	list-style: none inside none;
             	padding: 0;
             	margin: 0;
             	top: -0.7em;
             }
             ul#graphnodes li, ul#nodebgs li {
             	height: 39px;
             }
             ul#graphnodes {
             	position: absolute;
             	z-index: 10;
             	top: -1.0em;
             	list-style: none inside none;
             	padding: 0;
             }
             ul#graphnodes li .info {
             	display: block;
             	font-size: 70%;
             	position: relative;
             	top: -3px;
             }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages