[Python-checkins] r60666 - tracker/instances/jython/html/page.html

martin.v.loewis python-checkins at python.org
Fri Feb 8 07:32:58 CET 2008


Author: martin.v.loewis
Date: Fri Feb  8 07:32:58 2008
New Revision: 60666

Modified:
   tracker/instances/jython/html/page.html
Log:
Adopt jython.org page layout.


Modified: tracker/instances/jython/html/page.html
==============================================================================
--- tracker/instances/jython/html/page.html	(original)
+++ tracker/instances/jython/html/page.html	Fri Feb  8 07:32:58 2008
@@ -1,248 +1,322 @@
 <tal:block metal:define-macro="icing">
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-<title metal:define-slot="head_title">title goes here</title>
-<link media="screen" href="http://python.org/styles/screen-switcher-default.css" type="text/css" id="screen-switcher-stylesheet" rel="stylesheet" />
-<link media="screen" href="http://python.org/styles/netscape4.css" type="text/css" rel="stylesheet" />
-<link media="print" href="http://python.org/styles/print.css" type="text/css" rel="stylesheet" />
-<link media="screen" href="http://python.org/styles/largestyles.css" type="text/css" rel="alternate stylesheet" title="large text" />
-<link media="screen" href="http://python.org/styles/defaultfonts.css" type="text/css" rel="alternate stylesheet" title="default fonts" />
-<link rel="stylesheet" type="text/css" href="@@file/style.css" />
-<meta http-equiv="Content-Type"
- tal:attributes="content string:text/html;; charset=${request/client/charset}" />
-<script tal:replace="structure request/base_javascript">
-</script>
-<metal:x define-slot="more-javascript" />
-
-</head>
-<body
-tal:define="
-kw_create python:request.user.hasPermission('Create', 'keyword');
-columns string:id,activity,title,creator,status;
-columns_showall string:id,activity,title,creator,assignee,status;
-status_notresolved string:-1,1,3;
-">
-  <!--  Logo  -->
-  <h1 id="logoheader">
-    <a accesskey="1" href="." id="logolink">
-       <img src="http://python.org/images/python-logo.gif" 
-            alt="homepage" border="0" id="logo" /></a>
-  </h1>
-
-<div id="utility-menu">
-<!-- Search Box -->
-<div id="searchbox">
-    <form name="searchform" method="get" action="issue" id="searchform">
-      <div id="search">
-       <input type="hidden" name="@columns"
-              tal:attributes="value columns_showall"/>
-       <input type="hidden" name="@sort" value="-activity" />
-       <input type="hidden" name="@group" value="priority" />
-       <input type="hidden" name="@filter" value="status"/>
-       <input type="hidden" name="status" tal:attributes="value status_notresolved"/>
-       <input class="input-text" id="search-text" name="@search_text" size="10" />
-<input type="submit" id="submit" value="search in open issues" name="submit"
-       class="input-button"/>
+  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  <html>
+    <head>
+      <title metal:define-slot="head_title">title goes here</title>
+      <link rel="stylesheet"
+      href="http://www.jython.org/css/html4css1.css"
+      type="text/css" />
+      <link type="text/css"
+      href="http://www.jython.org/css/basic.css"
+      rel="stylesheet" />
+      <link media="screen" type="text/css"
+      href="http://www.jython.org/css/screen.css"
+      rel="stylesheet" />
+      <link media="print" type="text/css"
+      href="http://www.jython.org/css/print.css"
+      rel="stylesheet" />
+      <link type="text/css"
+      href="http://www.jython.org/css/profile.css"
+      rel="stylesheet" />
+      <link rel="stylesheet" type="text/css"
+      href="@@file/style.css" />
+      <meta http-equiv="Content-Type"
+      tal:attributes="content string:text/html;; charset=${request/client/charset}" />
+      <script tal:replace="structure request/base_javascript">
+      </script>
+      <metal:x define-slot="more-javascript" />
+    </head>
+    <body tal:define="kw_create python:request.user.hasPermission('Create', 'keyword'); columns string:id,activity,title,creator,status; columns_showall string:id,activity,title,creator,assignee,status; status_notresolved string:-1,1,3;">
+
+      <div id="top">
+        <div class="header">
+          <div class="grouplogo">
+            <a href="./">
+              <img class="logoImage" alt="Jython"
+              src="http://www.jython.org/css/jython.png"
+              title="Jython" />
+            </a>
+          </div>
+          <div class="searchbox">
+            <form name="searchform" method="get" action="issue"
+            id="searchform">
+              <div id="search">
+                <input type="hidden" name="@columns"
+                tal:attributes="value columns_showall" />
+                <input type="hidden" name="@sort"
+                value="-activity" />
+                <input type="hidden" name="@group"
+                value="priority" />
+                <input type="hidden" name="@filter"
+                value="status" />
+                <input type="hidden" name="status"
+                tal:attributes="value status_notresolved" />
+                <input class="input-text" id="search-text"
+                name="@search_text" size="10" />
+                <input type="submit" id="submit"
+                value="search in open issues" name="submit"
+                class="input-button" />
+              </div>
+            </form>
+          </div>
+        </div>
       </div>
