MercurialRoundupTheme

Changeset

4:d91b0a6a3974
2010-06-10 Paul Boddie raw files shortlog changelog graph 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. default tip
themes/mercurialroundup/html/_generic.login.html (file) themes/mercurialroundup/html/page.html (file) themes/mercurialroundup/html/style.css (file) themes/mercurialroundup/html/user.login.html
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/themes/mercurialroundup/html/_generic.login.html	Thu Jun 10 23:36:03 2010 +0200
     1.3 @@ -0,0 +1,32 @@
     1.4 +<!-- dollarId: user.item,v 1.7 2002/08/16 04:29:04 richard Exp dollar-->
     1.5 +<tal:block metal:use-macro="templates/page/macros/icing">
     1.6 +<title metal:fill-slot="head_title"
     1.7 + i18n:translate="">Log into <span i18n:name="tracker"
     1.8 + tal:replace="db/config/TRACKER_NAME" /></title>
     1.9 +<span metal:fill-slot="body_title" tal:omit-tag="python:1"
    1.10 + i18n:translate="">Log into <span i18n:name="tracker"
    1.11 + tal:replace="db/config/TRACKER_NAME" /></span>
    1.12 +<td class="content" metal:fill-slot="content">
    1.13 +
    1.14 +  <form method="POST" tal:condition="python:request.user.username=='anonymous'"
    1.15 +        tal:attributes="action request/base">
    1.16 +   <p class="userblock">
    1.17 +    <b i18n:translate="">Login</b><br>
    1.18 +    <input size="10" name="__login_name"><br>
    1.19 +    <input size="10" type="password" name="__login_password"><br>
    1.20 +    <input type="hidden" name="@action" value="Login">
    1.21 +    <input type="checkbox" name="remember" id="remember">
    1.22 +    <label for="remember" i18n:translate="">Remember me?</label><br>
    1.23 +    <input type="submit" value="Login" i18n:attributes="value"><br>
    1.24 +    <input type="hidden" name="__came_from" tal:attributes="value string:${request/base}${request/env/PATH_INFO}">
    1.25 +    <span tal:replace="structure request/indexargs_form" />
    1.26 +    <a href="user?@template=register"
    1.27 +       tal:condition="python:request.user.hasPermission('Register', 'user')"
    1.28 +     i18n:translate="">Register</a><br>
    1.29 +    <a href="user?@template=forgotten" i18n:translate="">Lost&nbsp;your&nbsp;login?</a><br>
    1.30 +   </p>
    1.31 +  </form>
    1.32 +
    1.33 +</td>
    1.34 +
    1.35 +</tal:block>
     2.1 --- a/themes/mercurialroundup/html/page.html	Wed Jun 09 01:20:33 2010 +0200
     2.2 +++ b/themes/mercurialroundup/html/page.html	Thu Jun 10 23:36:03 2010 +0200
     2.3 @@ -51,6 +51,7 @@
     2.4          ><input type="hidden" name="@type" value="issue"
     2.5          /><input type="hidden" name="@action" value="show"
     2.6          /></form></li
     2.7 +    ><li><a href="http://www.roundup-tracker.org/" i18n:translate="">Help</a></li
     2.8      ><li><form id="searchform" action="issue"><span class="container">
     2.9          <span class="hint" i18n:translate="">Search</span>&nbsp;<input name="@search_text" id="searchinput" type="text" size="20"
    2.10            tal:attributes="value request/search_text | default" />
    2.11 @@ -69,7 +70,7 @@
    2.12  
    2.13    <ul id="username">
    2.14    <li tal:condition="python:request.user.username=='anonymous'"
    2.15 -    ><a href="user?@template=login" i18n:translate="">Login</a></li
    2.16 +    ><a href="?@template=login" i18n:translate="">Login</a></li
    2.17    ><li tal:condition="python:request.user.username != 'anonymous'"
    2.18      i18n:translate=""><a href="user" i18n:name="user"
    2.19      tal:replace="python:request.user.username.plain(escape=1)">username</a></li
    2.20 @@ -89,6 +90,12 @@
    2.21    ><li tal:condition="python:request.user.username != 'anonymous'"
    2.22      ><a href="#" tal:attributes="href string:user${request/user/id}"
    2.23        i18n:translate="">Your Details</a></li
    2.24 +  ><li tal:condition="python:request.user.hasPermission('View', 'query')"
    2.25 +    ><span class="submenu-container"><a href="query?@template=edit" i18n:translate="">Your Queries</a><div class="submenu"
    2.26 +      ><tal:block tal:repeat="qs request/user/queries">
    2.27 +	<a href="#" tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}"
    2.28 +		    tal:content="qs/name">link</a><br>
    2.29 +      </tal:block></div></span></li
    2.30    ><li tal:condition="python:request.user.username != 'anonymous'"
    2.31      ><a href="#" tal:attributes="href python:request.indexargs_url('',
    2.32         {'@action':'logout'})" i18n:translate="">Logout</a></li>
    2.33 @@ -110,15 +117,6 @@
    2.34  
    2.35  <tr>
    2.36   <td rowspan="2" valign="top" class="sidebar">
    2.37 -  <p class="classblock"
    2.38 -     tal:condition="python:request.user.hasPermission('View', 'query')">
    2.39 -   <span i18n:translate=""
    2.40 -    ><b>Your Queries</b> (<a href="query?@template=edit">edit</a>)</span><br>
    2.41 -   <tal:block tal:repeat="qs request/user/queries">
    2.42 -    <a href="#" tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}"
    2.43 -       tal:content="qs/name">link</a><br>
    2.44 -   </tal:block>
    2.45 -  </p>
    2.46  
    2.47    <p class="classblock"
    2.48       tal:condition="python:kw_edit or kw_create">
    2.49 @@ -145,15 +143,6 @@
    2.50        href="user?@template=item" i18n:translate="">Add User</a>
    2.51    </p>
    2.52  
    2.53 -  <p class="userblock" tal:condition="python:request.user.username != 'anonymous'">
    2.54 -   <b i18n:translate="">Hello, <span i18n:name="user"
    2.55 -    tal:replace="python:request.user.username.plain(escape=1)">username</span></b><br>
    2.56 -  </p>
    2.57 -  <p class="userblock">
    2.58 -   <b i18n:translate="">Help</b><br>
    2.59 -   <a href="http://www.roundup-tracker.org"
    2.60 -    i18n:translate="">Roundup docs</a>
    2.61 -  </p>
    2.62   </td>
    2.63  </tr>
    2.64  <tr>
    2.65 @@ -165,6 +154,10 @@
    2.66  <pre tal:condition="request/form/debug | nothing" tal:content="request">
    2.67  </pre>
    2.68  
    2.69 +<div id="footer">
    2.70 +  <div id="pageline"></div>
    2.71 +</div>
    2.72 +
    2.73  </body>
    2.74  </html>
    2.75  </tal:block>
     3.1 --- a/themes/mercurialroundup/html/style.css	Wed Jun 09 01:20:33 2010 +0200
     3.2 +++ b/themes/mercurialroundup/html/style.css	Thu Jun 10 23:36:03 2010 +0200
     3.3 @@ -26,16 +26,16 @@
     3.4  
     3.5  /* Navigation and other controls. */
     3.6  
     3.7 +/* Styling similar to the main Mercurial site with adjustments made for the
     3.8 +   Mercurial Web theme. */
     3.9 +
    3.10  #username {
    3.11    float: right;
    3.12  }
    3.13  
    3.14  #username {
    3.15 -
    3.16 -  /* Styling similar to the main site. */
    3.17 -
    3.18    font-family: Verdana, Helvetica, Arial, sans-serif;
    3.19 -  font-size: .6428em;
    3.20 +  font-size: .8em;
    3.21    padding: 10px 25px;
    3.22  }
    3.23  
    3.24 @@ -49,6 +49,35 @@
    3.25    text-decoration: none;
    3.26  }
    3.27  
    3.28 +span.submenu-container {
    3.29 +  position: relative;
    3.30 +  display: inline-block;
    3.31 +}
    3.32 +
    3.33 +span.submenu-container:hover {
    3.34 +  background: #fff;
    3.35 +  border-bottom: 1px solid #ccc;
    3.36 +  padding-bottom: 1ex;
    3.37 +}
    3.38 +
    3.39 +span.submenu-container .submenu {
    3.40 +  display: none;
    3.41 +}
    3.42 +
    3.43 +span.submenu-container:hover .submenu {
    3.44 +  display: block;
    3.45 +  position: absolute;
    3.46 +  top: 3ex;
    3.47 +  left: 0;
    3.48 +
    3.49 +  background: #fff;
    3.50 +  border-width: 0 0 1px 0;
    3.51 +  border-style: solid;
    3.52 +  border-color: #ccc;
    3.53 +  padding: 1ex;
    3.54 +  z-index: 2;
    3.55 +}
    3.56 +
    3.57  /* Messages. */
    3.58  
    3.59  p.ok-message {
     4.1 --- a/themes/mercurialroundup/html/user.login.html	Wed Jun 09 01:20:33 2010 +0200
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,32 +0,0 @@
     4.4 -<!-- dollarId: user.item,v 1.7 2002/08/16 04:29:04 richard Exp dollar-->
     4.5 -<tal:block metal:use-macro="templates/page/macros/icing">
     4.6 -<title metal:fill-slot="head_title"
     4.7 - i18n:translate="">Log into <span i18n:name="tracker"
     4.8 - tal:replace="db/config/TRACKER_NAME" /></title>
     4.9 -<span metal:fill-slot="body_title" tal:omit-tag="python:1"
    4.10 - i18n:translate="">Log into <span i18n:name="tracker"
    4.11 - tal:replace="db/config/TRACKER_NAME" /></span>
    4.12 -<td class="content" metal:fill-slot="content">
    4.13 -
    4.14 -  <form method="POST" tal:condition="python:request.user.username=='anonymous'"
    4.15 -        tal:attributes="action request/base">
    4.16 -   <p class="userblock">
    4.17 -    <b i18n:translate="">Login</b><br>
    4.18 -    <input size="10" name="__login_name"><br>
    4.19 -    <input size="10" type="password" name="__login_password"><br>
    4.20 -    <input type="hidden" name="@action" value="Login">
    4.21 -    <input type="checkbox" name="remember" id="remember">
    4.22 -    <label for="remember" i18n:translate="">Remember me?</label><br>
    4.23 -    <input type="submit" value="Login" i18n:attributes="value"><br>
    4.24 -    <input type="hidden" name="__came_from" tal:attributes="value string:${request/base}${request/env/PATH_INFO}">
    4.25 -    <span tal:replace="structure request/indexargs_form" />
    4.26 -    <a href="user?@template=register"
    4.27 -       tal:condition="python:request.user.hasPermission('Register', 'user')"
    4.28 -     i18n:translate="">Register</a><br>
    4.29 -    <a href="user?@template=forgotten" i18n:translate="">Lost&nbsp;your&nbsp;login?</a><br>
    4.30 -   </p>
    4.31 -  </form>
    4.32 -
    4.33 -</td>
    4.34 -
    4.35 -</tal:block>