diff options
author | Thomas Citharel <tcit@tcit.fr> | 2015-01-31 23:50:40 +0100 |
---|---|---|
committer | Thomas Citharel <tcit@tcit.fr> | 2015-01-31 23:50:40 +0100 |
commit | 89e8812494dfef7cfd18ae341578836a5b897b71 (patch) | |
tree | 306824db85813dd64866967498b2eb1e31345aeb /install/index.php | |
parent | dd0d7ad9a18cce6424442ac37340ded039f5e0fb (diff) | |
parent | 22f19b23a6e9400b5776a9a7f0eedb9eb1b5362e (diff) | |
download | wallabag-89e8812494dfef7cfd18ae341578836a5b897b71.tar.gz wallabag-89e8812494dfef7cfd18ae341578836a5b897b71.tar.zst wallabag-89e8812494dfef7cfd18ae341578836a5b897b71.zip |
merge
Diffstat (limited to 'install/index.php')
-rwxr-xr-x | install/index.php | 61 |
1 files changed, 44 insertions, 17 deletions
diff --git a/install/index.php b/install/index.php index 73c594cd..68ed1326 100755 --- a/install/index.php +++ b/install/index.php | |||
@@ -288,6 +288,27 @@ cursor: pointer; | |||
288 | width: 100%; | 288 | width: 100%; |
289 | overflow: auto; | 289 | overflow: auto; |
290 | } | 290 | } |
291 | .compatibity_result { | ||
292 | margin: auto; | ||
293 | max-width: 300px; | ||
294 | min-height: 50px; | ||
295 | line-height: 50px; | ||
296 | text-align: center; | ||
297 | } | ||
298 | |||
299 | h2, legend { | ||
300 | font-size: 30px; | ||
301 | text-transform: uppercase; | ||
302 | font-family: "PT Sans",sans-serif; | ||
303 | } | ||
304 | |||
305 | legend:after { | ||
306 | content: ""; | ||
307 | height: 4px; | ||
308 | width: 70px; | ||
309 | background-color: #000; | ||
310 | display: block; | ||
311 | } | ||
291 | 312 | ||
292 | </style> | 313 | </style> |
293 | 314 | ||
@@ -341,14 +362,16 @@ cursor: pointer; | |||
341 | <p>To install wallabag, you just have to fill the following fields. That's all.</p> | 362 | <p>To install wallabag, you just have to fill the following fields. That's all.</p> |
342 | <p>If you need help, you can read the doc: <a href="docs/" target="_blank">offline documentation</a> and <a href="http://doc.wallabag.org" target="_blank">online one</a> (already up-to-date).</p> | 363 | <p>If you need help, you can read the doc: <a href="docs/" target="_blank">offline documentation</a> and <a href="http://doc.wallabag.org" target="_blank">online one</a> (already up-to-date).</p> |
343 | 364 | ||
344 | <p class="detail">Server compatibility test (click to view details) : <?php if (isOkay()) { ?> | 365 | <div> |
345 | <span class="good">All good</span> | 366 | <h2>Server compatibility test</h2> |
346 | <?php } elseif (isPassing()) { ?> | 367 | <?php if (isOkay()) { ?> |
347 | <span class="pass">Some problems, but it's OK !</span> | 368 | <div class="compatibity_result detail good">All good</div> |
348 | <?php } else { ?> | 369 | <?php } elseif (isPassing()) { ?> |
349 | <span class="bad">Bad news : you can't run wallabag</span> | 370 | <div class="compatibity_result detail pass">Some problems, but it's OK !</div> |
350 | <?php } ?> </p> | 371 | <?php } else { ?> |
351 | <?php $status = status(); ?> | 372 | <div class="compatibity_result detail bad">Bad news : you can't run wallabag</div> |
373 | <?php } $status = status(); ?> | ||
374 | </div> | ||
352 | 375 | ||
353 | <div class="details"> | 376 | <div class="details"> |
354 | <div> | 377 | <div> |
@@ -376,6 +399,12 @@ cursor: pointer; | |||
376 | <?php echo ($status['pdo']) ? '<td class="good">Enabled</span>' : '<td class="bad">Disabled'; ?></td> | 399 | <?php echo ($status['pdo']) ? '<td class="good">Enabled</span>' : '<td class="bad">Disabled'; ?></td> |
377 | <td><?php echo ($status['pdo']) ? '<strong>PDO:</strong> You have PDO support enabled.' : '<strong>PDO:</strong> Your PHP installation doesn\'t support PHP PDO. <strong>' . $status['app_name'] . ' will not work here.</strong>' ?></td> | 400 | <td><?php echo ($status['pdo']) ? '<strong>PDO:</strong> You have PDO support enabled.' : '<strong>PDO:</strong> Your PHP installation doesn\'t support PHP PDO. <strong>' . $status['app_name'] . ' will not work here.</strong>' ?></td> |
378 | </tr> | 401 | </tr> |
402 | <tr class="<?php echo ($status['pdo_drivers_passing']) ? 'enabled' : 'disabled'; ?>"> | ||
403 | <td>PDO Drivers</td> | ||
404 | <td>One of the PDO drivers must be installed</td> | ||
405 | <?php echo ($status['pdo_drivers_passing']) ? '<td class="good">One driver is enabled</span>' : '<td class="bad">No driver available'; ?></td> | ||
406 | <td><?php echo ($status['pdo_drivers_passing']) ? '<strong>PDO:</strong> You have at least one PDO driver installed.' : '<strong>PDO Drivers:</strong> Your PHP installation doesn\'t have any PDO driver installed. <strong>' . $status['app_name'] . ' will not work here.</strong>' ?></td> | ||
407 | </tr> | ||
379 | <tr class="<?php echo ($status['xml']) ? 'enabled' : 'disabled'; ?>"> | 408 | <tr class="<?php echo ($status['xml']) ? 'enabled' : 'disabled'; ?>"> |
380 | <td><a href="http://php.net/xml">XML</a></td> | 409 | <td><a href="http://php.net/xml">XML</a></td> |
381 | <td>Enabled</td> | 410 | <td>Enabled</td> |
@@ -466,9 +495,8 @@ cursor: pointer; | |||
466 | </tr> | 495 | </tr> |
467 | </tbody> | 496 | </tbody> |
468 | </table> | 497 | </table> |
469 | <span style="display:inline-block;text-align: right;" class="detail">Close details</span> | 498 | <hr> |
470 | </div> | 499 | </div> |
471 | <hr> | ||
472 | <div class="details"> | 500 | <div class="details"> |
473 | <?php //if ($status['php'] && $status['xml'] && $status['pcre'] && $status['mbstring'] && $status['iconv'] && $status['filter'] && $status['allow_url_fopen']) { ?> | 501 | <?php //if ($status['php'] && $status['xml'] && $status['pcre'] && $status['mbstring'] && $status['iconv'] && $status['filter'] && $status['allow_url_fopen']) { ?> |
474 | <?php if (isOkay()) { ?> | 502 | <?php if (isOkay()) { ?> |
@@ -486,12 +514,11 @@ cursor: pointer; | |||
486 | <?php } ?> | 514 | <?php } ?> |
487 | </div> | 515 | </div> |
488 | 516 | ||
489 | <div class="chunk"> | 517 | <div class="chunk"> |
490 | <p class="footnote">This compatibility test has been borrowed (and slightly adapted by <a href="http://fivefilters.org/content-only/">fivefilters.org</a>) from the one supplied by <a href="http://simplepie.org/">SimplePie.org</a>.</a></p> | 518 | <p class="footnote">This compatibility test has been borrowed (and slightly adapted by <a href="http://fivefilters.org/content-only/">fivefilters.org</a>) from the one supplied by <a href="http://simplepie.org/">SimplePie.org</a>.</a></p> |
519 | </div> | ||
520 | <hr> | ||
491 | </div> | 521 | </div> |
492 | |||
493 | </div> | ||
494 | <hr> | ||
495 | <form method="post" class="technical"> | 522 | <form method="post" class="technical"> |
496 | <?php if (!is_dir('vendor')) : ?> | 523 | <?php if (!is_dir('vendor')) : ?> |
497 | <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it:<br /> | 524 | <div class='messages notice install'>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it:<br /> |
@@ -502,14 +529,14 @@ cursor: pointer; | |||
502 | <b>Be careful, zip extension is not enabled in your PHP configuration. You'll have to unzip vendor.zip manually.</b> | 529 | <b>Be careful, zip extension is not enabled in your PHP configuration. You'll have to unzip vendor.zip manually.</b> |
503 | <?php endif; ?> | 530 | <?php endif; ?> |
504 | <em>This method is mainly recommended if you don't have a dedicated server.</em></li> | 531 | <em>This method is mainly recommended if you don't have a dedicated server.</em></li> |
505 | <li>use <a href="http://getcomposer.org/">Composer</a> :<pre><code>curl -s http://getcomposer.org/installer | php | 532 | <li>use <a href="http://getcomposer.org/">Composer</a> in your wallabag folder :<pre><code>curl -s http://getcomposer.org/installer | php |
506 | php composer.phar install</code></pre></li> | 533 | php composer.phar install</code></pre></li> |
507 | </ul> | 534 | </ul> |
508 | </div> | 535 | </div> |
509 | <?php endif; ?> | 536 | <?php endif; ?> |
510 | <div class="database_info"> | 537 | <div class="database_info"> |
511 | <fieldset class="database_inputs"> | 538 | <fieldset class="database_inputs"> |
512 | <legend><strong>Technical settings</strong></legend> | 539 | <legend><strong>Database settings</strong></legend> |
513 | <p> | 540 | <p> |
514 | Database engine: | 541 | Database engine: |
515 | <ul> | 542 | <ul> |