# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1276039233 -7200
# Node ID 693858c920001790308091d3586318bb52373337
# Parent  e8913039fa250928fc8874b92fd9af936685142b
Moved registration- and user-related menu entries to below the pageline.
Introduced a login page, combining login, registration and forgotten password
options.
Added styling for messages.
Incorporated Mercurial Web changes.

diff -r e8913039fa25 -r 693858c92000 themes/mercurialroundup/html/page.html
--- a/themes/mercurialroundup/html/page.html	Mon Jun 07 01:14:02 2010 +0200
+++ b/themes/mercurialroundup/html/page.html	Wed Jun 09 01:20:33 2010 +0200
@@ -35,12 +35,6 @@
       ><a href="issue?@template=item" i18n:translate="">New issue</a></li
     ><li tal:attributes="class python:request.form.getvalue('@template') == 'search' and 'current'" class=""
       ><a href="issue?@template=search" i18n:translate="">Search</a></li
-    ><li tal:condition="python:request.user.username=='anonymous' and request.user.hasPermission('Register', 'user')"
-      tal:attributes="class python:request.form.getvalue('@template') == 'register' and 'current'" class=""
-      ><a href="user?@template=register" i18n:translate="">Register</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
     ><li tal:condition="python:request.user.hasPermission('View', 'issue')"
       ><form method="POST" tal:attributes="action request/base"><span class="container">
         <a href="#"
@@ -70,11 +64,48 @@
     </li>
     </ul>
   </div>
+
   <div id="pageline"></div>
+
+  <ul id="username">
+  <li tal:condition="python:request.user.username=='anonymous'"
+    ><a href="user?@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
+  ><li tal:condition="python:request.user.username != 'anonymous'"
+    ><a href="#"
+      tal:attributes="href python:request.indexargs_url('issue', {
+      '@sort': '-activity',
+      '@group': 'priority',
+      '@filter': 'status,assignedto',
+      '@columns': 'id,activity,title,creator,status',
+      '@search_text': '',
+      'status': status_notresolved,
+      'assignedto': request.user.id,
+      '@dispname': i18n.gettext('Your Issues'),
+      })"
+      i18n:translate="">Your Issues</a></li
+  ><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.username != 'anonymous'"
+    ><a href="#" tal:attributes="href python:request.indexargs_url('',
+       {'@action':'logout'})" i18n:translate="">Logout</a></li>
+  </ul>
 </div>
 
 <h2><span metal:define-slot="body_title">body title</span></h2>
 
+<p tal:condition="options/error_message | nothing" class="error-message"
+   tal:repeat="m options/error_message" tal:content="structure m" />
+<p tal:condition="options/ok_message | nothing" class="ok-message">
+  <span tal:repeat="m options/ok_message"
+	tal:content="structure string:$m <br/ > " />
+  <a class="form-small" tal:attributes="href request/current_url"
+        i18n:translate="">clear this message</a>
+</p>
+
 <table class="body">
 
 <tr>
@@ -114,44 +145,9 @@
       href="user?@template=item" i18n:translate="">Add User</a>
   </p>
 
-  <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>
-
   <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>
-    <a href="#"
-       tal:attributes="href python:request.indexargs_url('issue', {
-      '@sort': '-activity',
-      '@group': 'priority',
-      '@filter': 'status,assignedto',
-      '@columns': 'id,activity,title,creator,status',
-      '@search_text': '',
-      'status': status_notresolved,
-      'assignedto': request.user.id,
-      '@dispname': i18n.gettext('Your Issues'),
-     })"
-    i18n:translate="">Your Issues</a><br>
-   <a href="#" tal:attributes="href string:user${request/user/id}"
-    i18n:translate="">Your Details</a><br>
-   <a href="#" tal:attributes="href python:request.indexargs_url('',
-       {'@action':'logout'})" i18n:translate="">Logout</a>
   </p>
   <p class="userblock">
    <b i18n:translate="">Help</b><br>
@@ -159,16 +155,6 @@
     i18n:translate="">Roundup docs</a>
   </p>
  </td>
