Mercurial > p > roundup > code

changeset 4755:d2f58accb405

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Copy layout to the html directory - Add some icons to the nav - Attempt to fix pagination - Tidy issue template
author Pradip Caulagi <caulagi@gmail.com>
date Sun, 03 Feb 2013 17:34:23 +0530
parents 4e16bcd4405e
children 0681542999ba
files setup.py share/roundup/templates/jinja2/html/issue.index.html share/roundup/templates/jinja2/html/issue.item.edit.html share/roundup/templates/jinja2/html/layout/navigation.html share/roundup/templates/jinja2/html/layout/pagination.html
diffstat 5 files changed, 81 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/setup.py	Sun Feb 03 17:29:32 2013 +0530
+++ b/setup.py	Sun Feb 03 17:34:23 2013 +0530
@@ -86,7 +86,7 @@
     templates = [t['path']
                  for t in listTemplates('share/roundup/templates').values()]
     for tdir in templates:
-        for idir in '. detectors extensions html static'.split():
+        for idir in '. detectors extensions html html/layout static'.split():
             data_files.append(include(os.path.join(tdir, idir), '*'))
 
     # add message files
--- a/share/roundup/templates/jinja2/html/issue.index.html	Sun Feb 03 17:29:32 2013 +0530
+++ b/share/roundup/templates/jinja2/html/issue.index.html	Sun Feb 03 17:34:23 2013 +0530
@@ -9,36 +9,38 @@
   {% include 'layout/permission.html' %}
 
   {% if context.is_view_ok %}
-    <table class='table'>
-      <tr class='info'>
-        <td>Priority</td>
-        <td>ID</td>
-        <td>Activity</td>
-        <td>Actor</td>
-        <td>Keyword</td>
-        <td>Title</td>
-        <td>Status</td>
-        <td>Creator</td>
-        <td>Assigned&nbsp;To</td>
-      </tr>
-      {% for issue in context.list() %}
-        <tr>
-         <td>{{ issue.priority.plain() }}</td>
-         <td>{{ issue.id }}</td>
-         <td>{{ issue.activity }}</td>
-         <td>{{ issue.actor }}</td>
-         <td>{{ issue.keyword.plain() }}</td>
-         <td>
-          <a href='issue{{ issue.id }}'>{{ issue.title.plain(hyperlink=0) }}</a>
-         </td>
-         <td>{{ issue.status.plain() }}</td>
-         <td>{{ issue.creator.plain() }}</td>
-         <td>{{ issue.assignedto.plain() }}</td>
+    {% if context.list() %}
+      <table class='table'>
+        <tr class='info'>
+          <td>Priority</td>
+          <td>ID</td>
+          <td>Activity</td>
+          <td>Actor</td>
+          <td>Keyword</td>
+          <td>Title</td>
+          <td>Status</td>
+          <td>Creator</td>
+          <td>Assigned&nbsp;To</td>
         </tr>
-      {% else %}
-        There are no issues yet.
-      {% endfor %}
-    </table>
+        {% for issue in context.list() %}
+          <tr>
+           <td>{{ issue.priority.plain() }}</td>
+           <td>{{ issue.id }}</td>
+           <td>{{ issue.activity }}</td>
+           <td>{{ issue.actor }}</td>
+           <td>{{ issue.keyword.plain() }}</td>
+           <td>
+            <a href='issue{{ issue.id }}'>{{ issue.title.plain(hyperlink=0) }}</a>
+           </td>
+           <td>{{ issue.status.plain() }}</td>
+           <td>{{ issue.creator.plain() }}</td>
+           <td>{{ issue.assignedto.plain() }}</td>
+          </tr>
+        {% endfor %}
+      </table>
+    {% else %}
+      <p class='text-error'>There are no issue yet!</p>
+    {% endif %}
   {% endif %}
 
   {% include 'layout/pagination.html' %}
--- a/share/roundup/templates/jinja2/html/issue.item.edit.html	Sun Feb 03 17:29:32 2013 +0530
+++ b/share/roundup/templates/jinja2/html/issue.item.edit.html	Sun Feb 03 17:34:23 2013 +0530
@@ -8,7 +8,7 @@
       enctype="multipart/form-data"
   >
   <fieldset>
-      <div class='container-fluid form-horizontal'>
+      <div class='container-fluid'>
         <!-- title -->
         <div class='row-fluid'>
           <div class='control-group'>
@@ -90,7 +90,7 @@
   <div class='form-actions'>
     {{ context.submit() }}
     {% if context.id %}
-      <a href='{{ context.copy_url }}'>Make a copy</a>
+      <a href='{{ context.copy_url() }}'>Make a copy</a>
     {% endif %}
   </div>
   <input type="hidden" name="@template" value="item">
--- a/share/roundup/templates/jinja2/html/layout/navigation.html	Sun Feb 03 17:29:32 2013 +0530
+++ b/share/roundup/templates/jinja2/html/layout/navigation.html	Sun Feb 03 17:34:23 2013 +0530
@@ -7,7 +7,9 @@
 <p>
   {% if request.user.hasPermission('View', 'issue') %}
     <ul class='nav nav-list'>
