From: Morris Jobke <morris.jobke@gmail.com>
Date: Mon, 2 Jun 2014 20:56:50 +0000 (+0200)
Subject: add info about sqlite on setup apge
X-Git-Tag: v7.0.0alpha2~142^2~3
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a4dd4cbb8fdf6d459325884290b3f4804a554328;p=nextcloud-server.git

add info about sqlite on setup apge
---

diff --git a/core/css/styles.css b/core/css/styles.css
index 4a84568244c..6cc6c03bf53 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 96719540f96..2717632fe14 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>