-     </form>
-</div>
-</div>
-
-
-<div id="left-hand-navigation">
-  
-    <!--  Main Menu NEED LEVEL TWO HEADER AND FOOTER -->
- <div id="menu">
-  <ul class="level-one">
-   <li class=""><a href="http://python.org/about" class="" title="About The Python Language">About</a></li>
-   <li class=""><a href="http://python.org/news" class="" title="">News</a></li>
-   <li class=""><a href="http://python.org/doc" class="" title="">Documentation</a></li>
-   <li class=""><a href="http://python.org/download" class="" title="">Download</a></li>
-   <li class=""><a href="http://python.org/community" class="" title="">Community</a></li>
-   <li class=""><a href="http://python.org/psf" class="" title="Python Software Foundation">PSF</a></li>
-   <li class=""><a href="http://python.org/links" class="" title="">Links</a></li>
-   <li class=""><a href="http://python.org/dev" class="" title="Python Core Language Development">Core Development</a></li>
-   <li class="selected"><a href="." class="selected" title="Python Issue Tracker">Issue Tracker</a>
-    <ul class="level-two">
-     <li tal:condition="python:request.user.hasPermission('View', 'issue')">
-      <b i18n:translate="">Issues</b>
-       <ul class="level-three">
-        <li tal:condition="python:request.user.hasPermission('Create', 'issue')">
-         <a href="issue?@template=item" i18n:translate="">Create New</a>
-        </li>
-        <li>
-    <li><a href="#"
-       tal:attributes="href python:request.indexargs_url('issue', {
-      '@sort': '-activity',
-      '@group': 'priority',
-      '@filter': 'status',
-      '@columns': columns_showall,
-      '@search_text': '',
-      'status': status_notresolved,
-      '@dispname': i18n.gettext('Show All'),
-      '@startwith': 0,
-     })"
-       i18n:translate="">Show Open</a></li>
-    <li><a href="#"
-       tal:attributes="href python:request.indexargs_url('issue', {
-      '@sort': '-activity',
-      '@group': 'priority',
-      '@filter': 'status,assignee',
-      '@columns': columns,
-      '@search_text': '',
-      'status': status_notresolved,
-      'assignee': '-1',
-      '@dispname': i18n.gettext('Show Unassigned'),
-      '@startwith': 0,
-     })"
-       i18n:translate="">Show Unassigned</a></li>
-        <li>
-         <a href="issue?@template=search&status=1" i18n:translate="">Search</a>
-        </li>
-        <li>
-         <form method="post" action="#">
-          <input type="submit" class="form-small" value="Show issue:"
-                 i18n:attributes="value"/>
-          <input class="form-small" size="4"
-                 type="text" name="@number"/>
-          <input type="hidden" name="@type" value="issue"/>
-          <input type="hidden" name="@action" value="show"/>
-         </form>
-        </li>
-       </ul>
-     </li>
-     <li tal:condition="python:request.user.username=='anonymous'">
-      <b i18n:translate="">User</b>
-      <form method="post" action="#">
-       <ul class="level-three">
-      <li>
-       <tal:span i18n:translate="">Login</tal:span><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 class="form-small" type="submit" value="Login" i18n:attributes="value"/><br/>
-       <input type="hidden" name="__came_from" tal:attributes="value string:${request/env/PATH_INFO}"/>
-       <span tal:replace="structure request/indexargs_form" />
-       </li>
-       <li>
-       <a href="user?@template=register"
-          tal:condition="python:request.user.hasPermission('Create', 'user')"
-          i18n:translate="">Register</a>
-	</li>
-       <li><a href="user?@template=forgotten" i18n:translate="">Lost&nbsp;your&nbsp;login?</a>
-       </li>
-       </ul>
-      </form>
-     </li>
-     <li tal:condition="python:request.user.username != 'anonymous'">
-   <b i18n:translate="">Hello, <span i18n:name="user"
-    tal:replace="request/user/username">username</span></b><br/>
-    <ul class="level-three">
-    <li>
-    <a href="#"
-       tal:attributes="href python:request.indexargs_url('issue', {
-      '@sort': '-activity',
-      '@group': 'priority',
-      '@filter': 'status,assignee',
-      '@columns': 'id,activity,title,creator,status',
-      '@search_text': '',
-      'status': status_notresolved,
-      'assignee': request.user.id,
-      '@dispname': i18n.gettext('Your Issues'),
-      '@startwith': 0,
-     })"
-    i18n:translate="">Your Issues</a>
-    </li>
-    <li>
-       <a tal:attributes="href string:user${request/user/id}"
-          i18n:translate="">Your Details</a>
-    </li>
-    <li>
-       <a tal:attributes="href python:request.indexargs_url('',
-          {'@action':'logout'})" i18n:translate="">Logout</a>
-    </li>
-    </ul>
-    </li>
-     <li class=""
-         tal:condition="python:request.user.hasPermission('View', 'query')">
-   <span i18n:translate=""><b>Your Queries</b> (<a class="nomargin" href="query?@template=edit">edit</a>)</span><br/>
-   <ul class="level-three" tal:repeat="qs request/user/queries">
-    <li><a tal:attributes="href string:${qs/klass}?${qs/url}&@dispname=${qs/name}"
-       tal:content="qs/name">link</a></li>
-   </ul>
-     </li>
-     <li class=""
-         tal:condition="python:request.user.hasPermission('View', 'user')">
-   <b i18n:translate="">Administration</b>
-   <ul class="level-three">
-   <li tal:condition="python:request.user.hasPermission('Edit', None)">
-    <a href="home?@template=classlist" i18n:translate="">Class List</a>
-   </li>
-   <li tal:condition="python:request.user.hasPermission('View', 'user')
-                            or request.user.hasPermission('Edit', 'user')">
-    <a href="user?@sort=username"  i18n:translate="">User List</a>
-   </li>
-   <li tal:condition="python:request.user.hasPermission('Create', 'user')"><a href="user?@template=item" i18n:translate="">Add User</a>
-   </li>
-   <li tal:condition="python:request.user.hasPermission('Edit',
- 'keyword')"><a href="keyword" i18n:translate="">Edit Keywords</a>
-   </li>
-   <li tal:condition="python:request.user.hasPermission('SB: May Classify',None)"><a href="msg?@sort=-spambayes_score">View Spam</a>
-   </li>
-   </ul>
-     </li>
-     <li class="">
-   <b i18n:translate="">Help</b><br/>
-   <a href="http://wiki.python.org/moin/TrackerDocs/"
-    i18n:translate="">Tracker Documentation</a>
-
-   <a href="http://psf.upfronthosting.co.za/roundup/meta">Report
-     Tracker Problem</a><br/>
-     </li>
-
-    </ul>
-   </li>
-  </ul>
- </div> <!-- menu -->
-</div> <!-- left-hand-navigation -->
-
-<div id="content-body">
-<div id="body-main">
-<div id="content">
-<div id="breadcrumb"><span metal:define-slot="body_title">body title</span></div>
- <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>
- <tal:block metal:define-slot="content">Page content goes here</tal:block>
-</div> <!-- content-body -->
-<div id="footer">
-<div id="credits">
-<a href="http://www.python.org/about/website">Website maintained by the Python community</a><br />
-
-<a href="http://www.upfrontsystems.co.za/" title="issue tracker hosting provided by Upfront Systems, South Africa">hosting by Upfront Systems</a> / 
-  <a href="http://roundup.sf.net" title="Powered by the Roundup Issue Tracker">powered by Roundup</a>
-</div> <!-- credits -->
-Copyright &copy; 1990-2006, <a href="http://python.org/psf">Python Software Foundation</a><br />
-<a href="http://python.org/about/legal">Legal Statements</a>
-</div> <!-- footer -->
-</div> <!-- body-main -->
-</div> <!-- content -->
-
-<pre tal:condition="request/form/deissue | nothing" tal:content="request">
-</pre>
-
-</body>
-</html>
+      <div id="main">
+        <div id="menu">
+          <div class="menupage">
+            <div class="menupagetitle">About</div>
+            <div class="menupageitem">
+              <a href="../Project/index.html">Welcome</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/license.html">License</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/installation.html">
+              Installation</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/userfaq.html">FAQ</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/news.html">News</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/history.html">History</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/download.html">Download</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/userguide.html">User Guide</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Jython21.html">Old Website</a>
+            </div>
+            <div class="menupagetitle">Community</div>
+            <div class="menupageitem">
+              <a href="http://wiki.python.org/jython/">Wiki</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/bugs.html">Reporting Bugs</a>
+            </div>
+            <div class="menupageitem">
+              <a href="http://sourceforge.net/mail/?group_id=12867">
+              Mailing Lists</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/devfaq.html">Developer FAQ</a>
+            </div>
+            <div class="menupageitem">
+              <a href="http://wiki.python.org/jython/JythonDeveloperGuide">
+              Developer Guide</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/roadmap.html">Jython Roadmap</a>
+            </div>
+            <div class="menupageitem">
+              <a href="../Project/contributors.html">
+              Contributors</a>
+            </div>
+            <div class="menupagetitle"></div>
+            <div style="height:1em"></div>
+            <div class="menupageitem">
+              <a target="_blank" href="http://www.python.org">
+                <img src="../css/PythonPoweredSmall.gif" />
+              </a>
+            </div>
+            <div style="height:1em"></div>
+            <div class="menupageitem">
+              <a target="_blank" href="http://sourceforge.net">
+                <img src="http://sourceforge.net/sflogo.php?group_id=12867" />
+              </a>
+            </div>
+            <div class="menupage">
+              <div class="menupagetitle">Issue Tracker</div>
+              <tal:replace tal:condition="python:request.user.hasPermission('View', 'issue')">
+
+                <div class="menupageitemgroup" i18n:translate="">Issues</div>
+                <div class="menupageitem"
+                tal:condition="python:request.user.hasPermission('Create', 'issue')">
+
+                  <a href="issue?@template=item" i18n:translate="">
+                  Create New</a>
+                </div>
+              </tal:replace>
+              <div class="menupageitem">
+                <a href="#"
+                tal:attributes="href python:request.indexargs_url('issue', { '@sort': '-activity', '@group': 'priority', '@filter': 'status', '@columns': columns_showall, '@search_text': '', 'status': status_notresolved, '@dispname': i18n.gettext('Show All'), '@startwith': 0, })"
+                i18n:translate="">Show Open</a>
+              </div>
+              <div class="menupageitem">
+                <a href="#"
+                tal:attributes="href python:request.indexargs_url('issue', { '@sort': '-activity', '@group': 'priority', '@filter': 'status,assignee', '@columns': columns, '@search_text': '', 'status': status_notresolved, 'assignee': '-1', '@dispname': i18n.gettext('Show Unassigned'), '@startwith': 0, })"
+                i18n:translate="">Show Unassigned</a>
+              </div>
+              <div class="menupageitem">
+                <a href="issue?@template=search&amp;status=1"
+                i18n:translate="">Search</a>
+              </div>
+              <div class="menupageitem">
+                <form method="post" action="#">
+                  <input type="submit" class="form-small"
+                  value="Show issue:" i18n:attributes="value" />
+                  <input class="form-small" size="4" type="text"
+                  name="@number" />
+                  <input type="hidden" name="@type"
+                  value="issue" />
+                  <input type="hidden" name="@action"
+                  value="show" />
+                </form>
+              </div>
+              <tal:replace
+              tal:condition="python:request.user.username=='anonymous'">
+
+                <div class="menupageitemgroup" i18n:translate="">User</div>
+                <div class="menupageitem">
+                  <form method="post" action="#">
+                    <!--li-->
+                    <tal:span i18n:translate="">Login</tal:span>
+                    <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 class="form-small" type="submit"
+                    value="Login" i18n:attributes="value" />
+                    <br />
+                    <input type="hidden" name="__came_from"
+                    tal:attributes="value string:${request/env/PATH_INFO}" />
+                    <span tal:replace="structure request/indexargs_form" />
+                    <!--/li>
+                      <li-->
+                    <a href="user?@template=register"
+                    tal:condition="python:request.user.hasPermission('Create', 'user')"
+                    i18n:translate="">Register</a>
+                    <!--/li>
+                      <li-->
+                    <a href="user?@template=forgotten"
+                    i18n:translate="">
+                    Lost&#160;your&#160;login?</a>
+                    <!--/li-->
+                    <!--/ul-->
+                  </form>
+                </div>
+              </tal:replace>
+              <tal:replace
+              tal:condition="python:request.user.username != 'anonymous'">
+
+                <div class="menupageitemgroup" i18n:translate="">Hello, 
+                <span i18n:name="user"
+                tal:replace="request/user/username">
+                username</span></div>
+                  <div class="menupageitem">
+                    <a href="#"
+                    tal:attributes="href python:request.indexargs_url('issue', { '@sort': '-activity', '@group': 'priority', '@filter': 'status,assignee', '@columns': 'id,activity,title,creator,status', '@search_text': '', 'status': status_notresolved, 'assignee': request.user.id, '@dispname': i18n.gettext('Your Issues'), '@startwith': 0, })"
+                    i18n:translate="">Your Issues</a>
+                  </div>
+                  <div class="menupageitem">
+                    <a tal:attributes="href string:user${request/user/id}"
+                    i18n:translate="">Your Details</a>
+                  </div>
+                  <div class="menupageitem">
+                    <a tal:attributes="href python:request.indexargs_url('', {'@action':'logout'})"
+                    i18n:translate="">Logout</a>
+                  </div>
+              </tal:replace>
+              <tal:replace
+              tal:condition="python:request.user.hasPermission('View', 'query')">
+
+                <div class="menupageitemgroup">Your Queries 
+                     (<a href="query?@template=edit">edit</a>)</div>
+                <div class="menupageitem"
+                tal:repeat="qs request/user/queries">
+                    <a tal:attributes="href string:${qs/klass}?${qs/url}&amp;@dispname=${qs/name}"
+                    tal:content="qs/name">link</a>
+                </div>
+              </tal:replace>
+              <tal:replace tal:condition="python:request.user.hasPermission('View', 'user')">
+
+                <div class="menupageitemgroup" i18n:translate="">Administration</div>
+                <div class="menupageitem" tal:condition="python:request.user.hasPermission('Edit', None)">
+
+                    <a href="home?@template=classlist"
+                    i18n:translate="">Class List</a>
+                </div>
+                <div class="menupageitem"  tal:condition="python:request.user.hasPermission('View', 'user') or request.user.hasPermission('Edit', 'user')">
+
+                    <a href="user?@sort=username"
+                    i18n:translate="">User List</a>
+                </div>
+                <div class="menupageitem"  tal:condition="python:request.user.hasPermission('Create', 'user')">
+
+                    <a href="user?@template=item"
+                    i18n:translate="">Add User</a>
+                </div>
+                <div class="menupageitem" tal:condition="python:request.user.hasPermission('Edit', 'keyword')">
+
+                  <a href="keyword" i18n:translate="">Edit Keywords</a>
+                </div>
+                <div class="menupageitem" tal:condition="python:request.user.hasPermission('SB: May Classify',None)">
+
+                    <a href="msg?@sort=-spambayes_score">View
+                    Spam</a>
+                </div>
+              </tal:replace>
+              <div class="menupageitemgroup" i18n:translate="">Help</div>
+              <div class="menupageitem"><a href="http://wiki.python.org/moin/TrackerDocs/"
+                i18n:translate="">Tracker Documentation</a></div>
+              <div class="menupageitem"><a href="http://psf.upfronthosting.co.za/roundup/meta">
+                Report Tracker Problem</a></div>
+            </div>
+            <!-- menupage -->
+          </div>
+          <!-- menu -->
+        </div>
+      </div>
+      <div id="content">
+            <h1 id="title">
+              <span  metal:define-slot="body_title">body title</span>
+            </h1>
+            <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 &lt;br/ &gt;" />
+              <a class="form-small"
+              tal:attributes="href request/current_url"
+              i18n:translate="">clear this message</a>
+            </p>
+            <tal:block metal:define-slot="content">Page content
+            goes here</tal:block>
+          <!-- content-body -->
+          <div class="footer">
+          <a href="http://www.upfrontsystems.co.za/"
+          title="issue tracker hosting provided by Upfront Systems, South Africa">
+          hosting by Upfront Systems</a>/ 
+          <a href="http://roundup.sf.net"
+          title="Powered by the Roundup Issue Tracker">powered by
+          Roundup</a>
+          <!-- footer -->
+        </div>
+      <!-- content -->
+      <pre tal:condition="request/form/deissue | nothing"
+      tal:content="request"></pre>
+    </body>
+  </html>
 </tal:block>
