# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1207214323 -7200
# Node ID da752414978770dd8aaa8f4303eac98563e4555d
# Parent  7ef281e78c644c174a1a5c00705e15b33f8157a9# Parent  eec89a03db0850ffef2fb3c71bef2d54102d6055
Merge from main.

diff -r 7ef281e78c64 -r da7524149787 templates/coal/changeset.tmpl
--- a/templates/coal/changeset.tmpl	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/coal/changeset.tmpl	Thu Apr 03 11:18:43 2008 +0200
@@ -59,8 +59,8 @@
 <div class="overflow">
 <table class="bigtable">
 <tr>
- <th class="lineno">Line</th>
- <th class="source">Diff</th>
+ <th class="lineno">line</th>
+ <th class="source">diff</th>
 </tr>
 </table>
 {diff}
diff -r 7ef281e78c64 -r da7524149787 templates/coal/fileannotate.tmpl
--- a/templates/coal/fileannotate.tmpl	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/coal/fileannotate.tmpl	Thu Apr 03 11:18:43 2008 +0200
@@ -63,9 +63,9 @@
 <div class="overflow">
 <table class="bigtable">
 <tr>
- <th class="annotate">Rev</th>
- <th class="lineno">Line</th>
- <th class="line">Source</th>
+ <th class="annotate">rev</th>
+ <th class="lineno">line</th>
+ <th class="line">source</th>
 </tr>
 {annotate%annotateline}
 </table>
diff -r 7ef281e78c64 -r da7524149787 templates/coal/filediff.tmpl
--- a/templates/coal/filediff.tmpl	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/coal/filediff.tmpl	Thu Apr 03 11:18:43 2008 +0200
@@ -60,8 +60,8 @@
 <div class="overflow">
 <table class="bigtable">
 <tr>
- <th class="lineno">Line</th>
- <th class="source">Diff</th>
+ <th class="lineno">line</th>
+ <th class="source">diff</th>
 </tr>
 <table>
 {diff}
diff -r 7ef281e78c64 -r da7524149787 templates/coal/filelog.tmpl
--- a/templates/coal/filelog.tmpl	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/coal/filelog.tmpl	Thu Apr 03 11:18:43 2008 +0200
@@ -45,9 +45,9 @@
 
 <table class="bigtable">
  <tr> 
-  <th class="age">Age</td>
-  <th class="author">Author</td>
-  <th class="description">Description</td>
+  <th class="age">age</td>
+  <th class="author">author</td>
+  <th class="description">description</td>
  </tr>
 {entries%filelogentry}
 </table>
diff -r 7ef281e78c64 -r da7524149787 templates/coal/filerevision.tmpl
--- a/templates/coal/filerevision.tmpl	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/coal/filerevision.tmpl	Thu Apr 03 11:18:43 2008 +0200
@@ -61,8 +61,8 @@
 <div class="overflow">
 <table class="bigtable">
 <tr>
- <th class="lineno">Line</th>
- <th class="source">Source</th>
+ <th class="lineno">line</th>
+ <th class="source">source</th>
 </tr>
 {text%fileline}
 </table>
diff -r 7ef281e78c64 -r da7524149787 templates/coal/manifest.tmpl
--- a/templates/coal/manifest.tmpl	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/coal/manifest.tmpl	Thu Apr 03 11:18:43 2008 +0200
@@ -34,16 +34,14 @@
 
 <table class="bigtable">
 <tr>
+  <th class="name">name</th>
+  <th class="size">size</th>
   <th class="permissions">permissions</th>
-  <th class="date">date</th>
-  <th class="size">size</th>
-  <th class="name">name</th>
 </tr>
-<tr class="parity{upparity}">
-  <td class="permissions">drwxr-xr-x
-  <td class="date">
-  <td class="size">
-  <td class="name"><a href="{url}file/{node|short}{up|urlescape}{sessionvars%urlparameter}">[up]</a>
+<tr class="fileline parity{upparity}">
+  <td class="name"><a href="{url}file/{node|short}{up|urlescape}{sessionvars%urlparameter}">[up]</a></td>
+  <td class="size"></td>
+  <td class="permissions">drwxr-xr-x</td>
 </tr>
 {dentries%direntry}
 {fentries%fileentry}
