From d1a61ff236cf95a7f3cba4a60e85c14e877c730d Mon Sep 17 00:00:00 2001
From: mr <mr@mrautenberg.de>
Date: Fri, 23 Sep 2011 15:58:03 +0200
Subject: remove unused js

---
 views/models_navigation.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'views/models_navigation.haml')

diff --git a/views/models_navigation.haml b/views/models_navigation.haml
index b491cb5..0dc1f63 100644
--- a/views/models_navigation.haml
+++ b/views/models_navigation.haml
@@ -42,7 +42,7 @@
         %img{:src => "arrow_right_inactive.png", :alt => '', :title => ''}/
 
     - js = ""
-    - ["id","created_at","name","type"].each do |s|
+    - ["created_at","name","type"].each do |s|
       - idname = s == "created_at" ? "date" : s
       - js += "$('##{idname}').click(function() \{ \n "
       - js += "  $('#sort_by').val('#{s}');\n "
-- 
cgit v1.2.3


From 5147b37a3285a231d8c938c3baf2f216a3b7f197 Mon Sep 17 00:00:00 2001
From: mr <mr@mrautenberg.de>
Date: Mon, 17 Oct 2011 10:04:44 +0200
Subject: model sorting for endpoints| pager for models

---
 views/models_navigation.haml | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

(limited to 'views/models_navigation.haml')

diff --git a/views/models_navigation.haml b/views/models_navigation.haml
index 0dc1f63..6bf05bd 100644
--- a/views/models_navigation.haml
+++ b/views/models_navigation.haml
@@ -1,12 +1,12 @@
 .models_navigation
-
+  - js = ""
   %form{:name => "nav", :action => url_for('/models'), :method => "get", :id => "nav"}
     %input{:type => :hidden, :name => :sort_by, :id => "sort_by", :value => params[:sort_by]}
     %input{:type => :hidden, :name => :order, :id => "order", :value => params[:order]}
     %input{:type => :hidden, :name => :page, :id => "page", :value => params[:page]}
 
     Sort by:
-    - ["created_at","name","type"].each do |s|
+    - ["created_at","name","type","endpoint"].each do |s|
       - idname = s == "created_at" ? "date" : s
       - if params[:sort_by] == s
         %div{:id => idname, :class => "active"}
@@ -22,27 +22,37 @@
     - if @models.size > 5
       |
       Models:
-      = "#{@models.size}"
-      - unless @page.to_i == 0
-        #prev
-          %img{:src => "arrow_left.png", :alt => 'previous', :title => 'previous'}/
-      -else
-        %img{:src => "arrow_left_inactive.png", :alt => '', :title => ''}/
-  
       - if @models.size < 5*@page+5
         - last = @models.size
       - else
         - last = 5*@page+5
   
-      = "(#{5*@page+1}-#{last}/#{@models.size})"
+      = "#{5*@page+1}-#{last} / #{@models.size}"
+
+      | Page:
+      - unless @page.to_i == 0
+        #prev{:class => "link"}
+          %img{:src => "arrow_left.png", :alt => 'previous', :title => 'previous'}/
+      -else
+        %img{:src => "arrow_left_inactive.png", :alt => '', :title => ''}/
+
+      - (0..(@models.size/5).to_f.ceil-1).each do |p|
+        -if p != @page.to_f
+          %a{:href => '#', :id => "page_link_#{p}", :class => "page page_link"} #{p+1}
+          - js += "$('#page_link_#{p}').click(function() \{ \n "
+          - js += "  $('#page').val('#{p}');\n "
+          - js += "  $('#nav').submit();\n "
+          - js += "});\n "
+        -else
+          %span{:class => "page page_active"} #{p+1}
+
       - unless 5*@page.to_i+5 >= @models.size
-        #next
+        #next{:class => "link"}
           %img{:src => "arrow_right.png", :alt => 'next', :title => 'next'}/
       -else
         %img{:src => "arrow_right_inactive.png", :alt => '', :title => ''}/
 
-    - js = ""
-    - ["created_at","name","type"].each do |s|
+    - ["created_at","name","type","endpoint"].each do |s|
       - idname = s == "created_at" ? "date" : s
       - js += "$('##{idname}').click(function() \{ \n "
       - js += "  $('#sort_by').val('#{s}');\n "
-- 
cgit v1.2.3


From f60f559c98343b36ed50cfba1a365f2738f59a68 Mon Sep 17 00:00:00 2001
From: mr <mr@mrautenberg.de>
Date: Mon, 17 Oct 2011 12:32:27 +0200
Subject: clean code for navigation

---
 views/models_navigation.haml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'views/models_navigation.haml')

diff --git a/views/models_navigation.haml b/views/models_navigation.haml
index 6bf05bd..c5eda97 100644
--- a/views/models_navigation.haml
+++ b/views/models_navigation.haml
@@ -26,7 +26,7 @@
         - last = @models.size
       - else
         - last = 5*@page+5
-  
+ 
       = "#{5*@page+1}-#{last} / #{@models.size}"
 
       | Page:
@@ -39,10 +39,10 @@
       - (0..(@models.size/5).to_f.ceil-1).each do |p|
         -if p != @page.to_f
           %a{:href => '#', :id => "page_link_#{p}", :class => "page page_link"} #{p+1}
-          - js += "$('#page_link_#{p}').click(function() \{ \n "
-          - js += "  $('#page').val('#{p}');\n "
-          - js += "  $('#nav').submit();\n "
-          - js += "});\n "
+          - js += "$('#page_link_#{p}').click(function() \{ \n"
+          - js += "  $('#page').val('#{p}');\n"
+          - js += "  $('#nav').submit();\n"
+          - js += "});\n"
         -else
           %span{:class => "page page_active"} #{p+1}
 
@@ -54,10 +54,10 @@
 
     - ["created_at","name","type","endpoint"].each do |s|
       - idname = s == "created_at" ? "date" : s
-      - js += "$('##{idname}').click(function() \{ \n "
-      - js += "  $('#sort_by').val('#{s}');\n "
-      - js += "  $('#nav').submit();\n "
-      - js += "});\n "
+      - js += "$('##{idname}').click(function() \{ \n"
+      - js += "  $('#sort_by').val('#{s}');\n"
+      - js += "  $('#nav').submit();\n"
+      - js += "});\n"
 
     :javascript
       $("#prev").click(function() {
-- 
cgit v1.2.3