1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/themes/mercurialweb/bookmarkentry.tmpl Sat Nov 26 01:08:12 2011 +0100 1.3 @@ -0,0 +1,6 @@ 1.4 +<tr class="parity{parity}"> 1.5 + <td class="date">{date|age}</td> 1.6 + <td class="navigation"><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></td> 1.7 + <td class="node">{node|short}</td> 1.8 + <td class="bookmarks"><span class="bookmark"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{bookmark|escape}</a></span></td> 1.9 +</tr>
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/themes/mercurialweb/bookmarks.tmpl Sat Nov 26 01:08:12 2011 +0100 2.3 @@ -0,0 +1,41 @@ 2.4 +{header} 2.5 +<title>{repo|escape} (bookmarks)</title> 2.6 +</head> 2.7 + 2.8 +<body> 2.9 + 2.10 +<div id="header"> 2.11 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 2.12 + <div class="controls"> 2.13 + <ul id="navibar"> 2.14 + <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 2.15 + ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li 2.16 + ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 2.17 + ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 2.18 + ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 2.19 + ><li class="current"><span>Bookmarks</span></li 2.20 + ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 2.21 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 2.22 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 2.23 + ><li><form id="searchform" action="{url}log"><span class="container"> 2.24 + <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 2.25 + </span> 2.26 + {sessionvars%hiddenformentry} 2.27 + </form> 2.28 + </li> 2.29 + </ul> 2.30 + </div> 2.31 + <div id="pageline"></div> 2.32 +</div> 2.33 + 2.34 +<h2>{repo|escape}</h2> 2.35 + 2.36 +<h3>Bookmarks</h3> 2.37 + 2.38 +<table class="bookmarks"> 2.39 + <tbody> 2.40 +{entries%bookmarkentry} 2.41 + </tbody> 2.42 +</table> 2.43 + 2.44 +{footer}
3.1 --- a/themes/mercurialweb/branches.tmpl Sun Nov 20 01:17:34 2011 +0100 3.2 +++ b/themes/mercurialweb/branches.tmpl Sat Nov 26 01:08:12 2011 +0100 3.3 @@ -5,7 +5,7 @@ 3.4 <body> 3.5 3.6 <div id="header"> 3.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 3.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 3.9 <div class="controls"> 3.10 <ul id="navibar"> 3.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 3.12 @@ -13,8 +13,10 @@ 3.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 3.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 3.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 3.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 3.17 ><li class="current"><span>Branches</span></li 3.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 3.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 3.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 3.21 ><li><form id="searchform" action="{url}log"><span class="container"> 3.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 3.23 </span>
4.1 --- a/themes/mercurialweb/changelog.tmpl Sun Nov 20 01:17:34 2011 +0100 4.2 +++ b/themes/mercurialweb/changelog.tmpl Sat Nov 26 01:08:12 2011 +0100 4.3 @@ -5,7 +5,7 @@ 4.4 <body> 4.5 4.6 <div id="header"> 4.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 4.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 4.9 <div class="controls"> 4.10 <ul id="navibar"> 4.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 4.12 @@ -13,8 +13,10 @@ 4.13 ><li class="current"><span>Changelog</span></li 4.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 4.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 4.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 4.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 4.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 4.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 4.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 4.21 ><li><form id="searchform" action="{url}log"><span class="container"> 4.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 4.23 </span>
5.1 --- a/themes/mercurialweb/changeset.tmpl Sun Nov 20 01:17:34 2011 +0100 5.2 +++ b/themes/mercurialweb/changeset.tmpl Sat Nov 26 01:08:12 2011 +0100 5.3 @@ -5,7 +5,7 @@ 5.4 <body> 5.5 5.6 <div id="header"> 5.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 5.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 5.9 <div class="controls"> 5.10 <ul id="navibar"> 5.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 5.12 @@ -13,8 +13,10 @@ 5.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 5.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 5.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 5.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 5.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 5.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 5.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 5.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 5.21 ><li><form id="searchform" action="{url}log"><span class="container"> 5.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 5.23 </span>
6.1 --- a/themes/mercurialweb/error.tmpl Sun Nov 20 01:17:34 2011 +0100 6.2 +++ b/themes/mercurialweb/error.tmpl Sat Nov 26 01:08:12 2011 +0100 6.3 @@ -5,7 +5,7 @@ 6.4 <body> 6.5 6.6 <div id="header"> 6.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 6.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 6.9 <div class="controls"> 6.10 <ul id="navibar"> 6.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 6.12 @@ -13,8 +13,10 @@ 6.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 6.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 6.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 6.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 6.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 6.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 6.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 6.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 6.21 ><li><form id="searchform" action="{url}log"><span class="container"> 6.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 6.23 </span>
7.1 --- a/themes/mercurialweb/fileannotate.tmpl Sun Nov 20 01:17:34 2011 +0100 7.2 +++ b/themes/mercurialweb/fileannotate.tmpl Sat Nov 26 01:08:12 2011 +0100 7.3 @@ -5,7 +5,7 @@ 7.4 <body> 7.5 7.6 <div id="header"> 7.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 7.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 7.9 <div class="controls"> 7.10 <ul id="navibar"> 7.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 7.12 @@ -13,8 +13,10 @@ 7.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 7.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 7.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 7.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 7.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 7.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 7.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 7.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 7.21 ><li><form id="searchform" action="{url}log"><span class="container"> 7.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 7.23 </span>
8.1 --- a/themes/mercurialweb/filediff.tmpl Sun Nov 20 01:17:34 2011 +0100 8.2 +++ b/themes/mercurialweb/filediff.tmpl Sat Nov 26 01:08:12 2011 +0100 8.3 @@ -5,7 +5,7 @@ 8.4 <body> 8.5 8.6 <div id="header"> 8.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 8.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 8.9 <div class="controls"> 8.10 <ul id="navibar"> 8.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 8.12 @@ -13,8 +13,10 @@ 8.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 8.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 8.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 8.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 8.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 8.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 8.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 8.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 8.21 ><li><form id="searchform" action="{url}log"><span class="container"> 8.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 8.23 </span>
9.1 --- a/themes/mercurialweb/filerevision.tmpl Sun Nov 20 01:17:34 2011 +0100 9.2 +++ b/themes/mercurialweb/filerevision.tmpl Sat Nov 26 01:08:12 2011 +0100 9.3 @@ -5,7 +5,7 @@ 9.4 <body> 9.5 9.6 <div id="header"> 9.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 9.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 9.9 <div class="controls"> 9.10 <ul id="navibar"> 9.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 9.12 @@ -13,8 +13,10 @@ 9.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 9.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 9.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 9.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 9.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 9.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 9.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 9.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 9.21 ><li><form id="searchform" action="{url}log"><span class="container"> 9.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 9.23 </span>
10.1 --- a/themes/mercurialweb/graph.tmpl Sun Nov 20 01:17:34 2011 +0100 10.2 +++ b/themes/mercurialweb/graph.tmpl Sat Nov 26 01:08:12 2011 +0100 10.3 @@ -5,7 +5,7 @@ 10.4 <body> 10.5 10.6 <div id="header"> 10.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 10.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 10.9 <div class="controls"> 10.10 <ul id="navibar"> 10.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 10.12 @@ -13,8 +13,10 @@ 10.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 10.14 ><li class="current"><span>Graph</span></li 10.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 10.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 10.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 10.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 10.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 10.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 10.21 ><li><form id="searchform" action="{url}log"><span class="container"> 10.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 10.23 </span>
11.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 11.2 +++ b/themes/mercurialweb/help.tmpl Sat Nov 26 01:08:12 2011 +0100 11.3 @@ -0,0 +1,39 @@ 11.4 +{header} 11.5 +<title>{repo|escape} (help)</title> 11.6 +</head> 11.7 + 11.8 +<body> 11.9 + 11.10 +<div id="header"> 11.11 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 11.12 + <div class="controls"> 11.13 + <ul id="navibar"> 11.14 + <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 11.15 + ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li 11.16 + ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 11.17 + ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 11.18 + ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 11.19 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 11.20 + ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 11.21 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 11.22 + ><li class="current"><span>Help</span></li 11.23 + ><li><form id="searchform" action="{url}log"><span class="container"> 11.24 + <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 11.25 + </span> 11.26 + {sessionvars%hiddenformentry} 11.27 + </form> 11.28 + </li> 11.29 + </ul> 11.30 + </div> 11.31 + <div id="pageline"></div> 11.32 +</div> 11.33 + 11.34 +<h2>{repo|escape}</h2> 11.35 + 11.36 +<h3>Help</h3> 11.37 + 11.38 +<pre> 11.39 +{doc|escape} 11.40 +</pre> 11.41 + 11.42 +{footer}
12.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 12.2 +++ b/themes/mercurialweb/helpentry.tmpl Sat Nov 26 01:08:12 2011 +0100 12.3 @@ -0,0 +1,4 @@ 12.4 +<tr> 12.5 + <td><a href="{url}help/{topic|urlescape}{sessionvars%urlparameter}">{topic|escape}</a></td> 12.6 + <td>{summary|escape}</td> 12.7 +</tr>
13.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 13.2 +++ b/themes/mercurialweb/helptopics.tmpl Sat Nov 26 01:08:12 2011 +0100 13.3 @@ -0,0 +1,57 @@ 13.4 +{header} 13.5 +<title>{repo|escape} (help)</title> 13.6 +</head> 13.7 + 13.8 +<body> 13.9 + 13.10 +<div id="header"> 13.11 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 13.12 + <div class="controls"> 13.13 + <ul id="navibar"> 13.14 + <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 13.15 + ><li><a href="{url}shortlog{sessionvars%urlparameter}">Shortlog</a></li 13.16 + ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 13.17 + ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 13.18 + ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 13.19 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 13.20 + ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 13.21 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 13.22 + ><li class="current"><span>Help</span></li 13.23 + ><li><form id="searchform" action="{url}log"><span class="container"> 13.24 + <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 13.25 + </span> 13.26 + {sessionvars%hiddenformentry} 13.27 + </form> 13.28 + </li> 13.29 + </ul> 13.30 + </div> 13.31 + <div id="pageline"></div> 13.32 +</div> 13.33 + 13.34 +<h2>{repo|escape}</h2> 13.35 + 13.36 +<h3>Help</h3> 13.37 + 13.38 +<div class="help"> 13.39 + 13.40 + <p class="navigation"> 13.41 + <a href="#topics" class="section">Topics</a> 13.42 + <a href="#main" class="section">Main Commands</a> 13.43 + <a href="#other" class="section">Other Commands</a> 13.44 + </p> 13.45 + 13.46 + <table> 13.47 + <tbody id="topics"> 13.48 + {topics%helpentry} 13.49 + </tbody> 13.50 + <tbody id="main"> 13.51 + {earlycommands%helpentry} 13.52 + </tbody> 13.53 + <tbody id="other"> 13.54 + {othercommands%helpentry} 13.55 + </tbody> 13.56 + </table> 13.57 + 13.58 +</div> 13.59 + 13.60 +{footer}
14.1 --- a/themes/mercurialweb/manifest.tmpl Sun Nov 20 01:17:34 2011 +0100 14.2 +++ b/themes/mercurialweb/manifest.tmpl Sat Nov 26 01:08:12 2011 +0100 14.3 @@ -5,7 +5,7 @@ 14.4 <body> 14.5 14.6 <div id="header"> 14.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 14.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 14.9 <div class="controls"> 14.10 <ul id="navibar"> 14.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 14.12 @@ -13,8 +13,10 @@ 14.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 14.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 14.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 14.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 14.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 14.18 ><li class="current"><span>Files</span></li 14.19 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 14.20 ><li><form id="searchform" action="{url}log"><span class="container"> 14.21 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 14.22 </span>
15.1 --- a/themes/mercurialweb/map Sun Nov 20 01:17:34 2011 +0100 15.2 +++ b/themes/mercurialweb/map Sat Nov 26 01:08:12 2011 +0100 15.3 @@ -1,6 +1,7 @@ 15.4 default = 'summary' 15.5 mimetype = 'application/xhtml+xml; charset={encoding}' 15.6 15.7 +bookmarks = bookmarks.tmpl 15.8 branches = branches.tmpl 15.9 changelog = changelog.tmpl 15.10 changeset = changeset.tmpl 15.11 @@ -10,6 +11,8 @@ 15.12 filerevision = filerevision.tmpl 15.13 graph = graph.tmpl 15.14 header = header.tmpl 15.15 +help = help.tmpl 15.16 +helptopics = helptopics.tmpl 15.17 footer = footer.tmpl 15.18 index = index.tmpl 15.19 manifest = manifest.tmpl 15.20 @@ -20,10 +23,12 @@ 15.21 tags = tags.tmpl 15.22 15.23 annotateline = annotateline.tmpl 15.24 +bookmarkentry = bookmarkentry.tmpl 15.25 branchentry = branchentry.tmpl 15.26 changelogentry = changelogentry.tmpl 15.27 direntry = direntry.tmpl 15.28 fileentry = fileentry.tmpl 15.29 +helpentry = helpentry.tmpl 15.30 indexentry = indexentry.tmpl 15.31 searchentry = searchentry.tmpl 15.32 shortlogentry = shortlogentry.tmpl
16.1 --- a/themes/mercurialweb/notfound.tmpl Sun Nov 20 01:17:34 2011 +0100 16.2 +++ b/themes/mercurialweb/notfound.tmpl Sat Nov 26 01:08:12 2011 +0100 16.3 @@ -5,7 +5,7 @@ 16.4 <body> 16.5 16.6 <div id="header"> 16.7 - <div id="logo"><a href="{url}{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 16.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 16.9 <div id="pageline"></div> 16.10 </div> 16.11
17.1 --- a/themes/mercurialweb/search.tmpl Sun Nov 20 01:17:34 2011 +0100 17.2 +++ b/themes/mercurialweb/search.tmpl Sat Nov 26 01:08:12 2011 +0100 17.3 @@ -5,7 +5,7 @@ 17.4 <body> 17.5 17.6 <div id="header"> 17.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 17.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 17.9 <div class="controls"> 17.10 <ul id="navibar"> 17.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 17.12 @@ -13,8 +13,10 @@ 17.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 17.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 17.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 17.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 17.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 17.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 17.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 17.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 17.21 ><li><form id="searchform" action="{url}log"><span class="container"> 17.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 17.23 </span>
18.1 --- a/themes/mercurialweb/shortlog.tmpl Sun Nov 20 01:17:34 2011 +0100 18.2 +++ b/themes/mercurialweb/shortlog.tmpl Sat Nov 26 01:08:12 2011 +0100 18.3 @@ -5,7 +5,7 @@ 18.4 <body> 18.5 18.6 <div id="header"> 18.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 18.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 18.9 <div class="controls"> 18.10 <ul id="navibar"> 18.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 18.12 @@ -13,8 +13,10 @@ 18.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 18.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 18.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 18.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 18.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 18.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 18.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 18.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 18.21 ><li><form id="searchform" action="{url}log"><span class="container"> 18.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 18.23 </span>
19.1 --- a/themes/mercurialweb/static/style-mercurialweb.css Sun Nov 20 01:17:34 2011 +0100 19.2 +++ b/themes/mercurialweb/static/style-mercurialweb.css Sat Nov 26 01:08:12 2011 +0100 19.3 @@ -91,18 +91,21 @@ 19.4 table.summary td.author, 19.5 table.summary td.date, 19.6 table.branches td.date, 19.7 +table.bookmarks td.date, 19.8 table.tags td.date { 19.9 width: 10%; 19.10 } 19.11 19.12 table.manifest td.node, 19.13 table.summary.branches td.date, 19.14 +table.summary.bookmarks td.date, 19.15 table.summary.tags td.date { 19.16 width: 20%; 19.17 } 19.18 19.19 table.summary td.navigation, 19.20 table.branches td.navigation, 19.21 +table.bookmarks td.navigation, 19.22 table.tags td.navigation { 19.23 width: 5%; 19.24 } 19.25 @@ -117,6 +120,7 @@ 19.26 19.27 td.branchinfo, 19.28 td.branches, 19.29 +td.bookmarks, 19.30 td.tags { 19.31 text-align: right; 19.32 white-space: nowrap; 19.33 @@ -141,6 +145,7 @@ 19.34 } 19.35 19.36 span.tag, 19.37 +span.bookmark, 19.38 span.branch, 19.39 span.inbranch { 19.40 padding: 0.25em 0.5em; 19.41 @@ -151,6 +156,10 @@ 19.42 background: #f1b500; 19.43 } 19.44 19.45 +span.bookmark { 19.46 + background: #f100b5; 19.47 +} 19.48 + 19.49 span.branch, /* default properties */ 19.50 span.open { 19.51 background: #b5f1b5; 19.52 @@ -166,6 +175,7 @@ 19.53 } 19.54 19.55 span.branch a, 19.56 +span.bookmark a, 19.57 span.tag a, 19.58 span.inbranch a, 19.59 span.open a, 19.60 @@ -455,14 +465,38 @@ 19.61 display: block !important; 19.62 } 19.63 19.64 +/* Folding sections for the help and diff pages. */ 19.65 + 19.66 +.help tbody:not(:target), 19.67 .diff div:not(:target) { 19.68 display: none; 19.69 } 19.70 19.71 +.help tbody:target, 19.72 .diff div:target { 19.73 display: block; 19.74 } 19.75 19.76 +/* Help views. */ 19.77 + 19.78 +.help { 19.79 + position: relative; 19.80 +} 19.81 + 19.82 +.help table { 19.83 + margin: 0 0 3em 0; /* leave space for the navigation if inactive */ 19.84 +} 19.85 + 19.86 +.help table tbody { 19.87 + padding-top: 3em; /* leave space for the navigation */ 19.88 +} 19.89 + 19.90 +.help p.navigation { 19.91 + position: absolute; 19.92 + top: 0; 19.93 + left: 0; 19.94 +} 19.95 + 19.96 /* Source views. */ 19.97 19.98 .source {
20.1 --- a/themes/mercurialweb/summary.tmpl Sun Nov 20 01:17:34 2011 +0100 20.2 +++ b/themes/mercurialweb/summary.tmpl Sat Nov 26 01:08:12 2011 +0100 20.3 @@ -5,7 +5,7 @@ 20.4 <body> 20.5 20.6 <div id="header"> 20.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 20.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 20.9 <div class="controls"> 20.10 <ul id="navibar"> 20.11 <li class="current"><span>Summary</span></li 20.12 @@ -13,8 +13,10 @@ 20.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 20.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 20.15 ><li><a href="{url}tags{sessionvars%urlparameter}">Tags</a></li 20.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 20.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 20.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 20.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 20.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 20.21 ><li><form id="searchform" action="{url}log"><span class="container"> 20.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 20.23 </span>
21.1 --- a/themes/mercurialweb/tags.tmpl Sun Nov 20 01:17:34 2011 +0100 21.2 +++ b/themes/mercurialweb/tags.tmpl Sat Nov 26 01:08:12 2011 +0100 21.3 @@ -5,7 +5,7 @@ 21.4 <body> 21.5 21.6 <div id="header"> 21.7 - <div id="logo"><a href="{url}..{sessionvars%urlparameter}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 21.8 + <div id="logo"><a href="{logourl}"><img src="{staticurl}mercurial-logo.png" alt="Mercurial logo" /></a></div> 21.9 <div class="controls"> 21.10 <ul id="navibar"> 21.11 <li><a href="{url}summary{sessionvars%urlparameter}">Summary</a></li 21.12 @@ -13,8 +13,10 @@ 21.13 ><li><a href="{url}changelog{sessionvars%urlparameter}">Changelog</a></li 21.14 ><li><a href="{url}graph{sessionvars%urlparameter}">Graph</a></li 21.15 ><li class="current"><span>Tags</span></li 21.16 + ><li><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></li 21.17 ><li><a href="{url}branches{sessionvars%urlparameter}">Branches</a></li 21.18 - ><li><a href="{url}file{sessionvars%urlparameter}">Files</a></li 21.19 + ><li><a href="{url}file/{node|short}{sessionvars%urlparameter}">Files</a></li 21.20 + ><li><a href="{url}help{sessionvars%urlparameter}">Help</a></li 21.21 ><li><form id="searchform" action="{url}log"><span class="container"> 21.22 <span class="hint">Search</span> <input name="rev" id="searchinput" type="text" size="20" /> 21.23 </span>