1 files changed, 24 insertions, 17 deletions

diff --git a/core/js/setup.js b/core/js/setup.js
index c0df1ed96b0..279b5fbebb9 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -7,10 +7,9 @@ $(document).ready(function() {
 		oracle:!!$('#hasOracle').val(),
 		mssql:!!$('#hasMSSQL').val()
 	};
-	
+
 	$('#selectDbType').buttonset();
-	$('#datadirContent').hide(250);
-	$('#databaseField').hide(250);
+
 	if($('#hasSQLite').val()){
 		$('#use_other_db').hide();
 		$('#use_oracle_db').hide();
@@ -23,12 +22,7 @@ $(document).ready(function() {
 		$('#use_oracle_db').slideUp(250);
 	});
 
-	$('#mysql').click(function() {
-		$('#use_other_db').slideDown(250);
-		$('#use_oracle_db').slideUp(250);
-	});
-
-	$('#pgsql').click(function() {
+	$('#mysql,#pgsql,#mssql').click(function() {
 		$('#use_other_db').slideDown(250);
 		$('#use_oracle_db').slideUp(250);
 	});
@@ -38,11 +32,6 @@ $(document).ready(function() {
 		$('#use_oracle_db').show(250);
 	});
 
-	$('#mssql').click(function() {
-		$('#use_other_db').slideDown(250);
-		$('#use_oracle_db').slideUp(250);
-	});
-
 	$('input[checked]').trigger('click');
 
 	$('#showAdvanced').click(function() {
@@ -54,7 +43,7 @@ $(document).ready(function() {
 		var post = $(this).serializeArray();
 
 		// Disable inputs
-		$(':submit', this).attr('disabled','disabled').val('Finishing …');
+		$(':submit', this).attr('disabled','disabled').val($(':submit', this).data('finishing'));
 		$('input', this).addClass('ui-state-disabled').attr('disabled','disabled');
 		$('#selectDbType').buttonset('disable');
 
@@ -75,8 +64,26 @@ $(document).ready(function() {
 		return false;
 	});
 
-	if(!dbtypes.sqlite){
-		$('#showAdvanced').click();
+	// Expand latest db settings if page was reloaded on error
+	var currentDbType = $('input[type="radio"]:checked').val();
+
+	if (currentDbType === undefined){
 		$('input[type="radio"]').first().click();
 	}
+
+	if (currentDbType === 'sqlite' || (dbtypes.sqlite && currentDbType === undefined)){
+		$('#datadirContent').hide(250);
+		$('#databaseField').hide(250);
+	}
+
+	$('#adminpass').strengthify({
+		zxcvbn: OC.linkTo('3rdparty','zxcvbn/js/zxcvbn.js'),
+		titles: [
+			t('core', 'Very weak password'),
+			t('core', 'Weak password'),
+			t('core', 'So-so password'),
+			t('core', 'Good password'),
+			t('core', 'Strong password')
+		]
+	});
 });