From 8b80a3e8400e39ef52290c290c9bf39341326336 Mon Sep 17 00:00:00 2001
From: Pierre Merlin <pierrem@apido.org>
Date: Fri, 23 Mar 2012 15:57:55 +0100
Subject: [PATCH 1/3] Update
 app/assets/stylesheets/locomotive/inline_editor/layout.css.scss

---
 app/assets/stylesheets/locomotive/inline_editor/layout.css.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/locomotive/inline_editor/layout.css.scss b/app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
index ffca3cca..442f2690 100644
--- a/app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
+++ b/app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
@@ -11,6 +11,7 @@ body {
     width: 100%;
     height: 100%;
     display: block;
+    min-height: 1000px;
   }
 }
 

From 65c570c4aac63d54fd6dd5f1f9a31acf516c440b Mon Sep 17 00:00:00 2001
From: Pierre Merlin <pierrem@apido.org>
Date: Fri, 23 Mar 2012 16:53:42 +0100
Subject: [PATCH 2/3] Update
 app/assets/stylesheets/locomotive/inline_editor/layout.css.scss

---
 app/assets/stylesheets/locomotive/inline_editor/layout.css.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/locomotive/inline_editor/layout.css.scss b/app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
index 442f2690..26193e85 100644
--- a/app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
+++ b/app/assets/stylesheets/locomotive/inline_editor/layout.css.scss
@@ -11,7 +11,7 @@ body {
     width: 100%;
     height: 100%;
     display: block;
-    min-height: 1000px;
+    min-height: 100%;
   }
 }
 

From 9cb48a3ad9db434dffdcda7d80da5c287dcbeebc Mon Sep 17 00:00:00 2001
From: Pierre Merlin <pierrem@apido.org>
Date: Fri, 23 Mar 2012 18:54:42 +0100
Subject: [PATCH 3/3] Adding public admin_ui.fr.yml for toolbar

---
 config/locales/admin_ui.fr.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/config/locales/admin_ui.fr.yml b/config/locales/admin_ui.fr.yml
index 7f10846a..d8f31f53 100644
--- a/config/locales/admin_ui.fr.yml
+++ b/config/locales/admin_ui.fr.yml
@@ -289,3 +289,18 @@ fr:
         explanations: "Si vous avez déjà uploadé le template de site par défaut (voir instructions), vous pouvez l'utiliser dès maintenant. Ou vous pouvez uploader un template de site sous forme d'un fichier zip (quelques themes disponibles <a href=\"http://www.locomotivecms.com/support/themes\">ici</a>)."
         back_to_default_template: "Cliquez <a href='#'>ici</a> pour sélectionner à la place le template de site par défault"
         next: Créer site
+
+    public:
+      pages:
+        show_toolbar:
+          statuses:
+            loading: "Chargement...."
+            disabled: "Editeur en ligne désactivé"
+          labels:
+            save_changes: "Enregistrez les modifications: "
+            editing_mode: "Mode édition: "
+            lang: "Langue: "
+          buttons:
+            back: "Revenir au panneau d'administration"
+            confirm: "Valider"
+            cancel: "Annuler"