diff options
| -rw-r--r-- | core/css/styles.css | 2 | ||||
| -rw-r--r-- | core/js/setup.js | 5 | ||||
| -rw-r--r-- | core/templates/installation.php | 6 | ||||
| -rwxr-xr-x | settings/admin.php | 4 | ||||
| -rw-r--r-- | settings/templates/admin.php | 14 |
5 files changed, 28 insertions, 3 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index be42fedd912..a9ffd83629b 100644 --- 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 d28f15a0a03..3b2c13bd421 100644 --- 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 709207e7977..6d73fb431f5 100644 --- 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> diff --git a/settings/admin.php b/settings/admin.php index a0769892ef4..fc76d3d74ab 100755 --- a/settings/admin.php +++ b/settings/admin.php @@ -88,6 +88,10 @@ $tmpl->assign('forms', array()); foreach($forms as $form) { $tmpl->append('forms', $form); } + +$databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false); +$tmpl->assign('databaseOverload', $databaseOverload); + $tmpl->printPage(); /** diff --git a/settings/templates/admin.php b/settings/templates/admin.php index cb57bc0ce72..c8ca031ec98 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -98,6 +98,20 @@ if (!$_['isAnnotationsWorking']) { <?php } +// SQLite database performance issue +if ($_['databaseOverload']) { + ?> +<div class="section"> + <h2><?php p($l->t('Database Performance Info'));?></h2> + + <p class="securitywarning"> + <?php p($l->t('SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: \'occ db:convert-type\'')); ?> + </p> + +</div> +<?php +} + // if module fileinfo available? if (!$_['has_fileinfo']) { ?> |