From 17820fbef6e2eda38b43cdb35a0c9c7b6fa59bb3 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 4 Nov 2013 16:48:40 +0100 Subject: [PATCH 1/3] LDAP: make buttons on Expert page work again, fixes #5585 --- apps/user_ldap/js/settings.js | 22 +++++++++---------- .../templates/part.settingcontrols.php | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js index 4c2f182dad..5f670353f6 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 017f21c8b1..3ec234d70f 100644 --- a/apps/user_ldap/templates/part.settingcontrols.php +++ b/apps/user_ldap/templates/part.settingcontrols.php @@ -1,6 +1,6 @@
- - Date: Mon, 4 Nov 2013 16:54:48 +0100 Subject: [PATCH 2/3] LDAP: improve design and placement of Save button --- apps/user_ldap/css/settings.css | 8 ++++++++ apps/user_ldap/templates/part.settingcontrols.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css index 65bff3aadb..41578e91b6 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/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php index 3ec234d70f..2d726fcd07 100644 --- a/apps/user_ldap/templates/part.settingcontrols.php +++ b/apps/user_ldap/templates/part.settingcontrols.php @@ -1,5 +1,5 @@
- + From 8b3da2336894cee99c61b32f7471c044c2a53141 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Wed, 6 Nov 2013 12:40:07 +0100 Subject: [PATCH 3/3] LDAP Wizard: l10ned Save button --- apps/user_ldap/templates/part.settingcontrols.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php index 2d726fcd07..0cdb8ccf16 100644 --- a/apps/user_ldap/templates/part.settingcontrols.php +++ b/apps/user_ldap/templates/part.settingcontrols.php @@ -1,5 +1,5 @@
- +