# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1276205763 -7200
# Node ID d91b0a6a3974114b7a95bb813e2658d233840b20
# Parent  693858c920001790308091d3586318bb52373337
Moved the login page into the _generic context.
Moved "Your Queries" into the user menu, with queries appearing in a pop-up
submenu.
Increased the user menu font size.
Added a pageline at the bottom of each page.

diff -r 693858c92000 -r d91b0a6a3974 themes/mercurialroundup/html/_generic.login.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/mercurialroundup/html/_generic.login.html	Thu Jun 10 23:36:03 2010 +0200
@@ -0,0 +1,32 @@
+<!-- dollarId: user.item,v 1.7 2002/08/16 04:29:04 richard Exp dollar-->
+<tal:block metal:use-macro="templates/page/macros/icing">
+<title metal:fill-slot="head_title"
+ i18n:translate="">Log into <span i18n:name="tracker"
+ tal:replace="db/config/TRACKER_NAME" /></title>
+<span metal:fill-slot="body_title" tal:omit-tag="python:1"
+ i18n:translate="">Log into <span i18n:name="tracker"
+ tal:replace="db/config/TRACKER_NAME" /></span>
+<td class="content" metal:fill-slot="content">
+
+  <form method="POST" tal:condition="python:request.user.username=='anonymous'"
+        tal:attributes="action request/base">
+   <p class="userblock">
+    <b i18n:translate="">Login</b><br>
+    <input size="10" name="__login_name"><br>
+    <input size="10" type="password" name="__login_password"><br>
+    <input type="hidden" name="@action" value="Login">
+    <input type="checkbox" name="remember" id="remember">
+    <label for="remember" i18n:translate="">Remember me?</label><br>
+    <input type="submit" value="Login" i18n:attributes="value"><br>
+    <input type="hidden" name="__came_from" tal:attributes="value string:${request/base}${request/env/PATH_INFO}">
+    <span tal:replace="structure request/indexargs_form" />
+    <a href="user?@template=register"
+       tal:condition="python:request.user.hasPermission('Register', 'user')"
+     i18n:translate="">Register</a><br>
+    <a href="user?@template=forgotten" i18n:translate="">Lost&nbsp;your&nbsp;login?</a><br>
+   </p>
+  </form>
+
+</td>
+
+</tal:block>
diff -r 693858c92000 -r d91b0a6a3974 themes/mercurialroundup/html/page.html
--- a/themes/mercurialroundup/html/page.html	Wed Jun 09 01:20:33 2010 +0200
+++ b/themes/mercurialroundup/html/page.html	Thu Jun 10 23:36:03 2010 +0200
@@ -51,6 +51,7 @@
         ><input type="hidden" name="@type" value="issue"
         /><input type="hidden" name="@action" value="show"
         /></form></li
+    ><li><a href="http://www.roundup-tracker.org/" i18n:translate="">Help</a></li
     ><li><form id="searchform" action="issue"><span class="container">
         <span class="hint" i18n:translate="">Search</span>&nbsp;<input name="@search_text" id="searchinput" type="text" size="20"
           tal:attributes="value request/search_text | default" />
@@ -69,7 +70,7 @@
 
   <ul id="username">
   <li tal:condition="python:request.user.username=='anonymous'"
-    ><a href="user?@template=login" i18n:translate="">Login</a></li
+    ><a href="?@template=login" i18n:translate="">Login</a></li
   ><li tal:condition="python:request.user.username != 'anonymous'"
     i18n:translate=""><a href="user" i18n:name="user"
     tal:replace="python:request.user.username.plain(escape=1)">username</a></li
@@ -89,6 +90,12 @@
   ><li tal:condition="python:request.user.username != 'anonymous'"
     ><a href="#" tal:attributes="href string:user${request/user/id}"
       i18n:translate="">Your Details</a></li
+  ><li tal:condition="python:request.user.hasPermission('View', 'query')"
+    ><span class="submenu-container"><a href="query?@template=edit" i18n:translate="">Your Queries</a><div class="submenu"
+      ><tal:block tal:repeat="qs request/user/queries">
+	<a href="#" tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}"
+		    tal:content="qs/name">link</a><br>
+      </tal:block></div></span></li
   ><li tal:condition="python:request.user.username != 'anonymous'"
     ><a href="#" tal:attributes="href python:request.indexargs_url('',
        {'@action':'logout'})" i18n:translate="">Logout</a></li>
@@ -110,15 +117,6 @@
 
 <tr>
  <td rowspan="2" valign="top" class="sidebar">