-
 <!--
 The following macros are intended to be used in search pages.
 
@@ -251,125 +325,106 @@
 
 See issue.search.html in the classic template for examples.
 -->
-
 <!-- creates a th and a label: -->
 <th metal:define-macro="th_label"
-    tal:define="required required | python:[]"
-    tal:attributes="class python:(name in required) and 'required' or nothing">
-  <label tal:attributes="for name" tal:content="label" i18n:translate="">text</label>
-	<metal:x define-slot="behind_the_label" />
-</th>
+tal:define="required required | python:[]"
+tal:attributes="class python:(name in required) and 'required' or nothing">
 
+  <label tal:attributes="for name" tal:content="label"
+  i18n:translate="">text</label>
+  <metal:x define-slot="behind_the_label" />
+</th>
 <td metal:define-macro="search_input">
-  <input tal:attributes="value python:request.form.getvalue(name) or nothing;
-                         name name;
-                         id name"/>
+  <input tal:attributes="value python:request.form.getvalue(name) or nothing; name name; id name" />
 </td>
-
 <td metal:define-macro="search_date">
-  <input tal:attributes="value python:request.form.getvalue(name) or nothing;
-                         name name;
-                         id name"/>
+  <input tal:attributes="value python:request.form.getvalue(name) or nothing; name name; id name" />
   <a class="classhelp"