diff -r 7ef281e78c64 -r da7524149787 templates/coal/map
--- a/templates/coal/map	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/coal/map	Thu Apr 03 11:18:43 2008 +0200
@@ -20,8 +20,8 @@
 changeset = changeset.tmpl
 manifest = manifest.tmpl
 
-direntry = '<tr class="parity{parity}"><td class="permissions">drwxr-xr-x</td><td class="date"></td><td class="size"></td><td class="name"><a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}/</a></td></tr>'
-fileentry = '<tr class="parity{parity}"><td class="permissions">{permissions|permissions}&nbsp;</td><td class="date">{date|isodate}&nbsp;</td><td class="size">{size}&nbsp;</td><td clase="filename"><a href="{url}file/{node|short}/{file|urlescape}#l1{sessionvars%urlparameter}">{basename|escape}</a></td></tr>'
+direntry = '<tr class="fileline parity{parity}"><td class="name"><img src="{staticurl}coal-folder.png"> <a href="{url}file/{node|short}{path|urlescape}{sessionvars%urlparameter}">{basename|escape}/</a><td class="size"></td><td class="permissions">drwxr-xr-x</td></tr>'
+fileentry = '<tr class="fileline parity{parity}"><td clase="filename"><img src="{staticurl}coal-file.png"> <a href="{url}file/{node|short}/{file|urlescape}#l1{sessionvars%urlparameter}">{basename|escape}</a></td><td class="size">{size}</td><td class="permissions">{permissions|permissions}</td></tr>'
 
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
diff -r 7ef281e78c64 -r da7524149787 templates/coal/search.tmpl
--- a/templates/coal/search.tmpl	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/coal/search.tmpl	Thu Apr 03 11:18:43 2008 +0200
@@ -3,7 +3,7 @@
 </head>
 <body>
 
-<div class="content">
+<div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -27,9 +27,9 @@
 
 <table class="bigtable">
  <tr> 
-  <th class="age">Age</td>
-  <th class="author">Author</td>
-  <th class="description">Description</td>
+  <th class="age">age</td>
+  <th class="author">author</td>
+  <th class="description">description</td>
  </tr>
 {entries}
 </table>
diff -r 7ef281e78c64 -r da7524149787 templates/coal/shortlog.tmpl
--- a/templates/coal/shortlog.tmpl	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/coal/shortlog.tmpl	Thu Apr 03 11:18:43 2008 +0200
@@ -40,9 +40,9 @@
 
 <table class="bigtable">
  <tr> 
-  <th class="age">Age</td>
-  <th class="author">Author</td>
-  <th class="description">Description</td>
+  <th class="age">age</td>
+  <th class="author">author</td>
+  <th class="description">description</td>
  </tr>
 {entries%shortlogentry}
 </table>
diff -r 7ef281e78c64 -r da7524149787 templates/static/coal-file.png
Binary file templates/static/coal-file.png has changed
diff -r 7ef281e78c64 -r da7524149787 templates/static/coal-folder.png
Binary file templates/static/coal-folder.png has changed
diff -r 7ef281e78c64 -r da7524149787 templates/static/style-coal.css
--- a/templates/static/style-coal.css	Thu Apr 03 11:16:07 2008 +0200
+++ b/templates/static/style-coal.css	Thu Apr 03 11:18:43 2008 +0200
@@ -85,11 +85,6 @@
   vertical-align: text-baseline;
 }
 
-.navigate a { 
-  #padding: 2pt;
-  #background-color: #f5f5f5;
-}
-
 /* Common */
 pre { margin: 0; }
 
@@ -128,13 +123,12 @@
 .bigtable .lineno a { color: #999; font-size: smaller; font-family: monospace;}
 .bigtable td.source { font-family: monospace; white-space: pre; }
 .bigtable .permissions { width: 8em; text-align: left;}
-.bigtable td.permissions { font-family: monospace; }
-.bigtable .date { width: 10em; text-align: left;}
 .bigtable .size { width: 5em; text-align: right; }
-.bigtable td.size { font-family: monospace; }
 .bigtable .annotate { text-align: right; padding-right: }
 .bigtable td.annotate { font-size: smaller; }
 
+.fileline { font-family: monospace; }
+
 /* Changeset entry */
 #changesetEntry { 
   border-collapse: collapse;