Mercurial > hg

changeset 13850:1209e1d52b68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgweb: add base link to file log for paper and coal styles (issue2452)
author Kevin Gessner <kevin@fogcreek.com>
date Thu, 31 Mar 2011 15:49:53 -0400
parents 9f97de157aad
children 3cbf5c6dcdb8
files mercurial/templates/coal/map mercurial/templates/paper/filelogentry.tmpl mercurial/templates/paper/map mercurial/templates/static/style-coal.css mercurial/templates/static/style-paper.css
diffstat 5 files changed, 15 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/templates/coal/map	Wed Jan 05 00:18:36 2011 +1100
+++ b/mercurial/templates/coal/map	Thu Mar 31 15:49:53 2011 -0400
@@ -94,14 +94,12 @@
 
 filerename = '{file|escape}@'
 filelogrename = '
-  <tr>
-    <th>base:</th>
-    <td>
-      <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
-        {file|escape}@{node|short}
-      </a>
-    </td>
-  </tr>'
+  <span class="base">
+    base
+    <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+      {file|escape}@{node|short}
+    </a>
+  </span>'
 fileannotateparent = '
   <tr>
     <td class="metatag">parent:</td>
--- a/mercurial/templates/paper/filelogentry.tmpl	Wed Jan 05 00:18:36 2011 +1100
+++ b/mercurial/templates/paper/filelogentry.tmpl	Thu Mar 31 15:49:53 2011 -0400
@@ -1,5 +1,5 @@
  <tr class="parity{parity}">
   <td class="age">{date|age}</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}</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>
--- a/mercurial/templates/paper/map	Wed Jan 05 00:18:36 2011 +1100
+++ b/mercurial/templates/paper/map	Thu Mar 31 15:49:53 2011 -0400
@@ -93,14 +93,12 @@
 
 filerename = '{file|escape}@'
 filelogrename = '
-  <tr>
-    <th>base:</th>
-    <td>
-      <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
-        {file|escape}@{node|short}
-      </a>
-    </td>
-  </tr>'
+  <span class="base">
+    base
+    <a href="{url}file/{node|short}/{file|urlescape}{sessionvars%urlparameter}">
+      {file|escape}@{node|short}
+    </a>
+  </span>'
 fileannotateparent = '
   <tr>
     <td class="metatag">parent:</td>
--- a/mercurial/templates/static/style-coal.css	Wed Jan 05 00:18:36 2011 +1100
+++ b/mercurial/templates/static/style-coal.css	Thu Mar 31 15:49:53 2011 -0400
@@ -173,6 +173,7 @@
 .bigtable .age { width: 6em; }
 .bigtable .author { width: 12em; }
 .bigtable .description { }
+.bigtable .description .base { font-size: 70%; float: right; line-height: 1.66; }
 .bigtable .node { width: 5em; font-family: monospace;}
 .bigtable .lineno { width: 2em; text-align: right;}
 .bigtable .lineno a { color: #999; font-size: smaller; font-family: monospace;}
--- a/mercurial/templates/static/style-paper.css	Wed Jan 05 00:18:36 2011 +1100
+++ b/mercurial/templates/static/style-paper.css	Thu Mar 31 15:49:53 2011 -0400
@@ -164,6 +164,7 @@
 .bigtable .age { width: 7em; }
 .bigtable .author { width: 12em; }
 .bigtable .description { }
+.bigtable .description .base { font-size: 70%; float: right; line-height: 1.66; }
 .bigtable .node { width: 5em; font-family: monospace;}
 .bigtable .permissions { width: 8em; text-align: left;}
 .bigtable .size { width: 5em; text-align: right; }