[PATCH 4 of 6] gitweb: file diff: Display metadata in same order as changeset does

Fri Jun 1 00:36:01 UTC 2007

2 files changed, 7 insertions(+), 12 deletions(-)
templates/gitweb/filediff.tmpl |   15 +++++----------
templates/gitweb/map           |    4 ++--


# HG changeset patch
# User Josef "Jeff" Sipek <jeffpc at josefsipek.net>
# Date 1180435960 14400
# Node ID faf2fa0f3fffd5e75448556540902640b77b3ec2
# Parent  0ed59f0076e0f765de6a5e2ce9dd5b7149471a16
gitweb: file diff: Display metadata in same order as changeset does

diff -r 0ed59f0076e0 -r faf2fa0f3fff templates/gitweb/filediff.tmpl

--- a/templates/gitweb/filediff.tmpl	Tue May 29 11:16:57 2007 -0400
+++ b/templates/gitweb/filediff.tmpl	Tue May 29 06:52:40 2007 -0400
@@ -6,7 +6,7 @@
 <body>
 
 <div class="page_header">
-<a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / annotate
+<a href="http://www.selenic.com/mercurial/" title="Mercurial"><div style="float:right;">Mercurial</div></a><a href="{url}summary{sessionvars%urlparameter}">{repo|escape}</a> / diff
 </div>
 
 <div class="page_nav">
@@ -27,21 +27,16 @@ diff |
 
 <table>
 <tr>
- <td class="metatag">changeset {rev}:</td>
- <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
-</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%filediffparent}
 {child%filediffchild}
-<tr>
- <td class="metatag">manifest:</td>
- <td><a href="{url}file/{node|short}{sessionvars%urlparameter}">{node|short}</a></td>
-</tr>
 </table>
 
+<div class="list_head"></div>
+
 <div class="page_body">
-<table>
 {diff}
-</table>
 </div>
 
 {footer}
diff -r 0ed59f0076e0 -r faf2fa0f3fff templates/gitweb/map
--- a/templates/gitweb/map	Tue May 29 11:16:57 2007 -0400
+++ b/templates/gitweb/map	Tue May 29 06:52:40 2007 -0400
@@ -43,9 +43,9 @@ diffblock = '<pre>#lines#</pre>'
 diffblock = '<pre>#lines#</pre>'
 changelogtag = '<tr><th class="tag">tag:</th><td class="tag">#tag|escape#</td></tr>'
 changesettag = '<tr><td>tag</td><td>#tag|escape#</td></tr>'
-filediffparent = '<tr><th class="parent">parent {rev}:</th><td class="parent"><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
+filediffparent = '<tr><td>parent {rev}</td><td style="font-family:monospace"><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filelogparent = '<tr><td align="right">parent #rev#:&nbsp;</td><td><a href="{url}file/{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
-filediffchild = '<tr><th class="child">child {rev}:</th><td class="child"><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
+filediffchild = '<tr><td>child {rev}</td><td style="font-family:monospace"><a class="list" href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">{node|short}</a></td></tr>'
 filelogchild = '<tr><td align="right">child #rev#:&nbsp;</td><td><a href="{url}file{node|short}/#file|urlescape#{sessionvars%urlparameter}">#node|short#</a></td></tr>'
 shortlog = shortlog.tmpl
 shortlogentry = '<tr class="parity#parity#"><td class="age"><i>#date|age# ago</i></td><td><i>#author#</i></td><td><a class="list" href="{url}rev/#node|short#{sessionvars%urlparameter}"><b>#desc|strip|firstline|escape#</b></a></td><td class="link" nowrap><a href="{url}rev/#node|short#{sessionvars%urlparameter}">changeset</a> | <a href="{url}file/#node|short#{sessionvars%urlparameter}">manifest</a></td></tr>'
