slitaz-dev-tools rev 279
hg: fix graph
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Wed Mar 01 20:51:06 2017 +0100 (2017-03-01) |
parents | bcc5664a94ba |
children | 1a4681ce84ef |
files | slitaz-mercurial-style/templates/slitaz/graph.tmpl slitaz-mercurial-style/templates/slitaz/header.tmpl slitaz-mercurial-style/templates/slitaz/map slitaz-mercurial-style/templates/static/style-slitaz.css |
line diff
1.1 --- a/slitaz-mercurial-style/templates/slitaz/graph.tmpl Wed Mar 01 19:20:14 2017 +0000 1.2 +++ b/slitaz-mercurial-style/templates/slitaz/graph.tmpl Wed Mar 01 20:51:06 2017 +0100 1.3 @@ -17,7 +17,6 @@ 1.4 <a href="http://doc.slitaz.org/">Doc</a> 1.5 <a href="http://forum.slitaz.org/">Forum</a> 1.6 <a href="http://irc.slitaz.org/">IRC</a> 1.7 - <a href="http://pro.slitaz.org/">Pro</a> 1.8 <a href="http://bugs.slitaz.org">Bugs</a> 1.9 <span>Hg</span> 1.10 <a href="http://cook.slitaz.org/">Cook</a> 1.11 @@ -58,12 +57,6 @@ 1.12 1.13 <h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a> graph</h2> 1.14 1.15 -<div class="navigate"> 1.16 -<a href="{url}graph/{rev}{lessvars%urlparameter}">less</a> 1.17 -<a href="{url}graph/{rev}{morevars%urlparameter}">more</a> 1.18 -| rev {rev}: {changenav%navgraph} 1.19 -</div> 1.20 - 1.21 <noscript><p>The revision graph only works with JavaScript-enabled browsers.</p></noscript> 1.22 1.23 <div id="wrapper"> 1.24 @@ -72,7 +65,7 @@ 1.25 <ul id="graphnodes"></ul> 1.26 </div> 1.27 1.28 -<script> 1.29 +<script type="text/javascript"> 1.30 <!-- hide script content 1.31 1.32 var data = {jsdata|json}; 1.33 @@ -89,36 +82,9 @@ 1.34 var bg = '<li class="bg parity' + parity + '"></li>'; 1.35 var left = (this.bg_height - this.box_size) + (this.columns + 1) * this.box_size; 1.36 var nstyle = 'padding-left: ' + left + 'px;'; 1.37 - 1.38 - var tagspan = ''; 1.39 - if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{ 1.40 - tagspan = '<span class="logtags">'; 1.41 - if (cur[6][1]) \{ 1.42 - tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; 1.43 - tagspan += cur[6][0] + '</span> '; 1.44 - } else if (!cur[6][1] && cur[6][0] != 'default') \{ 1.45 - tagspan += '<span class="inbranchtag" title="' + cur[6][0] + '">'; 1.46 - tagspan += cur[6][0] + '</span> '; 1.47 - } 1.48 - if (cur[7].length) \{ 1.49 - for (var t in cur[7]) \{ 1.50 - var tag = cur[7][t]; 1.51 - tagspan += '<span class="tagtag">' + tag + '</span> '; 1.52 - } 1.53 - } 1.54 - if (cur[8].length) \{ 1.55 - for (var t in cur[8]) \{ 1.56 - var bookmark = cur[8][t]; 1.57 - tagspan += '<span class="bookmarktag">' + bookmark + '</span> '; 1.58 - } 1.59 - } 1.60 - tagspan += '</span>'; 1.61 - } 1.62 - 1.63 var item = '<li style="' + nstyle + '"><span class="desc">'; 1.64 - item += '<a class="list" href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '"><b>' + cur[3] + '</b></a>'; 1.65 - item += '</span> ' + tagspan + ''; 1.66 - item += '<span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; 1.67 + item += '<a href="{url|urlescape}rev/' + cur[0] + '{sessionvars%urlparameter}" title="' + cur[0] + '">' + cur[3] + '</a>'; 1.68 + item += '</span><span class="info">' + cur[5] + ', by ' + cur[4] + '</span></li>'; 1.69 1.70 return [bg, item]; 1.71 1.72 @@ -129,23 +95,6 @@ 1.73 // stop hiding script --> 1.74 </script> 1.75 1.76 -<div class="page_nav"> 1.77 -<a href="{url|urlescape}graph/{symrev}{lessvars%urlparameter}">less</a> 1.78 -<a href="{url|urlescape}graph/{symrev}{morevars%urlparameter}">more</a> 1.79 -| {changenav%navgraph} 1.80 -</div> 1.81 - 1.82 -<script type="text/javascript"> 1.83 - ajaxScrollInit( 1.84 - '{url|urlescape}graph/{rev}?revcount=%next%&style={style}', 1.85 - {revcount}+60, 1.86 - function (htmlText, previousVal) \{ return previousVal + 60; }, 1.87 - '#wrapper', 1.88 - '<div class="%class%" style="text-align: center;">%text%</div>', 1.89 - 'graph' 1.90 - ); 1.91 -</script> 1.92 - 1.93 <!-- End of content --> 1.94 </div> 1.95
2.1 --- a/slitaz-mercurial-style/templates/slitaz/header.tmpl Wed Mar 01 19:20:14 2017 +0000 2.2 +++ b/slitaz-mercurial-style/templates/slitaz/header.tmpl Wed Mar 01 20:51:06 2017 +0100 2.3 @@ -5,3 +5,4 @@ 2.4 <meta name="robots" content="index, nofollow" /> 2.5 <link rel="icon" href="{staticurl}favicon.ico" type="image/ico" /> 2.6 <link rel="stylesheet" href="{staticurl}style-slitaz.css" type="text/css" /> 2.7 + <script type="text/javascript" src="{staticurl}mercurial.js"></script>
3.1 --- a/slitaz-mercurial-style/templates/slitaz/map Wed Mar 01 19:20:14 2017 +0000 3.2 +++ b/slitaz-mercurial-style/templates/slitaz/map Wed Mar 01 20:51:06 2017 +0100 3.3 @@ -195,3 +195,16 @@ 3.4 error = error.tmpl 3.5 urlparameter = '{separator}{name}={value|urlescape}' 3.6 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />' 3.7 + 3.8 +bookmarks = bookmarks.tmpl 3.9 +bookmarkentry = ' 3.10 + <tr class="parity{parity}"> 3.11 + <td class="age"><i class="age">{date|rfc822date}</i></td> 3.12 + <td><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}"><b>{bookmark|escape}</b></a></td> 3.13 + <td class="link"> 3.14 + <a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | 3.15 + <a href="{url|urlescape}log/{node|short}{sessionvars%urlparameter}">changelog</a> | 3.16 + <a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a> 3.17 + </td> 3.18 + </tr>' 3.19 +
4.1 --- a/slitaz-mercurial-style/templates/static/style-slitaz.css Wed Mar 01 19:20:14 2017 +0000 4.2 +++ b/slitaz-mercurial-style/templates/static/style-slitaz.css Wed Mar 01 20:51:06 2017 +0100 4.3 @@ -22,7 +22,7 @@ 4.4 h3 { color: #666; font-size: 140%; } 4.5 h4 { color: #888; font-size: 120%; } 4.6 h2, h3 { border-bottom: 1px dashed #afafaf; padding-bottom: 5px; } 4.7 -li { list-style-type: square; } 4.8 + 4.9 pre { 4.10 border: 1px solid #ddd; 4.11 padding: 10px; 4.12 @@ -535,27 +535,18 @@ 4.13 /* Graph */ 4.14 div#wrapper { 4.15 position: relative; 4.16 - border-top: 1px solid black; 4.17 - border-bottom: 1px solid black; 4.18 margin: 0; 4.19 padding: 0; 4.20 + margin-top: 3px; 4.21 } 4.22 4.23 canvas { 4.24 position: absolute; 4.25 z-index: 5; 4.26 - top: -0.7em; 4.27 + top: -0.9em; 4.28 margin: 0; 4.29 } 4.30 4.31 -ul#graphnodes { 4.32 - position: absolute; 4.33 - z-index: 10; 4.34 - top: -1.0em; 4.35 - list-style: none inside none; 4.36 - padding: 0; 4.37 -} 4.38 - 4.39 ul#nodebgs { 4.40 list-style: none inside none; 4.41 padding: 0; 4.42 @@ -567,9 +558,18 @@ 4.43 height: 39px; 4.44 } 4.45 4.46 +ul#graphnodes { 4.47 + position: absolute; 4.48 + z-index: 10; 4.49 + top: -0.8em; 4.50 + list-style: none inside none; 4.51 + padding: 0; 4.52 +} 4.53 + 4.54 ul#graphnodes li .info { 4.55 display: block; 4.56 - font-size: 70%; 4.57 + font-size: 100%; 4.58 position: relative; 4.59 top: -3px; 4.60 + font-style: italic; 4.61 }