##// END OF EJS Templates
merge with stable
Matt Mackall -
r13868:38906cf9 merge default
parent child Browse files
Show More
@@ -0,0 +1,8 b''
1 <entry>
2 <title>{bookmark|escape}</title>
3 <link rel="alternate" href="{urlbase}{url}rev/{node|short}"/>
4 <id>{urlbase}{url}#bookmark-{node}</id>
5 <updated>{date|rfc3339date}</updated>
6 <published>{date|rfc3339date}</published>
7 <content type="text">{bookmark|strip|escape}</content>
8 </entry>
@@ -0,0 +1,11 b''
1 {header}
2 <id>{urlbase}{url}</id>
3 <link rel="self" href="{urlbase}{url}atom-bookmarks"/>
4 <link rel="alternate" href="{urlbase}{url}bookmarks"/>
5 <title>{repo|escape}: bookmarks</title>
6 <summary>{repo|escape} bookmark history</summary>
7 <author><name>Mercurial SCM</name></author>
8 {latestentry%feedupdated}
9
10 {entries%bookmarkentry}
11 </feed>
@@ -0,0 +1,32 b''
1 {header}
2 <title>{repo|escape}: Bookmarks</title>
3 <link rel="alternate" type="application/atom+xml"
4 href="{url}atom-bookmarks" title="Atom feed for {repo|escape}"/>
5 <link rel="alternate" type="application/rss+xml"
6 href="{url}rss-bookmarks" title="RSS feed for {repo|escape}"/>
7 </head>
8 <body>
9
10 <div class="page_header">
11 <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / bookmarks
12 </div>
13
14 <div class="page_nav">
15 <a href="{url}summary{sessionvars%urlparameter}">summary</a> |
16 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 bookmarks |
21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
22 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
23 <a href="{url}help{sessionvars%urlparameter}">help</a>
24 <br/>
25 </div>
26
27 <div class="title">&nbsp;</div>
28 <table cellspacing="0">
29 {entries%bookmarkentry}
30 </table>
31
32 {footer}
@@ -0,0 +1,38 b''
1 {header}
2 <title>{repo|escape}: Bookmarks</title>
3 <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/>
4 <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/>
5 </head>
6
7 <body>
8 <div id="container">
9 <div class="page-header">
10 <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Bookmarks</h1>
11
12 <form action="{url}log">
13 {sessionvars%hiddenformentry}
14 <dl class="search">
15 <dt><label>Search: </label></dt>
16 <dd><input type="text" name="rev" /></dd>
17 </dl>
18 </form>
19
20 <ul class="page-nav">
21 <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li>
22 <li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li>
23 <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li class="current">bookmarks</li>
27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
30 </ul>
31 </div>
32
33 <h2 class="no-link no-border">bookmarks</h2>
34 <table cellspacing="0">
35 {entries%bookmarkentry}
36 </table>
37
38 {footer}
@@ -0,0 +1,6 b''
1 <item>
2 <title>{bookmark|escape}</title>
3 <link>{urlbase}{url}rev/{node|short}</link>
4 <description><![CDATA[{bookmark|strip|escape|addbreaks}]]></description>
5 <pubDate>{date|rfc822date}</pubDate>
6 </item>
@@ -0,0 +1,6 b''
1 {header}
2 <title>{repo|escape}: bookmarks </title>
3 <description>{repo|escape} bookmark history</description>
4 {entries%bookmarkentry}
5 </channel>
6 </rss>
@@ -8,4 +8,6 b' filelog = filelog.tmpl'
8 8 filelogentry = filelogentry.tmpl
9 9 tags = tags.tmpl
10 10 tagentry = tagentry.tmpl
11 bookmarks = bookmarks.tmpl
12 bookmarkentry = bookmarkentry.tmpl
11 13 error = error.tmpl
@@ -140,6 +140,18 b" tagentry = '"
140 140 {node|short}
141 141 </td>
142 142 </tr>'
143 bookmarks = ../paper/bookmarks.tmpl
144 bookmarkentry = '
145 <tr class="tagEntry parity{parity}">
146 <td>
147 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">
148 {bookmark|escape}
149 </a>
150 </td>
151 <td class="node">
152 {node|short}
153 </td>
154 </tr>'
143 155 branches = ../paper/branches.tmpl
144 156 branchentry = '
145 157 <tr class="tagEntry parity{parity}">
@@ -154,6 +166,7 b" branchentry = '"
154 166 </tr>'
155 167 changelogtag = '<span class="tag">{name|escape}</span> '
156 168 changesettag = '<span class="tag">{tag|escape}</span> '
169 changesetbookmark = '<span class="tag">{bookmark|escape}</span> '
157 170 changelogbranchhead = '<span class="branchhead">{name|escape}</span> '
158 171 changelogbranchname = '<span class="branchname">{name|escape}</span> '
159 172
@@ -17,6 +17,7 b''
17 17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 21 branches |
21 22 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
22 23 <a href="{url}help{sessionvars%urlparameter}">help</a>
@@ -24,6 +24,7 b''
24 24 changelog |
25 25 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
26 26 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
27 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
27 28 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
28 29 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
29 30 <a href="{url}help{sessionvars%urlparameter}">help</a>
@@ -1,5 +1,5 b''
1 1 <div>
2 <a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|age}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a>
2 <a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|age}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
3 3 </div>
4 4 <div class="title_text">
5 5 <div class="log_link">
@@ -17,6 +17,7 b''
17 17 <a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
21 22 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
22 23 changeset |
@@ -26,7 +27,7 b' changeset |'
26 27 </div>
27 28
28 29 <div>
29 <a class="title" href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a>
30 <a class="title" href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a>
30 31 </div>
31 32 <div class="title_text">
32 33 <table cellspacing="0">
@@ -12,7 +12,15 b''
12 12 </div>
13 13
14 14 <div class="page_nav">
15 <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}tags{sessionvars%urlparameter}">tags</a> | <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a><br/>
15 <a href="{url}summary{sessionvars%urlparameter}">summary</a> |
16 <a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a> |
17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
19 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
21 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
22 <a href="{url}help{sessionvars%urlparameter}">help</a>
23 <br/>
16 24 </div>
17 25
18 26 <div class="page_body">
@@ -17,6 +17,7 b''
17 17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
21 22 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
22 23 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
@@ -17,6 +17,7 b''
17 17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
21 22 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
22 23 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
@@ -17,6 +17,7 b''
17 17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
21 22 <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> |
22 23 revisions |
@@ -17,6 +17,7 b''
17 17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
21 22 <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a> |
22 23 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
@@ -24,6 +24,7 b''
24 24 <a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
25 25 graph |
26 26 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
27 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
27 28 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
28 29 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
29 30 <a href="{url}help{sessionvars%urlparameter}">help</a>
@@ -85,7 +86,7 b' graph.vertex = function(x, y, color, par'
85 86 item = item.replace(/_DATE/, cur[5]);
86 87
87 88 var tagspan = '';
88 if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) \{
89 if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{
89 90 tagspan = '<span class="logtags">';
90 91 if (cur[6][1]) \{
91 92 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
@@ -100,6 +101,12 b' graph.vertex = function(x, y, color, par'
100 101 tagspan += '<span class="tagtag">' + tag + '</span> ';
101 102 }
102 103 }
104 if (cur[8].length) \{
105 for (var t in cur[8]) \{
106 var bookmark = cur[8][t];
107 tagspan += '<span class="bookmarktag">' + bookmark + '</span> ';
108 }
109 }
103 110 tagspan += '</span>';
104 111 }
105 112
@@ -8,7 +8,7 b''
8 8 <body>
9 9
10 10 <div class="page_header">
11 <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
11 <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help
12 12 </div>
13 13
14 14 <div class="page_nav">
@@ -17,8 +17,10 b''
17 17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 branches |
21 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
22 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
23 help
22 24 <br/>
23 25 </div>
24 26
@@ -8,7 +8,7 b''
8 8 <body>
9 9
10 10 <div class="page_header">
11 <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches
11 <a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help
12 12 </div>
13 13
14 14 <div class="page_nav">
@@ -17,6 +17,7 b''
17 17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
21 22 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
22 23 help
@@ -17,6 +17,7 b''
17 17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
21 22 files |
22 23 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> {archives%archiveentry} |
@@ -24,7 +25,7 b' files |'
24 25 <br/>
25 26 </div>
26 27
27 <div class="title">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></div>
28 <div class="title">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></div>
28 29 <table cellspacing="0">
29 30 <tr class="parity{upparity}">
30 31 <td style="font-family:monospace">drwxr-xr-x</td>
@@ -170,6 +170,17 b" tagentry = '"
170 170 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
171 171 </td>
172 172 </tr>'
173 bookmarks = bookmarks.tmpl
174 bookmarkentry = '
175 <tr class="parity{parity}">
176 <td class="age"><i>{date|age}</i></td>
177 <td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{bookmark|escape}</b></a></td>
178 <td class="link">
179 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
180 <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
181 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
182 </td>
183 </tr>'
173 184 branches = branches.tmpl
174 185 branchentry = '
175 186 <tr class="parity{parity}">
@@ -214,6 +225,7 b' graph = graph.tmpl'
214 225 tagtag = '<span class="tagtag" title="{name}">{name}</span> '
215 226 branchtag = '<span class="branchtag" title="{name}">{name}</span> '
216 227 inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> '
228 bookmarktag = '<span class="bookmarktag" title="{name}">{name}</span> '
217 229 shortlogentry = '
218 230 <tr class="parity{parity}">
219 231 <td class="age"><i>{date|age}</i></td>
@@ -221,7 +233,7 b" shortlogentry = '"
221 233 <td>
222 234 <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">
223 235 <b>{desc|strip|firstline|escape|nonempty}</b>
224 <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span>
236 <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span>
225 237 </a>
226 238 </td>
227 239 <td class="link" nowrap>
@@ -24,6 +24,7 b''
24 24 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
25 25 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
26 26 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
27 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
27 28 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
28 29 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
29 30 |
@@ -23,6 +23,7 b' shortlog |'
23 23 <a href="{url}log/{rev}{sessionvars%urlparameter}">changelog</a> |
24 24 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
25 25 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
26 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
26 27 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
27 28 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
28 29 <a href="{url}help{sessionvars%urlparameter}">help</a>
@@ -24,6 +24,7 b' summary |'
24 24 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
25 25 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
26 26 <a href="{url}tags{sessionvars%urlparameter}">tags</a> |
27 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
27 28 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
28 29 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry} |
29 30 <a href="{url}help{sessionvars%urlparameter}">help</a>
@@ -17,6 +17,7 b''
17 17 <a href="{url}log{sessionvars%urlparameter}">changelog</a> |
18 18 <a href="{url}graph{sessionvars%urlparameter}">graph</a> |
19 19 tags |
20 <a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a> |
20 21 <a href="{url}branches{sessionvars%urlparameter}">branches</a> |
21 22 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a> |
22 23 <a href="{url}help{sessionvars%urlparameter}">help</a>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li class="current">branches</li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li class="current">changelog</li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -24,6 +24,7 b''
24 24 <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
25 25 <li class="current">graph</li>
26 26 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
27 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
27 28 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
28 29 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
29 30 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -7,7 +7,7 b''
7 7 <body>
8 8 <div id="container">
9 9 <div class="page-header">
10 <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Branches</h1>
10 <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Help</h1>
11 11
12 12 <form action="{url}log">
13 13 {sessionvars%hiddenformentry}
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
28 29 <li class="current">help</li>
@@ -7,7 +7,7 b''
7 7 <body>
8 8 <div id="container">
9 9 <div class="page-header">
10 <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Branches</h1>
10 <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Help</h1>
11 11
12 12 <form action="{url}log">
13 13 {sessionvars%hiddenformentry}
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}help{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
28 29 <li class="current">help</li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li class="current">files</li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -147,6 +147,17 b" tagentry = '"
147 147 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
148 148 </td>
149 149 </tr>'
150 bookmarks = bookmarks.tmpl
151 bookmarkentry = '
152 <tr class="parity{parity}">
153 <td class="nowrap">{date|age}</td>
154 <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{bookmark|escape}</a></td>
155 <td class="nowrap">
156 <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> |
157 <a href="{url}log/{node|short}{sessionvars%urlparameter}">changelog</a> |
158 <a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>
159 </td>
160 </tr>'
150 161 branches = branches.tmpl
151 162 branchentry = '
152 163 <tr class="parity{parity}">
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
28 29 {archives%archiveentry}
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -23,6 +23,7 b''
23 23 <li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li>
24 24 <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li>
25 25 <li class="current">tags</li>
26 <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
26 27 <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li>
27 28 <li><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></li>
28 29 <li><a href="{url}help{sessionvars%urlparameter}">help</a></li>
@@ -7,4 +7,6 b' filelog = filelog.tmpl'
7 7 filelogentry = filelogentry.tmpl
8 8 tags = tags.tmpl
9 9 tagentry = tagentry.tmpl
10 bookmarks = bookmarks.tmpl
11 bookmarkentry = bookmarkentry.tmpl
10 12 error = error.tmpl
@@ -80,6 +80,10 b' span.logtags span.inbranchtag {'
80 80 background-color: #d5dde6;
81 81 border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
82 82 }
83 span.logtags span.bookmarktag {
84 background-color: #afdffa;
85 border-color: #ccecff #46ace6 #46ace6 #ccecff;
86 }
83 87
84 88 /* Graph */
85 89 div#wrapper {
@@ -640,6 +640,7 b' Overviews'
640 640 <a href="/log?style=gitweb">changelog</a> |
641 641 <a href="/graph?style=gitweb">graph</a> |
642 642 <a href="/tags?style=gitweb">tags</a> |
643 <a href="/bookmarks?style=gitweb">bookmarks</a> |
643 644 <a href="/branches?style=gitweb">branches</a> |
644 645 <a href="/file/1d22e65f027e?style=gitweb">files</a> |
645 646 <a href="/help?style=gitweb">help</a>
@@ -662,7 +663,7 b' Overviews'
662 663 <td>
663 664 <a class="list" href="/rev/1d22e65f027e?style=gitweb">
664 665 <b>branch</b>
665 <span class="logtags"><span class="branchtag" title="stable">stable</span> <span class="tagtag" title="tip">tip</span> </span>
666 <span class="logtags"><span class="branchtag" title="stable">stable</span> <span class="tagtag" title="tip">tip</span> <span class="bookmarktag" title="something">something</span> </span>
666 667 </a>
667 668 </td>
668 669 <td class="link" nowrap>
@@ -792,6 +793,7 b' Overviews'
792 793 <a href="/log/2?style=gitweb">changelog</a> |
793 794 graph |
794 795 <a href="/tags?style=gitweb">tags</a> |
796 <a href="/bookmarks?style=gitweb">bookmarks</a> |
795 797 <a href="/branches?style=gitweb">branches</a> |
796 798 <a href="/file/1d22e65f027e?style=gitweb">files</a> |
797 799 <a href="/help?style=gitweb">help</a>
@@ -853,7 +855,7 b' Overviews'
853 855 item = item.replace(/_DATE/, cur[5]);
854 856
855 857 var tagspan = '';
856 if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) {
858 if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) {
857 859 tagspan = '<span class="logtags">';
858 860 if (cur[6][1]) {
859 861 tagspan += '<span class="branchtag" title="' + cur[6][0] + '">';
@@ -868,6 +870,12 b' Overviews'
868 870 tagspan += '<span class="tagtag">' + tag + '</span> ';
869 871 }
870 872 }
873 if (cur[8].length) {
874 for (var t in cur[8]) {
875 var bookmark = cur[8][t];
876 tagspan += '<span class="bookmarktag">' + bookmark + '</span> ';
877 }
878 }
871 879 tagspan += '</span>';
872 880 }
873 881
@@ -383,6 +383,10 b' static file'
383 383 background-color: #d5dde6;
384 384 border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4;
385 385 }
386 span.logtags span.bookmarktag {
387 background-color: #afdffa;
388 border-color: #ccecff #46ace6 #46ace6 #ccecff;
389 }
386 390
387 391 /* Graph */
388 392 div#wrapper {
General Comments 0
You need to be logged in to leave comments. Login now