diff options
Diffstat (limited to 'mercurial/templates')
69 files changed, 129 insertions, 648 deletions
diff --git a/mercurial/templates/coal/map b/mercurial/templates/coal/map index 320996f..50f4937 100644 --- a/mercurial/templates/coal/map +++ b/mercurial/templates/coal/map @@ -63,7 +63,6 @@ fileentry = ' filerevision = ../paper/filerevision.tmpl fileannotate = ../paper/fileannotate.tmpl filediff = ../paper/filediff.tmpl -filecomparison = ../paper/filecomparison.tmpl filelog = ../paper/filelog.tmpl fileline = ' <div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>' @@ -84,16 +83,6 @@ difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class= difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>' diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}' -comparisonblock =' - <tbody class="block"> - {lines} - </tbody>' -comparisonline = ' - <tr> - <td class="source {type}"><a href="#{lineid}" id="{lineid}">{leftlinenumber}</a> {leftline|escape}</td> - <td class="source {type}"><a href="#{lineid}" id="{lineid}">{rightlinenumber}</a> {rightline|escape}</td> - </tr>' - changelogparent = ' <tr> <th class="parent">parent {rev}:</th> @@ -210,7 +199,7 @@ indexentry = ' <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td> <td>{description}</td> <td>{contact|obfuscate}</td> - <td class="age">{lastchange|rfc822date}</td> + <td class="age">{lastchange|date}</td> <td class="indexlinks">{archives%indexarchiveentry}</td> </tr>\n' indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}"> ↓{type|escape}</a>' diff --git a/mercurial/templates/gitweb/changelogentry.tmpl b/mercurial/templates/gitweb/changelogentry.tmpl index 3935de6..ffe97ce 100644 --- a/mercurial/templates/gitweb/changelogentry.tmpl +++ b/mercurial/templates/gitweb/changelogentry.tmpl @@ -1,5 +1,5 @@ <div> -<a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|rfc822date}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a> +<a class="title" href="{url}rev/{node|short}{sessionvars%urlparameter}"><span class="age">{date|date}</span>{desc|strip|firstline|escape|nonempty}<span class="logtags"> {inbranch%inbranchtag}{branches%branchtag}{tags%tagtag}{bookmarks%bookmarktag}</span></a> </div> <div class="title_text"> <div class="log_link"> diff --git a/mercurial/templates/gitweb/changeset.tmpl b/mercurial/templates/gitweb/changeset.tmpl index 7c8f731..31399e3 100644 --- a/mercurial/templates/gitweb/changeset.tmpl +++ b/mercurial/templates/gitweb/changeset.tmpl @@ -32,7 +32,7 @@ changeset | <div class="title_text"> <table cellspacing="0"> <tr><td>author</td><td>{author|obfuscate}</td></tr> -<tr><td></td><td class="date age">{date|rfc822date}</td></tr> +<tr><td></td><td class="date age">{date|date}</td></tr> {branch%changesetbranch} <tr><td>changeset {rev}</td><td style="font-family:monospace">{node|short}</td></tr> {parent%changesetparent} diff --git a/mercurial/templates/gitweb/fileannotate.tmpl b/mercurial/templates/gitweb/fileannotate.tmpl index 66b4aac..6dbe69a 100644 --- a/mercurial/templates/gitweb/fileannotate.tmpl +++ b/mercurial/templates/gitweb/fileannotate.tmpl @@ -26,7 +26,6 @@ <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> | annotate | <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | -<a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | <a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a> | <a href="{url}help{sessionvars%urlparameter}">help</a> <br/> @@ -41,7 +40,7 @@ annotate | <td>{author|obfuscate}</td></tr> <tr> <td></td> - <td class="date age">{date|rfc822date}</td></tr> + <td class="date age">{date|date}</td></tr> {branch%filerevbranch} <tr> <td>changeset {rev}</td> diff --git a/mercurial/templates/gitweb/filecomparison.tmpl b/mercurial/templates/gitweb/filecomparison.tmpl deleted file mode 100644 index e062486..0000000 --- a/mercurial/templates/gitweb/filecomparison.tmpl +++ /dev/null @@ -1,71 +0,0 @@ -{header} -<title>{repo|escape}: comparison {file|escape}</title> -<link rel="alternate" type="application/atom+xml" - href="{url}atom-log" title="Atom feed for {repo|escape}"/> -<link rel="alternate" type="application/rss+xml" - href="{url}rss-log" title="RSS feed for {repo|escape}"/> -</head> -<body> - -<div class="page_header"> -<a href="{logourl}" title="Mercurial" style="float: right;">Mercurial</a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / comparison -</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> | -<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 href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> | -<a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a> | -<a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> | -<a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> | -<a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | -comparison | -<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a> | -<a href="{url}help{sessionvars%urlparameter}">help</a> -<br/> -</div> - -<div class="title">{file|escape}</div> - -<table> -{branch%filerevbranch} -<tr> - <td>changeset {rev}</td> - <td style="font-family:monospace"><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td></tr> -{parent%filecompparent} -{child%filecompchild} -</table> - -<div class="list_head"></div> - -<div class="page_body"> - -<div class="legend"> - <span class="legendinfo equal">equal</span> - <span class="legendinfo delete">deleted</span> - <span class="legendinfo insert">inserted</span> - <span class="legendinfo replace">replaced</span> -</div> - -<div class="comparison"> - <table style="border-collapse:collapse;"> - <thead class="header"> - <tr> - <th>{leftrev}:{leftnode|short}</th> - <th>{rightrev}:{rightnode|short}</th> - </tr> - </thead> - {comparison} - </table> -</div> - -</div> - -{footer} diff --git a/mercurial/templates/gitweb/filediff.tmpl b/mercurial/templates/gitweb/filediff.tmpl index 42d0602..5450adb 100644 --- a/mercurial/templates/gitweb/filediff.tmpl +++ b/mercurial/templates/gitweb/filediff.tmpl @@ -26,10 +26,8 @@ <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> | <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> | diff | -<a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | -<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a> | +<a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a><br/> | <a href="{url}help{sessionvars%urlparameter}">help</a> -<br/> </div> <div class="title">{file|escape}</div> diff --git a/mercurial/templates/gitweb/filelog.tmpl b/mercurial/templates/gitweb/filelog.tmpl index 0591726..52c042b 100644 --- a/mercurial/templates/gitweb/filelog.tmpl +++ b/mercurial/templates/gitweb/filelog.tmpl @@ -23,7 +23,6 @@ revisions | <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> | <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | -<a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | <a href="{url}rss-log/tip/{file|urlescape}">rss</a> | <a href="{url}help{sessionvars%urlparameter}">help</a> <br/> diff --git a/mercurial/templates/gitweb/filerevision.tmpl b/mercurial/templates/gitweb/filerevision.tmpl index f47320d..9338c67 100644 --- a/mercurial/templates/gitweb/filerevision.tmpl +++ b/mercurial/templates/gitweb/filerevision.tmpl @@ -26,7 +26,6 @@ file | <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> | <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> | <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | -<a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | <a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a> | <a href="{url}help{sessionvars%urlparameter}">help</a> <br/> @@ -41,7 +40,7 @@ file | <td>{author|obfuscate}</td></tr> <tr> <td></td> - <td class="date age">{date|rfc822date}</td></tr> + <td class="date age">{date|date}</td></tr> {branch%filerevbranch} <tr> <td>changeset {rev}</td> diff --git a/mercurial/templates/gitweb/graph.tmpl b/mercurial/templates/gitweb/graph.tmpl index 039ef8b..0ddcf18 100644 --- a/mercurial/templates/gitweb/graph.tmpl +++ b/mercurial/templates/gitweb/graph.tmpl @@ -51,6 +51,16 @@ var data = {jsdata|json}; var graph = new Graph(); graph.scale({bg_height}); +graph.edge = function(x0, y0, x1, y1, color) \{ + + this.setColor(color, 0.0, 0.65); + this.ctx.beginPath(); + this.ctx.moveTo(x0, y0); + this.ctx.lineTo(x1, y1); + this.ctx.stroke(); + +} + var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a class="list" href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID"><b>_DESC</b></a>'; revlink += '</span> _TAGS'; diff --git a/mercurial/templates/gitweb/map b/mercurial/templates/gitweb/map index a1e93f5..3ab9be4 100644 --- a/mercurial/templates/gitweb/map +++ b/mercurial/templates/gitweb/map @@ -26,7 +26,6 @@ filenodelink = ' <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> | <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> | <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | - <a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> </td> </tr>' @@ -38,7 +37,6 @@ filenolink = ' file | annotate | <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | - <a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> </td> </tr>' @@ -83,7 +81,6 @@ fileentry = ' filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl filediff = filediff.tmpl -filecomparison = filecomparison.tmpl filelog = filelog.tmpl fileline = ' <div style="font-family:monospace" class="parity{parity}"> @@ -102,17 +99,6 @@ difflineplus = '<span style="color:#008800;"><a class="linenr" href="#{lineid}" difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' difflineat = '<span style="color:#990099;"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' diffline = '<span><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' - -comparisonblock =' - <tbody class="block"> - {lines} - </tbody>' -comparisonline = ' - <tr style="font-family:monospace"> - <td class="{type}"><pre><a class="linenr" href="#{lineid}" id="{lineid}">{leftlinenumber}</a> {leftline|escape}</pre></td> - <td class="{type}"><pre><a class="linenr" href="#{lineid}" id="{lineid}">{rightlinenumber}</a> {rightline|escape}</pre></td> - </tr>' - changelogparent = ' <tr> <th class="parent">parent {rev}:</th> @@ -176,7 +162,7 @@ fileannotatechild = ' tags = tags.tmpl tagentry = ' <tr class="parity{parity}"> - <td class="age"><i class="age">{date|rfc822date}</i></td> + <td class="age"><i class="age">{date|date}</i></td> <td><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"><b>{tag|escape}</b></a></td> <td class="link"> <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | @@ -187,7 +173,7 @@ tagentry = ' bookmarks = bookmarks.tmpl bookmarkentry = ' <tr class="parity{parity}"> - <td class="age"><i class="age">{date|rfc822date}</i></td> + <td class="age"><i class="age">{date|date}</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> | @@ -198,7 +184,7 @@ bookmarkentry = ' branches = branches.tmpl branchentry = ' <tr class="parity{parity}"> - <td class="age"><i class="age">{date|rfc822date}</i></td> + <td class="age"><i class="age">{date|date}</i></td> <td><a class="list" href="{url}shortlog/{node|short}{sessionvars%urlparameter}"><b>{node|short}</b></a></td> <td class="{status}">{branch|escape}</td> <td class="link"> @@ -217,15 +203,6 @@ filediffparent = ' </a> </td> </tr>' -filecompparent = ' - <tr> - <td>parent {rev}</td> - <td style="font-family:monospace"> - <a class="list" href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}"> - {node|short} - </a> - </td> - </tr>' filelogparent = ' <tr> <td align="right">parent {rev}: </td> @@ -238,13 +215,6 @@ filediffchild = ' <a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> </td> </tr>' -filecompchild = ' - <tr> - <td>child {rev}</td> - <td style="font-family:monospace"> - <a class="list" href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a> - </td> - </tr>' filelogchild = ' <tr> <td align="right">child {rev}: </td> @@ -258,7 +228,7 @@ inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> ' bookmarktag = '<span class="bookmarktag" title="{name}">{name}</span> ' shortlogentry = ' <tr class="parity{parity}"> - <td class="age"><i class="age">{date|rfc822date}</i></td> + <td class="age"><i class="age">{date|date}</i></td> <td><i>{author|person}</i></td> <td> <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"> @@ -273,7 +243,7 @@ shortlogentry = ' </tr>' filelogentry = ' <tr class="parity{parity}"> - <td class="age"><i class="age">{date|rfc822date}</i></td> + <td class="age"><i class="age">{date|date}</i></td> <td> <a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}"> <b>{desc|strip|firstline|escape|nonempty}</b> @@ -292,7 +262,7 @@ indexentry = ' </td> <td>{description}</td> <td>{contact|obfuscate}</td> - <td class="age">{lastchange|rfc822date}</td> + <td class="age">{lastchange|date}</td> <td class="indexlinks">{archives%indexarchiveentry}</td> <td><div class="rss_logo"><a href="{url}rss-log">RSS</a> <a href="{url}atom-log">Atom</a></div></td> </tr>\n' diff --git a/mercurial/templates/gitweb/summary.tmpl b/mercurial/templates/gitweb/summary.tmpl index 2d1aca2..79f42a1 100644 --- a/mercurial/templates/gitweb/summary.tmpl +++ b/mercurial/templates/gitweb/summary.tmpl @@ -56,11 +56,11 @@ summary | <tr class="light"><td colspan="3"><a class="list" href="{url}bookmarks{sessionvars%urlparameter}">...</a></td></tr> </table> -<div><a class="title" href="{url}branches{sessionvars%urlparameter}">branches</a></div> +<div><a class="title" href="#">branches</a></div> <table cellspacing="0"> {branches%branchentry} <tr class="light"> - <td colspan="4"><a class="list" href="{url}branches{sessionvars%urlparameter}">...</a></td> + <td colspan="4"><a class="list" href="#">...</a></td> </tr> </table> {footer} diff --git a/mercurial/templates/map-cmdline.bisect b/mercurial/templates/map-cmdline.bisect deleted file mode 100644 index 37c5ffb..0000000 --- a/mercurial/templates/map-cmdline.bisect +++ /dev/null @@ -1,25 +0,0 @@ -changeset = 'changeset: {rev}:{node|short}\nbisect: {bisect}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n' -changeset_quiet = '{bisect|shortbisect} {rev}:{node|short}\n' -changeset_verbose = 'changeset: {rev}:{node|short}\nbisect: {bisect}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n' -changeset_debug = 'changeset: {rev}:{node}\nbisect: {bisect}\n{branches}{bookmarks}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n' -start_files = 'files: ' -file = ' {file}' -end_files = '\n' -start_file_mods = 'files: ' -file_mod = ' {file_mod}' -end_file_mods = '\n' -start_file_adds = 'files+: ' -file_add = ' {file_add}' -end_file_adds = '\n' -start_file_dels = 'files-: ' -file_del = ' {file_del}' -end_file_dels = '\n' -start_file_copies = 'copies: ' -file_copy = ' {name} ({source})' -end_file_copies = '\n' -parent = 'parent: {rev}:{node|formatnode}\n' -manifest = 'manifest: {rev}:{node}\n' -branch = 'branch: {branch}\n' -tag = 'tag: {tag}\n' -bookmark = 'bookmark: {bookmark}\n' -extra = 'extra: {key}={value|stringescape}\n' diff --git a/mercurial/templates/map-cmdline.default b/mercurial/templates/map-cmdline.default index 41131de..aeb695b 100644 --- a/mercurial/templates/map-cmdline.default +++ b/mercurial/templates/map-cmdline.default @@ -1,7 +1,7 @@ changeset = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\nsummary: {desc|firstline}\n\n' changeset_quiet = '{rev}:{node|short}\n' changeset_verbose = 'changeset: {rev}:{node|short}\n{branches}{bookmarks}{tags}{parents}user: {author}\ndate: {date|date}\n{files}{file_copies_switch}description:\n{desc|strip}\n\n\n' -changeset_debug = 'changeset: {rev}:{node}\n{branches}{bookmarks}{tags}phase: {phase}\n{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n' +changeset_debug = 'changeset: {rev}:{node}\n{branches}{bookmarks}{tags}{parents}{manifest}user: {author}\ndate: {date|date}\n{file_mods}{file_adds}{file_dels}{file_copies_switch}{extras}description:\n{desc|strip}\n\n\n' start_files = 'files: ' file = ' {file}' end_files = '\n' diff --git a/mercurial/templates/monoblue/bookmarks.tmpl b/mercurial/templates/monoblue/bookmarks.tmpl index d3870da..7fb79ee 100644 --- a/mercurial/templates/monoblue/bookmarks.tmpl +++ b/mercurial/templates/monoblue/bookmarks.tmpl @@ -7,7 +7,7 @@ <body> <div id="container"> <div class="page-header"> - <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / bookmarks</h1> + <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Bookmarks</h1> <form action="{url}log"> {sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/branches.tmpl b/mercurial/templates/monoblue/branches.tmpl index 4ef9c25..969e5a1 100644 --- a/mercurial/templates/monoblue/branches.tmpl +++ b/mercurial/templates/monoblue/branches.tmpl @@ -7,7 +7,7 @@ <body> <div id="container"> <div class="page-header"> - <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / branches</h1> + <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Branches</h1> <form action="{url}log"> {sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/changelogentry.tmpl b/mercurial/templates/monoblue/changelogentry.tmpl index 1c04f07..ef7be4e 100644 --- a/mercurial/templates/monoblue/changelogentry.tmpl +++ b/mercurial/templates/monoblue/changelogentry.tmpl @@ -1,6 +1,6 @@ <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> <ul class="changelog-entry"> - <li class="age">{date|rfc822date}</li> + <li class="age">{date|date}</li> <li>by <span class="name">{author|obfuscate}</span> <span class="revdate">[{date|rfc822date}] rev {rev}</span></li> <li class="description">{desc|strip|escape|addbreaks|nonempty}</li> </ul> diff --git a/mercurial/templates/monoblue/changeset.tmpl b/mercurial/templates/monoblue/changeset.tmpl index 0ecbffb..47284a9 100644 --- a/mercurial/templates/monoblue/changeset.tmpl +++ b/mercurial/templates/monoblue/changeset.tmpl @@ -7,7 +7,7 @@ <body> <div id="container"> <div class="page-header"> - <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / changeset</h1> + <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / files</h1> <form action="{url}log"> {sessionvars%hiddenformentry} @@ -38,13 +38,13 @@ <h2 class="no-link no-border">changeset</h2> <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> - <p class="changeset-age age">{date|rfc822date}</p> + <p class="changeset-age age">{date|date}</p> <dl class="overview"> <dt>author</dt> <dd>{author|obfuscate}</dd> <dt>date</dt> - <dd>{date|rfc822date}</dd> + <dd>{date|date}</dd> {branch%changesetbranch} <dt>changeset {rev}</dt> <dd>{node|short}</dd> diff --git a/mercurial/templates/monoblue/error.tmpl b/mercurial/templates/monoblue/error.tmpl index 61f3215..edbef72 100644 --- a/mercurial/templates/monoblue/error.tmpl +++ b/mercurial/templates/monoblue/error.tmpl @@ -7,7 +7,7 @@ <body> <div id="container"> <div class="page-header"> - <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / not found: {repo|escape}</h1> + <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Not found: {repo|escape}</h1> <form action="{url}log"> {sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/fileannotate.tmpl b/mercurial/templates/monoblue/fileannotate.tmpl index 38563cf..2e2349d 100644 --- a/mercurial/templates/monoblue/fileannotate.tmpl +++ b/mercurial/templates/monoblue/fileannotate.tmpl @@ -35,19 +35,18 @@ <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li> <li class="current">annotate</li> <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> - <li><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li> <li><a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a></li> </ul> <h2 class="no-link no-border">{file|escape}@{node|short} (annotated)</h2> <h3 class="changeset">{file|escape}</h3> - <p class="changeset-age age">{date|rfc822date}</p> + <p class="changeset-age age">{date|date}</p> <dl class="overview"> <dt>author</dt> <dd>{author|obfuscate}</dd> <dt>date</dt> - <dd>{date|rfc822date}</dd> + <dd>{date|date}</dd> {branch%filerevbranch} <dt>changeset {rev}</dt> <dd><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd> diff --git a/mercurial/templates/monoblue/filecomparison.tmpl b/mercurial/templates/monoblue/filecomparison.tmpl deleted file mode 100644 index 99204a6..0000000 --- a/mercurial/templates/monoblue/filecomparison.tmpl +++ /dev/null @@ -1,72 +0,0 @@ -{header} -<title>{repo|escape}: comparison {file|escape}</title> - <link rel="alternate" type="application/atom+xml" href="{url}atom-log" title="Atom feed for {repo|escape}"/> - <link rel="alternate" type="application/rss+xml" href="{url}rss-log" title="RSS feed for {repo|escape}"/> -</head> - -<body> -<div id="container"> - <div class="page-header"> - <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / file comparison</h1> - - <form action="{url}log"> - {sessionvars%hiddenformentry} - <dl class="search"> - <dt><label>Search: </label></dt> - <dd><input type="text" name="rev" /></dd> - </dl> - </form> - - <ul class="page-nav"> - <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li> - <li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li> - <li><a href="{url}log{sessionvars%urlparameter}">changelog</a></li> - <li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li> - <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> - <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> - <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> - <li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">files</a></li> - <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> - </ul> - </div> - - <ul class="submenu"> - <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li> - <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li> - <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> - <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> - <li class="current">comparison</li> - <li><a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a></li> - </ul> - - <h2 class="no-link no-border">comparison: {file|escape}</h2> - <h3 class="changeset">{file|escape}</h3> - - <dl class="overview"> - {branch%filerevbranch} - <dt>changeset {rev}</dt> - <dd><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd> - {parent%filecompparent} - {child%filecompchild} - </dl> - - <div class="legend"> - <span class="legendinfo equal">equal</span> - <span class="legendinfo delete">deleted</span> - <span class="legendinfo insert">inserted</span> - <span class="legendinfo replace">replaced</span> - </div> - - <div class="comparison"> - <table class="bigtable"> - <thead class="header"> - <tr> - <th>{leftrev}:{leftnode|short}</th> - <th>{rightrev}:{rightnode|short}</th> - </tr> - </thead> - {comparison} - </table> - </div> - -{footer} diff --git a/mercurial/templates/monoblue/filediff.tmpl b/mercurial/templates/monoblue/filediff.tmpl index 2c2fa70..e6298f9 100644 --- a/mercurial/templates/monoblue/filediff.tmpl +++ b/mercurial/templates/monoblue/filediff.tmpl @@ -35,7 +35,6 @@ <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li> <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> <li class="current">diff</li> - <li><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li> <li><a href="{url}raw-diff/{node|short}/{file|urlescape}">raw</a></li> </ul> diff --git a/mercurial/templates/monoblue/filelog.tmpl b/mercurial/templates/monoblue/filelog.tmpl index d737cd4..0e77f9f 100644 --- a/mercurial/templates/monoblue/filelog.tmpl +++ b/mercurial/templates/monoblue/filelog.tmpl @@ -35,7 +35,6 @@ <li class="current">revisions</li> <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> - <li><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li> <li><a href="{url}rss-log/tip/{file|urlescape}">rss</a></li> </ul> diff --git a/mercurial/templates/monoblue/filerevision.tmpl b/mercurial/templates/monoblue/filerevision.tmpl index 6d404d7..dd73037 100644 --- a/mercurial/templates/monoblue/filerevision.tmpl +++ b/mercurial/templates/monoblue/filerevision.tmpl @@ -35,19 +35,18 @@ <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a></li> <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> - <li><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li> <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li> </ul> <h2 class="no-link no-border">{file|escape}@{node|short}</h2> <h3 class="changeset">{file|escape}</h3> - <p class="changeset-age age">{date|rfc822date}</p> + <p class="changeset-age age">{date|date}</p> <dl class="overview"> <dt>author</dt> <dd>{author|obfuscate}</dd> <dt>date</dt> - <dd>{date|rfc822date}</dd> + <dd>{date|date}</dd> {branch%filerevbranch} <dt>changeset {rev}</dt> <dd><a class="list" href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd> diff --git a/mercurial/templates/monoblue/footer.tmpl b/mercurial/templates/monoblue/footer.tmpl index c19bdae..c7bdca5 100644 --- a/mercurial/templates/monoblue/footer.tmpl +++ b/mercurial/templates/monoblue/footer.tmpl @@ -9,7 +9,7 @@ </div> <div id="powered-by"> - <p><a href="{logourl}" title="Mercurial"><img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a></p> + <p><a href="{logourl}" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p> </div> <div id="corner-top-left"></div> diff --git a/mercurial/templates/monoblue/graph.tmpl b/mercurial/templates/monoblue/graph.tmpl index fad0d82..08fd79d 100644 --- a/mercurial/templates/monoblue/graph.tmpl +++ b/mercurial/templates/monoblue/graph.tmpl @@ -49,6 +49,16 @@ var graph = new Graph(); graph.scale({bg_height}); + graph.edge = function(x0, y0, x1, y1, color) \{ + + this.setColor(color, 0.0, 0.65); + this.ctx.beginPath(); + this.ctx.moveTo(x0, y0); + this.ctx.lineTo(x1, y1); + this.ctx.stroke(); + + } + var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>'; revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>'; diff --git a/mercurial/templates/monoblue/help.tmpl b/mercurial/templates/monoblue/help.tmpl index 8cdb77b..33468f2 100644 --- a/mercurial/templates/monoblue/help.tmpl +++ b/mercurial/templates/monoblue/help.tmpl @@ -7,7 +7,7 @@ <body> <div id="container"> <div class="page-header"> - <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help</h1> + <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Help</h1> <form action="{url}log"> {sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/helptopics.tmpl b/mercurial/templates/monoblue/helptopics.tmpl index 364dd28..ca4ca9b 100644 --- a/mercurial/templates/monoblue/helptopics.tmpl +++ b/mercurial/templates/monoblue/helptopics.tmpl @@ -7,7 +7,7 @@ <body> <div id="container"> <div class="page-header"> - <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / help</h1> + <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Help</h1> <form action="{url}log"> {sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/index.tmpl b/mercurial/templates/monoblue/index.tmpl index e5086f7..25fe333 100644 --- a/mercurial/templates/monoblue/index.tmpl +++ b/mercurial/templates/monoblue/index.tmpl @@ -26,7 +26,7 @@ </div> <div id="powered-by"> - <p><a href="{logourl}" title="Mercurial"><img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a></p> + <p><a href="{logourl}" title="Mercurial"><img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p> </div> <div id="corner-top-left"></div> diff --git a/mercurial/templates/monoblue/map b/mercurial/templates/monoblue/map index 209254d..b1fd123 100644 --- a/mercurial/templates/monoblue/map +++ b/mercurial/templates/monoblue/map @@ -26,7 +26,6 @@ filenodelink = ' <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> | <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> | <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | - <a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> </td> </tr>' @@ -38,7 +37,6 @@ filenolink = ' file | annotate | <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | - <a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a> | <a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">revisions</a> </td> </tr>' @@ -76,7 +74,6 @@ fileentry = ' filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl filediff = filediff.tmpl -filecomparison = filecomparison.tmpl filelog = filelog.tmpl fileline = ' <div style="font-family:monospace" class="parity{parity}"> @@ -85,7 +82,7 @@ fileline = ' annotateline = ' <tr class="parity{parity}"> <td class="linenr"> - <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}" + <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}" title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a> </td> <td class="lineno"> @@ -97,17 +94,6 @@ difflineplus = '<span style="color:#008800;"><a class="linenr" href="#{lineid}" difflineminus = '<span style="color:#cc0000;"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' difflineat = '<span style="color:#990099;"><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' diffline = '<span><a class="linenr" href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</span>' - -comparisonblock =' - <tbody class="block"> - {lines} - </tbody>' -comparisonline = ' - <tr> - <td class="source {type}"><a class="linenr" href="#{lineid}" id="{lineid}">{leftlinenumber}</a> {leftline|escape}</td> - <td class="source {type}"><a class="linenr" href="#{lineid}" id="{lineid}">{rightlinenumber}</a> {rightline|escape}</td> - </tr>' - changelogparent = ' <tr> <th class="parent">parent {rev}:</th> @@ -155,7 +141,7 @@ fileannotatechild = ' tags = tags.tmpl tagentry = ' <tr class="parity{parity}"> - <td class="nowrap age">{date|rfc822date}</td> + <td class="nowrap age">{date|date}</td> <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{tag|escape}</a></td> <td class="nowrap"> <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | @@ -166,7 +152,7 @@ tagentry = ' bookmarks = bookmarks.tmpl bookmarkentry = ' <tr class="parity{parity}"> - <td class="nowrap date">{date|rfc822date}</td> + <td class="nowrap date">{date|date}</td> <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{bookmark|escape}</a></td> <td class="nowrap"> <a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a> | @@ -177,7 +163,7 @@ bookmarkentry = ' branches = branches.tmpl branchentry = ' <tr class="parity{parity}"> - <td class="nowrap age">{date|rfc822date}</td> + <td class="nowrap age">{date|date}</td> <td><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">{node|short}</a></td> <td class="{status}">{branch|escape}</td> <td class="nowrap"> @@ -190,9 +176,6 @@ diffblock = '<pre>{lines}</pre>' filediffparent = ' <dt>parent {rev}</dt> <dd><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>' -filecompparent = ' - <dt>parent {rev}</dt> - <dd><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>' filelogparent = ' <tr> <td align="right">parent {rev}: </td> @@ -201,9 +184,6 @@ filelogparent = ' filediffchild = ' <dt>child {rev}</dt> <dd><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>' -filecompchild = ' - <dt>child {rev}</dt> - <dd><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></dd>' filelogchild = ' <tr> <td align="right">child {rev}: </td> @@ -216,7 +196,7 @@ inbranchtag = '<span class="inbranchtag" title="{name}">{name}</span> ' bookmarktag = '<span class="bookmarktag" title="{name}">{name}</span> ' shortlogentry = ' <tr class="parity{parity}"> - <td class="nowrap age">{date|rfc822date}</td> + <td class="nowrap age">{date|date}</td> <td>{author|person}</td> <td> <a href="{url}rev/{node|short}{sessionvars%urlparameter}"> @@ -231,7 +211,7 @@ shortlogentry = ' </tr>' filelogentry = ' <tr class="parity{parity}"> - <td class="nowrap age">{date|rfc822date}</td> + <td class="nowrap age">{date|date}</td> <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td> <td class="nowrap"> <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a> | <a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a> | <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a> @@ -244,7 +224,7 @@ indexentry = ' <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td> <td>{description}</td> <td>{contact|obfuscate}</td> - <td class="age">{lastchange|rfc822date}</td> + <td class="age">{lastchange|date}</td> <td class="indexlinks">{archives%indexarchiveentry}</td> <td> <div class="rss_logo"> diff --git a/mercurial/templates/monoblue/notfound.tmpl b/mercurial/templates/monoblue/notfound.tmpl index 3410e6c..38df584 100644 --- a/mercurial/templates/monoblue/notfound.tmpl +++ b/mercurial/templates/monoblue/notfound.tmpl @@ -7,7 +7,7 @@ <body> <div id="container"> <div class="page-header"> - <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / not found: {repo|escape}</h1> + <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Not found: {repo|escape}</h1> <form action="{url}log"> {sessionvars%hiddenformentry} diff --git a/mercurial/templates/monoblue/tags.tmpl b/mercurial/templates/monoblue/tags.tmpl index 3e08735..0c8f93d 100644 --- a/mercurial/templates/monoblue/tags.tmpl +++ b/mercurial/templates/monoblue/tags.tmpl @@ -7,7 +7,7 @@ <body> <div id="container"> <div class="page-header"> - <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / tags</h1> + <h1><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / Tags</h1> <form action="{url}log"> {sessionvars%hiddenformentry} diff --git a/mercurial/templates/paper/bookmarks.tmpl b/mercurial/templates/paper/bookmarks.tmpl index 5989243..897d84b 100644 --- a/mercurial/templates/paper/bookmarks.tmpl +++ b/mercurial/templates/paper/bookmarks.tmpl @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> diff --git a/mercurial/templates/paper/branches.tmpl b/mercurial/templates/paper/branches.tmpl index b26a04d..b239291 100644 --- a/mercurial/templates/paper/branches.tmpl +++ b/mercurial/templates/paper/branches.tmpl @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> diff --git a/mercurial/templates/paper/changeset.tmpl b/mercurial/templates/paper/changeset.tmpl index b7cc62b..cca2745 100644 --- a/mercurial/templates/paper/changeset.tmpl +++ b/mercurial/templates/paper/changeset.tmpl @@ -6,7 +6,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -49,7 +49,7 @@ files, or words in the commit message</div> </tr> <tr> <th class="date">date</th> - <td class="date age">{date|rfc822date}</td></tr> + <td class="date age">{date|date}</td></tr> <tr> <th class="author">parents</th> <td class="author">{parent%changesetparent}</td> diff --git a/mercurial/templates/paper/error.tmpl b/mercurial/templates/paper/error.tmpl index 6d17a80..1a850cb 100644 --- a/mercurial/templates/paper/error.tmpl +++ b/mercurial/templates/paper/error.tmpl @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> @@ -15,8 +15,6 @@ <li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> <li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> -</ul> -<ul> <li><a href="{url}help{sessionvars%urlparameter}">help</a></li> </ul> </div> diff --git a/mercurial/templates/paper/fileannotate.tmpl b/mercurial/templates/paper/fileannotate.tmpl index 1388337..121ef5f 100644 --- a/mercurial/templates/paper/fileannotate.tmpl +++ b/mercurial/templates/paper/fileannotate.tmpl @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -25,7 +25,6 @@ <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li> <li><a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li> <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> -<li><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li> <li class="active">annotate</li> <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li> <li><a href="{url}raw-annotate/{node|short}/{file|urlescape}">raw</a></li> @@ -55,7 +54,7 @@ files, or words in the commit message</div> </tr> <tr> <th class="date">date</th> - <td class="date age">{date|rfc822date}</td> + <td class="date age">{date|date}</td> </tr> <tr> <th class="author">parents</th> diff --git a/mercurial/templates/paper/filecomparison.tmpl b/mercurial/templates/paper/filecomparison.tmpl deleted file mode 100644 index 9d3421a..0000000 --- a/mercurial/templates/paper/filecomparison.tmpl +++ /dev/null @@ -1,93 +0,0 @@ -{header} -<title>{repo|escape}: {file|escape} comparison</title> -</head> -<body> - -<div class="container"> -<div class="menu"> -<div class="logo"> -<a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> -</div> -<ul> -<li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> -<li><a href="{url}graph/{node|short}{sessionvars%urlparameter}">graph</a></li> -<li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li> -<li><a href="{url}bookmarks{sessionvars%urlparameter}">bookmarks</a></li> -<li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> -</ul> -<ul> -<li><a href="{url}rev/{node|short}{sessionvars%urlparameter}">changeset</a></li> -<li><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">browse</a></li> -</ul> -<ul> -<li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li> -<li><a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li> -<li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> -<li class="active">comparison</li> -<li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> -<li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li> -<li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li> -</ul> -<ul> -<li><a href="{url}help{sessionvars%urlparameter}">help</a></li> -</ul> -</div> - -<div class="main"> -<h2><a href="{url}{sessionvars%urlparameter}">{repo|escape}</a></h2> -<h3>comparison {file|escape} @ {rev}:{node|short}</h3> - -<form class="search" action="{url}log"> -<p>{sessionvars%hiddenformentry}</p> -<p><input name="rev" id="search1" type="text" size="30" /></p> -<div id="hint">find changesets by author, revision, -files, or words in the commit message</div> -</form> - -<div class="description">{desc|strip|escape|nonempty}</div> - -<table id="changesetEntry"> -<tr> - <th>author</th> - <td>{author|obfuscate}</td> -</tr> -<tr> - <th>date</th> - <td class="date age">{date|rfc822date}</td> -</tr> -<tr> - <th>parents</th> - <td>{parent%filerevparent}</td> -</tr> -<tr> - <th>children</th> - <td>{child%filerevchild}</td> -</tr> -{changesettag} -</table> - -<div class="overflow"> -<div class="sourcefirst"> comparison</div> -<div class="legend"> - <span class="legendinfo equal">equal</span> - <span class="legendinfo delete">deleted</span> - <span class="legendinfo insert">inserted</span> - <span class="legendinfo replace">replaced</span> -</div> - -<table class="bigtable"> - <thead class="header"> - <tr> - <th>{leftrev}:{leftnode|short}</th> - <th>{rightrev}:{rightnode|short}</th> - </tr> - </thead> - {comparison} -</table> - -</div> -</div> -</div> - -{footer} diff --git a/mercurial/templates/paper/filediff.tmpl b/mercurial/templates/paper/filediff.tmpl index b8d83de..3b63266 100644 --- a/mercurial/templates/paper/filediff.tmpl +++ b/mercurial/templates/paper/filediff.tmpl @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -24,7 +24,6 @@ <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li> <li><a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li> <li class="active">diff</li> -<li><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li> <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li> <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li> @@ -54,7 +53,7 @@ files, or words in the commit message</div> </tr> <tr> <th>date</th> - <td class="date age">{date|rfc822date}</td> + <td class="date age">{date|date}</td> </tr> <tr> <th>parents</th> diff --git a/mercurial/templates/paper/filelog.tmpl b/mercurial/templates/paper/filelog.tmpl index 8b043da..d03fcb4 100644 --- a/mercurial/templates/paper/filelog.tmpl +++ b/mercurial/templates/paper/filelog.tmpl @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -27,7 +27,6 @@ <ul> <li><a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file</a></li> <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> -<li><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li> <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> <li class="active">file log</li> <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li> diff --git a/mercurial/templates/paper/filelogentry.tmpl b/mercurial/templates/paper/filelogentry.tmpl index 8b4ae84..2829500 100644 --- a/mercurial/templates/paper/filelogentry.tmpl +++ b/mercurial/templates/paper/filelogentry.tmpl @@ -1,5 +1,5 @@ <tr class="parity{parity}"> - <td class="age">{date|rfc822date}</td> + <td class="age">{date|date}</td> <td class="author">{author|person}</td> <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags%changelogtag}{rename%filelogrename}</td> </tr> diff --git a/mercurial/templates/paper/filerevision.tmpl b/mercurial/templates/paper/filerevision.tmpl index c2a7468..d41356a 100644 --- a/mercurial/templates/paper/filerevision.tmpl +++ b/mercurial/templates/paper/filerevision.tmpl @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -23,7 +23,6 @@ <li class="active">file</li> <li><a href="{url}file/tip/{file|urlescape}{sessionvars%urlparameter}">latest</a></li> <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</a></li> -<li><a href="{url}comparison/{node|short}/{file|urlescape}{sessionvars%urlparameter}">comparison</a></li> <li><a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}">annotate</a></li> <li><a href="{url}log/{node|short}/{file|urlescape}{sessionvars%urlparameter}">file log</a></li> <li><a href="{url}raw-file/{node|short}/{file|urlescape}">raw</a></li> @@ -53,7 +52,7 @@ files, or words in the commit message</div> </tr> <tr> <th class="date">date</th> - <td class="date age">{date|rfc822date}</td> + <td class="date age">{date|date}</td> </tr> <tr> <th class="author">parents</th> diff --git a/mercurial/templates/paper/graph.tmpl b/mercurial/templates/paper/graph.tmpl index bee94ae..7a4f363 100644 --- a/mercurial/templates/paper/graph.tmpl +++ b/mercurial/templates/paper/graph.tmpl @@ -12,7 +12,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> @@ -62,6 +62,16 @@ var data = {jsdata|json}; var graph = new Graph(); graph.scale({bg_height}); +graph.edge = function(x0, y0, x1, y1, color) \{ + + this.setColor(color, 0.0, 0.65); + this.ctx.beginPath(); + this.ctx.moveTo(x0, y0); + this.ctx.lineTo(x1, y1); + this.ctx.stroke(); + +} + var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>'; revlink += '</span>_TAGS<span class="info">_DATE, by _USER</span></li>'; diff --git a/mercurial/templates/paper/help.tmpl b/mercurial/templates/paper/help.tmpl index f490918..eab0ae5 100644 --- a/mercurial/templates/paper/help.tmpl +++ b/mercurial/templates/paper/help.tmpl @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> @@ -21,7 +21,7 @@ <li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li> </ul> <ul> - <li class="active"><a href="{url}help{sessionvars%urlparameter}">help</a></li> + <li class="active">help</li> </ul> </div> diff --git a/mercurial/templates/paper/helptopics.tmpl b/mercurial/templates/paper/helptopics.tmpl index a723b53..537954f 100644 --- a/mercurial/templates/paper/helptopics.tmpl +++ b/mercurial/templates/paper/helptopics.tmpl @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> diff --git a/mercurial/templates/paper/index.tmpl b/mercurial/templates/paper/index.tmpl index 04b4ffb..57968f7 100644 --- a/mercurial/templates/paper/index.tmpl +++ b/mercurial/templates/paper/index.tmpl @@ -6,7 +6,7 @@ <div class="container"> <div class="menu"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> </div> <div class="main"> <h2>Mercurial Repositories</h2> diff --git a/mercurial/templates/paper/manifest.tmpl b/mercurial/templates/paper/manifest.tmpl index 3dc7e77..1537550 100644 --- a/mercurial/templates/paper/manifest.tmpl +++ b/mercurial/templates/paper/manifest.tmpl @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog/{node|short}{sessionvars%urlparameter}">log</a></li> diff --git a/mercurial/templates/paper/map b/mercurial/templates/paper/map index d384cc6..df9242a 100644 --- a/mercurial/templates/paper/map +++ b/mercurial/templates/paper/map @@ -62,7 +62,6 @@ fileentry = ' filerevision = filerevision.tmpl fileannotate = fileannotate.tmpl filediff = filediff.tmpl -filecomparison = filecomparison.tmpl filelog = filelog.tmpl fileline = ' <div class="parity{parity} source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</div>' @@ -71,7 +70,7 @@ filelogentry = filelogentry.tmpl annotateline = ' <tr class="parity{parity}"> <td class="annotate"> - <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#l{targetline}" + <a href="{url}annotate/{node|short}/{file|urlescape}{sessionvars%urlparameter}#{targetline}" title="{node|short}: {desc|escape|firstline}">{author|user}@{rev}</a> </td> <td class="source"><a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}</td> @@ -83,16 +82,6 @@ difflineminus = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class= difflineat = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> <span class="atline">{line|escape}</span>' diffline = '<a href="#{lineid}" id="{lineid}">{linenumber}</a> {line|escape}' -comparisonblock =' - <tbody class="block"> - {lines} - </tbody>' -comparisonline = ' - <tr> - <td class="source {type}"><a href="#{lineid}" id="{lineid}">{leftlinenumber}</a> {leftline|escape}</td> - <td class="source {type}"><a href="#{lineid}" id="{lineid}">{rightlinenumber}</a> {rightline|escape}</td> - </tr>' - changelogparent = ' <tr> <th class="parent">parent {rev}:</th> @@ -209,7 +198,7 @@ indexentry = ' <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td> <td>{description}</td> <td>{contact|obfuscate}</td> - <td class="age">{lastchange|rfc822date}</td> + <td class="age">{lastchange|date}</td> <td class="indexlinks">{archives%indexarchiveentry}</td> </tr>\n' indexarchiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}"> ↓{type|escape}</a>' diff --git a/mercurial/templates/paper/search.tmpl b/mercurial/templates/paper/search.tmpl index feee155..f9d5e1f 100644 --- a/mercurial/templates/paper/search.tmpl +++ b/mercurial/templates/paper/search.tmpl @@ -7,7 +7,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> </div> <ul> <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> diff --git a/mercurial/templates/paper/shortlog.tmpl b/mercurial/templates/paper/shortlog.tmpl index b69d4b0..a2694b5 100644 --- a/mercurial/templates/paper/shortlog.tmpl +++ b/mercurial/templates/paper/shortlog.tmpl @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li class="active">log</li> diff --git a/mercurial/templates/paper/shortlogentry.tmpl b/mercurial/templates/paper/shortlogentry.tmpl index 09e94c0..7faf468 100644 --- a/mercurial/templates/paper/shortlogentry.tmpl +++ b/mercurial/templates/paper/shortlogentry.tmpl @@ -1,5 +1,5 @@ <tr class="parity{parity}"> - <td class="age">{date|rfc822date}</td> + <td class="age">{date|date}</td> <td class="author">{author|person}</td> <td class="description"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a>{inbranch%changelogbranchname}{branches%changelogbranchhead}{tags % '<span class="tag">{name|escape}</span> '}{bookmarks % '<span class="tag">{name|escape}</span> '}</td> </tr> diff --git a/mercurial/templates/paper/tags.tmpl b/mercurial/templates/paper/tags.tmpl index 9b4e623..a2321cd 100644 --- a/mercurial/templates/paper/tags.tmpl +++ b/mercurial/templates/paper/tags.tmpl @@ -11,7 +11,7 @@ <div class="menu"> <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" alt="mercurial" /></a> +<img src="{staticurl}hglogo.png" alt="mercurial" /></a> </div> <ul> <li><a href="{url}shortlog{sessionvars%urlparameter}">log</a></li> diff --git a/mercurial/templates/raw/graph.tmpl b/mercurial/templates/raw/graph.tmpl deleted file mode 100644 index da2a81a..0000000 --- a/mercurial/templates/raw/graph.tmpl +++ /dev/null @@ -1,6 +0,0 @@ -{header} -# HG graph -# Node ID {node} -# Rows shown {rows} - -{nodes%graphnode} diff --git a/mercurial/templates/raw/graphedge.tmpl b/mercurial/templates/raw/graphedge.tmpl deleted file mode 100644 index cb84efa..0000000 --- a/mercurial/templates/raw/graphedge.tmpl +++ /dev/null @@ -1 +0,0 @@ -edge: ({col}, {row}) -> ({nextcol}, {nextrow}) (color {color}) diff --git a/mercurial/templates/raw/graphnode.tmpl b/mercurial/templates/raw/graphnode.tmpl deleted file mode 100644 index b1c9983..0000000 --- a/mercurial/templates/raw/graphnode.tmpl +++ /dev/null @@ -1,7 +0,0 @@ -changeset: {node} -user: {user} -date: {age} -summary: {desc} -{branches%branchname}{tags%tagname}{bookmarks%bookmarkname} -node: ({col}, {row}) (color {color}) -{edges%graphedge} diff --git a/mercurial/templates/raw/map b/mercurial/templates/raw/map index 5a682b2..ed5c35b 100644 --- a/mercurial/templates/raw/map +++ b/mercurial/templates/raw/map @@ -1,5 +1,3 @@ -default = 'shortlog' -shortlog = "'raw' is not a browsable style" mimetype = 'text/plain; charset={encoding}' header = '' footer = '' @@ -30,9 +28,3 @@ bookmarks = '{entries%bookmarkentry}' bookmarkentry = '{bookmark} {node}\n' branches = '{entries%branchentry}' branchentry = '{branch} {node} {status}\n' -graph = graph.tmpl -graphnode = graphnode.tmpl -graphedge = graphedge.tmpl -bookmarkname = 'bookmark: {name}\n' -branchname = 'branch: {name}\n' -tagname = 'tag: {name}\n' diff --git a/mercurial/templates/spartan/changelogentry.tmpl b/mercurial/templates/spartan/changelogentry.tmpl index f506b94..52dd3fd 100644 --- a/mercurial/templates/spartan/changelogentry.tmpl +++ b/mercurial/templates/spartan/changelogentry.tmpl @@ -1,6 +1,6 @@ <table class="logEntry parity{parity}"> <tr> - <th><span class="age">{date|rfc822date}</span>:</th> + <th><span class="age">{date|date}</span>:</th> <th class="firstline">{desc|strip|firstline|escape|nonempty}</th> </tr> <tr> @@ -16,7 +16,7 @@ </tr> <tr> <th class="date">date:</th> - <td class="date">{date|rfc822date}</td> + <td class="date">{date|date}</td> </tr> <tr> <th class="files"><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a>:</th> diff --git a/mercurial/templates/spartan/changeset.tmpl b/mercurial/templates/spartan/changeset.tmpl index b357126..51944ca 100644 --- a/mercurial/templates/spartan/changeset.tmpl +++ b/mercurial/templates/spartan/changeset.tmpl @@ -31,7 +31,7 @@ </tr> <tr> <th class="date">date:</th> - <td class="date age">{date|rfc822date}</td> + <td class="date age">{date|date}</td> </tr> <tr> <th class="files">files:</th> diff --git a/mercurial/templates/spartan/fileannotate.tmpl b/mercurial/templates/spartan/fileannotate.tmpl index 5d6a72b..6648103 100644 --- a/mercurial/templates/spartan/fileannotate.tmpl +++ b/mercurial/templates/spartan/fileannotate.tmpl @@ -30,7 +30,7 @@ <td>{author|obfuscate}</td></tr> <tr> <td class="metatag">date:</td> - <td class="date age">{date|rfc822date}</td> + <td class="date age">{date|date}</td> </tr> <tr> <td class="metatag">permissions:</td> diff --git a/mercurial/templates/spartan/filelogentry.tmpl b/mercurial/templates/spartan/filelogentry.tmpl index baff52d..63dd686 100644 --- a/mercurial/templates/spartan/filelogentry.tmpl +++ b/mercurial/templates/spartan/filelogentry.tmpl @@ -1,6 +1,6 @@ <table class="logEntry parity{parity}"> <tr> - <th><span class="age">{date|rfc822date}</span>:</th> + <th><span class="age">{date|date}</span>:</th> <th class="firstline"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></th> </tr> <tr> @@ -18,7 +18,7 @@ </tr> <tr> <th class="date">date:</th> - <td class="date">{date|rfc822date}</td> + <td class="date">{date|date}</td> </tr> </table> diff --git a/mercurial/templates/spartan/filerevision.tmpl b/mercurial/templates/spartan/filerevision.tmpl index 548d3c6..eb46a10 100644 --- a/mercurial/templates/spartan/filerevision.tmpl +++ b/mercurial/templates/spartan/filerevision.tmpl @@ -30,7 +30,7 @@ <td>{author|obfuscate}</td></tr> <tr> <td class="metatag">date:</td> - <td class="date age">{date|rfc822date}</td></tr> + <td class="date age">{date|date}</td></tr> <tr> <td class="metatag">permissions:</td> <td>{permissions|permissions}</td></tr> diff --git a/mercurial/templates/spartan/footer.tmpl b/mercurial/templates/spartan/footer.tmpl index 665bdb2..851c758 100644 --- a/mercurial/templates/spartan/footer.tmpl +++ b/mercurial/templates/spartan/footer.tmpl @@ -2,7 +2,7 @@ {motd} <div class="logo"> <a href="{logourl}"> -<img src="{staticurl}{logoimg}" width=75 height=90 border=0 alt="mercurial"></a> +<img src="{staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a> </div> </body> diff --git a/mercurial/templates/spartan/graph.tmpl b/mercurial/templates/spartan/graph.tmpl index 054bc42..67736e0 100644 --- a/mercurial/templates/spartan/graph.tmpl +++ b/mercurial/templates/spartan/graph.tmpl @@ -43,6 +43,16 @@ var data = {jsdata|json}; var graph = new Graph(); graph.scale({bg_height}); +graph.edge = function(x0, y0, x1, y1, color) \{ + + this.setColor(color, 0.0, 0.65); + this.ctx.beginPath(); + this.ctx.moveTo(x0, y0); + this.ctx.lineTo(x1, y1); + this.ctx.stroke(); + +} + var revlink = '<li style="_STYLE"><span class="desc">'; revlink += '<a href="{url}rev/_NODEID{sessionvars%urlparameter}" title="_NODEID">_DESC</a>'; revlink += '</span><span class="info">_DATE, by _USER</span></li>'; diff --git a/mercurial/templates/spartan/map b/mercurial/templates/spartan/map index 8280723..8aaacae 100644 --- a/mercurial/templates/spartan/map +++ b/mercurial/templates/spartan/map @@ -168,7 +168,7 @@ indexentry = ' <td><a href="{url}{sessionvars%urlparameter}">{name|escape}</a></td> <td>{description}</td> <td>{contact|obfuscate}</td> - <td class="age">{lastchange|rfc822date}</td> + <td class="age">{lastchange|date}</td> <td class="indexlinks"> <a href="{url}rss-log">RSS</a> <a href="{url}atom-log">Atom</a> diff --git a/mercurial/templates/spartan/shortlogentry.tmpl b/mercurial/templates/spartan/shortlogentry.tmpl index d104753..670c786 100644 --- a/mercurial/templates/spartan/shortlogentry.tmpl +++ b/mercurial/templates/spartan/shortlogentry.tmpl @@ -1,6 +1,6 @@ <table class="slogEntry parity{parity}"> <tr> - <td class="age">{date|rfc822date}</td> + <td class="age">{date|date}</td> <td class="author">{author|person}</td> <td class="node"><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape|nonempty}</a></td> </tr> diff --git a/mercurial/templates/static/mercurial.js b/mercurial/templates/static/mercurial.js index 70347d7..3bc27a4 100644 --- a/mercurial/templates/static/mercurial.js +++ b/mercurial/templates/static/mercurial.js @@ -58,44 +58,25 @@ function Graph() { // Set the colour. // - // If color is a string, expect an hexadecimal RGB - // value and apply it unchanged. If color is a number, - // pick a distinct colour based on an internal wheel; - // the bg parameter provides the value that should be - // assigned to the 'zero' colours and the fg parameter - // provides the multiplier that should be applied to - // the foreground colours. - var s; - if(typeof color == "string") { - s = "#" + color; - } else { //typeof color == "number" - color %= colors.length; - var red = (colors[color][0] * fg) || bg; - var green = (colors[color][1] * fg) || bg; - var blue = (colors[color][2] * fg) || bg; - red = Math.round(red * 255); - green = Math.round(green * 255); - blue = Math.round(blue * 255); - s = 'rgb(' + red + ', ' + green + ', ' + blue + ')'; - } + // Picks a distinct colour based on an internal wheel; the bg + // parameter provides the value that should be assigned to the 'zero' + // colours and the fg parameter provides the multiplier that should be + // applied to the foreground colours. + + color %= colors.length; + var red = (colors[color][0] * fg) || bg; + var green = (colors[color][1] * fg) || bg; + var blue = (colors[color][2] * fg) || bg; + red = Math.round(red * 255); + green = Math.round(green * 255); + blue = Math.round(blue * 255); + var s = 'rgb(' + red + ', ' + green + ', ' + blue + ')'; this.ctx.strokeStyle = s; this.ctx.fillStyle = s; return s; } - this.edge = function(x0, y0, x1, y1, color, width) { - - this.setColor(color, 0.0, 0.65); - if(width >= 0) - this.ctx.lineWidth = width; - this.ctx.beginPath(); - this.ctx.moveTo(x0, y0); - this.ctx.lineTo(x1, y1); - this.ctx.stroke(); - - } - this.render = function(data) { var backgrounds = ''; @@ -112,20 +93,13 @@ function Graph() { var edges = cur[2]; var fold = false; - var prevWidth = this.ctx.lineWidth; for (var j in edges) { line = edges[j]; start = line[0]; end = line[1]; color = line[2]; - var width = line[3]; - if(width < 0) - width = prevWidth; - var branchcolor = line[4]; - if(branchcolor) - color = branchcolor; - + if (end > this.columns || start > this.columns) { this.columns += 1; } @@ -139,10 +113,9 @@ function Graph() { x1 = this.cell[0] + this.box_size * end + this.box_size / 2; y1 = this.bg[1] + this.bg_height / 2; - this.edge(x0, y0, x1, y1, color, width); + this.edge(x0, y0, x1, y1, color); } - this.ctx.lineWidth = prevWidth; // Draw the revision node in the right column diff --git a/mercurial/templates/static/style-coal.css b/mercurial/templates/static/style-coal.css index 1dee828..33fb0e6 100644 --- a/mercurial/templates/static/style-coal.css +++ b/mercurial/templates/static/style-coal.css @@ -286,40 +286,3 @@ ul#graphnodes li .info { position: relative; top: -3px; } - -/* Comparison */ -.legend { - padding: 1.5% 0 1.5% 0; -} - -.legendinfo { - border: 1px solid #999; - font-size: 80%; - text-align: center; - padding: 0.5%; -} - -.equal { - background-color: #ffffff; -} - -.delete { - background-color: #faa; - color: #333; -} - -.insert { - background-color: #ffa; -} - -.replace { - background-color: #e8e8e8; -} - -.header { - text-align: center; -} - -.block { - border-top: 1px solid #999; -} diff --git a/mercurial/templates/static/style-gitweb.css b/mercurial/templates/static/style-gitweb.css index c5e9514..82f5ef5 100644 --- a/mercurial/templates/static/style-gitweb.css +++ b/mercurial/templates/static/style-gitweb.css @@ -126,44 +126,3 @@ ul#graphnodes li .info { top: -3px; font-style: italic; } - -/* Comparison */ -.legend { - padding: 1.5% 0 1.5% 0; -} - -.legendinfo { - border: 1px solid #d9d8d1; - font-size: 80%; - text-align: center; - padding: 0.5%; -} - -.equal { - background-color: #ffffff; -} - -.delete { - background-color: #faa; - color: #333; -} - -.insert { - background-color: #ffa; -} - -.replace { - background-color: #e8e8e8; -} - -.comparison { - overflow-x: auto; -} - -.header th { - text-align: center; -} - -.block { - border-top: 1px solid #d9d8d1; -} diff --git a/mercurial/templates/static/style-monoblue.css b/mercurial/templates/static/style-monoblue.css index b4e3579..c015061 100644 --- a/mercurial/templates/static/style-monoblue.css +++ b/mercurial/templates/static/style-monoblue.css @@ -477,50 +477,3 @@ ul#graphnodes li .info { position: relative; } /** end of canvas **/ - -/** comparison **/ -.legend { - margin-left: 20px; - padding: 1.5% 0 1.5% 0; -} - -.legendinfo { - border: 1px solid #999; - font-size: 80%; - text-align: center; - padding: 0.5%; -} - -.equal { - background-color: #ffffff; -} - -.delete { - background-color: #faa; - color: #333; -} - -.insert { - background-color: #ffa; -} - -.replace { - background-color: #e8e8e8; -} - -.comparison { - overflow-x: auto; -} - -.comparison table td { - padding: 0px 5px; -} - -.header th { - font-weight: bold; -} - -.block { - border-top: 1px solid #999; -} -/** end of comparison **/ diff --git a/mercurial/templates/static/style-paper.css b/mercurial/templates/static/style-paper.css index e881c1c..6c8b1c2 100644 --- a/mercurial/templates/static/style-paper.css +++ b/mercurial/templates/static/style-paper.css @@ -275,40 +275,3 @@ ul#graphnodes li .info { position: relative; top: -3px; } - -/* Comparison */ -.legend { - padding: 1.5% 0 1.5% 0; -} - -.legendinfo { - border: 1px solid #999; - font-size: 80%; - text-align: center; - padding: 0.5%; -} - -.equal { - background-color: #ffffff; -} - -.delete { - background-color: #faa; - color: #333; -} - -.insert { - background-color: #ffa; -} - -.replace { - background-color: #e8e8e8; -} - -.header { - text-align: center; -} - -.block { - border-top: 1px solid #999; -} |