Show More
@@ -159,6 +159,7 b' def _search(web, req, tmpl):' | |||||
159 | rev=ctx.rev(), |
|
159 | rev=ctx.rev(), | |
160 | node=hex(n), |
|
160 | node=hex(n), | |
161 | tags=webutil.nodetagsdict(web.repo, n), |
|
161 | tags=webutil.nodetagsdict(web.repo, n), | |
|
162 | bookmarks=webutil.nodebookmarksdict(web.repo, n), | |||
162 | inbranch=webutil.nodeinbranch(web.repo, ctx), |
|
163 | inbranch=webutil.nodeinbranch(web.repo, ctx), | |
163 | branches=webutil.nodebranchdict(web.repo, ctx)) |
|
164 | branches=webutil.nodebranchdict(web.repo, ctx)) | |
164 |
|
165 | |||
@@ -362,6 +363,7 b' def manifest(web, req, tmpl):' | |||||
362 | dentries=dirlist, |
|
363 | dentries=dirlist, | |
363 | archives=web.archivelist(hex(node)), |
|
364 | archives=web.archivelist(hex(node)), | |
364 | tags=webutil.nodetagsdict(web.repo, node), |
|
365 | tags=webutil.nodetagsdict(web.repo, node), | |
|
366 | bookmarks=webutil.nodebookmarksdict(web.repo, node), | |||
365 | inbranch=webutil.nodeinbranch(web.repo, ctx), |
|
367 | inbranch=webutil.nodeinbranch(web.repo, ctx), | |
366 | branches=webutil.nodebranchdict(web.repo, ctx)) |
|
368 | branches=webutil.nodebranchdict(web.repo, ctx)) | |
367 |
|
369 | |||
@@ -490,6 +492,7 b' def summary(web, req, tmpl):' | |||||
490 | rev=i, |
|
492 | rev=i, | |
491 | node=hn, |
|
493 | node=hn, | |
492 | tags=webutil.nodetagsdict(web.repo, n), |
|
494 | tags=webutil.nodetagsdict(web.repo, n), | |
|
495 | bookmarks=webutil.nodebookmarksdict(web.repo, n), | |||
493 | inbranch=webutil.nodeinbranch(web.repo, ctx), |
|
496 | inbranch=webutil.nodeinbranch(web.repo, ctx), | |
494 | branches=webutil.nodebranchdict(web.repo, ctx))) |
|
497 | branches=webutil.nodebranchdict(web.repo, ctx))) | |
495 |
|
498 | |||
@@ -651,6 +654,8 b' def filelog(web, req, tmpl):' | |||||
651 | "child": webutil.children(iterfctx), |
|
654 | "child": webutil.children(iterfctx), | |
652 | "desc": iterfctx.description(), |
|
655 | "desc": iterfctx.description(), | |
653 | "tags": webutil.nodetagsdict(repo, iterfctx.node()), |
|
656 | "tags": webutil.nodetagsdict(repo, iterfctx.node()), | |
|
657 | "bookmarks": webutil.nodebookmarksdict( | |||
|
658 | repo, iterfctx.node()), | |||
654 | "branch": webutil.nodebranchnodefault(iterfctx), |
|
659 | "branch": webutil.nodebranchnodefault(iterfctx), | |
655 | "inbranch": webutil.nodeinbranch(repo, iterfctx), |
|
660 | "inbranch": webutil.nodeinbranch(repo, iterfctx), | |
656 | "branches": webutil.nodebranchdict(repo, iterfctx)}) |
|
661 | "branches": webutil.nodebranchdict(repo, iterfctx)}) |
@@ -1,4 +1,4 b'' | |||||
1 | <h3 class="changelog"><a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a></h3> |
|
1 | <h3 class="changelog"><a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3> | |
2 | <ul class="changelog-entry"> |
|
2 | <ul class="changelog-entry"> | |
3 | <li class="age">{date|age}</li> |
|
3 | <li class="age">{date|age}</li> | |
4 | <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li> |
|
4 | <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li> |
@@ -36,7 +36,7 b'' | |||||
36 |
|
36 | |||
37 | <h2 class="no-link no-border">changeset</h2> |
|
37 | <h2 class="no-link no-border">changeset</h2> | |
38 |
|
38 | |||
39 | <h3 class="changeset"><a href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></a></h3> |
|
39 | <h3 class="changeset"><a href="{url}raw-rev/{node|short}">{desc|strip|escape|firstline|nonempty} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a></h3> | |
40 | <p class="changeset-age"><span>{date|age}</span></p> |
|
40 | <p class="changeset-age"><span>{date|age}</span></p> | |
41 |
|
41 | |||
42 | <dl class="overview"> |
|
42 | <dl class="overview"> |
@@ -82,7 +82,7 b'' | |||||
82 | item = item.replace(/_DATE/, cur[5]); |
|
82 | item = item.replace(/_DATE/, cur[5]); | |
83 |
|
83 | |||
84 | var tagspan = ''; |
|
84 | var tagspan = ''; | |
85 | if (cur[7].length || (cur[6][0] != 'default' || cur[6][1])) \{ |
|
85 | if (cur[7].length || cur[8].length || (cur[6][0] != 'default' || cur[6][1])) \{ | |
86 | tagspan = '<span class="logtags">'; |
|
86 | tagspan = '<span class="logtags">'; | |
87 | if (cur[6][1]) \{ |
|
87 | if (cur[6][1]) \{ | |
88 | tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; |
|
88 | tagspan += '<span class="branchtag" title="' + cur[6][0] + '">'; | |
@@ -97,6 +97,12 b'' | |||||
97 | tagspan += '<span class="tagtag">' + tag + '</span> '; |
|
97 | tagspan += '<span class="tagtag">' + tag + '</span> '; | |
98 | } |
|
98 | } | |
99 | } |
|
99 | } | |
|
100 | if (cur[8].length) \{ | |||
|
101 | for (var t in cur[8]) \{ | |||
|
102 | var bookmark = cur[8][t]; | |||
|
103 | tagspan += '<span class="bookmarktag">' + bookmark + '</span> '; | |||
|
104 | } | |||
|
105 | } | |||
100 | tagspan += '</span>'; |
|
106 | tagspan += '</span>'; | |
101 | } |
|
107 | } | |
102 |
|
108 |
@@ -35,7 +35,7 b'' | |||||
35 | </ul> |
|
35 | </ul> | |
36 |
|
36 | |||
37 | <h2 class="no-link no-border">files</h2> |
|
37 | <h2 class="no-link no-border">files</h2> | |
38 | <p class="files">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span></p> |
|
38 | <p class="files">{path|escape} <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></p> | |
39 |
|
39 | |||
40 | <table> |
|
40 | <table> | |
41 | <tr class="parity{upparity}"> |
|
41 | <tr class="parity{upparity}"> |
@@ -180,6 +180,7 b' shortlog = shortlog.tmpl' | |||||
180 | tagtag = '<span class="tagtag" title="{name}">{name}</span> ' |
|
180 | tagtag = '<span class="tagtag" title="{name}">{name}</span> ' | |
181 | branchtag = '<span class="branchtag" title="{name}">{name}</span> ' |
|
181 | branchtag = '<span class="branchtag" title="{name}">{name}</span> ' | |
182 | inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> ' |
|
182 | inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> ' | |
|
183 | bookmarktag = '<span class="bookmarktag" title="{name}">{name}</span> ' | |||
183 | shortlogentry = ' |
|
184 | shortlogentry = ' | |
184 | <tr class="parity{parity}"> |
|
185 | <tr class="parity{parity}"> | |
185 | <td class="nowrap">{date|age}</td> |
|
186 | <td class="nowrap">{date|age}</td> | |
@@ -187,7 +188,7 b" shortlogentry = '" | |||||
187 | <td> |
|
188 | <td> | |
188 | <a href="{url}rev/{node|short}{sessionvars%urlparameter}"> |
|
189 | <a href="{url}rev/{node|short}{sessionvars%urlparameter}"> | |
189 | {desc|strip|firstline|escape|nonempty} |
|
190 | {desc|strip|firstline|escape|nonempty} | |
190 | <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}</span> |
|
191 | <span class="logtags">{inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span> | |
191 | </a> |
|
192 | </a> | |
192 | </td> |
|
193 | </td> | |
193 | <td class="nowrap"> |
|
194 | <td class="nowrap"> |
@@ -246,6 +246,10 b' span.logtags span.inbranchtag {' | |||||
246 | background-color: #d5dde6; |
|
246 | background-color: #d5dde6; | |
247 | border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4; |
|
247 | border-color: #e3ecf4 #9398f4 #9398f4 #e3ecf4; | |
248 | } |
|
248 | } | |
|
249 | span.logtags span.bookmarktag { | |||
|
250 | background-color: #afdffa; | |||
|
251 | border-color: #ccecff #46ace6 #46ace6 #ccecff; | |||
|
252 | } | |||
249 |
|
253 | |||
250 | div.diff pre { |
|
254 | div.diff pre { | |
251 | margin: 10px 0 0 0; |
|
255 | margin: 10px 0 0 0; |
General Comments 0
You need to be logged in to leave comments.
Login now