upstream/mercurial-mirror Commit - r6729:855851ea

graph: improve script hiding tricks

Dirkjan Ochtman -

r6729:855851ea default

parent child

templates/coal/graph.tmpl

0 +4 -1

             {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{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>{repo|escape}</h2>
             <h3>graph</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             </form>
             <div class="navigate">
             <a href="{url}graph/{uprev}{sessionvars%urlparameter}?revcount={revcountless}">less</a>
             <a href="{url}graph/{uprev}{sessionvars%urlparameter}?revcount={revcountmore}">more</a>
             | {changenav%navgraphentry}
             </div>
             <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.visibility = 'hidden';
+            document.getElementById('noscript').style.display = 'none';
             data = {jsdata|json};
             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 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; '));
             	return [bg, item];
             }
             graph.render(data);
+            // stop hiding script -->
             </script>
             <div class="navigate">
             <a href="{url}graph/{uprev}{sessionvars%urlparameter}?revcount={revcountless}">less</a>
             <a href="{url}graph/{uprev}{sessionvars%urlparameter}?revcount={revcountmore}">more</a>
             | {changenav%navgraphentry}
             </div>
             </div>
             </div>
             {footer}

templates/gitweb/graph.tmpl

0 +4 -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#"/>
             </head>
             <body>
             <div class="page_header">
             <a href="http://www.selenic.com/mercurial/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">#repo|escape#</a> / graph
             </div>
             <form action="{url}log">
             {sessionvars%hiddenformentry}
             <div class="search">
             <input type="text" name="rev"  />
             </div>
             </form>
             <div class="page_nav">
             <a href="{url}summary{sessionvars%urlparameter}">summary</a> |
             <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
             <a href="{url}log/#rev#{sessionvars%urlparameter}">changelog</a> |
             graph |
             <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
             <a href="{url}file/#node|short#{sessionvars%urlparameter}">files</a>
             <br/>
             <a href="{url}graph/{uprev}{sessionvars%urlparameter}?revcount={revcountless}">less</a>
             <a href="{url}graph/{uprev}{sessionvars%urlparameter}?revcount={revcountmore}">more</a>
             | #changenav%navgraphentry#<br/>
             </div>
             <div class="title">&nbsp;</div>
             <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.visibility = 'hidden';
+            document.getElementById('noscript').style.display = 'none';
             data = {jsdata|json};
             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 class="list" href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID"><b>_DESC</b></a>';
             revlink += '</span> _TAGS';
             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]);
             	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_nav">
             <a href="{url}graph/{uprev}{sessionvars%urlparameter}?revcount={revcountless}">less</a>
             <a href="{url}graph/{uprev}{sessionvars%urlparameter}?revcount={revcountmore}">more</a>
             | {changenav%navgraphentry}
             </div>
             #footer#

templates/graph.tmpl

0 +4 -1

             #header#
             <title>#repo|escape#: graph</title>
             <link rel="alternate" type="application/atom+xml"
                href="#url#atom-tags" title="Atom feed for #repo|escape#: tags">
             <link rel="alternate" type="application/rss+xml"
                href="#url#rss-tags" title="RSS feed for #repo|escape#: tags">
             </head>
             <body>
             <div class="buttons">
             <a href="#url#log{sessionvars%urlparameter}">changelog</a>
             <a href="#url#shortlog{sessionvars%urlparameter}">shortlog</a>
             <a href="#url#tags{sessionvars%urlparameter}">tags</a>
             <a href="#url#file/#node|short#/{sessionvars%urlparameter}">files</a>
             </div>
             <h2>graph</h2>
             <form action="#url#log">
             {sessionvars%hiddenformentry}
             <p>
             <label for="search1">search:</label>
             <input name="rev" id="search1" type="text" size="30">
             navigate: <small class="navigate">#changenav%navgraphentry#</small>
             </p>
             </form>
             <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.visibility = 'hidden';
+            document.getElementById('noscript').style.display = 'none';
             data = {jsdata|json};
             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>';
             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]);
             	return [bg, item];
             }
             graph.render(data);
+            // stop hiding script -->
             </script>
             <form action="#url#log">
             {sessionvars%hiddenformentry}
             <p>
             <label for="search1">search:</label>
             <input name="rev" id="search1" type="text" size="30">
             navigate: <small class="navigate">#changenav%navgraphentry#</small>
             </p>
             </form>
             #footer#

templates/static/style-gitweb.css

