Mercurial > p > roundup > code

changeset 4716:fa03ae7ac570

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- 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)
author Pradip Caulagi <caulagi@gmail.com>
date Fri, 28 Dec 2012 10:54:42 +0530
parents 324cbd9f7d0e
children 9dc50be521ee
files share/roundup/templates/responsive/html/bug.index.html share/roundup/templates/responsive/html/page.html share/roundup/templates/responsive/html/task.index.html share/roundup/templates/responsive/html/task.search.html
diffstat 4 files changed, 3 insertions(+), 65 deletions(-) [+]
line wrap: on
line diff
--- a/share/roundup/templates/responsive/html/bug.index.html	Fri Dec 28 01:06:37 2012 +0100
+++ b/share/roundup/templates/responsive/html/bug.index.html	Fri Dec 28 10:54:42 2012 +0530
@@ -25,7 +25,6 @@
   <tr>
    <th tal:condition="request/show/severity" i18n:translate="">Severity</th>
    <th tal:condition="request/show/id" i18n:translate="">ID</th>
-   <th tal:condition="request/show/creation" i18n:translate="">Creation</th>
    <th tal:condition="request/show/activity" i18n:translate="">Activity</th>
    <th tal:condition="request/show/actor" i18n:translate="">Actor</th>
    <th tal:condition="request/show/title" i18n:translate="">Title</th>
@@ -35,8 +34,6 @@
    <th tal:condition="request/show/resolution" i18n:translate="">Resolution</th>
    <th tal:condition="request/show/creator" i18n:translate="">Creator</th>
    <th tal:condition="request/show/assignee" i18n:translate="">Assigned&nbsp;To</th>
-   <th tal:condition="request/show/keywords" i18n:translate="">Keywords</th>
-   <th tal:condition="request/show/dependencies" i18n:translate="">Depends On</th>
    <th tal:condition="request/show/type" i18n:translate="">Type</th>
   </tr>
  <tal:block tal:repeat="i batch" condition="true">
@@ -53,8 +50,6 @@
    <td tal:condition="request/show/severity"
        tal:content="python:i.severity.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/id" tal:content="i/id">&nbsp;</td>
-   <td class="date" tal:condition="request/show/creation"
-       tal:content="i/creation/reldate">&nbsp;</td>
    <td class="date" tal:condition="request/show/activity"
        tal:content="i/activity/reldate">&nbsp;</td>
    <td tal:condition="request/show/actor"
@@ -75,10 +70,6 @@
        tal:content="python:i.creator.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/assignee"
        tal:content="python:i.assignee.plain() or default">&nbsp;</td>
-   <td tal:condition="request/show/keywords"
-       tal:content="python:i.keywords.plain() or default">&nbsp;</td>
-   <td tal:condition="request/show/dependencies"
-       tal:content="python:i.dependencies.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/type"
        tal:content="python:i.type.plain() or default">&nbsp;</td>
   </tr>
--- a/share/roundup/templates/responsive/html/page.html	Fri Dec 28 01:06:37 2012 +0100
+++ b/share/roundup/templates/responsive/html/page.html	Fri Dec 28 10:54:42 2012 +0530
@@ -58,7 +58,8 @@
       <div class="span3 well">
         <ul tal:condition="python:request.user.hasPermission('View', 'bug')" class='nav nav-list'>
           <li class='nav-header'><i class='icon-fire'></i>Bugs</li>
-          <li><a href="/" i18n:translate="">Bugs</a></li>
+          <li><a href="bug" i18n:translate="">Bugs</a>
+          </li>
           <li tal:condition="python:request.user.hasPermission('Create', 'bug')">
             <a href="bug?@template=item" i18n:translate="">Create New</a>
           </li>
@@ -105,7 +106,7 @@
         <hr>
         <ul tal:condition="python:request.user.hasPermission('View', 'task')" class='nav nav-list'>
           <li class="nav-header"><i class='icon-briefcase'></i>Tasks</li>
-          <li><a href="/" i18n:translate="">Tasks</a></li>
+          <li><a href="task" i18n:translate="">Tasks</a></li>
           <li tal:condition="python:request.user.hasPermission('Create', 'task')">
             <a href="task?@template=item" i18n:translate="">Create New</a>
           </li>
--- a/share/roundup/templates/responsive/html/task.index.html	Fri Dec 28 01:06:37 2012 +0100
+++ b/share/roundup/templates/responsive/html/task.index.html	Fri Dec 28 10:54:42 2012 +0530
@@ -23,20 +23,15 @@
 <tal:block tal:define="batch request/batch" tal:condition="context/is_view_ok">
  <table class="table">
   <tr>
