[html] Reinstate 'about' link

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/htdocs/css/style.css b/htdocs/css/style.css
index 943e39dad20cd54f971036bc4491738be36877e7..81950abbf8fcf0de2253f7a5391fc75bb6f78974 100644 (file)
--- a/htdocs/css/style.css
+++ b/htdocs/css/style.css
@@ -49,6 +49,8 @@ body {
 }
 
 #nav {
 }
 
 #nav {

+       float: left
+       width: 100%;

        background: #e8e8e8;
        border-bottom: 0.2em solid #786fb4;
        font-size: 90%;
        background: #e8e8e8;
        border-bottom: 0.2em solid #786fb4;
        font-size: 90%;


@@ -59,6 +61,13 @@ body {
        text-decoration: underline;
 }
 
        text-decoration: underline;
 }
 

+#navleft {
+       float: left;
+}
+
+#navright {
+       float: right;
+}

 
 #content {
        padding: 1em;
 
 #content {
        padding: 1em;

diff --git a/templates/base.html b/templates/base.html
index 896b93970de93d9d985c5aff66bfe204fef4d3ac..048d0523b8f34846298b4815808d85dbb3db34db 100644 (file)
--- a/templates/base.html
+++ b/templates/base.html
@@ -38,23 +38,29 @@
    <div style="clear: both;"></div>
   </div>
   <div id="nav">
    <div style="clear: both;"></div>
   </div>
   <div id="nav">

-  {% if project %}
-   <strong>Project</strong>: {{ project.linkname }}
-    :
-    <a href="{% url patchwork.views.patch.list project_id=project.linkname %}"
-     >patches</a>
-    :
-    <a href="{% url patchwork.views.project project_id=project.linkname %}"
-     >project info</a>
-   {% if other_projects %}
-    :
-    <a href="{% url patchwork.views.projects %}"
-    >other projects</a>
+   <div id="navleft">
+   {% if project %}
+    <strong>Project</strong>: {{ project.linkname }}
+     :
+     <a href="{% url patchwork.views.patch.list project_id=project.linkname %}"
+      >patches</a>
+     :
+     <a href="{% url patchwork.views.project project_id=project.linkname %}"
+      >project info</a>
+    {% if other_projects %}
+     :
+     <a href="{% url patchwork.views.projects %}"
+     >other projects</a>
+     {% endif %}
+    {% else %}
+     <a href="{% url patchwork.views.projects %}"
+     >project list</a>

     {% endif %}
     {% endif %}

-   {% else %}
-    <a href="{% url patchwork.views.projects %}"
-    >project list</a>
-   {% endif %}
+   </div>
+   <div id="navright">
+    <a href="{% url patchwork.views.help path="about/" %}">about</a>
+   </div>
+   <div style="clear: both"></div>

   </div>
 {% if messages %}
   <div id="messages">
   </div>
 {% if messages %}
   <div id="messages">