1.1 --- a/themes/mercurialweb/changelogentry.tmpl Sat Nov 26 01:20:46 2011 +0100
1.2 +++ b/themes/mercurialweb/changelogentry.tmpl Sun Nov 27 21:10:16 2011 +0100
1.3 @@ -15,7 +15,7 @@
1.4 <a href="{url}graph/{node|short}{sessionvars%urlparameter}#{node|short}">graph</a>
1.5 </td>
1.6 <td class="description">{desc|strip|escape}</td>
1.7 - <td class="branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}</td>
1.8 + <td class="branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}{bookmarks%bookmarktag}</td>
1.9 </tr>
1.10 <tr class="parity{parity}">
1.11 <td colspan="3"></td>
2.1 --- a/themes/mercurialweb/changeset.tmpl Sat Nov 26 01:20:46 2011 +0100
2.2 +++ b/themes/mercurialweb/changeset.tmpl Sun Nov 27 21:10:16 2011 +0100
2.3 @@ -48,7 +48,7 @@
2.4 <a href="{url}graph/{node|short}{sessionvars%urlparameter}#{node|short}">graph</a>
2.5 </td>
2.6 <td class="description">{desc|strip|escape}</td>
2.7 - <td class="branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}</td>
2.8 + <td class="branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}{bookmarks%bookmarktag}</td>
2.9 </tr>
2.10 <tr>
2.11 <td colspan="3"></td>
3.1 --- a/themes/mercurialweb/graphlabel.tmpl Sat Nov 26 01:20:46 2011 +0100
3.2 +++ b/themes/mercurialweb/graphlabel.tmpl Sun Nov 27 21:10:16 2011 +0100
3.3 @@ -1,5 +1,5 @@
3.4 <tr id="{node|short}">
3.5 <td class="graphlabel">{age}</td>
3.6 <td class="graphlabel"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline}</a></td>
3.7 - <td class="graphlabel branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}</td>
3.8 + <td class="graphlabel branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}{bookmarks%bookmarktag}</td>
3.9 </tr>
4.1 --- a/themes/mercurialweb/manifest.tmpl Sat Nov 26 01:20:46 2011 +0100
4.2 +++ b/themes/mercurialweb/manifest.tmpl Sun Nov 27 21:10:16 2011 +0100
4.3 @@ -39,7 +39,7 @@
4.4 <a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">changelog</a>
4.5 </td>
4.6 <td class="archives">{archives%archiveentry}</td>
4.7 - <td class="branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}</td>
4.8 + <td class="branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}{bookmarks%bookmarktag}</td>
4.9 </tr>
4.10 </tbody>
4.11 </table>
5.1 --- a/themes/mercurialweb/map Sat Nov 26 01:20:46 2011 +0100
5.2 +++ b/themes/mercurialweb/map Sun Nov 27 21:10:16 2011 +0100
5.3 @@ -44,6 +44,7 @@
5.4
5.5 annotatelink = '<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{rev}:{node|short}</a> '
5.6 archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|xmlescape}</a> '
5.7 +bookmarktag = '<span class="bookmark"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
5.8 branchlabel = '<span class="branch">{name}</span> '
5.9 branchtag = '<span class="branch"><a href="{url}rev/{node|short}{sessionvars%urlparameter}#{node|short}">{name}</a></span> '
5.10 changelogpagerlink = '<a href="{url}changelog/{node|short}{sessionvars%urlparameter}#{node|short}">{label|xmlescape}</a> '
6.1 --- a/themes/mercurialweb/shortlogentry.tmpl Sat Nov 26 01:20:46 2011 +0100
6.2 +++ b/themes/mercurialweb/shortlogentry.tmpl Sun Nov 27 21:10:16 2011 +0100
6.3 @@ -3,5 +3,5 @@
6.4 <td class="author">{author|person|xmlescape}</td>
6.5 <td class="navigation"><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></td>
6.6 <td class="commentline"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape}</a></td>
6.7 - <td class="branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}</td>
6.8 + <td class="branchinfo">{branches%branchtag}{inbranch%inbranchtag}{tags%tagtag}{bookmarks%bookmarktag}</td>
6.9 </tr>
7.1 --- a/themes/mercurialweb/summary.tmpl Sat Nov 26 01:20:46 2011 +0100
7.2 +++ b/themes/mercurialweb/summary.tmpl Sun Nov 27 21:10:16 2011 +0100
7.3 @@ -74,4 +74,12 @@
7.4 </tbody>
7.5 </table>
7.6
7.7 +<h3><a href="{url}bookmarks{sessionvars%urlparameter}">Bookmarks</a></h3>
7.8 +
7.9 +<table class="summary bookmarks">
7.10 + <tbody>
7.11 +{bookmarks%bookmarkentry}
7.12 + </tbody>
7.13 +</table>
7.14 +
7.15 {footer}