# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1275786597 -7200
# Node ID e6482a6c1f8e2ad14fd1b44e13ea5ff4c37596b1
# Parent  b325eb6923718a212c0dc3dc01b30876ada3ee9e
Added branch and tag information.
Introduced prettier navigation options in the shortlog.
Added a menu entry for branches.

diff -r b325eb692371 -r e6482a6c1f8e themes/mercurialweb/map
--- a/themes/mercurialweb/map	Fri Jun 04 00:57:25 2010 +0200
+++ b/themes/mercurialweb/map	Sun Jun 06 03:09:57 2010 +0200
@@ -12,5 +12,9 @@
 summary = summary.tmpl
 
 archiveentry = '<a href="{url}archive/{node|short}{extension|urlescape}">{type|escape}</a> '
+branchtag = '<span class="branch">{name}</span> '
+inbranchtag = '<span class="inbranch">{name}</span> '
+tagtag = '<span class="tag">{name}</span> '
+
 hiddenformentry = '<input type="hidden" name="{name}" value="{value|escape}" />'
 urlparameter = '{separator}{name}={value|urlescape}'
diff -r b325eb692371 -r e6482a6c1f8e themes/mercurialweb/search.tmpl
--- a/themes/mercurialweb/search.tmpl	Fri Jun 04 00:57:25 2010 +0200
+++ b/themes/mercurialweb/search.tmpl	Sun Jun 06 03:09:57 2010 +0200
@@ -11,6 +11,7 @@
     <li><a href="{url}summary{sessionvars%urlparameter}">summary</a></li
     ><li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li
     ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
+    ><li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li
     ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
     ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
diff -r b325eb692371 -r e6482a6c1f8e themes/mercurialweb/shortlog.tmpl
--- a/themes/mercurialweb/shortlog.tmpl	Fri Jun 04 00:57:25 2010 +0200
+++ b/themes/mercurialweb/shortlog.tmpl	Sun Jun 06 03:09:57 2010 +0200
@@ -12,6 +12,7 @@
     ><li class="current"><span>shortlog</span></li
     ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
     ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
+    ><li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li
     ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">
         <span class="hint">Search</span>&nbsp;<input name="rev" id="searchinput" type="text" size="20" />
diff -r b325eb692371 -r e6482a6c1f8e themes/mercurialweb/shortlogentry.tmpl
--- a/themes/mercurialweb/shortlogentry.tmpl	Fri Jun 04 00:57:25 2010 +0200
+++ b/themes/mercurialweb/shortlogentry.tmpl	Sun Jun 06 03:09:57 2010 +0200
@@ -1,6 +1,7 @@
 <tr class="parity{parity}">
   <td>{date|age} ago</td>
   <td>{author|person}</td>
+  <td class="navigation"><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></td>
   <td><a href="{url}rev/{node|short}{sessionvars%urlparameter}">{desc|strip|firstline|escape}</a></td>
-  <td><a href="{url}file/{node|short}{sessionvars%urlparameter}">files</a></td>
+  <td>{inbranch%inbranchtag}{tags%tagtag}</td>
 </tr>
diff -r b325eb692371 -r e6482a6c1f8e themes/mercurialweb/static/style-mercurialweb.css
--- a/themes/mercurialweb/static/style-mercurialweb.css	Fri Jun 04 00:57:25 2010 +0200
+++ b/themes/mercurialweb/static/style-mercurialweb.css	Sun Jun 06 03:09:57 2010 +0200
@@ -38,7 +38,7 @@
 
 table
 {
-    margin: 0 1em 1em 1em;
+    margin: 1em 0;
     border-collapse: collapse;
 }
 
