hgweb: add separate bookmarks listing to gitweb theme (based on
38c9837b1f75)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mercurial/templates/gitweb/bookmarks.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -0,0 +1,32 @@
+{header}
+<title>{repo|escape}: Bookmarks</title>
+<link rel="alternate" type="application/atom+xml"
+ href="{url}atom-bookmarks" title="Atom feed for {repo|escape}"/>
+<link rel="alternate" type="application/rss+xml"
+ href="{url}rss-bookmarks" title="RSS feed for {repo|escape}"/>
+</head>
+<body>
+
+<div class="page_header">
+<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / bookmarks
+</div>
+
+<div class="page_nav">
+<a href="{url}summary{sessionvars%urlparameter}">summary</a> |
+<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
+<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
+<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
+<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+bookmarks |
+<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
+<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
+<a href="{url}help{sessionvars%urlparameter}">help</a>
+<br/>
+</div>
+
+<div class="title"> </div>
+<table cellspacing="0">
+{entries%bookmarkentry}
+</table>
+
+{footer}
--- a/mercurial/templates/gitweb/branches.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/branches.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
branches |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
<a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/changelog.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/changelog.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -24,6 +24,7 @@
changelog |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
<a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/changeset.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/changeset.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
changeset |
--- a/mercurial/templates/gitweb/error.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/error.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -16,6 +16,7 @@
<a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
<a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/fileannotate.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/fileannotate.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
--- a/mercurial/templates/gitweb/filediff.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/filediff.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
--- a/mercurial/templates/gitweb/filelog.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/filelog.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
revisions |
--- a/mercurial/templates/gitweb/filerevision.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/filerevision.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
--- a/mercurial/templates/gitweb/graph.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/graph.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -24,6 +24,7 @@
<a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
graph |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
<a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/help.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/help.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
help
--- a/mercurial/templates/gitweb/helptopics.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/helptopics.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
help
--- a/mercurial/templates/gitweb/manifest.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/manifest.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
files |
<a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> {archives%archiveentry} |
--- a/mercurial/templates/gitweb/map Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/map Sun Apr 03 23:47:05 2011 +0900
@@ -170,6 +170,17 @@
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
</td>
</tr>'
+bookmarks = bookmarks.tmpl
+bookmarkentry = '
+ <tr class="parity{parity}">
+ <td class="age"><i>{date|age}</i></td>
+ <td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{bookmark|escape}</b></a></td>
+ <td class="link">
+ <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
+ <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
+ <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
+ </td>
+ </tr>'
branches = branches.tmpl
branchentry = '
<tr class="parity{parity}">
--- a/mercurial/templates/gitweb/search.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/search.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -24,6 +24,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
|
--- a/mercurial/templates/gitweb/shortlog.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/shortlog.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -23,6 +23,7 @@
<a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
<a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/summary.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/summary.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -24,6 +24,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
<a href="{url}tags{sessionvars%urlparameter}">tags</a> |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
<a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/mercurial/templates/gitweb/tags.tmpl Sun Apr 03 23:44:28 2011 +0900
+++ b/mercurial/templates/gitweb/tags.tmpl Sun Apr 03 23:47:05 2011 +0900
@@ -17,6 +17,7 @@
<a href="{url}log{sessionvars%urlparameter}">changelog</a> |
<a href="{url}graph{sessionvars%urlparameter}">graph</a> |
tags |
+<a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
<a href="{url}branches{sessionvars%urlparameter}">branches</a> |
<a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
<a href="{url}help{sessionvars%urlparameter}">help</a>
--- a/tests/test-hgweb-commands.t Sun Apr 03 23:44:28 2011 +0900
+++ b/tests/test-hgweb-commands.t Sun Apr 03 23:47:05 2011 +0900
@@ -640,6 +640,7 @@
<a href="/log?style=gitweb">changelog</a> |
<a href="/graph?style=gitweb">graph</a> |
<a href="/tags?style=gitweb">tags</a> |
+ <a href="/bookmarks?style=gitweb">bookmarks</a> |
<a href="/branches?style=gitweb">branches</a> |
<a href="/file/1d22e65f027e?style=gitweb">files</a> |
<a href="/help?style=gitweb">help</a>
@@ -792,6 +793,7 @@
<a href="/log/2?style=gitweb">changelog</a> |
graph |
<a href="/tags?style=gitweb">tags</a> |
+ <a href="/bookmarks?style=gitweb">bookmarks</a> |
<a href="/branches?style=gitweb">branches</a> |
<a href="/file/1d22e65f027e?style=gitweb">files</a> |
<a href="/help?style=gitweb">help</a>