-	 tal:attributes="href python:'''javascript:help_window('issue?@template=calendar&property=%s&form=itemSynopsis', 300, 200)'''%name">(cal)</a>
+  tal:attributes="href python:'''javascript:help_window('issue?@template=calendar&amp;property=%s&amp;form=itemSynopsis', 300, 200)'''%name">
+  (cal)</a>
 </td>
-
 <td metal:define-macro="search_popup">
   <!--
     context needs to specify the popup "columns" as a comma-separated
     string (eg. "id,title" or "id,name,description") as well as name
   -->
-  <input tal:attributes="value python:request.form.getvalue(name) or nothing;
-                         name name;
-                         id name"/>
-  <span tal:replace="structure python:db.issue.classhelp(columns,
-                                      property=name)" />
+  <input tal:attributes="value python:request.form.getvalue(name) or nothing; name name; id name" />
+  <span tal:replace="structure python:db.issue.classhelp(columns, property=name)" />
 </td>
-
 <td metal:define-macro="search_select">
   <select tal:attributes="name name; id name"
-          tal:define="value python:request.form.getvalue(name)">
+  tal:define="value python:request.form.getvalue(name)">
     <option value="" i18n:translate="">don't care</option>
     <metal:slot define-slot="extra_options" />
-    <option value="" i18n:translate="" disabled="disabled">------------</option>
+    <option value="" i18n:translate="" disabled="disabled">
+    ------------</option>
     <option tal:repeat="s python:db[db_klass].list()"
