From 3ef38eafd26188e56ed2ea365cc5c522aac7b568 Mon Sep 17 00:00:00 2001
From: echarp <emmanuel.charpentier@free.fr>
Date: Sun, 27 Jul 2014 15:49:58 +0200
Subject: [PATCH] =?UTF-8?q?Meilleur=20affichage=20en=20largeur=20de=20nomb?=
 =?UTF-8?q?re=20d'=C3=A9l=C3=A9ments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/assets/stylesheets/all.css.sass    | 12 ++++++------
 app/assets/stylesheets/events.css.sass |  4 ++++
 app/assets/stylesheets/list.css.sass   |  1 +
 app/views/regions/stats.html.haml      | 10 +++++-----
 config/locales/fr.yml                  |  4 ++--
 5 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/app/assets/stylesheets/all.css.sass b/app/assets/stylesheets/all.css.sass
index b36fe49a..203565f4 100644
--- a/app/assets/stylesheets/all.css.sass
+++ b/app/assets/stylesheets/all.css.sass
@@ -2,7 +2,7 @@
 @import "font-awesome"
 
 *
-  margin: 0
+  margin: 0 auto
   padding: 0
   max-width: 100%
   box-sizing: border-box
@@ -96,24 +96,24 @@ header.top
     height: auto
 
 main
+  *
+    max-width: 80em
   h1
-    margin: 10px 5px 5px 5px
+    margin: 10px auto 5px auto
     letter-spacing: 2px
   h2
-    margin: 50px 0px 20px
+    margin: 50px auto 20px
   h3
-    margin: 1.1em 0 1em
+    margin: 1.1em auto 1em
     font-size: 1.2em
     text-align: left
   ul, ol
-    margin: 10px 0px 10px 35px
     text-align: left
     li
       margin-left: 2em
       line-height: 1.3em
   p
     margin: 0.95em auto
-    max-width: 80em
     text-align: justify
     line-height: 1.3em
     &.label
diff --git a/app/assets/stylesheets/events.css.sass b/app/assets/stylesheets/events.css.sass
index 3514715b..1eefbce3 100644
--- a/app/assets/stylesheets/events.css.sass
+++ b/app/assets/stylesheets/events.css.sass
@@ -3,6 +3,7 @@
 form.region_selector
   width: 98%
   position: absolute
+  max-width: 100%
   margin-top: 2.45em
   label
     display: none
@@ -35,6 +36,7 @@ header.calendar-header
 
 body.events.index table
   width: 90%
+  max-width: 100%
   margin-top: 3.5em
   tr
     th
@@ -110,8 +112,10 @@ body.events.index table
 .formats
   width: 90%
   margin: 11px auto 28px
+  max-width: 100%
   font-size: smaller
   text-align: right
+  padding-right: 2px
 
 sidebar#lug-list
   float: right
diff --git a/app/assets/stylesheets/list.css.sass b/app/assets/stylesheets/list.css.sass
index dd49d398..55641173 100644
--- a/app/assets/stylesheets/list.css.sass
+++ b/app/assets/stylesheets/list.css.sass
@@ -34,6 +34,7 @@ dl
     text-align: left
     &.quantity
       text-align: right
+      padding-right: 16em
     h3
       display: inline
 
diff --git a/app/views/regions/stats.html.haml b/app/views/regions/stats.html.haml
index 42d3e288..9ee26b0d 100644
--- a/app/views/regions/stats.html.haml
+++ b/app/views/regions/stats.html.haml
@@ -4,17 +4,17 @@
 
 %dl
   %dt=t '.all'
-  %dd.quantity= Event.count()
+  %dd.quantity= number_with_delimiter Event.count()
 
   %dt=t '.allModeration'
-  %dd.quantity= Event.unscoped.where(moderated: 0).count()
+  %dd.quantity= number_with_delimiter Event.unscoped.where(moderated: 0).count()
 
 %h3=t '.regional'
 
 %dl
   - @region_events.each do |region|
     %dt.item= region[0]
-    %dd.quantity= region[1]
+    %dd.quantity= number_with_delimiter region[1]
 
 %h3=t '.city'
 
@@ -23,14 +23,14 @@
 %dl
   - @city_events.each do |city|
     %dt.item= city[0]
-    %dd.quantity= city[1]
+    %dd.quantity= number_with_delimiter city[1]
 
 %h3=t '.dates'
 
 %dl
   - @month_events.each do |month|
     %dt.item= l(Date.new(month[0][0].to_i, month[0][1].to_i), format: :month).capitalize
-    %dd.quantity= month[1]
+    %dd.quantity= number_with_delimiter month[1]
 
 %h3=t '.web'
 
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 4951e850..0d8be790 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -163,8 +163,8 @@ Exemple: `%{tag}`\n
 Exemple: `%{daylimit}`"
     stats:
       title: Statistiques
-      all: Nombre d'événements validés depuis la création de l'Agenda
-      allModeration: Nombre d'événements en cours de modération
+      all: Événements validés
+      allModeration: Événements en cours de modération
       regional: Par région
       city: Par ville
       city_conditions: Seules les villes où plus de trois événements ont été organisés sont mentionnées.