diff options
-rw-r--r-- | install/index.php | 14 | ||||
-rwxr-xr-x | 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']) { | |||
172 | <li><a href="http://www.wallabag.org/">wallabag.org</a></li> | 172 | <li><a href="http://www.wallabag.org/">wallabag.org</a></li> |
173 | </ul> | 173 | </ul> |
174 | <?php if (!empty($errors)) : ?> | 174 | <?php if (!empty($errors)) : ?> |
175 | <div class='install messages error'> | 175 | <div class='messages error install'> |
176 | <p>Errors during installation:</p> | 176 | <p>Errors during installation:</p> |
177 | <p> | 177 | <p> |
178 | <ul> | 178 | <ul> |
@@ -185,7 +185,7 @@ else if ($_POST['install']) { | |||
185 | </div> | 185 | </div> |
186 | <?php endif; ?> | 186 | <?php endif; ?> |
187 | <?php if (!empty($successes)) : ?> | 187 | <?php if (!empty($successes)) : ?> |
188 | <div class='install messages success'> | 188 | <div class='messages success install'> |
189 | <p> | 189 | <p> |
190 | <ul> | 190 | <ul> |
191 | <?php foreach($successes as $success) :?> | 191 | <?php foreach($successes as $success) :?> |
@@ -194,6 +194,14 @@ else if ($_POST['install']) { | |||
194 | </ul> | 194 | </ul> |
195 | </p> | 195 | </p> |
196 | </div> | 196 | </div> |
197 | <?php else : ?> | ||
198 | <?php if (file_exists('inc/poche/config.inc.php') && is_dir('vendor')) : ?> | ||
199 | <div class='messages success install'> | ||
200 | <p> | ||
201 | wallabag seems already installed. If you want to update it, you only have to delete install folder. | ||
202 | </p> | ||
203 | </div> | ||
204 | <?php endif; ?> | ||
197 | <?php endif; ?> | 205 | <?php endif; ?> |
198 | <p>To install wallabag, you just have to fill the following fields. That's all.</p> | 206 | <p>To install wallabag, you just have to fill the following fields. That's all.</p> |
199 | <p>Don't forget to check your server compatibility <a href="wallabag_compatibility_test.php">here</a>.</p> | 207 | <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']) { | |||
201 | <fieldset> | 209 | <fieldset> |
202 | <legend><strong>Technical settings</strong></legend> | 210 | <legend><strong>Technical settings</strong></legend> |
203 | <?php if (!is_dir('vendor')) : ?> | 211 | <?php if (!is_dir('vendor')) : ?> |
204 | <div class='install messages notice'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it: | 212 | <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it: |
205 | <ul> | 213 | <ul> |
206 | <li>automatically download and extract vendor.zip into your wallabag folder. | 214 | <li>automatically download and extract vendor.zip into your wallabag folder. |
207 | <p><input type="submit" name="download" value="Download vendor.zip" /></p> | 215 | <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 @@ | |||
1 | .install .messages.error { | 1 | .messages.error.install { |
2 | border: 1px solid #c42608; | 2 | border: 1px solid #c42608; |
3 | color: #c00 !important; | 3 | color: #c00 !important; |
4 | background: #fff0ef; | 4 | background: #fff0ef; |
5 | text-align: left; | 5 | text-align: left; |
6 | } | 6 | } |
7 | 7 | ||
8 | .install .messages.notice { | 8 | .messages.notice.install { |
9 | border: 1px solid #ebcd41; | 9 | border: 1px solid #ebcd41; |
10 | color: #000; | 10 | color: #000; |
11 | background: #fffcd3; | 11 | background: #fffcd3; |
12 | text-align: left; | 12 | text-align: left; |
13 | } | 13 | } |
14 | 14 | ||
15 | .install .messages.success { | 15 | .messages.success.install { |
16 | border: 1px solid #6dc70c; | 16 | border: 1px solid #6dc70c; |
17 | background: #e0fbcc; | 17 | background: #e0fbcc !important; |
18 | text-align: left; | 18 | text-align: left; |
19 | } \ No newline at end of file | 19 | } \ No newline at end of file |