-            tal:attributes="value s/id; selected python:value == s.id"
-            tal:content="python:s[db_content]"></option>
+    tal:attributes="value s/id; selected python:value == s.id"
+    tal:content="python:s[db_content]"></option>
   </select>
 </td>
-
 <!-- like search_select, but translates the further values.
 Could extend it (METAL 1.1 attribute "extend-macro")
 -->
 <td metal:define-macro="search_select_translated">
   <select tal:attributes="name name; id name"
-          tal:define="value python:request.form.getvalue(name)">
+  tal:define="value python:request.form.getvalue(name)">
     <option value="" i18n:translate="">don't care</option>
     <metal:slot define-slot="extra_options" />
-    <option value="" i18n:translate="" disabled="disabled">------------</option>
+    <option value="" i18n:translate="" disabled="disabled">
+    ------------</option>
     <option tal:repeat="s python:db[db_klass].list()"
-            tal:attributes="value s/id; selected python:value == s.id"
-						tal:content="python:s[db_content]"
-						i18n:translate=""></option>
+    tal:attributes="value s/id; selected python:value == s.id"
+    tal:content="python:s[db_content]" i18n:translate=""></option>
   </select>
 </td>
-
 <!-- currently, there is no convenient API to get a list of all roles -->
 <td metal:define-macro="search_select_roles"
