upstream/mercurial-mirror Commit - r6775:54ccf417

coal: include current node in log, graph menu links

Brendan Cully -

r6775:54ccf417 default

parent child

templates/coal/changeset.tmpl

0 +2 -2

             {header}
             <title>{repo|escape}: {node|short}</title>
             </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><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
-             <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
+             <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
              <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
             </ul>
             <ul>
              <li class="active">changeset</li>
              <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">browse</a></li>
             </ul>
             <ul>
              {archives%archiveentry}</ul>
             </ul>
             </div>
             <div class="main">
             <h2>{repo|escape}</h2>
             <h3>changeset {rev}:{node|short} {changesettag}</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             </form>
             <div class="description">{desc|strip|escape|addbreaks}</div>
             <table id="changesetEntry">
             <tr>
              <th class="author">author</th>
              <td class="author">{author|obfuscate}</td>
             </tr>
             <tr>
              <th class="date">date</th>
              <td class="date">{date|date} ({date|age} ago)</td></tr>
             <tr>
              <th class="author">parents</th>
              <td class="author">{parent%changesetparent}</td>
             </tr>
             <tr>
              <th class="author">children</th>
              <td class="author">{child%changesetchild}</td>
             </tr>
             <tr>
              <th class="files">files</th>
              <td class="files">{files}</td></tr>
             </tr>
             </table>
             <tr>
             <div class="overflow">
             <table class="bigtable">
             <tr>
              <th class="lineno">line</th>
              <th class="source">diff</th>
             </tr>
             </table>
             {diff}
             </div>
             </div>
             {footer}

templates/coal/fileannotate.tmpl

0 +2 -2

             {header}
             <title>{repo|escape}: {file|escape} annotate</title>
             </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><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
-            <li><a href="{url}graph/{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></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>
             <ul>
             <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
             <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
             <li class="active">annotate</li>
             <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
             <li><a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a></li>
             </ul>
             </div>
             <div class="main">
             <h2>{repo|escape}</h2>
             <h3>annotate {file|escape} @ {rev}:{node|short}</h2>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             </form>
             <div class="description">{desc|strip|escape|addbreaks}</div>
             <table id="changesetEntry">
             <tr>
              <th class="author">author</th>
              <td class="author">{author|obfuscate}</td>
             </tr>
             <tr>
              <th class="date">date</th>
              <td class="date">{date|date} ({date|age} ago)</td>
             </tr>
             <tr>
              <th class="author">parents</th>
              <td class="author">{parent%filerevparent}</td>
             </tr>
             <tr>
              <th class="author">children</th>
              <td class="author">{child%filerevchild}</td>
             </tr>
             {changesettag}
             </table>
             <br/>
             <div class="overflow">
             <table class="bigtable">
             <tr>
              <th class="annotate">rev</th>
              <th class="lineno">line</th>
              <th class="line">source</th>
             </tr>
             {annotate%annotateline}
             </table>
             </div>
             </div>
             </div>
             {footer}

templates/coal/filediff.tmpl

0 +2 -2

             {header}
             <title>{repo|escape}: {file|escape} diff</title>
             </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><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
-            <li><a href="{url}graph/{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></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>
             <ul>
             <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
             <li class="active">diff</li>
             <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
             <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
             <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li>
             </ul>
             </div>
             <div class="main">
             <h2>{repo|escape}</h2>
             <h3>diff {file|escape} @ {rev}:{node|short}</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             </form>
             <div class="description">{desc|strip|escape|addbreaks}</div>
             <table id="changesetEntry">
             <tr>
              <th>author</th>
              <td>{author|obfuscate}</td>
             </tr>
             <tr>
              <th>date</th>
              <td>{date|date} ({date|age} ago)</td>
             </tr>
             <tr>
              <th>parents</th>
              <td>{parent%filerevparent}</td>
             </tr>
             <tr>
              <th>children</th>
              <td>{child%filerevchild}</td>
             </tr>
             {changesettag}
             </table>
             <div class="overflow">
             <table class="bigtable">
             <tr>
              <th class="lineno">line</th>
              <th class="source">diff</th>
             </tr>
             <table>
             {diff}
             </div>
             </div>
             </div>
             {footer}

templates/coal/filelog.tmpl

