1.1 --- a/themes/mercurialroundup/html/page.html Sun Jun 06 16:20:14 2010 +0200
1.2 +++ b/themes/mercurialroundup/html/page.html Mon Jun 07 01:14:02 2010 +0200
1.3 @@ -4,6 +4,7 @@
1.4 <html>
1.5 <head>
1.6 <title metal:define-slot="head_title">title goes here</title>
1.7 +<link rel="stylesheet" type="text/css" href="@@file/style-mercurialweb.css">
1.8 <link rel="stylesheet" type="text/css" href="@@file/style.css">
1.9 <meta http-equiv="Content-Type"
1.10 tal:attributes="content string:text/html;; charset=${request/client/charset}" />
1.11 @@ -12,9 +13,7 @@
1.12 <metal:x define-slot="more-javascript" />
1.13
1.14 </head>
1.15 -<body class="body">
1.16 -
1.17 -<table class="body"
1.18 +<body class="body"
1.19 tal:define="
1.20 kw_edit python:request.user.hasPermission('Edit', 'keyword');
1.21 kw_create python:request.user.hasPermission('Create', 'keyword');
1.22 @@ -25,27 +24,58 @@
1.23 "
1.24 >
1.25
1.26 -<tr>
1.27 - <td class="page-header-left"> </td>
1.28 - <td class="page-header-top">
1.29 - <div id="searchbox">
1.30 - <form method="GET" action="issue">
1.31 - <input type="hidden" name="@columns"
1.32 - tal:attributes="value columns_showall"
1.33 - value="id,activity,title,creator,assignedto,status"/>
1.34 - <input type="hidden" name="@sort" value="activity"/>
1.35 - <input type="hidden" name="@group" value="priority"/>
1.36 - <input id="search-text" name="@search_text" size="10"
1.37 - tal:attributes="value request/search_text | default" />
1.38 - <input type="submit" id="submit" name="submit" value="Search"
1.39 - i18n:attributes="value" />
1.40 - </form>
1.41 - </div>
1.42 - <div id="body-title">
1.43 - <h2><span metal:define-slot="body_title">body title</span></h2>
1.44 - </div>
1.45 - </td>
1.46 -</tr>
1.47 +<div id="header">
1.48 + <div id="logo"><a href="#" tal:attributes="href request/base"><img src="@@file/mercurial-logo.png" alt="Mercurial logo" /></a></div>
1.49 + <div class="controls">
1.50 + <ul id="navibar">
1.51 + <li tal:attributes="class python:request.form.getvalue('@template') is None and 'current'" class=""
1.52 + ><a href="#" tal:attributes="href request/base">Home</a></li
1.53 + ><li tal:condition="python:request.user.hasPermission('Create', 'issue')"
1.54 + tal:attributes="class python:request.form.getvalue('@template') == 'item' and 'current'" class=""
1.55 + ><a href="issue?@template=item" i18n:translate="">New issue</a></li
1.56 + ><li tal:attributes="class python:request.form.getvalue('@template') == 'search' and 'current'" class=""
1.57 + ><a href="issue?@template=search" i18n:translate="">Search</a></li
1.58 + ><li tal:condition="python:request.user.username=='anonymous' and request.user.hasPermission('Register', 'user')"
1.59 + tal:attributes="class python:request.form.getvalue('@template') == 'register' and 'current'" class=""
1.60 + ><a href="user?@template=register" i18n:translate="">Register</a></li
1.61 + ><li tal:condition="python:request.user.username != 'anonymous'"
1.62 + i18n:translate=""><a href="user" i18n:name="user"
1.63 + tal:replace="python:request.user.username.plain(escape=1)">username</a></li
1.64 + ><li tal:condition="python:request.user.hasPermission('View', 'issue')"
1.65 + ><form method="POST" tal:attributes="action request/base"><span class="container">
1.66 + <a href="#"
1.67 + tal:attributes="href python:request.indexargs_url('issue', {
1.68 + '@sort': '-activity',
1.69 + '@group': 'priority',
1.70 + '@filter': 'status',
1.71 + '@columns': columns_showall,
1.72 + '@search_text': '',
1.73 + 'status': status_notresolved,
1.74 + '@dispname': i18n.gettext('Show All'),
1.75 + })"
1.76 + i18n:translate="">Browse</a></span
1.77 + ><input type="hidden" name="@type" value="issue"
1.78 + /><input type="hidden" name="@action" value="show"
1.79 + /></form></li
1.80 + ><li><form id="searchform" action="issue"><span class="container">
1.81 + <span class="hint" i18n:translate="">Search</span> <input name="@search_text" id="searchinput" type="text" size="20"
1.82 + tal:attributes="value request/search_text | default" />
1.83 + </span>
1.84 + <input type="hidden" name="@columns"
1.85 + tal:attributes="value columns_showall"
1.86 + value="id,activity,title,creator,assignedto,status" />
1.87 + <input type="hidden" name="@sort" value="activity" />
1.88 + <input type="hidden" name="@group" value="priority" />
1.89 + </form>
1.90 + </li>
1.91 + </ul>
1.92 + </div>
1.93 + <div id="pageline"></div>
1.94 +</div>
1.95 +
1.96 +<h2><span metal:define-slot="body_title">body title</span></h2>
1.97 +
1.98 +<table class="body">
1.99
1.100 <tr>
1.101 <td rowspan="2" valign="top" class="sidebar">
1.102 @@ -59,45 +89,6 @@
1.103 </tal:block>
1.104 </p>
1.105
1.106 - <form method="POST" tal:attributes="action request/base">
1.107 - <p class="classblock"
1.108 - tal:condition="python:request.user.hasPermission('View', 'issue')">
1.109 - <b i18n:translate="">Issues</b><br>
1.110 - <span tal:condition="python:request.user.hasPermission('Create', 'issue')">
1.111 - <a href="issue?@template=item" i18n:translate="">Create New</a><br>
1.112 - </span>
1.113 - <a href="#"
1.114 - tal:attributes="href python:request.indexargs_url('issue', {
1.115 - '@sort': '-activity',
1.116 - '@group': 'priority',
1.117 - '@filter': 'status,assignedto',
1.118 - '@columns': columns,
1.119 - '@search_text': '',
1.120 - 'status': status_notresolved,
1.121 - 'assignedto': '-1',
1.122 - '@dispname': i18n.gettext('Show Unassigned'),
1.123 - })"
1.124 - i18n:translate="">Show Unassigned</a><br>
1.125 - <a href="#"
1.126 - tal:attributes="href python:request.indexargs_url('issue', {
1.127 - '@sort': '-activity',
1.128 - '@group': 'priority',
1.129 - '@filter': 'status',
1.130 - '@columns': columns_showall,
1.131 - '@search_text': '',
1.132 - 'status': status_notresolved,
1.133 - '@dispname': i18n.gettext('Show All'),
1.134 - })"
1.135 - i18n:translate="">Show All</a><br>
1.136 - <a href="issue?@template=search" i18n:translate="">Search</a><br>
1.137 - <input type="submit" class="form-small" value="Show issue:"
1.138 - i18n:attributes="value"><input class="form-small" size="4"
1.139 - type="text" name="@number">
1.140 - <input type="hidden" name="@type" value="issue">
1.141 - <input type="hidden" name="@action" value="show">
1.142 - </p>
1.143 - </form>
1.144 -
1.145 <p class="classblock"
1.146 tal:condition="python:kw_edit or kw_create">
1.147 <b i18n:translate="">Keywords</b><br>