-	  tal:define="onchange onchange | nothing">
-  <select name=roles id=roles tal:attributes="onchange onchange">
+tal:define="onchange onchange | nothing">
+  <select name="roles" id="roles"
+  tal:attributes="onchange onchange">
     <option value="" i18n:translate="">don't care</option>
-    <option value="" i18n:translate="" disabled="disabled">------------</option>
+    <option value="" i18n:translate="" disabled="disabled">
+    ------------</option>
     <option value="User">User</option>
     <option value="Developer">Developer</option>
     <option value="Coordinator">Coordinator</option>
   </select>
 </td>
-
 <td metal:define-macro="search_multiselect">
-  <input tal:attributes="value python:request.form.getvalue(name) or nothing;
-                         name name;
-                         id name"/>
-  <span tal:replace="structure python:db[db_klass].classhelp(db_content,
-                                        property=name, width='600')" />
+  <input tal:attributes="value python:request.form.getvalue(name) or nothing; name name; id name" />
+  <span tal:replace="structure python:db[db_klass].classhelp(db_content, property=name, width='600')" />
 </td>
-
 <td metal:define-macro="search_checkboxes">
- <ul class="search-checkboxes"
-     tal:define="value python:request.form.getvalue(name);
-                 values python:value and value.split(',') or []">
- <li tal:repeat="s python:db[db_klass].list()">
-  <input type="checkbox" tal:attributes="name name; id string:$name-${s/id};
-    value s/id; checked python:s.id in values" />
-  <label tal:attributes="for string:$name-${s/id}"
-         tal:content="python:s[db_content]" />
- </li>
- <li metal:define-slot="no_value_item">
-  <input type="checkbox" value="-1" tal:attributes="name name;
-     id string:$name--1; checked python:value == '-1'" />
-  <label tal:attributes="for string:$name--1" i18n:translate="">no value</label>
- </li>
- </ul>
-</td>
+  <ul class="search-checkboxes"
+  tal:define="value python:request.form.getvalue(name); values python:value and value.split(',') or []">
 
