merge

[github/wallabag/wallabag.git] / install / index.php

diff --git a/install/index.php b/install/index.php
index 54f7f7f2ae15d4a62dfc3f866d462754429040c9..68ed1326a5d2bf9866a4513a5a6648982ab98562 100755 (executable)
--- a/install/index.php
+++ b/install/index.php
@@ -275,6 +275,19 @@ background-color:#FF9500;
 .detail {
 cursor: pointer;
 }
+.descriptions {
+    margin-left: 10%;
+    position: relative;
+    top: 50%;
+}
+.database_inputs {
+    float: left;
+    width: 50%
+}
+.database_info {
+    width: 100%;
+    overflow: auto;
+}
 .compatibity_result {
        margin: auto;
        max-width: 300px;
@@ -521,7 +534,8 @@ php composer.phar install</code></pre></li>
                     </ul>
                     </div>
                 <?php endif; ?>
-                <fieldset>
+                <div class="database_info">
+                <fieldset class="database_inputs">
                     <legend><strong>Database settings</strong></legend>
                     <p>
                         Database engine:
@@ -558,8 +572,20 @@ php composer.phar install</code></pre></li>
                         </ul>
                     </p>
                 </fieldset>
+                <div class="descriptions">
+                    <div id="sqlite_description">
+                        SQLite is the most simple database system of all three. It is therefore recommended for people who don't want or know how to configure other database systems.
+                    </div>
+                    <div id="mysql_description">
+                        MySQL is one of the most popular database systems. It comes with most shared hosting plans.
+                    </div>
+                    <div id="postgres_description">
+                        PostgreSQL. If you want it, you already know why you want it.
+                    </div>
+                </div>
+                </div>
                 <hr>
-                <fieldset>
+                <fieldset style="clear: both">
                     <legend><strong>User settings</strong></legend>
                     <p>
                         <label for="username">Username</label>
@@ -581,7 +607,10 @@ php composer.phar install</code></pre></li>
         </div>
         <script>
             $("#mysql_infos").hide();
+            $("#mysql_description").hide();
             $("#pg_infos").hide();
+            $("#postgres_description").hide();
+            $("#sqlite_description").show();
 
             $(".details").hide();
 
@@ -618,6 +647,9 @@ php composer.phar install</code></pre></li>
                         $("#pg_infos").hide();
                         $("#pdo_postgres").hide();
                         $("#pdo_sqlite").hide();
+                        $("#sqlite_description").hide();
+                        $("#postgres_description").hide();
+                        $("#mysql_description").show();
                         $("#install_button").show();        
                     }
                     else {
@@ -627,6 +659,9 @@ php composer.phar install</code></pre></li>
                             $("#pg_infos").show();
                             $("#pdo_postgres").show();
                             $("#pdo_sqlite").hide();
+                            $("#sqlite_description").hide();
+                            $("#mysql_description").hide();
+                            $("#postgres_description").show();
                             $("#install_button").show();
                         }
                         else {
@@ -634,6 +669,9 @@ php composer.phar install</code></pre></li>
                             $("#pg_infos").hide();
                             $("#pdo_postgres").hide();
                             $("#pdo_mysql").hide();
+                            $("#sqlite_description").show();
+                            $("#mysql_description").hide();
+                            $("#postgres_description").hide();
                             <?php
                             if (!extension_loaded('pdo_sqlite')) : ?>
                             $("#pdo_sqlite").show();