-      <li class='nav-header' i18n:translate="">Issues</li>
+      <li class='nav-header' i18n:translate="">
+        <i class='icon-fire'></i>Issues
+      </li>
       {% if request.user.hasPermission('Create', 'issue') %}
         <li>
           <a href="issue?@template=item" i18n:translate="">Create New</a>
@@ -59,7 +61,9 @@
    <ul class='nav nav-list'>
     {% if request.user.hasPermission('Create', 'keyword')
           or request.user.hasPermission('Edit', 'keyword') %}
-      <li class='nav-header' i18n:translate="">Keywords</li>
+      <li class='nav-header'>
+        <i class='icon-star'></i>Keywords
+      </li>
     {% endif %}
     {% if request.user.hasPermission('Create', 'keyword') %}
       <li>
@@ -81,7 +85,9 @@
 <p>
   {% if request.user.hasPermission('View', 'user') %}
     <ul class='nav nav-list'>
-      <li class='nav-header' i18n:translate="">Administration</li>
+      <li class='nav-header'>
+        <i class='icon-eye-open'></i>Administration
+      </li>
 
       {% if request.user.hasPermission('Edit', None) %}
         <li>
@@ -108,7 +114,9 @@
 {% if  request.user.username == 'anonymous' %}
   <form method="POST" tal:attributes="action request/base">
     <ul class='nav nav-list'>
-      <li class='nav-header' i18n:translate="">Login</li>
+      <li class='nav-header'>
+        <i class='icon-user'></i>Login
+      </li>
       <li>
         <input type='text' name="__login_name" placeholder='username'>
       </li>
@@ -139,7 +147,8 @@
 {% else %}
   <ul class='nav nav-list'>
     <li class='nav-header'>
-      Hello, <span class='username'>{{ request.user.username.plain(escape=1) }}</span>
+      <i class='icon-user'></i>Hello,
+      <span class='username'>{{ request.user.username.plain(escape=1) }}</span>
     </li>
     <li>
       <a href="{{ request.indexargs_url('issue', {
@@ -165,7 +174,9 @@
 
 <p>
   <ul class='nav nav-list'>
-    <li class='nav-header' i18n:translate="">Help</li>
+    <li class='nav-header'>
+      <i class='icon-bookmark'></i>Help
+    </li>
     <li>
       <a href="http://www.roundup-tracker.org" i18n:translate="">Roundup docs</a>
     </li>
--- a/share/roundup/templates/jinja2/html/layout/pagination.html	Sun Feb 03 17:29:32 2013 +0530
+++ b/share/roundup/templates/jinja2/html/layout/pagination.html	Sun Feb 03 17:34:23 2013 +0530
@@ -1,24 +1,32 @@
-
-  <div class='pagination pagination-centered' tal:condition="batch">
-    <ul>
-      <li tal:define="prev batch/previous" tal:condition="prev" class='disabled'>
-        <a tal:define="prev batch/previous" tal:condition="prev"
-         tal:attributes="href python:request.indexargs_url(request.classname,
-         {'@startwith':prev.first, '@pagesize':prev.size})"
-         i18n:translate="">Previous</a>
+<div class='pagination pagination-centered'>
+  {% set batch = request.batch() %}
+  <ul>
+    {% if batch and batch.previous %}
+      <li>
+        <a href="#"
+         >Previous</a>
+      </li>
+    {% else %}
+      <li class='disabled'>
+        <a href='#' i18n:translate="">Previous</a>
       </li>
-      <li tal:define="prev batch/previous" tal:condition="not:prev" class='disabled'><a href='#' i18n:translate="">Previous</a></li>
-     <li i18n:translate="">
-      <a href='#'><span tal:replace="batch/start" i18n:name="start"
-     />..<span tal:replace="python: batch.start + batch.length -1" i18n:name="end"
-     /> out of <span tal:replace="batch/sequence_length" i18n:name="total"
-     /></a></li>
-      <li tal:define="next batch/next" tal:condition="next" class='disabled'>
-      <a tal:define="next batch/next" tal:condition="next"
-         tal:attributes="href python:request.indexargs_url(request.classname,
-         {'@startwith':next.first, '@pagesize':next.size})"
-         i18n:translate="">Next</a>
+    {% endif %}
+    <li>
+      <span>
+        {{ batch.start }}...{{ batch.start + batch.length -1 }}
+        out of {{ batch.sequence_length }}
+      </span>
+    </li>
+    {% if batch and batch.next() %}
+      <li>
+        <a href="{{ request.indexargs_url(request.classname,
+                {'@startwith':batch.next().first, '@pagesize':batch.next().size}) }}"
+        >Next</a>
       </li>
-      <li tal:define="next batch/next" tal:condition="not:next" class='disabled'><a href='#' i18n:translate="">Next</a></li>
-     </ul>
-  </div>
+    {% else %}
+      <li class='disabled'>
+        <a href='#' i18n:translate="">Next</a>
+      </li>
+    {% endif %}
+  </ul>
+</div>
Roundup Issue Tracker: http://roundup-tracker.org/