+    <li tal:repeat="s python:db[db_klass].list()">
+      <input type="checkbox"
+      tal:attributes="name name; id string:$name-${s/id}; value s/id; checked python:s.id in values" />
+      <label tal:attributes="for string:$name-${s/id}"
+      tal:content="python:s[db_content]" />
+    </li>
+    <li metal:define-slot="no_value_item">
+      <input type="checkbox" value="-1"
+      tal:attributes="name name; id string:$name--1; checked python:value == '-1'" />
+      <label tal:attributes="for string:$name--1"
+      i18n:translate="">no value</label>
+    </li>
+  </ul>
+</td>
 <td metal:define-macro="column_input">
   <input type="checkbox" name="@columns"
-         tal:attributes="value name;
-                         checked python:name in cols"/>
+  tal:attributes="value name; checked python:name in cols" />
 </td>
-
 <td metal:define-macro="sort_input">
   <input type="radio" name="@sort"
-         tal:attributes="value name;
-                         checked python:name == sort_on"/>
+  tal:attributes="value name; checked python:name == sort_on" />
 </td>
-
 <td metal:define-macro="group_input">
   <input type="radio" name="@group"
-         tal:attributes="value name;
-                         checked python:name == group_on"/>
+  tal:attributes="value name; checked python:name == group_on" />
 </td>
