From 97d285e497525340f63d0cdc4d14548629fabf1c Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Wed, 1 Jan 2014 22:38:56 +0100
Subject: [PATCH] =?UTF-8?q?Ajout=20d'une=20url=20pour=20le=20flux=20rss=20?=
 =?UTF-8?q?semblable=20=C3=A0=20l'ancienne=20en=20php?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/events.css.sass |  2 +-
 app/controllers/events_controller.rb   | 27 +++++++++++---------------
 config/routes.rb                       |  2 ++
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass
index 6918d03f..9c40d4f8 100644
--- a/app/assets/stylesheets/events.css.sass
+++ b/app/assets/stylesheets/events.css.sass
@@ -20,7 +20,7 @@ main form.region_selector + h2
 
 // For whole year calendar
 main form.region_selector + h2 + h2
-  padding: 6px 0 0
+  padding: 0.26em 0 0
   font-size: 1.2em
   margin-bottom: 0.8em
 
diff --git a/app/controllers/events_controller.rb b/app/controllers/events_controller.rb
index 764d33d0..20280850 100644
--- a/app/controllers/events_controller.rb
+++ b/app/controllers/events_controller.rb
@@ -2,30 +2,26 @@ class EventsController < InheritedResources::Base
   before_action :set_event, only: [:show, :edit, :update, :destroy]
 
   def index
+    @events = Event
+    if (params[:region] && params[:region].present? && params[:region] != 'all')
+      @events = @events.region(params[:region])
+    end
+    if (params[:tag])
+      @events = @events.tag(params[:tag])
+    end
+
     respond_to do |format|
       format.html {
         if (params[:year] and !params[:month])
           # Whole year calendar
-          @events = Event.year(params[:year] || Date.today.year)
+          @events = @events.year params[:year]
         else
-          @events = Event.month(params[:year] || Date.today.year, params[:month] || Date.today.month)
-        end
-        if (params[:region] && params[:region].present? && params[:region] != 'all')
-          @events = @events.region(params[:region])
-        end
-        if (params[:tag])
-          @events = @events.tag(params[:tag])
+          @events = @events.month(params[:year] || Date.today.year, params[:month] || Date.today.month)
         end
       }
 
       format.rss {
-        @events = Event.where('start_time >= now()').order(start_time: :asc).limit(25)
-        if (params[:region] && params[:region].present? && params[:region] != 'all')
-          @events = @events.region(params[:region])
-        end
-        if (params[:tag])
-          @events = @events.tag(params[:tag])
-        end
+        @events = @events.where('start_time >= now()').order(start_time: :asc).limit(25)
       }
     end
   end
@@ -38,7 +34,6 @@ class EventsController < InheritedResources::Base
     @event.region = Region.find(params[:event][:region])
 
     if (params[:visu])
-      logger.info 'XXXXXXXXXXXXXXX'
       render action: 'new'
       return
     end
diff --git a/config/routes.rb b/config/routes.rb
index 763b6b3d..f7810c15 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,8 @@ AgendaDuLibreRails::Application.routes.draw do
   resources :events
   resources :users
 
+  get ':format.php' => 'events#index'
+
   devise_for :admin_users, ActiveAdmin::Devise.config
   ActiveAdmin.routes(self)