Mercurial > hg

changeset 6453:cb16217ff4d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
coal: more tweaking - add quirksmode hack in attempt to make MSIE happy - add container divs for more browsers compatibility - fix file log button on file page - link to first line of file source from browser - change revision navigator style
author Matt Mackall <mpm@selenic.com>
date Wed, 02 Apr 2008 18:47:19 -0500
parents d93f2f39bef4
children eec89a03db08 7ef281e78c64
files templates/coal/changeset.tmpl templates/coal/error.tmpl templates/coal/fileannotate.tmpl templates/coal/filediff.tmpl templates/coal/filelog.tmpl templates/coal/filerevision.tmpl templates/coal/header.tmpl templates/coal/manifest.tmpl templates/coal/map templates/coal/search.tmpl templates/coal/shortlog.tmpl templates/coal/tags.tmpl templates/static/style-coal.css
diffstat 13 files changed, 33 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/templates/coal/changeset.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/changeset.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -2,6 +2,7 @@
 <title>{repo|escape}: {node|short}</title>
 </head>
 <body>
+<div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -64,7 +65,7 @@
 </table>
 {diff}
 </div>
-
+</div>
 {footer}
 
 
--- a/templates/coal/error.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/error.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -3,6 +3,7 @@
 </head>
 <body>
 
+<div class="content">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -33,5 +34,6 @@
 </p>
 </div>
 </div>
+</div>
 
 {footer}
--- a/templates/coal/fileannotate.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/fileannotate.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -3,6 +3,7 @@
 </head>
 <body>
 
+<div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -69,6 +70,7 @@
 {annotate%annotateline}
 </table>
 </div>
-
+</div>
 </div>
+
 {footer}
--- a/templates/coal/filediff.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/filediff.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -3,6 +3,7 @@
 </head>
 <body>
 
+<div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -66,6 +67,7 @@
 {diff}
 </div>
 </div>	
+</div>
 
 {footer}
 
--- a/templates/coal/filelog.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/filelog.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -8,6 +8,7 @@
 </head>
 <body>
 
+<div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -52,5 +53,6 @@
 </table>
 
 </div>
+</div>
 
 {footer}
--- a/templates/coal/filerevision.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/filerevision.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -3,6 +3,7 @@
 </head>
 <body>
 
+<div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -20,7 +21,7 @@
 <li class="active">file</li>
 <li><a href="{url}diff/{node|short}/{file|urlescape}{sessionvars%urlparameter}">diff</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}">revisions</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>
 </div>
@@ -66,7 +67,7 @@
 {text%fileline}
 </table>
 </div>
-
+</div>
 </div>
 
 {footer}
--- a/templates/coal/header.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/header.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -1,3 +1,4 @@
+<!-- quirksmode -->
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
--- a/templates/coal/manifest.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/manifest.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -3,6 +3,7 @@
 </head>
 <body>
 
+<div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -47,5 +48,6 @@
 {dentries%direntry}
 {fentries%fileentry}
 </table>
-</main>
+</div>
+</div>
 {footer}
--- a/templates/coal/map	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/map	Wed Apr 02 18:47:19 2008 -0500
@@ -21,7 +21,7 @@
 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}{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>'
 
 filerevision = filerevision.tmpl
 fileannotate = fileannotate.tmpl
--- a/templates/coal/search.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/search.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -3,6 +3,7 @@
 </head>
 <body>
 
+<div class="content">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -34,5 +35,6 @@
 </table>
 
 </div>
+</div>
 
 {footer}
--- a/templates/coal/shortlog.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/shortlog.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -47,5 +48,7 @@
 </table>
 
 <div class="navigate">rev {rev}: {changenav%navshortentry}</div>
+</div>
+</div>
 
 {footer}
--- a/templates/coal/tags.tmpl	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/coal/tags.tmpl	Wed Apr 02 18:47:19 2008 -0500
@@ -7,6 +7,7 @@
 </head>
 <body>
 
+<div class="container">
 <div class="menu">
 <div class="logo">
 <a href="http://www.selenic.com/mercurial/">
@@ -35,5 +36,6 @@
 {entries%tagentry}
 </table>
 </div>
+</div>
 
 {footer}
--- a/templates/static/style-coal.css	Wed Apr 02 18:47:17 2008 -0500
+++ b/templates/static/style-coal.css	Wed Apr 02 18:47:19 2008 -0500
@@ -5,14 +5,16 @@
   font-family: sans-serif;
 }
 
+.container {
+  padding-right: 150px;
+}
+
 .main {
-  position: absolute;
-  margin-top: 0;
+  position: relative;
   background: white;
   padding: 2em;
   border-right: 15px solid black;
   border-bottom: 15px solid black;
-  margin-right: 150px;
 }
 
 .overflow {
@@ -20,10 +22,6 @@
   overflow: auto;
 }
 
-.main {
-  background: white;
-}
-
 .menu {
   background: #999;
   padding: 10px;
@@ -88,9 +86,8 @@
 }
 
 .navigate a { 
-  padding: 2pt;
-  background-color: #f5f5f5;
-  color: black;
+  #padding: 2pt;
+  #background-color: #f5f5f5;
 }
 
 /* Common */