-  <p class="classblock"
-     tal:condition="python:request.user.hasPermission('View', 'query')">
-   <span i18n:translate=""
-    ><b>Your Queries</b> (<a href="query?@template=edit">edit</a>)</span><br>
-   <tal:block tal:repeat="qs request/user/queries">
-    <a href="#" tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}"
-       tal:content="qs/name">link</a><br>
-   </tal:block>
-  </p>
 
   <p class="classblock"
      tal:condition="python:kw_edit or kw_create">
@@ -145,15 +143,6 @@
       href="user?@template=item" i18n:translate="">Add User</a>
   </p>
 
-  <p class="userblock" tal:condition="python:request.user.username != 'anonymous'">
-   <b i18n:translate="">Hello, <span i18n:name="user"
-    tal:replace="python:request.user.username.plain(escape=1)">username</span></b><br>
-  </p>
-  <p class="userblock">
-   <b i18n:translate="">Help</b><br>
-   <a href="http://www.roundup-tracker.org"
-    i18n:translate="">Roundup docs</a>
-  </p>
  </td>
 </tr>
 <tr>
@@ -165,6 +154,10 @@
 <pre tal:condition="request/form/debug | nothing" tal:content="request">
 </pre>
 
+<div id="footer">
+  <div id="pageline"></div>
+</div>
+
 </body>
 </html>
 </tal:block>
diff -r 693858c92000 -r d91b0a6a3974 themes/mercurialroundup/html/style.css
--- a/themes/mercurialroundup/html/style.css	Wed Jun 09 01:20:33 2010 +0200
+++ b/themes/mercurialroundup/html/style.css	Thu Jun 10 23:36:03 2010 +0200
@@ -26,16 +26,16 @@
 
 /* Navigation and other controls. */
 
+/* Styling similar to the main Mercurial site with adjustments made for the
+   Mercurial Web theme. */
+
 #username {
   float: right;
 }
 
 #username {
-
-  /* Styling similar to the main site. */
-
   font-family: Verdana, Helvetica, Arial, sans-serif;
-  font-size: .6428em;
+  font-size: .8em;
   padding: 10px 25px;
 }
 
@@ -49,6 +49,35 @@
   text-decoration: none;
 }
 
+span.submenu-container {
+  position: relative;
+  display: inline-block;
+}
+
+span.submenu-container:hover {
+  background: #fff;
+  border-bottom: 1px solid #ccc;
+  padding-bottom: 1ex;
+}
+
+span.submenu-container .submenu {
+  display: none;
+}
+
+span.submenu-container:hover .submenu {
+  display: block;
+  position: absolute;
+  top: 3ex;
+  left: 0;
+
+  background: #fff;
+  border-width: 0 0 1px 0;
+  border-style: solid;
+  border-color: #ccc;
+  padding: 1ex;
+  z-index: 2;
+}
+
 /* Messages. */
 
 p.ok-message {
diff -r 693858c92000 -r d91b0a6a3974 themes/mercurialroundup/html/user.login.html
--- a/themes/mercurialroundup/html/user.login.html	Wed Jun 09 01:20:33 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-<!-- dollarId: user.item,v 1.7 2002/08/16 04:29:04 richard Exp dollar-->
-<tal:block metal:use-macro="templates/page/macros/icing">
-<title metal:fill-slot="head_title"
- i18n:translate="">Log into <span i18n:name="tracker"
- tal:replace="db/config/TRACKER_NAME" /></title>
-<span metal:fill-slot="body_title" tal:omit-tag="python:1"
- i18n:translate="">Log into <span i18n:name="tracker"
- tal:replace="db/config/TRACKER_NAME" /></span>
-<td class="content" metal:fill-slot="content">
-
-  <form method="POST" tal:condition="python:request.user.username=='anonymous'"
-        tal:attributes="action request/base">
-   <p class="userblock">
-    <b i18n:translate="">Login</b><br>
-    <input size="10" name="__login_name"><br>
-    <input size="10" type="password" name="__login_password"><br>
-    <input type="hidden" name="@action" value="Login">
-    <input type="checkbox" name="remember" id="remember">
-    <label for="remember" i18n:translate="">Remember me?</label><br>
-    <input type="submit" value="Login" i18n:attributes="value"><br>
-    <input type="hidden" name="__came_from" tal:attributes="value string:${request/base}${request/env/PATH_INFO}">
-    <span tal:replace="structure request/indexargs_form" />
-    <a href="user?@template=register"
-       tal:condition="python:request.user.hasPermission('Register', 'user')"
-     i18n:translate="">Register</a><br>
-    <a href="user?@template=forgotten" i18n:translate="">Lost&nbsp;your&nbsp;login?</a><br>
-   </p>
-  </form>
-
-</td>
-
-</tal:block>