From 6d7defc87cd6ce40910b66472168e3d86c362164 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Fri, 23 Aug 2013 22:24:41 +0200
Subject: [PATCH] new messages when update / install

---
 inc/poche/Poche.class.php                    | 6 +++---
 install/{update.php => update_to_1beta3.php} | 0
 tpl/error.twig                               | 5 ++---
 3 files changed, 5 insertions(+), 6 deletions(-)
 rename install/{update.php => update_to_1beta3.php} (100%)

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index e0dc0d20..4832f816 100644
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -47,16 +47,16 @@ class Poche
             die('You don\'t have write access on cache directory.');
         }
         else if (file_exists('./install/update.php') && !DEBUG_POCHE) {
-            $msg = 'A poche update is needed. Please execute this update <a href="install/update.php">by clicking here</a>. If you have already do the update, please delete /install folder.';
+            $msg = '<h1>setup</h1><p><strong>It\'s your first time here?</strong> Please copy /install/poche.sqlite in db folder. Then, delete install folder.<br /><strong>If you have already installed poche</strong>, an update is needed <a href="install/update.php">by clicking here</a>.</p>';
             $allIsGood = FALSE;
         }
         else if (file_exists('./install') && !DEBUG_POCHE) {
-            $msg = 'If you want to update your poche, you just have to delete /install folder. <br />To install your poche with sqlite, copy /install/poche.sqlite in /db and delete the folder /install. you have to delete the /install folder before using poche.';
+            $msg = '<h1>setup</h1><p><strong>If you want to update your poche</strong>, you just have to delete /install folder. <br /><strong>To install your poche with sqlite</strong>, copy /install/poche.sqlite in /db and delete the folder /install. you have to delete the /install folder before using poche.</p>';
             $allIsGood = FALSE;
         }
         else if (STORAGE == 'sqlite' && !is_writable(STORAGE_SQLITE)) {
             Tools::logm('you don\'t have write access on sqlite file');
-            $msg = 'You don\'t have write access on sqlite file.';
+            $msg = '<h1>error</h1><p>You don\'t have write access on sqlite file.</p>';
             $allIsGood = FALSE;
         }
         
diff --git a/install/update.php b/install/update_to_1beta3.php
similarity index 100%
rename from install/update.php
rename to install/update_to_1beta3.php
diff --git a/tpl/error.twig b/tpl/error.twig
index 84c3bc1c..14c49925 100644
--- a/tpl/error.twig
+++ b/tpl/error.twig
@@ -1,7 +1,6 @@
 {% extends "layout.twig" %}
-{% block title %}{% trans "error" %}{% endblock %}
+{% block title %}{% trans "plop" %}{% endblock %}
 {% block content %}
-    <h1>error</h1>
-        <p>{{ msg|raw }}</p>
+        {{ msg|raw }}
         <p>Don't forget <a href="http://inthepoche.com/?pages/Documentation">the documentation</a>.</p>
 {% endblock %}
\ No newline at end of file
-- 
2.41.0