From 2baa0dc10b09b57e11245f82d08dff60359a10c4 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sat, 28 Apr 2012 04:03:17 +0200
Subject: [PATCH] Improved pagination.

---
 .../controllers/_dashboard/ticket.js.coffee   |  2 +-
 .../app/views/dashboard/ticket.jst.eco        | 45 ++++++++++++-------
 app/assets/stylesheets/zzz.css                |  5 ++-
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee
index 20a65c5ba..62e1ceded 100644
--- a/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee
+++ b/app/assets/javascripts/app/controllers/_dashboard/ticket.js.coffee
@@ -67,7 +67,7 @@ class App.DashboardTicket extends App.Controller
     )
     html = $(html)
     html.find('li').removeClass('active')
-    html.find("[data-id=\"#{@start_page}\"]").parents('li').addClass('active')
+    html.find(".page [data-id=\"#{@start_page}\"]").parents('li').addClass('active')
 
 
     shown_all_attributes = @ticketTableAttributes( App.Overview.find(@overview.id).view.d.overview )
diff --git a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco
index b65371201..9f74c8466 100644
--- a/app/assets/javascripts/app/views/dashboard/ticket.jst.eco
+++ b/app/assets/javascripts/app/views/dashboard/ticket.jst.eco
@@ -1,21 +1,34 @@
 <div class="row">
   <div class="span9">
-    <h2><%= @overview.meta.name %> <small><a href="#" data-type="settings" class="icon-edit"></a>
-    </small></h2>
-    <div class="pagination">
-      <ul>
-        <% if @start_page != 1: %>
-          <li><a href="#" data-id="<%= @start_page - 1 %>" data-type="page">«</a></li>
-        <% end %>
-        <% for item in [1..@pages_total]: %>
-          <li>
-            <a href="#" data-id="<%= item %>" data-type="page"><%= item %></a>
-          </li>
-        <% end %>
-        <% if @start_page != @pages_total: %>
-          <li><a href="#" data-id="<%= @start_page + 1 %>" data-type="page">»</a></li>
-        <% end %>
-      </ul>
+    <div class="row">
+      <div class="span4">
+      <h2><%= @overview.meta.name %> <small><a href="#" data-type="settings" class="icon-edit"></a></small></h2>
+      </div>
+      <div class="span5">
+        <div class="pagination">
+          <ul>
+            <li>
+            <% if @start_page != 1: %>
+              <a href="#" data-id="<%= @start_page - 1 %>" data-type="page">«</a>
+            <% else: %>
+              <a href="#" data-id="<%= @start_page %>" data-type="page">«</a>
+            <% end %>
+            </li>
+            <% for item in [1..@pages_total]: %>
+              <li class="page">
+                <a href="#" data-id="<%= item %>" data-type="page"><%= item %></a>
+              </li>
+            <% end %>
+            <li>
+            <% if @start_page != @pages_total: %>
+              <a href="#" data-id="<%= @start_page + 1 %>" data-type="page">»</a>
+            <% else: %>
+              <a href="#" data-id="<%= @start_page %>" data-type="page">»</a>
+            </li>
+            <% end %>
+          </ul>
+        </div>
+      </div>
     </div>
     <div class="table-overview"></div>
   </div>
diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css
index 706e18382..0f8c41ba7 100644
--- a/app/assets/stylesheets/zzz.css
+++ b/app/assets/stylesheets/zzz.css
@@ -24,7 +24,10 @@ body {
 }
 /* improved spacing */
 .pagination {
-  margin: 0px 0px;
+  padding-top: 2px;
+  margin: 0px 4px;
+  height: 30px;
+  float: right;
 }
 .pagination a {
   padding: 0px 10px;