From d70978d726629dd32ae946fb7cd085e28eeb1347 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Wed, 3 Sep 2014 18:49:17 +0200
Subject: [PATCH] Un peu plus de couleurs sur les boutons de formulaires

---
 app/assets/stylesheets/moderations.css.sass |  6 ++++++
 app/controllers/tags_controller.rb          |  4 ++--
 app/models/event.rb                         |  2 +-
 app/views/events/show.html.haml             |  3 ++-
 app/views/moderations/refuse.html.haml      |  9 +++++++--
 app/views/moderations/validate.html.haml    | 12 +++++++++---
 config/locales/views/fr.yml                 |  4 ++--
 7 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/app/assets/stylesheets/moderations.css.sass b/app/assets/stylesheets/moderations.css.sass
index 59d440bc..5ec104e8 100644
--- a/app/assets/stylesheets/moderations.css.sass
+++ b/app/assets/stylesheets/moderations.css.sass
@@ -33,3 +33,9 @@ h2.warning
         padding: 0.2em
         font-weight: normal
         +inline-block()
+
+.fa.fa-check, .fa.fa-thumbs-up
+  color: green
+
+.fa.fa-thumbs-down
+  color: red
diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb
index a9c269b2..60640121 100644
--- a/app/controllers/tags_controller.rb
+++ b/app/controllers/tags_controller.rb
@@ -15,7 +15,7 @@ class TagsController < InheritedResources::Base
   end
 
   def show
-    @events_future = Event.future.tag params[:id]
-    @events_past = Event.past.tag params[:id]
+    @events_future = Event.moderated.future.tag params[:id]
+    @events_past = Event.moderated.past.tag params[:id]
   end
 end
diff --git a/app/models/event.rb b/app/models/event.rb
index 20ad105d..b7c91a45 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -81,6 +81,6 @@ class Event < ActiveRecord::Base
   end
 
   def full_address
-    [address, city, related_region.name].compact.join(', ')
+    [address, city, related_region.name].compact.join ', '
   end
 end
diff --git a/app/views/events/show.html.haml b/app/views/events/show.html.haml
index c39f15b2..b620467a 100644
--- a/app/views/events/show.html.haml
+++ b/app/views/events/show.html.haml
@@ -35,7 +35,8 @@
 %p= display_date
 
 %p.full_address
-  %span= @event.address
+  - if @event.address.present?
+    %span= @event.address
   %span= link_to @event.city, "http://fr.wikipedia.org/wiki/#{url_encode @event.city}"
   %span= link_to @event.related_region.try(:name),
       "http://fr.wikipedia.org/wiki/#{url_encode @event.related_region.name}"
diff --git a/app/views/moderations/refuse.html.haml b/app/views/moderations/refuse.html.haml
index df14ffb0..c90777cb 100644
--- a/app/views/moderations/refuse.html.haml
+++ b/app/views/moderations/refuse.html.haml
@@ -26,8 +26,13 @@
       = label_tag :reason_text, t('.reason')
       = text_area_tag :reason_text, nil, cols: 40, rows: 5
 
-    = submit_tag t '.ok'
-    = link_to t('.ko'), moderations_url, class: :button
+    = link_to moderations_url do
+      %em.fa.fa-arrow-left
+      =t '.ko'
+
+    = button_tag do
+      %em.fa.fa-thumbs-down
+      =t '.ok'
 
 %fieldset
   %legend=Event.model_name.human
diff --git a/app/views/moderations/validate.html.haml b/app/views/moderations/validate.html.haml
index c8edcdfe..765812b1 100644
--- a/app/views/moderations/validate.html.haml
+++ b/app/views/moderations/validate.html.haml
@@ -5,11 +5,17 @@
 %fieldset
   - if @event.locality?
     %h2.warning=t '.warning'
-  %h2=t '.question'
 
   = form_for @moderation, url: { action: :accept }, html: { method: :put } do |f|
-    = f.submit t('.ok'), name: :yes
-    = link_to t('.ko'), moderations_url, class: :button
+    %h2=t '.question'
+
+    = link_to moderations_url do
+      %em.fa.fa-arrow-left
+      =t '.ko'
+
+    = f.button name: :yes do
+      %em.fa.fa-thumbs-up
+      =t '.ok'
 
 %fieldset
   %legend=Event.model_name.human
diff --git a/config/locales/views/fr.yml b/config/locales/views/fr.yml
index 79e24e03..aa487858 100644
--- a/config/locales/views/fr.yml
+++ b/config/locales/views/fr.yml
@@ -145,7 +145,7 @@ Exemple: `%{daylimit}`"
       warning: Attention, cet événement est à portée nationale!
       question: Confirmez-vous la validation de cet événement?
       ok: Oui
-      ko: Non
+      ko: Modération
     accept:
       ok: Événement accepté
     refuse:
@@ -153,7 +153,7 @@ Exemple: `%{daylimit}`"
       motif: Motif
       question: Quel motif souhaitez-vous associer au rejet de cet événement?
       ok: Rejeter
-      ko: Annuler
+      ko: Modération
       reason_r_1: Hors sujet
       reason_r_2: Pas assez d'informations
       reason_r_3: Événement déjà enregistré