1.1 --- a/themes/mercurialroundup/html/page.html Mon Jun 07 01:14:02 2010 +0200
1.2 +++ b/themes/mercurialroundup/html/page.html Wed Jun 09 01:20:33 2010 +0200
1.3 @@ -35,12 +35,6 @@
1.4 ><a href="issue?@template=item" i18n:translate="">New issue</a></li
1.5 ><li tal:attributes="class python:request.form.getvalue('@template') == 'search' and 'current'" class=""
1.6 ><a href="issue?@template=search" i18n:translate="">Search</a></li
1.7 - ><li tal:condition="python:request.user.username=='anonymous' and request.user.hasPermission('Register', 'user')"
1.8 - tal:attributes="class python:request.form.getvalue('@template') == 'register' and 'current'" class=""
1.9 - ><a href="user?@template=register" i18n:translate="">Register</a></li
1.10 - ><li tal:condition="python:request.user.username != 'anonymous'"
1.11 - i18n:translate=""><a href="user" i18n:name="user"
1.12 - tal:replace="python:request.user.username.plain(escape=1)">username</a></li
1.13 ><li tal:condition="python:request.user.hasPermission('View', 'issue')"
1.14 ><form method="POST" tal:attributes="action request/base"><span class="container">
1.15 <a href="#"
1.16 @@ -70,11 +64,48 @@
1.17 </li>
1.18 </ul>
1.19 </div>
1.20 +
1.21 <div id="pageline"></div>
1.22 +
1.23 + <ul id="username">
1.24 + <li tal:condition="python:request.user.username=='anonymous'"
1.25 + ><a href="user?@template=login" i18n:translate="">Login</a></li
1.26 + ><li tal:condition="python:request.user.username != 'anonymous'"
1.27 + i18n:translate=""><a href="user" i18n:name="user"
1.28 + tal:replace="python:request.user.username.plain(escape=1)">username</a></li
1.29 + ><li tal:condition="python:request.user.username != 'anonymous'"
1.30 + ><a href="#"
1.31 + tal:attributes="href python:request.indexargs_url('issue', {
1.32 + '@sort': '-activity',
1.33 + '@group': 'priority',
1.34 + '@filter': 'status,assignedto',
1.35 + '@columns': 'id,activity,title,creator,status',
1.36 + '@search_text': '',
1.37 + 'status': status_notresolved,
1.38 + 'assignedto': request.user.id,
1.39 + '@dispname': i18n.gettext('Your Issues'),
1.40 + })"
1.41 + i18n:translate="">Your Issues</a></li
1.42 + ><li tal:condition="python:request.user.username != 'anonymous'"
1.43 + ><a href="#" tal:attributes="href string:user${request/user/id}"
1.44 + i18n:translate="">Your Details</a></li
1.45 + ><li tal:condition="python:request.user.username != 'anonymous'"
1.46 + ><a href="#" tal:attributes="href python:request.indexargs_url('',
1.47 + {'@action':'logout'})" i18n:translate="">Logout</a></li>
1.48 + </ul>
1.49 </div>
1.50
1.51 <h2><span metal:define-slot="body_title">body title</span></h2>
1.52
1.53 +<p tal:condition="options/error_message | nothing" class="error-message"
1.54 + tal:repeat="m options/error_message" tal:content="structure m" />
1.55 +<p tal:condition="options/ok_message | nothing" class="ok-message">
1.56 + <span tal:repeat="m options/ok_message"
1.57 + tal:content="structure string:$m <br/ > " />
1.58 + <a class="form-small" tal:attributes="href request/current_url"
1.59 + i18n:translate="">clear this message</a>
1.60 +</p>
1.61 +
1.62 <table class="body">
1.63
1.64 <tr>
1.65 @@ -114,44 +145,9 @@
1.66 href="user?@template=item" i18n:translate="">Add User</a>
1.67 </p>
1.68
1.69 - <form method="POST" tal:condition="python:request.user.username=='anonymous'"
1.70 - tal:attributes="action request/base">
1.71 - <p class="userblock">
1.72 - <b i18n:translate="">Login</b><br>
1.73 - <input size="10" name="__login_name"><br>
1.74 - <input size="10" type="password" name="__login_password"><br>
1.75 - <input type="hidden" name="@action" value="Login">
1.76 - <input type="checkbox" name="remember" id="remember">
1.77 - <label for="remember" i18n:translate="">Remember me?</label><br>
1.78 - <input type="submit" value="Login" i18n:attributes="value"><br>
1.79 - <input type="hidden" name="__came_from" tal:attributes="value string:${request/base}${request/env/PATH_INFO}">
1.80 - <span tal:replace="structure request/indexargs_form" />
1.81 - <a href="user?@template=register"
1.82 - tal:condition="python:request.user.hasPermission('Register', 'user')"
1.83 - i18n:translate="">Register</a><br>
1.84 - <a href="user?@template=forgotten" i18n:translate="">Lost your login?</a><br>
1.85 - </p>
1.86 - </form>
1.87 -
1.88 <p class="userblock" tal:condition="python:request.user.username != 'anonymous'">
1.89 <b i18n:translate="">Hello, <span i18n:name="user"
1.90 tal:replace="python:request.user.username.plain(escape=1)">username</span></b><br>
1.91 - <a href="#"
1.92 - tal:attributes="href python:request.indexargs_url('issue', {
1.93 - '@sort': '-activity',
1.94 - '@group': 'priority',
1.95 - '@filter': 'status,assignedto',
1.96 - '@columns': 'id,activity,title,creator,status',
1.97 - '@search_text': '',
1.98 - 'status': status_notresolved,
1.99 - 'assignedto': request.user.id,
1.100 - '@dispname': i18n.gettext('Your Issues'),
1.101 - })"
1.102 - i18n:translate="">Your Issues</a><br>
1.103 - <a href="#" tal:attributes="href string:user${request/user/id}"
1.104 - i18n:translate="">Your Details</a><br>
1.105 - <a href="#" tal:attributes="href python:request.indexargs_url('',
1.106 - {'@action':'logout'})" i18n:translate="">Logout</a>
1.107 </p>
1.108 <p class="userblock">
1.109 <b i18n:translate="">Help</b><br>
1.110 @@ -159,16 +155,6 @@
1.111 i18n:translate="">Roundup docs</a>
1.112 </p>
1.113 </td>
1.114 - <td>
1.115 - <p tal:condition="options/error_message | nothing" class="error-message"
1.116 - tal:repeat="m options/error_message" tal:content="structure m" />
1.117 - <p tal:condition="options/ok_message | nothing" class="ok-message">
1.118 - <span tal:repeat="m options/ok_message"
1.119 - tal:content="structure string:$m <br/ > " />
1.120 - <a class="form-small" tal:attributes="href request/current_url"
1.121 - i18n:translate="">clear this message</a>
1.122 - </p>
1.123 - </td>
1.124 </tr>
1.125 <tr>
1.126 <td class="content" metal:define-slot="content">Page content goes here</td>