-
 <!--
 The following macros are intended for user editing.
 
@@ -379,20 +434,20 @@
 
 See user.item.html in the classic template for examples.
 -->
-<script metal:define-macro="user_utils" type="text/javascript" src="@@file/user_utils.js"></script>
-
+<script metal:define-macro="user_utils" type="text/javascript"
+src="@@file/user_utils.js"></script>
 <!-- src: value will be re-used for other input fields -->
-<input metal:define-macro="user_src_input"
-    type="text" tal:attributes="onblur python:edit_ok and 'split_name(this)';
-    id name; name name; value value; readonly not:edit_ok"
-    value="heinz.kunz"/>
+<input metal:define-macro="user_src_input" type="text"
+tal:attributes="onblur python:edit_ok and 'split_name(this)'; id name; name name; value value; readonly not:edit_ok"
+value="heinz.kunz" />
 <!-- normal: no re-using -->
 <input metal:define-macro="user_normal_input" type="text"
-    tal:attributes="id name; name name; value value; readonly not:edit_ok"
-    value="heinz"/>
+tal:attributes="id name; name name; value value; readonly not:edit_ok"
+value="heinz" />
 <!-- password: type; no initial value -->
-    <input metal:define-macro="user_pw_input" type="password"
-    tal:attributes="id name; name name; readonly not:edit_ok" value=""/>
-    <input metal:define-macro="user_confirm_input" type="password"
-    tal:attributes="id name; name string:@confirm@$name; readonly not:edit_ok" value=""/>
-
+<input metal:define-macro="user_pw_input" type="password"
+tal:attributes="id name; name name; readonly not:edit_ok"
+value="" />
+<input metal:define-macro="user_confirm_input" type="password"
+tal:attributes="id name; name string:@confirm@$name; readonly not:edit_ok"
+value="" />


More information about the Python-checkins mailing list