add info about sqlite on setup apge

diff --git a/core/css/styles.css b/core/css/styles.css
index 4a84568244ca661110dd12a91860d27807922427..6cc6c03bf5336fd81e6f58ad103396efa3e3f459 100644 (file)
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -558,7 +558,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
 }
 
 
-#body-login p.info{
+#body-login footer .info {
        white-space: nowrap;
 }
 

diff --git a/core/js/setup.js b/core/js/setup.js
index 96719540f9610fbdf04ae9fa09f78c404ccc3cb2..2717632fe141a8334abd26479660d07b153d9c35 100644 (file)
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -13,6 +13,8 @@ $(document).ready(function() {
        if($('#hasSQLite').val()){
                $('#use_other_db').hide();
                $('#use_oracle_db').hide();
+       } else {
+               $('#sqliteInformation').hide();
        }
        $('#adminlogin').change(function(){
                $('#adminlogin').val($.trim($('#adminlogin').val()));
@@ -20,16 +22,19 @@ $(document).ready(function() {
        $('#sqlite').click(function() {
                $('#use_other_db').slideUp(250);
                $('#use_oracle_db').slideUp(250);
+               $('#sqliteInformation').show();
        });
 
        $('#mysql,#pgsql,#mssql').click(function() {
                $('#use_other_db').slideDown(250);
                $('#use_oracle_db').slideUp(250);
+               $('#sqliteInformation').hide();
        });
 
        $('#oci').click(function() {
                $('#use_other_db').slideDown(250);
                $('#use_oracle_db').show(250);
+               $('#sqliteInformation').hide();
        });
 
        $('input[checked]').trigger('click');

diff --git a/core/templates/installation.php b/core/templates/installation.php
index 709207e79772491edcdbee50bae31ae2a4439abb..6d73fb431f5f49d04d55ab988ac9d0e1be8c4798 100644 (file)
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -91,7 +91,7 @@
                <div id="selectDbType">
                <?php foreach($_['databases'] as $type => $label): ?>
                <?php if(count($_['databases']) === 1): ?>
-               <p class="info"><?php p($label . ' ' . $l->t( 'will be used' )); ?>.</p>
+               <p class="info"><?php p($l->t( 'Only %s is available.', array($label) )); ?>.</p>
                <input type="hidden" id="dbtype" name="dbtype" value="<?php p($type) ?>" />
                <?php else: ?>
                <input type="radio" name="dbtype" value="<?php p($type) ?>" id="<?php p($type) ?>"
@@ -112,7 +112,7 @@
                                        autocomplete="off" autocapitalize="off" autocorrect="off" />
                        </p>
                        <p class="infield groupmiddle">
-                               <input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword" 
+                               <input type="password" name="dbpass" id="dbpass" placeholder="" data-typetoggle="#dbpassword"
                                        value="<?php p($_['dbpass']); ?>"
                                        autocomplete="off" autocapitalize="off" autocorrect="off" />
                                <label for="dbpass" class="infield"><?php p($l->t( 'Database password' )); ?></label>
@@ -147,5 +147,7 @@
                <?php endif; ?>
        <?php endif; ?>
 
+       <p id="sqliteInformation" class="info"><?php p($l->t('SQLite will be used as database. For larger installations we recommend to change this.'));?></p>
+
        <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>
 </form>