Mercurial > hg-stable

changeset 35159:e397f8585953

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: show changeset age in more places (gitweb and monoblue) mercurial.js has a process_dates() function that calculates relative age for a given date, it works for all elements with "age" css class. If those elements also have "date" css class, the original text is preserved and age is added at the end. This patch adds these two css classes in some pages in gitweb and monoblue that weren't already using this feature.
author Anton Shestakov <av6@dwimlabs.net>
date Tue, 21 Nov 2017 20:28:57 +0800
parents 5cd6682b5a90
children a2e927ded455
files mercurial/templates/gitweb/summary.tmpl mercurial/templates/monoblue/changeset.tmpl mercurial/templates/monoblue/fileannotate.tmpl mercurial/templates/monoblue/filerevision.tmpl mercurial/templates/monoblue/summary.tmpl tests/test-hgweb-commands.t
diffstat 6 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/templates/gitweb/summary.tmpl	Sun Nov 19 05:34:50 2017 +0100
+++ b/mercurial/templates/gitweb/summary.tmpl	Tue Nov 21 20:28:57 2017 +0800
@@ -31,7 +31,7 @@
 <table cellspacing="0">
 <tr><td>description</td><td>{desc}</td></tr>
 <tr><td>owner</td><td>{owner|obfuscate}</td></tr>
-<tr><td>last change</td><td>{lastchange|rfc822date}</td></tr>
+<tr><td>last change</td><td class="date age">{lastchange|rfc822date}</td></tr>
 </table>
 
 <div><a  class="title" href="{url|urlescape}shortlog{sessionvars%urlparameter}">changes</a></div>
--- a/mercurial/templates/monoblue/changeset.tmpl	Sun Nov 19 05:34:50 2017 +0100
+++ b/mercurial/templates/monoblue/changeset.tmpl	Tue Nov 21 20:28:57 2017 +0800
@@ -44,7 +44,7 @@
         <dt>author</dt>
         <dd>{author|obfuscate}</dd>
         <dt>date</dt>
-        <dd>{date|rfc822date}</dd>
+        <dd class="date age">{date|rfc822date}</dd>
         {branch%changesetbranch}
         <dt>changeset {rev}</dt>
         <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>
--- a/mercurial/templates/monoblue/fileannotate.tmpl	Sun Nov 19 05:34:50 2017 +0100
+++ b/mercurial/templates/monoblue/fileannotate.tmpl	Tue Nov 21 20:28:57 2017 +0800
@@ -42,7 +42,7 @@
         <dt>author</dt>
         <dd>{author|obfuscate}</dd>
         <dt>date</dt>
-        <dd>{date|rfc822date}</dd>
+        <dd class="date age">{date|rfc822date}</dd>
         {branch%filerevbranch}
         <dt>changeset {rev}</dt>
         <dd><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>
--- a/mercurial/templates/monoblue/filerevision.tmpl	Sun Nov 19 05:34:50 2017 +0100
+++ b/mercurial/templates/monoblue/filerevision.tmpl	Tue Nov 21 20:28:57 2017 +0800
@@ -42,7 +42,7 @@
         <dt>author</dt>
         <dd>{author|obfuscate}</dd>
         <dt>date</dt>
-        <dd>{date|rfc822date}</dd>
+        <dd class="date age">{date|rfc822date}</dd>
         {branch%filerevbranch}
         <dt>changeset {rev}</dt>
         <dd><a class="list" href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></dd>
--- a/mercurial/templates/monoblue/summary.tmpl	Sun Nov 19 05:34:50 2017 +0100
+++ b/mercurial/templates/monoblue/summary.tmpl	Tue Nov 21 20:28:57 2017 +0800
@@ -34,7 +34,7 @@
         <dt>owner</dt>
         <dd>{owner|obfuscate}</dd>
         <dt>last change</dt>
-        <dd>{lastchange|rfc822date}</dd>
+        <dd class="date age">{lastchange|rfc822date}</dd>
     </dl>
 
     <h2><a href="{url|urlescape}shortlog{sessionvars%urlparameter}">Changes</a></h2>
--- a/tests/test-hgweb-commands.t	Sun Nov 19 05:34:50 2017 +0100
+++ b/tests/test-hgweb-commands.t	Tue Nov 21 20:28:57 2017 +0800
@@ -1572,7 +1572,7 @@
   <table cellspacing="0">
   <tr><td>description</td><td>unknown</td></tr>
   <tr><td>owner</td><td>&#70;&#111;&#111;&#32;&#66;&#97;&#114;&#32;&#60;&#102;&#111;&#111;&#46;&#98;&#97;&#114;&#64;&#101;&#120;&#97;&#109;&#112;&#108;&#101;&#46;&#99;&#111;&#109;&#62;</td></tr>
-  <tr><td>last change</td><td>Thu, 01 Jan 1970 00:00:00 +0000</td></tr>
+  <tr><td>last change</td><td class="date age">Thu, 01 Jan 1970 00:00:00 +0000</td></tr>
   </table>
   
   <div><a  class="title" href="/shortlog?style=gitweb">changes</a></div>