diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2017-11-14 14:03:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-14 14:03:27 +0100 |
| commit | a6d894893770e9ce5b89dcb3d9d30f346be06bfe (patch) | |
| tree | b563e84fc835212ecbc980eab8b163f950a41fe2 | |
| parent | ab0a3fbbbc24d813a13f19b89785a7f7ab8fcdb1 (diff) | |
| parent | f575060b93717491f09f1f85726b6eee07d467bd (diff) | |
| download | nextcloud-server-a6d894893770e9ce5b89dcb3d9d30f346be06bfe.tar.gz nextcloud-server-a6d894893770e9ce5b89dcb3d9d30f346be06bfe.zip | |
Merge pull request #5749 from nextcloud/ldap-primary-buttons
LDAP Wizard: primary-style buttons
| -rw-r--r-- | apps/user_ldap/js/wizard/wizardTabElementary.js | 1 | ||||
| -rw-r--r-- | apps/user_ldap/js/wizard/wizardTabGeneric.js | 4 | ||||
| -rw-r--r-- | apps/user_ldap/templates/part.wizardcontrols.php | 2 | ||||
| -rw-r--r-- | core/css/jquery-ui-fixes.scss | 7 |
4 files changed, 13 insertions, 1 deletions
diff --git a/apps/user_ldap/js/wizard/wizardTabElementary.js b/apps/user_ldap/js/wizard/wizardTabElementary.js index 7ce1009565d..3c6eb1adc45 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('primary'); view.onConfigLoaded(view, configuration); }, diff --git a/apps/user_ldap/js/wizard/wizardTabGeneric.js b/apps/user_ldap/js/wizard/wizardTabGeneric.js index 57ac375e321..9997d6e1b04 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('primary'); + }); + item.$element.change(function () { + 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 89eb96827e6..bd84b23c76d 100644 --- a/apps/user_ldap/templates/part.wizardcontrols.php +++ b/apps/user_ldap/templates/part.wizardcontrols.php @@ -5,7 +5,7 @@ type="button"> <?php p($l->t('Back'));?> </button> - <button class="ldap_action_continue" name="ldap_action_continue" type="button"> + <button class="ldap_action_continue primary" name="ldap_action_continue" type="button"> <?php p($l->t('Continue'));?> </button> <a href="<?php p(link_to_docs('admin-ldap')); ?>" diff --git a/core/css/jquery-ui-fixes.scss b/core/css/jquery-ui-fixes.scss index 87167100813..9dc75fc3274 100644 --- a/core/css/jquery-ui-fixes.scss +++ b/core/css/jquery-ui-fixes.scss @@ -193,3 +193,10 @@ color: $color-primary-element; } } + +.ui-button.primary { + background-color: $color-primary; + color: $color-primary-text; + border: 1px solid $color-primary-text; +} + |