0 +2 -2

             {header}
             <title>{repo|escape}: {file|escape} history</title>
             <link rel="alternate" type="application/atom+xml"
                href="{url}atom-log/tip/{file|urlescape}" title="Atom feed for {repo|escape}:{file}">
             <link rel="alternate" type="application/rss+xml"
                href="{url}rss-log/tip/{file|urlescape}" title="RSS feed for {repo|escape}:{file}">
             </head>
             </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><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
-            <li><a href="{url}graph/{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></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>
             <ul>
             <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li>
             <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
             <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
             <li class="active">file log</li>
             <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li>
             </ul>
             </div>
             <div class="main">
             <h2>{repo|escape}</h2>
             <h3>log {file|escape}</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             </form>
             <div class="navigate">{nav%filenaventry}</div>
             <table class="bigtable">
              <tr>
               <th class="age">age</td>
               <th class="author">author</td>
               <th class="description">description</td>
              </tr>
             {entries%filelogentry}
             </table>
             </div>
             </div>
             {footer}

templates/coal/filerevision.tmpl

0 +2 -2

             {header}
             <title>{repo|escape}: {node|short} {file|escape}</title>
             </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><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
-            <li><a href="{url}graph/{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></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>
             <ul>
             <li class="active">file</li>
             <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li>
             <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li>
             <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li>
             <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li>
             </ul>
             </div>
             <div class="main">
             <h2>{repo|escape}</h2>
             <h3>view {file|escape} @ {rev}:{node|short}</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             </form>
             <div class="description">{desc|strip|escape|addbreaks}</div>
             <table id="changesetEntry">
             <tr>
              <th class="author">author</th>
              <td class="author">{author|obfuscate}</td>
             </tr>
             <tr>
              <th class="date">date</th>
              <td class="date">{date|date} ({date|age} ago)</td>
             </tr>
             <tr>
              <th class="author">parents</th>
              <td class="author">{parent%filerevparent}</td>
             </tr>
             <tr>
              <th class="author">children</th>
              <td class="author">{child%filerevchild}</td>
             </tr>
             {changesettag}
             </table>
             <div class="overflow">
             <table class="bigtable">
             <tr>
              <th class="lineno">line</th>
              <th class="source">source</th>
             </tr>
             {text%fileline}
             </table>
             </div>
             </div>
             </div>
             {footer}

templates/coal/graph.tmpl

0 +1 -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><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>{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.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="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/coal/manifest.tmpl

0 +2 -2

             {header}
             <title>{repo|escape}: {node|short} {path|escape}</title>
             </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><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li>
-            <li><a href="{url}graph/{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></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 class="active">browse</li>
             </ul>
             <ul>
             {archives%archiveentry}
             </ul>
             </div>
             <div class="main">
             <h2>{repo|escape}</h2>
             <h3>directory {path|escape} @ {rev}:{node|short} {tags%changelogtag}</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             </form>
             <table class="bigtable">
             <tr>
               <th class="name">name</th>
               <th class="size">size</th>
               <th class="permissions">permissions</th>
             </tr>
             <tr class="fileline parity{upparity}">
               <td class="name"><a href="{url}file/{node|short}{up|urlescape}{sessionvars%urlparameter}">[up]</a></td>
               <td class="size"></td>
               <td class="permissions">drwxr-xr-x</td>
             </tr>
             {dentries%direntry}
             {fentries%fileentry}
             </table>
             </div>
             </div>
             {footer}

templates/coal/shortlog.tmpl

0 +1 -1

             {header}
             <title>{repo|escape}: log</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="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 class="active">log</li>
-            <li><a href="{url}graph{sessionvars%urlparameter}">graph</a></li>
+            <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></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>
             <ul>
             {archives%archiveentry}
             </ul>
             </div>
             <div class="main">
             <h2>{repo|escape}</h2>
             <h3>log</h3>
             <form class="search" action="{url}log">
             {sessionvars%hiddenformentry}
             <p><input name="rev" id="search1" type="text" size="30"></p>
             </form>
             <div class="navigate">rev {rev}: {changenav%navshortentry}</div>
             <table class="bigtable">
              <tr>
               <th class="age">age</td>
               <th class="author">author</td>
               <th class="description">description</td>
              </tr>
             {entries%shortlogentry}
             </table>
             <div class="navigate">rev {rev}: {changenav%navshortentry}</div>
             </div>
             </div>
             {footer}

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