From 65e723234172883514d1f2e00614e326dcbed0a5 Mon Sep 17 00:00:00 2001
From: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
Date: Thu, 28 Nov 2013 22:51:45 +0000
Subject: [PATCH] Replaced link_to with button class by button

---
 app/controllers/public/events_controller.rb |  2 --
 app/controllers/public/search_controller.rb |  2 --
 app/helpers/dates_helper.rb                 |  4 ++--
 app/models/event.rb                         | 15 ++++++---------
 lib/noosfero/plugin.rb                      |  1 +
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/controllers/public/events_controller.rb b/app/controllers/public/events_controller.rb
index 749d7d8..23b9c49 100644
--- a/app/controllers/public/events_controller.rb
+++ b/app/controllers/public/events_controller.rb
@@ -17,8 +17,6 @@ class EventsController < PublicController
     events_in_range = profile.events.by_range((@date - 1.month).at_beginning_of_month .. (@date + 1.month).at_end_of_month)
 
     @calendar = populate_calendar(@date, events_in_range)
-    @previous_calendar = populate_calendar(@date - 1.month, events_in_range)
-    @next_calendar = populate_calendar(@date + 1.month, events_in_range)
   end
 
   def events_by_day
diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index f38f243..7cf89c1 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -114,8 +114,6 @@ class SearchController < PublicController
 
     events = @searches[@asset][:results]
     @calendar = populate_calendar(@date, events)
-    @previous_calendar = populate_calendar(@date - 1.month, events)
-    @next_calendar = populate_calendar(@date + 1.month, events)
   end
 
   # keep old URLs workings
diff --git a/app/helpers/dates_helper.rb b/app/helpers/dates_helper.rb
index 77300e4..4be36e1 100644
--- a/app/helpers/dates_helper.rb
+++ b/app/helpers/dates_helper.rb
@@ -139,7 +139,7 @@ module DatesHelper
     previous_month_date = date - 1.month
 
     label ||= show_month(previous_month_date.year, previous_month_date.month)
-    link_to label, {:year => previous_month_date.year, :month => previous_month_date.month}, {:class => 'button icon-back with-text'}
+    button(:back, label,  {:year => previous_month_date.year, :month => previous_month_date.month})
   end
 
   def link_to_next_month(year, month, label = nil)
@@ -147,7 +147,7 @@ module DatesHelper
     next_month_date = date + 1.month
 
     label ||= show_month(next_month_date.year, next_month_date.month)
-    link_to label, {:year => next_month_date.year, :month => next_month_date.month}, {:class => 'button icon-next with-text'}
+    button(:next, label, {:year => next_month_date.year, :month => next_month_date.month})
   end
 
   def pick_date(object, method, options = {}, html_options = {})
diff --git a/app/models/event.rb b/app/models/event.rb
index 9caece2..7ae459d 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -29,26 +29,23 @@ class Event < Article
     end
   end
 
-named_scope :by_day, lambda { |date|
-    {
-      :conditions => ['start_date = :date AND end_date IS NULL OR (start_date <= :date AND end_date >= :date)', {:date => date}],
+  named_scope :by_day, lambda { |date|
+    { :conditions => ['start_date = :date AND end_date IS NULL OR (start_date <= :date AND end_date >= :date)', {:date => date}],
       :order => 'start_date ASC'
     }
   }
 
-named_scope :next_events_from_month, lambda { |date|
+  named_scope :next_events_from_month, lambda { |date|
     date_temp = date.strftime("%Y-%m-%d")
-    {
-      :conditions => ["start_date >= ?","#{date_temp}"],
+    { :conditions => ["start_date >= ?","#{date_temp}"],
       :limit => 10,
       :order => 'start_date ASC'
     }
   }
 
-named_scope :by_month, lambda { |date|
+  named_scope :by_month, lambda { |date|
     date_temp = date.strftime("%Y-%m")
-    {
-      :conditions => ["EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?",date.year,date.month],
+    { :conditions => ["EXTRACT(YEAR FROM start_date) = ? AND EXTRACT(MONTH FROM start_date) = ?",date.year,date.month],
       :limit => 10,
       :order => 'start_date ASC'
     }
diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb
index 662e63c..765a260 100644
--- a/lib/noosfero/plugin.rb
+++ b/lib/noosfero/plugin.rb
@@ -1,3 +1,4 @@
+require 'noosfero'
 include ActionView::Helpers::AssetTagHelper
 
 class Noosfero::Plugin
--
libgit2 0.21.2