@@ -51,7 +51,7 @@
 }
 
 th, td {
-    padding: 0.25em 0.5em 0.25em 0.5em;
+    padding: 0.4em 0.25em;
 }
 
 td p {
@@ -65,6 +65,23 @@
 h2 { font-size: 1.6em; }
 h3 { font-size: 1.3em; }
 
+/* Repository information. */
+
+span.tag {
+    background: #f1b500;
+    padding: 0.25em 0.5em;
+}
+
+span.branch {
+    background: #b5f1b5;
+    padding: 0.25em 0.5em;
+}
+
+span.inbranch {
+    background: #b5b5b5;
+    padding: 0.25em 0.5em;
+}
+
 /* Navigational and editing controls. */
 
 .controls {
@@ -85,6 +102,19 @@
     padding: 0;
 }
 
+#navibar a, #navibar li.current span, .navigation a {
+    color: #fff;
+    text-decoration: none;
+}
+
+#navibar a, #navibar li.current span {
+    background: #999;
+}
+
+.navigation a {
+    background: #ccc;
+}
+
 #navibar a, #navibar li.current span {
 
     /* Need a block to redefine the height. */
@@ -93,18 +123,21 @@
     height: 42px;
     line-height: 42px;
 
-    color: #fff;
     margin: 0;
     padding: 0 16px;
-    background: #999;
-    text-decoration: none;
 }
 
-#navibar a:hover, #navibar a:focus, #navibar li.current a, #navibar li.current span {
+.navigation a {
+    padding: 0.25em 0.5em;
+}
+
+#navibar a:hover, #navibar a:focus, #navibar li.current a, #navibar li.current span,
+.navigation a:hover, .navigation a:focus {
     background: #00b5f1;
 }
 
-#navibar a:hover, #navibar a:focus, #navibar li.current a {
+#navibar a:hover, #navibar a:focus, #navibar li.current a,
+.navigation a:hover, .navigation a:focus {
     text-decoration: none;
 }
 
@@ -185,59 +218,6 @@
     border-bottom: 1px solid #ccc;
 }
 
-#message {
-    clear: both;
-    margin: 0;
-    padding: 5px 10px;
-
-    /* Styling similar to the advanced search. */
-
-    border-bottom: 1px solid #ADB9CC;
-    background-color: #E7E7E7;
-}
-
-#message p {
-    margin: 5px 0;
-    padding: 0;
-}
-
-#message div.buttons {
-    font-weight: normal;
-}
-
-.dialog form {
-    margin: 0 15px;
-}
-
-.dialog td {
-    border: none;
-    padding: 5px;
-}
-
-.dialog td.label {
-    text-align: right;
-    font-weight: bold;
-    width: 25%;
-}
-
-*[dir="rtl"] .dialog td.label {
-    text-align: left;
-}
-
-.dialog td.content input {
-    width: 100%;
-}
-
-#page {
-
-    /* Prevent mixing of header and content elements. */
-
-    clear: both;
-    background-color: white;
-    margin: 0;
-    padding: 0.25em;
-}
-
 #credits {
     float: right;
 
@@ -261,33 +241,3 @@
 #credits a {
     text-decoration: none;
 }
-
-.diff {
-    width:99%;
-}
-
-.diff-header {
-    font-weight: bold;
-}
-
-.diff-title {
-    background-color: #C0C0C0;
-}
-
-.diff-added {
-    background-color: #E0FFE0;
-    vertical-align: sub;
-}
-
-.diff-removed {
-    background-color: #FFFFE0;
-    vertical-align: sub;
-}
-
-.diff-added span {
-    background-color: #80FF80;
-}
-
-.diff-removed span {
-    background-color: #FFFF80;
-}
diff -r b325eb692371 -r e6482a6c1f8e themes/mercurialweb/summary.tmpl
--- a/themes/mercurialweb/summary.tmpl	Fri Jun 04 00:57:25 2010 +0200
+++ b/themes/mercurialweb/summary.tmpl	Sun Jun 06 03:09:57 2010 +0200
@@ -11,6 +11,7 @@
     <li class="current"><span>summary</span></li
     ><li><a href="{url}shortlog{sessionvars%urlparameter}">shortlog</a></li
     ><li><a href="{url}changelog{sessionvars%urlparameter}">changelog</a></li
+    ><li><a href="{url}branches{sessionvars%urlparameter}">branches</a></li
     ><li><a href="{url}tags{sessionvars%urlparameter}">tags</a></li
     ><li><a href="{url}files{sessionvars%urlparameter}">files</a></li
     ><li><form id="searchform" action="{url}log"><span class="container">