From c03d47d355ea4447acba5b523c5f01601cc24edc Mon Sep 17 00:00:00 2001
From: Nicolas Bally <info@nicolasbally.com>
Date: Fri, 13 Dec 2013 16:56:16 +0100
Subject: [PATCH] =?UTF-8?q?bug=20tri=20agenda=20corrig=C3=A9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admin/events_controller.rb    | 13 +++++--
 app/views/admin/events/_index_block.html.haml | 38 +++++++++++--------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/app/controllers/admin/events_controller.rb b/app/controllers/admin/events_controller.rb
index aa90b8f..58f15a3 100644
--- a/app/controllers/admin/events_controller.rb
+++ b/app/controllers/admin/events_controller.rb
@@ -98,10 +98,17 @@ class Admin::EventsController < ApplicationController
 		@events = Event.order('start_at, stop_at')
 		@events = @events.after(start) if start
 		@events = @events.before(stop) if stop
-		per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 1500
+		per_page = (params[:per_page] and params[:per_page] != "") ? params[:per_page] : 20
 		page = (params[:page] and params[:page] != "") ? params[:page] : 1 
-		@events = Event.all.page(page).per(per_page)
+		#@events = Event.all.page(page).per(per_page)
 
-		#@events = Event.order('start_at, stop_at').after(start).before(stop)
+    @events = Event.order('start_at DESC, stop_at DESC')
+    @events  = @events.after(start) if start
+    @events = @events.before(stop) if stop
+		
+    
+    
+    
+    @events = @events.page(page).per(per_page)
 	end
 end
diff --git a/app/views/admin/events/_index_block.html.haml b/app/views/admin/events/_index_block.html.haml
index 026b08d..b41a012 100644
--- a/app/views/admin/events/_index_block.html.haml
+++ b/app/views/admin/events/_index_block.html.haml
@@ -1,22 +1,28 @@
 
 .search_pannel
-	
-	=form_tag "", :method => "get", :remote => true do
-		.field_with_suppr
-			=text_field_tag :start, params[:start],:class => "datepicker"
-			.suppr
-				=i(:remove, :icon => false)
-		.field_with_suppr
-			=text_field_tag :stop, params[:stop], :class => "datepicker"
-			.suppr
-				=i(:remove, :icon => false)
-				
-		=submit_tag "filtrer", :class => "btn"
-	
+  
+  =form_tag "", :method => "get", :remote => true do
+    .input-append
+      =text_field_tag :start, params[:start],:class => "datepicker", :placeholder => "Début"
+      %button.btn{:onclick => "$(this).prev('input').val('');"}
+        =i(:remove, :icon => false)
+        
+    .input-append
+      =text_field_tag :stop, params[:stop],:class => "datepicker", :placeholder => "Fin"
+      %button.btn
+        =i(:remove, :icon => false)
+    
+    
+        
+    =submit_tag "filtrer", :class => "btn", :style => "margin-bottom: 10px;"
+    
+    
+   
+  
 
 %table#events.table.table-hover
-	=render @events
-	#pagination
-		= paginate @events, :remote => true 
+  =render @events
+  #pagination
+    = paginate @events, :remote => true