nicer index navigation

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1701 57a73879-2fb5-44c3-a270-3262357dd7e2

diff --git a/CHANGES.txt b/CHANGES.txt
index e67226d68d74bab7b3ca7197719ff2e8341d6063..2db947bd5d98d711eb8dbb88cb4ca8371574937a 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -69,6 +69,7 @@ Feature:
 - added Windows Service mode for roundup-server when daemonification is
   attempted on Windows.
 - sort HTMLClass.properties results by name (sf feature 724738)
+- nicer index navigation (sf feature 676866)
 
 Fixed:
 - applied unicode patch. All data is stored in utf-8. Incoming messages

diff --git a/templates/classic/html/issue.index.html b/templates/classic/html/issue.index.html
index ae9480dd213f0366bc47e3bf6b36b2f0c672a6fd..0d331c5b56116cf9c4578a363b0b9dc102134019 100644 (file)
--- a/templates/classic/html/issue.index.html
+++ b/templates/classic/html/issue.index.html
@@ -56,18 +56,27 @@ You are not allowed to view this page.
   </tr>
 
  </tal:block>
- <tr class="navigation" tal:define="colspan python:len(request.columns)">
-  <th tal:attributes="colspan python:colspan/2">
-   <a tal:define="prev batch/previous" tal:condition="prev"
-      tal:attributes="href python:request.indexargs_url(request.classname,
-      {':startwith':prev.first, ':pagesize':prev.size})">&lt;&lt; previous</a>
-   &nbsp;
-  </th>
-  <th tal:attributes="colspan python:colspan/2 + colspan%2">
-   <a tal:define="next batch/next" tal:condition="next"
-      tal:attributes="href python:request.indexargs_url(request.classname,
-      {':startwith':next.first, ':pagesize':next.size})">next &gt;&gt;</a>
-   &nbsp;
+
+ <tr tal:condition="batch">
+  <th tal:attributes="colspan python:len(request.columns)">
+   <table width="100%">
+    <tr class="navigation">
+     <th>
+      <a tal:define="prev batch/previous" tal:condition="prev"
+         tal:attributes="href python:request.indexargs_href(request.classname,
+         {':startwith':prev.first, ':pagesize':prev.size})">&lt;&lt; previous</a>
+      &nbsp;
+     </th>
+     <th tal:content="python: '%d...%d out of %d'%(batch.start,
+             batch.start+batch.length-1, batch.sequence_length)">current</th>
+     <th>
+      <a tal:define="next batch/next" tal:condition="next"
+         tal:attributes="href python:request.indexargs_href(request.classname,
+         {':startwith':next.first, ':pagesize':next.size})">next &gt;&gt;</a>
+      &nbsp;
+     </th>
+    </tr>
+   </table>
   </th>
  </tr>
 </table>

diff --git a/templates/classic/html/style.css b/templates/classic/html/style.css
index bfd49430a6715539bfb66ed461c3578f8e38f878..6c31365204c0809add9e000f29d80f8520cdc4ad 100644 (file)
--- a/templates/classic/html/style.css
+++ b/templates/classic/html/style.css
@@ -134,11 +134,19 @@ table.list td {
 }
 
 table.list tr.navigation th {
-  text-align: right;
+  width: 33%;
+  border-style: hidden;
+  text-align: center;
+}
+table.list tr.navigation td {
+    border: none
 }
 table.list tr.navigation th:first-child {
   text-align: left;
 }
+table.list tr.navigation th:last-child {
+  text-align: right;
+}
 
 
 /* style for message displays */
@@ -345,3 +353,4 @@ table.otherinfo th {
   font-weight: bold;
   text-align: left;
 }
+/* SHA: 1c2bdea9d2295da079168403292e5c9039bb5088 */