From e1cfef7bf1ba8efc293b11811d0ac8f1775e0c2a Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@gmail.com>
Date: Wed, 19 Feb 2014 23:08:01 +0100
Subject: Update _head.twig

Remove googlefonts now called in font.css - need still to put the woff file in font directory
---
 themes/baggy/_head.twig | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/themes/baggy/_head.twig b/themes/baggy/_head.twig
index 0079b228..206d5aae 100644
--- a/themes/baggy/_head.twig
+++ b/themes/baggy/_head.twig
@@ -2,7 +2,6 @@
         <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-144x144-precomposed.png">
         <link rel="apple-touch-icon-precomposed" sizes="72x72" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-72x72-precomposed.png">
         <link rel="apple-touch-icon-precomposed" href="{{ poche_url }}/themes/{{theme}}/img/apple-touch-icon-precomposed.png">
-        <link href='http://fonts.googleapis.com/css?family=PT+Sans:700' rel='stylesheet' type='text/css'>
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/ratatouille.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/font.css" media="all">
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/main.css" media="all">
@@ -10,4 +9,4 @@
         <link rel="stylesheet" href="{{ poche_url }}/themes/{{theme}}/css/print.css" media="print">
         <script src="{{ poche_url }}/themes/{{theme}}/js/jquery-2.0.3.min.js"></script>
         <script src="{{ poche_url }}/themes/{{theme}}/js/init.js"></script>
-        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
\ No newline at end of file
+        <script src="{{ poche_url }}/themes/{{ constant('DEFAULT_THEME') }}/js/closeMessage.js"></script>
-- 
cgit v1.2.3


From 860473f33c6ac02725a5e5f340592be599503de2 Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@gmail.com>
Date: Wed, 19 Feb 2014 23:09:12 +0100
Subject: Update font.css

Add reference for ptsans font in local instead of google fonts
---
 themes/baggy/css/font.css | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/themes/baggy/css/font.css b/themes/baggy/css/font.css
index e69de29b..ec662158 100755
--- a/themes/baggy/css/font.css
+++ b/themes/baggy/css/font.css
@@ -0,0 +1,6 @@
+@font-face {
+  font-family: 'PT Sans';
+  font-style: normal;
+  font-weight: 700;
+  src: local('PT Sans Bold'), local('PTSans-Bold'), url(/themes/baggy/fonts/ptsans.woff) format('woff');
+}
-- 
cgit v1.2.3


From 30c12d392700d05ef183e117c2a55c5f98f1e031 Mon Sep 17 00:00:00 2001
From: Nicolas Steinmetz <nsteinmetz@gmail.com>
Date: Wed, 19 Feb 2014 23:30:55 +0100
Subject: add font file

---
 themes/baggy/font/ptsans.woff | Bin 0 -> 24816 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 themes/baggy/font/ptsans.woff

diff --git a/themes/baggy/font/ptsans.woff b/themes/baggy/font/ptsans.woff
new file mode 100644
index 00000000..cf7c62e1
Binary files /dev/null and b/themes/baggy/font/ptsans.woff differ
-- 
cgit v1.2.3


From d09a5674e915e79762931a3465461327fb5737ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas.loeuillet@gmail.com>
Date: Thu, 20 Feb 2014 08:58:59 +0100
Subject: [add] message in install screen to prevent user when wallabag is
 already installed

---
 install/index.php             | 14 +++++++++++---
 themes/baggy/css/messages.css |  8 ++++----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/install/index.php b/install/index.php
index 4d7e8cd2..975b997f 100644
--- a/install/index.php
+++ b/install/index.php
@@ -172,7 +172,7 @@ else if ($_POST['install']) {
                 <li><a href="http://www.wallabag.org/">wallabag.org</a></li>
             </ul> 
             <?php if (!empty($errors)) : ?>
-                <div class='install messages error'>
+                <div class='messages error install'>
                     <p>Errors during installation:</p>
                     <p>
                         <ul>
@@ -185,7 +185,7 @@ else if ($_POST['install']) {
                 </div>
             <?php endif; ?>
             <?php if (!empty($successes)) : ?>
-                <div class='install messages success'>
+                <div class='messages success install'>
                     <p>
                         <ul>
                         <?php foreach($successes as $success) :?>
@@ -194,6 +194,14 @@ else if ($_POST['install']) {
                         </ul>
                     </p>
                 </div>
+            <?php else : ?>
+                <?php if (file_exists('inc/poche/config.inc.php') && is_dir('vendor')) : ?>
+                <div class='messages success install'>
+                    <p>
+                        wallabag seems already installed. If you want to update it, you only have to delete install folder.
+                    </p>
+                </div>
+                <?php endif; ?>    
             <?php endif; ?>
             <p>To install wallabag, you just have to fill the following fields. That's all.</p>
             <p>Don't forget to check your server compatibility <a href="wallabag_compatibility_test.php">here</a>.</p>
@@ -201,7 +209,7 @@ else if ($_POST['install']) {
                 <fieldset>
                     <legend><strong>Technical settings</strong></legend>
                     <?php if (!is_dir('vendor')) : ?>
-                        <div class='install messages notice'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it: 
+                        <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it: 
                         <ul>
                             <li>automatically download and extract vendor.zip into your wallabag folder. 
                             <p><input type="submit" name="download" value="Download vendor.zip" /></p>
diff --git a/themes/baggy/css/messages.css b/themes/baggy/css/messages.css
index 85a0dbc1..42da70b3 100755
--- a/themes/baggy/css/messages.css
+++ b/themes/baggy/css/messages.css
@@ -1,19 +1,19 @@
-.install .messages.error {
+.messages.error.install {
     border: 1px solid #c42608;
     color: #c00 !important;
     background: #fff0ef;
     text-align: left;
 }
 
-.install .messages.notice {
+.messages.notice.install {
     border: 1px solid #ebcd41;
     color: #000;
     background: #fffcd3;
     text-align: left;
 }
 
-.install .messages.success {
+.messages.success.install {
     border: 1px solid #6dc70c;
-    background: #e0fbcc;
+    background: #e0fbcc !important;
     text-align: left;
 }
\ No newline at end of file
-- 
cgit v1.2.3