wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5682 from owncloud/fix5585

Browse source 
LDAP: make buttons on Expert page work again, fixes #5585
This commit is contained in:
blizzz 2013-11-07 03:34:49 -08:00
commit 0b1749e581
3 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/user_ldap/css/settings.css
View file

@ -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;

22
apps/user_ldap/js/settings.js
View file

@ -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);
});
}
}

4
apps/user_ldap/templates/part.settingcontrols.php
View file

@ -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"