Skip to content

Commit bb936f6

Browse files
caulagicaulagi
committed
- Clicking on bug/task should go to respective index page
- Clean up the index page for bug and task - Clean up search page for task (no keyword and severity)
1 parent 5518905 commit bb936f6

File tree

4 files changed

+3
-65
lines changed

4 files changed

+3
-65
lines changed

‎share/roundup/templates/responsive/html/bug.index.html‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<tr>
2626
<th tal:condition="request/show/severity" i18n:translate="">Severity</th>
2727
<th tal:condition="request/show/id" i18n:translate="">ID</th>
28-
<th tal:condition="request/show/creation" i18n:translate="">Creation</th>
2928
<th tal:condition="request/show/activity" i18n:translate="">Activity</th>
3029
<th tal:condition="request/show/actor" i18n:translate="">Actor</th>
3130
<th tal:condition="request/show/title" i18n:translate="">Title</th>
@@ -35,8 +34,6 @@
3534
<th tal:condition="request/show/resolution" i18n:translate="">Resolution</th>
3635
<th tal:condition="request/show/creator" i18n:translate="">Creator</th>
3736
<th tal:condition="request/show/assignee" i18n:translate="">Assigned&nbsp;To</th>
38-
<th tal:condition="request/show/keywords" i18n:translate="">Keywords</th>
39-
<th tal:condition="request/show/dependencies" i18n:translate="">Depends On</th>
4037
<th tal:condition="request/show/type" i18n:translate="">Type</th>
4138
</tr>
4239
<tal:block tal:repeat="i batch" condition="true">
@@ -53,8 +50,6 @@
5350
<td tal:condition="request/show/severity"
5451
tal:content="python:i.severity.plain() or default">&nbsp;</td>
5552
<td tal:condition="request/show/id" tal:content="i/id">&nbsp;</td>
56-
<td class="date" tal:condition="request/show/creation"
57-
tal:content="i/creation/reldate">&nbsp;</td>
5853
<td class="date" tal:condition="request/show/activity"
5954
tal:content="i/activity/reldate">&nbsp;</td>
6055
<td tal:condition="request/show/actor"
@@ -75,10 +70,6 @@
7570
tal:content="python:i.creator.plain() or default">&nbsp;</td>
7671
<td tal:condition="request/show/assignee"
7772
tal:content="python:i.assignee.plain() or default">&nbsp;</td>
78-
<td tal:condition="request/show/keywords"
79-
tal:content="python:i.keywords.plain() or default">&nbsp;</td>
80-
<td tal:condition="request/show/dependencies"
81-
tal:content="python:i.dependencies.plain() or default">&nbsp;</td>
8273
<td tal:condition="request/show/type"
8374
tal:content="python:i.type.plain() or default">&nbsp;</td>
8475
</tr>

‎share/roundup/templates/responsive/html/page.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@
5858
<div class="span3 well">
5959
<ul tal:condition="python:request.user.hasPermission('View', 'bug')" class='nav nav-list'>
6060
<li class='nav-header'><i class='icon-fire'></i>Bugs</li>
61-
<li><a href="/" i18n:translate="">Bugs</a></li>
61+
<li><a href="bug" i18n:translate="">Bugs</a>
62+
</li>
6263
<li tal:condition="python:request.user.hasPermission('Create', 'bug')">
6364
<a href="bug?@template=item" i18n:translate="">Create New</a>
6465
</li>
@@ -105,7 +106,7 @@
105106
<hr>
106107
<ul tal:condition="python:request.user.hasPermission('View', 'task')" class='nav nav-list'>
107108
<li class="nav-header"><i class='icon-briefcase'></i>Tasks</li>
108-
<li><a href="/" i18n:translate="">Tasks</a></li>
109+
<li><a href="task" i18n:translate="">Tasks</a></li>
109110
<li tal:condition="python:request.user.hasPermission('Create', 'task')">
110111
<a href="task?@template=item" i18n:translate="">Create New</a>
111112
</li>