0 +1 0

             body { font-family: sans-serif; font-size: 12px; margin:0px; border:solid #d9d8d1; border-width:1px; margin:10px; }
             a { color:#0000cc; }
             a:hover, a:visited, a:active { color:#880000; }
             div.page_header { height:25px; padding:8px; font-size:18px; font-weight:bold; background-color:#d9d8d1; }
             div.page_header a:visited { color:#0000cc; }
             div.page_header a:hover { color:#880000; }
             div.page_nav { padding:8px; }
             div.page_nav a:visited { color:#0000cc; }
             div.page_path { padding:8px; border:solid #d9d8d1; border-width:0px 0px 1px}
             div.page_footer { padding:4px 8px; background-color: #d9d8d1; }
             div.page_footer_text { float:left; color:#555555; font-style:italic; }
             div.page_body { padding:8px; }
             div.title, a.title {
             	display:block; padding:6px 8px;
             	font-weight:bold; background-color:#edece6; text-decoration:none; color:#000000;
             }
             a.title:hover { background-color: #d9d8d1; }
             div.title_text { padding:6px 0px; border: solid #d9d8d1; border-width:0px 0px 1px; }
             div.log_body { padding:8px 8px 8px 150px; }
             .age { white-space:nowrap; }
             span.age { position:relative; float:left; width:142px; font-style:italic; }
             div.log_link {
             	padding:0px 8px;
             	font-size:10px; font-family:sans-serif; font-style:normal;
             	position:relative; float:left; width:136px;
             }
             div.list_head { padding:6px 8px 4px; border:solid #d9d8d1; border-width:1px 0px 0px; font-style:italic; }
             a.list { text-decoration:none; color:#000000; }
             a.list:hover { text-decoration:underline; color:#880000; }
             table { padding:8px 4px; }
             th { padding:2px 5px; font-size:12px; text-align:left; }
             tr.light:hover, .parity0:hover { background-color:#edece6; }
             tr.dark, .parity1 { background-color:#f6f6f0; }
             tr.dark:hover, .parity1:hover { background-color:#edece6; }
             td { padding:2px 5px; font-size:12px; vertical-align:top; }
             td.link { padding:2px 5px; font-family:sans-serif; font-size:10px; }
             td.indexlinks { white-space: nowrap; }
             td.indexlinks a {
               padding: 2px 5px; line-height: 10px;
               border: 1px solid;
               color: #ffffff; background-color: #7777bb;
               border-color: #aaaadd #333366 #333366 #aaaadd;
               font-weight: bold;  text-align: center; text-decoration: none;
               font-size: 10px;
             }
             td.indexlinks a:hover { background-color: #6666aa; }
             div.pre { font-family:monospace; font-size:12px; white-space:pre; }
             div.diff_info { font-family:monospace; color:#000099; background-color:#edece6; font-style:italic; }
             div.index_include { border:solid #d9d8d1; border-width:0px 0px 1px; padding:12px 8px; }
             div.search { margin:4px 8px; position:absolute; top:56px; right:12px }
             .linenr { color:#999999; text-decoration:none }
             div.rss_logo { float: right; white-space: nowrap; }
             div.rss_logo a {
             	padding:3px 6px; line-height:10px;
             	border:1px solid; border-color:#fcc7a5 #7d3302 #3e1a01 #ff954e;
             	color:#ffffff; background-color:#ff6600;
             	font-weight:bold; font-family:sans-serif; font-size:10px;
             	text-align:center; text-decoration:none;
             }
             div.rss_logo a:hover { background-color:#ee5500; }
             pre { margin: 0; }
             span.logtags span {
             	padding: 0px 4px;
             	font-size: 10px;
             	font-weight: normal;
             	border: 1px solid;
             	background-color: #ffaaff;
             	border-color: #ffccff #ff00ee #ff00ee #ffccff;
             }
             span.logtags span.tagtag {
             	background-color: #ffffaa;
             	border-color: #ffffcc #ffee00 #ffee00 #ffffcc;
             }
             span.logtags span.branchtag {
             	background-color: #aaffaa;
             	border-color: #ccffcc #00cc33 #00cc33 #ccffcc;
             }
             span.logtags span.inbranchtag {
             	background-color: #d5dde6;
             	border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
             }
             /* Graph */
             div#wrapper {
             	position: relative;
             	margin: 0;
             	padding: 0;
+            	margin-top: 3px;
             }
             canvas {
             	position: absolute;
             	z-index: 5;
             	top: -0.9em;
             	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: -0.8em;
             	list-style: none inside none;
             	padding: 0;
             }
             ul#graphnodes li .info {
             	display: block;
             	font-size: 100%;
             	position: relative;
             	top: -3px;
             	font-style: italic;
             }

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