From 5603d9a5ea39d5945b555d186753c752418b616b Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Mon, 17 Jul 2017 12:16:09 +0200 Subject: [PATCH 1/3] hackishly add primary css class adaption for jquery ui Signed-off-by: Arthur Schiwon --- apps/user_ldap/css/settings.css | 8 ++++++++ apps/user_ldap/js/wizard/wizardTabElementary.js | 1 + apps/user_ldap/js/wizard/wizardTabGeneric.js | 4 ++++ apps/user_ldap/templates/part.wizardcontrols.php | 2 +- 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css index 54d0e2dbb0cb7..4288bdc2c2471 100644 --- a/apps/user_ldap/css/settings.css +++ b/apps/user_ldap/css/settings.css @@ -209,6 +209,14 @@ select[multiple=multiple] + button { color: #777; } +.ldap_primary { + border: 1px solid #0082c9 !important; + background-color: rgba(0, 130, 201, .7) !important; + background-image: none !important; + color: #fff !important; + cursor: pointer; +} + #ldapSettings { background-color: white; padding: 0; diff --git a/apps/user_ldap/js/wizard/wizardTabElementary.js b/apps/user_ldap/js/wizard/wizardTabElementary.js index 7ce1009565d52..ea40b7682af1c 100644 --- a/apps/user_ldap/js/wizard/wizardTabElementary.js +++ b/apps/user_ldap/js/wizard/wizardTabElementary.js @@ -214,6 +214,7 @@ OCA = OCA || {}; onConfigSwitch: function(view, configuration) { this.baseDNTestTriggered = false; view.disableElement(view.managedItems.ldap_port.$relatedElements); + view.managedItems.ldap_dn.$saveButton.removeClass('ldap_primary'); view.onConfigLoaded(view, configuration); }, diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js index 57ac375e3213f..375ec45066f2a 100644 --- a/apps/user_ldap/js/wizard/wizardTabGeneric.js +++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js @@ -359,6 +359,10 @@ OCA = OCA || {}; item.$saveButton.click(function(event) { event.preventDefault(); view._requestSave(item.$element); + item.$saveButton.removeClass('ldap_primary'); + }); + item.$element.change(function () { + item.$saveButton.addClass('ldap_primary'); }); })(this.managedItems[id]); } diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php index 89eb96827e618..8ef6e88840784 100644 --- a/apps/user_ldap/templates/part.wizardcontrols.php +++ b/apps/user_ldap/templates/part.wizardcontrols.php @@ -5,7 +5,7 @@ type="button"> t('Back'));?> - Date: Tue, 5 Sep 2017 23:26:28 +0200 Subject: [PATCH 2/3] Use primary class also for ui-button elements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/user_ldap/css/settings.css | 8 -------- apps/user_ldap/js/wizard/wizardTabElementary.js | 2 +- apps/user_ldap/js/wizard/wizardTabGeneric.js | 4 ++-- apps/user_ldap/templates/part.wizardcontrols.php | 2 +- core/css/jquery-ui-fixes.scss | 6 ++++++ 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css index 4288bdc2c2471..54d0e2dbb0cb7 100644 --- a/apps/user_ldap/css/settings.css +++ b/apps/user_ldap/css/settings.css @@ -209,14 +209,6 @@ select[multiple=multiple] + button { color: #777; } -.ldap_primary { - border: 1px solid #0082c9 !important; - background-color: rgba(0, 130, 201, .7) !important; - background-image: none !important; - color: #fff !important; - cursor: pointer; -} - #ldapSettings { background-color: white; padding: 0; diff --git a/apps/user_ldap/js/wizard/wizardTabElementary.js b/apps/user_ldap/js/wizard/wizardTabElementary.js index ea40b7682af1c..3c6eb1adc45c4 100644 --- a/apps/user_ldap/js/wizard/wizardTabElementary.js +++ b/apps/user_ldap/js/wizard/wizardTabElementary.js @@ -214,7 +214,7 @@ OCA = OCA || {}; onConfigSwitch: function(view, configuration) { this.baseDNTestTriggered = false; view.disableElement(view.managedItems.ldap_port.$relatedElements); - view.managedItems.ldap_dn.$saveButton.removeClass('ldap_primary'); + view.managedItems.ldap_dn.$saveButton.removeClass('primary'); view.onConfigLoaded(view, configuration); }, diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js index 375ec45066f2a..9997d6e1b04c8 100644 --- a/apps/user_ldap/js/wizard/wizardTabGeneric.js +++ b/apps/user_ldap/js/wizard/wizardTabGeneric.js @@ -359,10 +359,10 @@ OCA = OCA || {}; item.$saveButton.click(function(event) { event.preventDefault(); view._requestSave(item.$element); - item.$saveButton.removeClass('ldap_primary'); + item.$saveButton.removeClass('primary'); }); item.$element.change(function () { - item.$saveButton.addClass('ldap_primary'); + item.$saveButton.addClass('primary'); }); })(this.managedItems[id]); } diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php index 8ef6e88840784..bd84b23c76dbe 100644 --- a/apps/user_ldap/templates/part.wizardcontrols.php +++ b/apps/user_ldap/templates/part.wizardcontrols.php @@ -5,7 +5,7 @@ type="button"> t('Back'));?> - Date: Mon, 13 Nov 2017 16:39:09 +0100 Subject: [PATCH 3/3] add newline at the end of the ~~universe~~ file Signed-off-by: Arthur Schiwon --- core/css/jquery-ui-fixes.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss index fcc4c75080916..9dc75fc327450 100644 --- a/core/css/jquery-ui-fixes.scss +++ b/core/css/jquery-ui-fixes.scss @@ -198,4 +198,5 @@ background-color: $color-primary; color: $color-primary-text; border: 1px solid $color-primary-text; -} \ No newline at end of file +} +