‎share/roundup/templates/responsive/html/task.index.html‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,15 @@
2323
<tal:block tal:define="batch request/batch" tal:condition="context/is_view_ok">
2424
<table class="table">
2525
<tr>
26-
<th tal:condition="request/show/severity" i18n:translate="">Severity</th>
2726
<th tal:condition="request/show/id" i18n:translate="">ID</th>
2827
<th tal:condition="request/show/creation" i18n:translate="">Creation</th>
2928
<th tal:condition="request/show/activity" i18n:translate="">Activity</th>
3029
<th tal:condition="request/show/actor" i18n:translate="">Actor</th>
3130
<th tal:condition="request/show/title" i18n:translate="">Title</th>
3231
<th tal:condition="request/show/components" i18n:translate="">Components</th>
33-
<th tal:condition="request/show/versions" i18n:translate="">Versions</th>
3432
<th tal:condition="request/show/status" i18n:translate="">Status</th>
3533
<th tal:condition="request/show/resolution" i18n:translate="">Resolution</th>
36-
<th tal:condition="request/show/creator" i18n:translate="">Creator</th>
3734
<th tal:condition="request/show/assignee" i18n:translate="">Assigned&nbsp;To</th>
38-
<th tal:condition="request/show/keywords" i18n:translate="">Keywords</th>
39-
<th tal:condition="request/show/dependencies" i18n:translate="">Depends On</th>
4035
<th tal:condition="request/show/type" i18n:translate="">Type</th>
4136
</tr>
4237
<tal:block tal:repeat="i batch" condition="true">
@@ -50,8 +45,6 @@
5045
</tr>
5146

5247
<tr tal:attributes="class python:['even','odd'][repeat['i'].even()]">
53-
<td tal:condition="request/show/severity"
54-
tal:content="python:i.severity.plain() or default">&nbsp;</td>
5548
<td tal:condition="request/show/id" tal:content="i/id">&nbsp;</td>
5649
<td class="date" tal:condition="request/show/creation"
5750
tal:content="i/creation/reldate">&nbsp;</td>
@@ -65,20 +58,12 @@
6558
</td>
6659
<td tal:condition="request/show/components"
6760
tal:content="python:i.components.plain() or default">&nbsp;</td>
68-
<td tal:condition="request/show/versions"
69-
tal:content="python:i.versions.plain() or default">&nbsp;</td>
7061
<td tal:condition="request/show/status"
7162
tal:content="python:i.status.plain() or default">&nbsp;</td>
7263
<td tal:condition="request/show/resolution"
7364
tal:content="python:i.resolution.plain() or default">&nbsp;</td>
74-
<td tal:condition="request/show/creator"
75-
tal:content="python:i.creator.plain() or default">&nbsp;</td>
7665
<td tal:condition="request/show/assignee"
7766
tal:content="python:i.assignee.plain() or default">&nbsp;</td>
78-
<td tal:condition="request/show/keywords"
79-
tal:content="python:i.keywords.plain() or default">&nbsp;</td>
80-
<td tal:condition="request/show/dependencies"
81-
tal:content="python:i.dependencies.plain() or default">&nbsp;</td>
8267
<td tal:condition="request/show/type"
8368
tal:content="python:i.type.plain() or default">&nbsp;</td>
8469
</tr>

‎share/roundup/templates/responsive/html/task.search.html‎

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -135,32 +135,6 @@
135135
<td metal:use-macro="group_input"></td>
136136
</tr>
137137

138-
<tr tal:define="name string:versions;
139-
db_klass string:version;
140-
db_content string:name;">
141-
<th i18n:translate="">Versions:</th>
142-
<td metal:use-macro="search_select_translated">
143-
<option metal:fill-slot="extra_options" value="-1" i18n:translate=""
144-
tal:attributes="selected python:value == '-1'">not selected</option>
145-
</td>
146-
<td metal:use-macro="column_input"></td>
147-
<td metal:use-macro="sort_input"></td>
148-
<td metal:use-macro="group_input"></td>
149-
</tr>
150-
151-
<!--tr tal:define="name string:severity;
152-
db_klass string:severity;
153-
db_content string:name;">
154-
<th i18n:translate="">Severity:</th>
155-
<td metal:use-macro="search_select_translated">
156-
<option metal:fill-slot="extra_options" value="-1" i18n:translate=""
157-
tal:attributes="selected python:value == '-1'">not selected</option>
158-
</td>
159-
<td metal:use-macro="column_input"></td>
160-
<td metal:use-macro="sort_input"></td>
161-
<td metal:use-macro="group_input"></td>
162-
</tr-->
163-
164138
<tr tal:define="name string:dependencies;
165139
db_klass string:task;
166140
db_content string:id;">
@@ -188,19 +162,6 @@
188162
<td metal:use-macro="group_input"></td>
189163
</tr>
190164

191-
<tr tal:define="name string:keywords;
192-
db_klass string:keyword;
193-
db_content string:name;">
194-
<th i18n:translate="">Keyword:</th>
195-
<td metal:use-macro="search_select_keywords">
196-
<option metal:fill-slot="extra_options" value="-1" i18n:translate=""
197-
tal:attributes="selected python:value == '-1'">not set</option>
198-
</td>
199-
<td metal:use-macro="column_input"></td>
200-
<td metal:use-macro="sort_input"></td>
201-
<td metal:use-macro="group_input"></td>
202-
</tr>
203-
204165
<tr tal:define="name string:priority;
205166
db_klass string:priority;
206167
db_content string:name;">

0 commit comments

Comments
 (0)