Patchwork [2,of,3] hgweb: move archive entries outside of <li> in monoblue style

login
register
mail settings
Submitter Anton Shestakov
Date Jan. 9, 2015, 5:20 p.m.
Message ID <804c0b12828662447f52.1420824027@neuro>
Download mbox | patch
Permalink /patch/7405/
State Accepted
Commit 8f7e839aaa70f0e1899162e087ff547f615106c9
Headers show

Comments

Anton Shestakov - Jan. 9, 2015, 5:20 p.m.
# HG changeset patch
# User Anton Shestakov <engored@ya.ru>
# Date 1420815218 -28800
#      Fri Jan 09 22:53:38 2015 +0800
# Node ID 804c0b12828662447f52973f1ea11ee42b9534b6
# Parent  7123a7138ec3aeb3e3d2643a510e7a806025f888
hgweb: move archive entries outside of <li> in monoblue style

archiveentry already includes surrounding <li></li>, so putting archive entries
inside <li> element produced incorrect markup.
Matt Mackall - Jan. 9, 2015, 9:33 p.m.
On Sat, 2015-01-10 at 01:20 +0800, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <engored@ya.ru>
> # Date 1420815218 -28800
> #      Fri Jan 09 22:53:38 2015 +0800
> # Node ID 804c0b12828662447f52973f1ea11ee42b9534b6
> # Parent  7123a7138ec3aeb3e3d2643a510e7a806025f888
> hgweb: move archive entries outside of <li> in monoblue style

These first two are queued for default, thanks.

Patch

diff --git a/mercurial/templates/monoblue/changelog.tmpl b/mercurial/templates/monoblue/changelog.tmpl
--- a/mercurial/templates/monoblue/changelog.tmpl
+++ b/mercurial/templates/monoblue/changelog.tmpl
@@ -25,7 +25,8 @@ 
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-            <li><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
+            <li><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a></li>
+            {archives%archiveentry}
 	    <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
         </ul>
     </div>
diff --git a/mercurial/templates/monoblue/changeset.tmpl b/mercurial/templates/monoblue/changeset.tmpl
--- a/mercurial/templates/monoblue/changeset.tmpl
+++ b/mercurial/templates/monoblue/changeset.tmpl
@@ -32,7 +32,8 @@ 
 
     <ul class="submenu">
         <li class="current">changeset</li>
-        <li><a href="{url|urlescape}raw-rev/{node|short}">raw</a> {archives%archiveentry}</li>
+        <li><a href="{url|urlescape}raw-rev/{node|short}">raw</a></li>
+        {archives%archiveentry}
     </ul>
 
     <h2 class="no-link no-border">changeset</h2>
diff --git a/mercurial/templates/monoblue/manifest.tmpl b/mercurial/templates/monoblue/manifest.tmpl
--- a/mercurial/templates/monoblue/manifest.tmpl
+++ b/mercurial/templates/monoblue/manifest.tmpl
@@ -31,7 +31,7 @@ 
     </div>
 
     <ul class="submenu">
-        <li><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a> {archives%archiveentry}</li>
+        <li><a href="{url|urlescape}rev/{node|short}{sessionvars%urlparameter}">changeset</a></li>
         {archives%archiveentry}
     </ul>
 
diff --git a/mercurial/templates/monoblue/notfound.tmpl b/mercurial/templates/monoblue/notfound.tmpl
--- a/mercurial/templates/monoblue/notfound.tmpl
+++ b/mercurial/templates/monoblue/notfound.tmpl
@@ -25,7 +25,8 @@ 
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-            <li><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}</li>
+            <li><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a></li>
+            {archives%archiveentry}
             <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
         </ul>
     </div>
diff --git a/mercurial/templates/monoblue/search.tmpl b/mercurial/templates/monoblue/search.tmpl
--- a/mercurial/templates/monoblue/search.tmpl
+++ b/mercurial/templates/monoblue/search.tmpl
@@ -25,7 +25,8 @@ 
             <li><a href="{url|urlescape}tags{sessionvars%urlparameter}">tags</a></li>
             <li><a href="{url|urlescape}bookmarks{sessionvars%urlparameter}">bookmarks</a></li>
             <li><a href="{url|urlescape}branches{sessionvars%urlparameter}">branches</a></li>
-            <li><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a>{archives%archiveentry}
+            <li><a href="{url|urlescape}file/{node|short}{sessionvars%urlparameter}">files</a></li>
+            {archives%archiveentry}
             <li><a href="{url|urlescape}help{sessionvars%urlparameter}">help</a></li>
         </ul>
     </div>