-   <th tal:condition="request/show/severity" i18n:translate="">Severity</th>
    <th tal:condition="request/show/id" i18n:translate="">ID</th>
    <th tal:condition="request/show/creation" i18n:translate="">Creation</th>
    <th tal:condition="request/show/activity" i18n:translate="">Activity</th>
    <th tal:condition="request/show/actor" i18n:translate="">Actor</th>
    <th tal:condition="request/show/title" i18n:translate="">Title</th>
    <th tal:condition="request/show/components"  i18n:translate="">Components</th>
-   <th tal:condition="request/show/versions" i18n:translate="">Versions</th>
    <th tal:condition="request/show/status"    i18n:translate="">Status</th>
    <th tal:condition="request/show/resolution" i18n:translate="">Resolution</th>
-   <th tal:condition="request/show/creator" i18n:translate="">Creator</th>
    <th tal:condition="request/show/assignee" i18n:translate="">Assigned&nbsp;To</th>
-   <th tal:condition="request/show/keywords" i18n:translate="">Keywords</th>
-   <th tal:condition="request/show/dependencies" i18n:translate="">Depends On</th>
    <th tal:condition="request/show/type" i18n:translate="">Type</th>
   </tr>
  <tal:block tal:repeat="i batch" condition="true">
@@ -50,8 +45,6 @@
   </tr>
 
   <tr tal:attributes="class python:['even','odd'][repeat['i'].even()]">
-   <td tal:condition="request/show/severity"
-       tal:content="python:i.severity.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/id" tal:content="i/id">&nbsp;</td>
    <td class="date" tal:condition="request/show/creation"
        tal:content="i/creation/reldate">&nbsp;</td>
@@ -65,20 +58,12 @@
    </td>
    <td tal:condition="request/show/components"
        tal:content="python:i.components.plain() or default">&nbsp;</td>
-   <td tal:condition="request/show/versions"
-       tal:content="python:i.versions.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/status"
        tal:content="python:i.status.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/resolution"
        tal:content="python:i.resolution.plain() or default">&nbsp;</td>
-   <td tal:condition="request/show/creator"
-       tal:content="python:i.creator.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/assignee"
        tal:content="python:i.assignee.plain() or default">&nbsp;</td>
-   <td tal:condition="request/show/keywords"
-       tal:content="python:i.keywords.plain() or default">&nbsp;</td>
-   <td tal:condition="request/show/dependencies"
-       tal:content="python:i.dependencies.plain() or default">&nbsp;</td>
    <td tal:condition="request/show/type"
        tal:content="python:i.type.plain() or default">&nbsp;</td>
   </tr>
--- a/share/roundup/templates/responsive/html/task.search.html	Fri Dec 28 01:06:37 2012 +0100
+++ b/share/roundup/templates/responsive/html/task.search.html	Fri Dec 28 10:54:42 2012 +0530
@@ -135,32 +135,6 @@
   <td metal:use-macro="group_input"></td>
 </tr>
 
-<tr tal:define="name string:versions;
-                db_klass string:version;
-                db_content string:name;">
-  <th i18n:translate="">Versions:</th>
-  <td metal:use-macro="search_select_translated">
-    <option metal:fill-slot="extra_options" value="-1" i18n:translate=""
-            tal:attributes="selected python:value == '-1'">not selected</option>
-  </td>
-  <td metal:use-macro="column_input"></td>
-  <td metal:use-macro="sort_input"></td>
-  <td metal:use-macro="group_input"></td>
-</tr>
-
-<!--tr tal:define="name string:severity;
-                db_klass string:severity;
-                db_content string:name;">
-  <th i18n:translate="">Severity:</th>
-  <td metal:use-macro="search_select_translated">
-    <option metal:fill-slot="extra_options" value="-1" i18n:translate=""
-            tal:attributes="selected python:value == '-1'">not selected</option>
-  </td>
-  <td metal:use-macro="column_input"></td>
-  <td metal:use-macro="sort_input"></td>
-  <td metal:use-macro="group_input"></td>
-</tr-->
-
 <tr tal:define="name string:dependencies;
                 db_klass string:task;
                 db_content string:id;">
@@ -188,19 +162,6 @@
   <td metal:use-macro="group_input"></td>
 </tr>
 
-<tr tal:define="name string:keywords;
-                db_klass string:keyword;
-                db_content string:name;">
-  <th i18n:translate="">Keyword:</th>
-  <td metal:use-macro="search_select_keywords">
-    <option metal:fill-slot="extra_options" value="-1" i18n:translate=""
-            tal:attributes="selected python:value == '-1'">not set</option>
-  </td>
-  <td metal:use-macro="column_input"></td>
-  <td metal:use-macro="sort_input"></td>
-  <td metal:use-macro="group_input"></td>
-</tr>
-
 <tr tal:define="name string:priority;
                 db_klass string:priority;
                 db_content string:name;">
Roundup Issue Tracker: http://roundup-tracker.org/