Merge pull request #5682 from owncloud/fix5585

LDAP: make buttons on Expert page work again, fixes #5585

3 files changed, 21 insertions, 13 deletions

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 65bff3aadb7..41578e91b69 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -80,6 +80,10 @@
 	height: 15px;
 }
 
+.ldapSettingControls {
+	margin-top: 3ex;
+}
+
 #ldap fieldset p label {
 	width: 20%;
 	max-width: 200px;
@@ -90,6 +94,10 @@
 	padding-right: 5px;
 }
 
+#ldap fieldset input[type=submit] {
+	width: auto;
+}
+
 #ldap fieldset input, #ldap fieldset textarea {
  	width: 60%;
 	display: inline-block;
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index aeb4b9bff59..3abec1e232e 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -652,8 +652,8 @@ var LdapWizard = {
 $(document).ready(function() {
 	$('#ldapAdvancedAccordion').accordion({ heightStyle: 'content', animate: 'easeInOutCirc'});
 	$('#ldapSettings').tabs({ beforeActivate: LdapWizard.onTabChange });
-	$('#ldap_submit').button();
-	$('#ldap_action_test_connection').button();
+	$('.ldap_submit').button();
+	$('.ldap_action_test_connection').button();
 	$('#ldap_action_delete_configuration').button();
 	LdapWizard.initMultiSelect($('#ldap_userfilter_groups'),
 							   'ldap_userfilter_groups',
@@ -682,7 +682,7 @@ $(document).ready(function() {
 		event.preventDefault();
 		LdapWizard.controlBack();
 	});
-	$('#ldap_action_test_connection').click(function(event){
+	$('.ldap_action_test_connection').click(function(event){
 		event.preventDefault();
 		$.post(
 			OC.filePath('user_ldap','ajax','testConfiguration.php'),
@@ -716,18 +716,18 @@ $(document).ready(function() {
 		);
 	});
 
-	$('#ldap_submit').click(function(event) {
+	$('.ldap_submit').click(function(event) {
 		event.preventDefault();
 		$.post(
 			OC.filePath('user_ldap','ajax','setConfiguration.php'),
 			$('#ldap').serialize(),
 			function (result) {
-				bgcolor = $('#ldap_submit').css('background');
+				bgcolor = $('.ldap_submit').css('background');
 				if (result.status === 'success') {
 					//the dealing with colors is a but ugly, but the jQuery version in use has issues with rgba colors
-					$('#ldap_submit').css('background', '#fff');
-					$('#ldap_submit').effect('highlight', {'color':'#A8FA87'}, 5000, function() {
-						$('#ldap_submit').css('background', bgcolor);
+					$('.ldap_submit').css('background', '#fff');
+					$('.ldap_submit').effect('highlight', {'color':'#A8FA87'}, 5000, function() {
+						$('.ldap_submit').css('background', bgcolor);
 					});
 					//update the Label in the config chooser
 					caption = $('#ldap_serverconfig_chooser option:selected:first').text();
@@ -737,9 +737,9 @@ $(document).ready(function() {
 					$('#ldap_serverconfig_chooser option:selected:first').text(caption);
 
 				} else {
-					$('#ldap_submit').css('background', '#fff');
-					$('#ldap_submit').effect('highlight', {'color':'#E97'}, 5000, function() {
-						$('#ldap_submit').css('background', bgcolor);
+					$('.ldap_submit').css('background', '#fff');
+					$('.ldap_submit').effect('highlight', {'color':'#E97'}, 5000, function() {
+						$('.ldap_submit').css('background', bgcolor);
 					});
 				}
 			}
diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php
index 017f21c8b1c..0cdb8ccf16f 100644
--- a/apps/user_ldap/templates/part.settingcontrols.php
+++ b/apps/user_ldap/templates/part.settingcontrols.php
@@ -1,6 +1,6 @@
 <div class="ldapSettingControls">
-	<input id="ldap_submit" type="submit" value="Save" />
-	<button id="ldap_action_test_connection" name="ldap_action_test_connection">
+	<input class="ldap_submit" value="<?php p($l->t('Save'));?>" type="submit">
+	<button class="ldap_action_test_connection" name="ldap_action_test_connection">
 		<?php p($l->t('Test Configuration'));?>
 	</button>
 	<a href="<?php p($theme->getDocBaseUrl()); ?>/server/5.0/admin_manual/auth_ldap.html"