- <td>
-  <p tal:condition="options/error_message | nothing" class="error-message"
-     tal:repeat="m options/error_message" tal:content="structure m" />
-  <p tal:condition="options/ok_message | nothing" class="ok-message">
-    <span tal:repeat="m options/ok_message"
-       tal:content="structure string:$m <br/ > " />
-     <a class="form-small" tal:attributes="href request/current_url"
-        i18n:translate="">clear this message</a>
-  </p>
- </td>
 </tr>
 <tr>
  <td class="content" metal:define-slot="content">Page content goes here</td>
diff -r e8913039fa25 -r 693858c92000 themes/mercurialroundup/html/style-mercurialweb.css
--- a/themes/mercurialroundup/html/style-mercurialweb.css	Mon Jun 07 01:14:02 2010 +0200
+++ b/themes/mercurialroundup/html/style-mercurialweb.css	Wed Jun 09 01:20:33 2010 +0200
@@ -40,6 +40,7 @@
 {
     margin: 1em 0;
     border-collapse: collapse;
+    width: 100%;
 }
 
 th {
@@ -59,6 +60,10 @@
     padding: 0;
 }
 
+tr.parity1 {
+    background: #f7f7f7;
+}
+
 /* Styling of headings from the main site. */
 
 h1 { font-size: 2em; }
diff -r e8913039fa25 -r 693858c92000 themes/mercurialroundup/html/style.css
--- a/themes/mercurialroundup/html/style.css	Mon Jun 07 01:14:02 2010 +0200
+++ b/themes/mercurialroundup/html/style.css	Wed Jun 09 01:20:33 2010 +0200
@@ -15,19 +15,71 @@
   border-collapse: separate;
 }
 
-td.sidebar {
-  padding: 1px 0 0 1px;
-  white-space: nowrap;
+dl, ol, ul {
+  padding: 0 1em;
+  margin: 0 0.5em;
+}
+
+li p {
+  margin: 0.1em 0;
+}
+
+/* Navigation and other controls. */
+
+#username {
+  float: right;
+}
+
+#username {
+
+  /* Styling similar to the main site. */
+
+  font-family: Verdana, Helvetica, Arial, sans-serif;
+  font-size: .6428em;
+  padding: 10px 25px;
+}
+
+#username li {
+  display: inline;
+  padding: 0 2px;
+  margin: 0 4px;
+}
+
+#username a {
+  text-decoration: none;
+}
+
+/* Messages. */
+
+p.ok-message {
+  border-bottom: 1px solid #ccc;
+  background-color: #f0f0f0;
+  padding: 5px 10px;
+}
+
+p.error-message {
+  border-bottom: 1px solid #ccc;
+  background-color: #f0f0f0;
+  padding: 5px 10px;
+}
+
+p.error-message a[href] {
+  color: #005cd5;
 }
 
 /* don't display the header when printing */
 @media print {
-    td.sidebar {
-        display: none;
-    }
-    .index-controls {
-        display: none;
-    }
+  td.sidebar {
+    display: none;
+  }
+  .index-controls {
+    display: none;
+  }
+}
+
+td.sidebar {
+  padding: 1px 0 0 1px;
+  white-space: nowrap;
 }
 
 td.sidebar p.classblock {
@@ -60,24 +112,6 @@
   white-space: nowrap;
 }
 
-p.ok-message {
-  background-color: #22bb22;
-  padding: 5px;
-  color: white;
-  font-weight: bold;
-}
-p.error-message {
-  background-color: #bb2222;
-  padding: 5px;
-  color: white;
-  font-weight: bold;
-}
-p.error-message a[href] {
-  color: white;
-  text-decoration: underline;
-}
-
-
 /* style for search forms */
 ul.search-checkboxes {
     display: inline;
diff -r e8913039fa25 -r 693858c92000 themes/mercurialroundup/html/user.login.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/themes/mercurialroundup/html/user.login.html	Wed Jun 09 01:20:33 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>