aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorThomas Citharel <tcit@tcit.fr>2015-02-01 00:44:13 +0100
committerThomas Citharel <tcit@tcit.fr>2015-02-01 00:44:13 +0100
commit9834d87e9713280e930f8ea07b8e9f77c22b2716 (patch)
tree2f872bd46b63f12cbe4971e5fe9af6966f2d30c1
parent89e8812494dfef7cfd18ae341578836a5b897b71 (diff)
downloadwallabag-9834d87e9713280e930f8ea07b8e9f77c22b2716.tar.gz
wallabag-9834d87e9713280e930f8ea07b8e9f77c22b2716.tar.zst
wallabag-9834d87e9713280e930f8ea07b8e9f77c22b2716.zip
final adjustments
-rwxr-xr-xinstall/index.php57
1 files changed, 48 insertions, 9 deletions
diff --git a/install/index.php b/install/index.php
index 68ed1326..892af241 100755
--- a/install/index.php
+++ b/install/index.php
@@ -294,6 +294,8 @@ cursor: pointer;
294 min-height: 50px; 294 min-height: 50px;
295 line-height: 50px; 295 line-height: 50px;
296 text-align: center; 296 text-align: center;
297 margin-bottom: 30px;
298 border-radius: 3px;
297} 299}
298 300
299h2, legend { 301h2, legend {
@@ -309,6 +311,18 @@ legend:after {
309 background-color: #000; 311 background-color: #000;
310 display: block; 312 display: block;
311} 313}
314#reloadpage {
315cursor: pointer;
316background-color: #000;
317color: #FFF;
318padding: 0.5em 1em;
319display: inline-block;
320border: 1px solid #000;
321}
322#reloadpage:hover {
323 background-color: #FFF;
324 color: #000;
325}
312 326
313</style> 327</style>
314 328
@@ -511,17 +525,21 @@ legend:after {
511 <?php } else { ?> 525 <?php } else { ?>
512 <h3>Bottom Line: We're sorry…</h3> 526 <h3>Bottom Line: We're sorry…</h3>
513 <p><em>Your webhost does not support the minimum requirements for <?php echo $status['app_name']; ?>.</em> It may be a good idea to contact your webhost and point them to the results of this test. They may be able to enable/install the required components.</p> 527 <p><em>Your webhost does not support the minimum requirements for <?php echo $status['app_name']; ?>.</em> It may be a good idea to contact your webhost and point them to the results of this test. They may be able to enable/install the required components.</p>
528 <p>If this is your own server and you think you have all the requirements installed, please get in touch with us.</p>
514 <?php } ?> 529 <?php } ?>
515 </div> 530 </div>
516 531
517 <div class="chunk"> 532 <div class="chunk">
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> 533 <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> 534 </div>
520 <hr>
521 </div> 535 </div>
522 <form method="post" class="technical"> 536 <form method="post" class="technical">
537 <hr>
538 <div class='twig'>
539 <h2>Twig installation</h2>
523 <?php if (!is_dir('vendor')) : ?> 540 <?php if (!is_dir('vendor')) : ?>
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 /> 541
542 <p>wallabag needs twig, a template engine (<a href="http://twig.sensiolabs.org/">?</a>). Two ways to install it:</p>
525 <ul> 543 <ul>
526 <li>automatically download and extract vendor.zip into your wallabag folder. 544 <li>automatically download and extract vendor.zip into your wallabag folder.
527 <p><input type="submit" name="download" value="Download vendor.zip" /></p> 545 <p><input type="submit" name="download" value="Download vendor.zip" /></p>
@@ -530,11 +548,17 @@ legend:after {
530 <?php endif; ?> 548 <?php endif; ?>
531 <em>This method is mainly recommended if you don't have a dedicated server.</em></li> 549 <em>This method is mainly recommended if you don't have a dedicated server.</em></li>
532 <li>use <a href="http://getcomposer.org/">Composer</a> in your wallabag folder :<pre><code>curl -s http://getcomposer.org/installer | php 550 <li>use <a href="http://getcomposer.org/">Composer</a> in your wallabag folder :<pre><code>curl -s http://getcomposer.org/installer | php
533php composer.phar install</code></pre></li> 551php composer.phar install</code></pre>
552 <span id="reloadpage">Reload to check</span>
553 </li>
534 </ul> 554 </ul>
535 </div> 555
556 <?php else : ?>
557 Twig is properly installed.
536 <?php endif; ?> 558 <?php endif; ?>
559 </div>
537 <div class="database_info"> 560 <div class="database_info">
561 <hr>
538 <fieldset class="database_inputs"> 562 <fieldset class="database_inputs">
539 <legend><strong>Database settings</strong></legend> 563 <legend><strong>Database settings</strong></legend>
540 <p> 564 <p>
@@ -580,11 +604,12 @@ php composer.phar install</code></pre></li>
580 MySQL is one of the most popular database systems. It comes with most shared hosting plans. 604 MySQL is one of the most popular database systems. It comes with most shared hosting plans.
581 </div> 605 </div>
582 <div id="postgres_description"> 606 <div id="postgres_description">
583 PostgreSQL. If you want it, you already know why you want it. 607 PostgreSQL. Because some people prefer it to MySQL.
584 </div> 608 </div>
585 </div> 609 </div>
586 </div> 610 </div>
587 <hr> 611 <hr>
612 <div class="usersettings">
588 <fieldset style="clear: both"> 613 <fieldset style="clear: both">
589 <legend><strong>User settings</strong></legend> 614 <legend><strong>User settings</strong></legend>
590 <p> 615 <p>
@@ -601,22 +626,32 @@ php composer.phar install</code></pre></li>
601 <input type="email" id="email" name="email" /> 626 <input type="email" id="email" name="email" />
602 </p> 627 </p>
603 </fieldset> 628 </fieldset>
604
605 <input type="submit" id="install_button" value="Install wallabag" name="install" /> 629 <input type="submit" id="install_button" value="Install wallabag" name="install" />
630 </div>
606 </form> 631 </form>
607 </div> 632 </div>
608 <script> 633 <script>
634 <?php if (!is_dir('vendor')) : ?>
635 $(".database_info").hide();
636 $(".usersettings").hide();
637 <?php endif ?>
638 /*
639 * Database showing/hiding
640 */
609 $("#mysql_infos").hide(); 641 $("#mysql_infos").hide();
610 $("#mysql_description").hide(); 642 $("#mysql_description").hide();
611 $("#pg_infos").hide(); 643 $("#pg_infos").hide();
612 $("#postgres_description").hide(); 644 $("#postgres_description").hide();
613 $("#sqlite_description").show(); 645 $("#sqlite_description").show();
614
615 $(".details").hide();
616
617 $("#pdo_postgres").hide(); 646 $("#pdo_postgres").hide();
618 $("#pdo_mysql").hide(); 647 $("#pdo_mysql").hide();
619 648
649 /*
650 * Details hiding
651 */
652
653 $(".details").hide();
654
620 <?php 655 <?php
621 if (!isPassing()) : ?> 656 if (!isPassing()) : ?>
622 $('.technical').hide(); 657 $('.technical').hide();
@@ -687,6 +722,10 @@ php composer.phar install</code></pre></li>
687 { 722 {
688 $('.details').toggle(); 723 $('.details').toggle();
689 }); 724 });
725 $("#reloadpage").click(function()
726 {
727 location.reload();
728 });
690 729
691 </script> 730 </script>
692 </body> 731 </body>