From 9e40f5f2c7958143a29606e5bce650a93e477ecc Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Wed, 19 Aug 2015 16:09:42 +0200 Subject: [PATCH 01/59] Remove option to skip certificate validation to prevent insecure configurations Skipping certificate validation will allow MITM on every single request and not give any real security over just running unencrypted queries. On top of that, there is no way to configure this behavior from within PHP except of setting environment variables, which is really hacky and has side effects on other requests. fixes #9607 --- .../Config/Resource/LdapResourceForm.php | 16 ----- .../Icinga/Protocol/Ldap/LdapConnection.php | 64 ++++--------------- 2 files changed, 14 insertions(+), 66 deletions(-) diff --git a/application/forms/Config/Resource/LdapResourceForm.php b/application/forms/Config/Resource/LdapResourceForm.php index c6e452d2c..d20ec55af 100644 --- a/application/forms/Config/Resource/LdapResourceForm.php +++ b/application/forms/Config/Resource/LdapResourceForm.php @@ -81,22 +81,6 @@ class LdapResourceForm extends Form ) ); - if (isset($formData['encryption']) && $formData['encryption'] !== 'none') { - // TODO(jom): Do not show this checkbox unless the connection is actually failing due to certificate errors - $this->addElement( - 'checkbox', - 'reqcert', - array( - 'required' => true, - 'label' => $this->translate('Require Certificate'), - 'description' => $this->translate( - 'When checked, the LDAP server must provide a valid and known (trusted) certificate.' - ), - 'value' => 1 - ) - ); - } - $this->addElement( 'text', 'root_dn', diff --git a/library/Icinga/Protocol/Ldap/LdapConnection.php b/library/Icinga/Protocol/Ldap/LdapConnection.php index 841e855da..13036f847 100644 --- a/library/Icinga/Protocol/Ldap/LdapConnection.php +++ b/library/Icinga/Protocol/Ldap/LdapConnection.php @@ -122,13 +122,6 @@ class LdapConnection implements Selectable, Inspectable */ protected $rootDn; - /** - * Whether to load the configuration for strict certificate validation or the one for non-strict validation - * - * @var bool - */ - protected $validateCertificate; - /** * Whether the bind on this connection has already been performed * @@ -176,7 +169,6 @@ class LdapConnection implements Selectable, Inspectable $this->bindPw = $config->bind_pw; $this->rootDn = $config->root_dn; $this->port = $config->get('port', 389); - $this->validateCertificate = (bool) $config->get('reqcert', true); $this->encryption = $config->encryption; if ($this->encryption !== null) { @@ -957,16 +949,9 @@ class LdapConnection implements Selectable, Inspectable $info = new Inspection(''); } - if ($this->encryption === static::STARTTLS || $this->encryption === static::LDAPS) { - $this->prepareTlsEnvironment(); - } - $hostname = $this->hostname; if ($this->encryption === static::LDAPS) { $info->write('Connect using LDAPS'); - if (! $this->validateCertificate) { - $info->write('Skip certificate validation'); - } $hostname = 'ldaps://' . $hostname; } @@ -983,9 +968,6 @@ class LdapConnection implements Selectable, Inspectable if ($this->encryption === static::STARTTLS) { $this->encrypted = true; $info->write('Connect using STARTTLS'); - if (! $this->validateCertificate) { - $info->write('Skip certificate validation'); - } if (! ldap_start_tls($ds)) { throw new LdapException('LDAP STARTTLS failed: %s', ldap_error($ds)); } @@ -998,30 +980,6 @@ class LdapConnection implements Selectable, Inspectable return $ds; } - /** - * Set up how to handle StartTLS connections - * - * @throws LdapException In case the LDAPRC environment variable cannot be set - */ - protected function prepareTlsEnvironment() - { - // TODO: allow variable known CA location (system VS Icinga) - if (Platform::isWindows()) { - putenv('LDAPTLS_REQCERT=never'); - } else { - if ($this->validateCertificate) { - $ldap_conf = $this->getConfigDir('ldap_ca.conf'); - } else { - $ldap_conf = $this->getConfigDir('ldap_nocert.conf'); - } - - putenv('LDAPRC=' . $ldap_conf); // TODO: Does not have any effect - if (getenv('LDAPRC') !== $ldap_conf) { - throw new LdapException('putenv failed'); - } - } - } - /** * Create an LDAP entry * @@ -1103,6 +1061,13 @@ class LdapConnection implements Selectable, Inspectable try { $ds = $this->prepareNewConnection($insp); } catch (Exception $e) { + if ($this->encryption === 'starttls') { + // The Exception does not return any proper error messages in case of certificate errors. Connecting + // by STARTTLS will usually fail at this point when the certificate is unknown, + // so at least try to give some hints. + $insp->write('NOTE: There might be an issue with the chosen encryption. Ensure that the LDAP-Server ' . + 'supports STARTTLS and that the LDAP-Client is configured to accept its certificate.'); + } return $insp->error($e->getMessage()); } @@ -1116,6 +1081,13 @@ class LdapConnection implements Selectable, Inspectable '***' /* $this->bindPw */ ); if (! $success) { + // ldap_error does not return any proper error messages in case of certificate errors. Connecting + // by LDAPS will usually fail at this point when the certificate is unknown, so at least try to give + // some hints. + if ($this->encryption === 'ldaps') { + $insp->write('NOTE: There might be an issue with the chosen encryption. Ensure that the LDAP-Server ' . + ' supports LDAPS and that the LDAP-Client is configured to accept its certificate.'); + } return $insp->error(sprintf('%s failed: %s', $msg, ldap_error($ds))); } $insp->write(sprintf($msg . ' successful')); @@ -1137,12 +1109,4 @@ class LdapConnection implements Selectable, Inspectable } return $insp; } - - /** - * Reset the environment variables set by self::prepareTlsEnvironment() - */ - public function __destruct() - { - putenv('LDAPRC'); - } } From 41d68f6a7417430991d34e27988ced05ecd8b45f Mon Sep 17 00:00:00 2001 From: Matthias Jentsch Date: Wed, 19 Aug 2015 16:36:47 +0200 Subject: [PATCH 02/59] Fix delete comments and downtimes button Fix faulty target names and add additional error checking in case the target DOM Element is not present. fixes #9330 --- .../monitoring/application/views/scripts/list/comments.phtml | 2 +- .../monitoring/application/views/scripts/list/downtimes.phtml | 2 +- public/js/icinga/events.js | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/application/views/scripts/list/comments.phtml b/modules/monitoring/application/views/scripts/list/comments.phtml index 3287f08e9..44b452f42 100644 --- a/modules/monitoring/application/views/scripts/list/comments.phtml +++ b/modules/monitoring/application/views/scripts/list/comments.phtml @@ -67,7 +67,7 @@ ) : $this->translate('This comment does not expire.'); ?> - + populate( diff --git a/modules/monitoring/application/views/scripts/list/downtimes.phtml b/modules/monitoring/application/views/scripts/list/downtimes.phtml index 1125aa9ba..a45bd0499 100644 --- a/modules/monitoring/application/views/scripts/list/downtimes.phtml +++ b/modules/monitoring/application/views/scripts/list/downtimes.phtml @@ -126,7 +126,7 @@ if (! $this->compact): ?> - + populate( diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 71408d712..4b9576a5d 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -509,6 +509,9 @@ self.icinga.ui.layout1col(); } else { $target = $('#' + targetId); + if (! $target.length) { + self.icinga.logger.warn('Link target "#' + targetId + '" does not exist in DOM.'); + } } } From 690d60672c485243c9c8f9256055ed24d3a7364e Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 14:34:43 +0200 Subject: [PATCH 03/59] Introduce form element decorator Spinner refs #8369 --- library/Icinga/Web/Form.php | 8 ++++ library/Icinga/Web/Form/Decorator/Spinner.php | 45 +++++++++++++++++++ public/css/icinga/forms.less | 19 ++++++++ 3 files changed, 72 insertions(+) create mode 100644 library/Icinga/Web/Form/Decorator/Spinner.php diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php index 2730f6998..40d6bb409 100644 --- a/library/Icinga/Web/Form.php +++ b/library/Icinga/Web/Form.php @@ -801,9 +801,17 @@ class Form extends Zend_Form && ! array_key_exists('disabledLoadDefaultDecorators', $options) ) { $options['decorators'] = static::$defaultElementDecorators; + if (! isset($options['data-progress-label']) && ($type === 'submit' + || ($type === 'button' && isset($options['type']) && $options['type'] === 'submit')) + ) { + array_splice($options['decorators'], 1, 0, array(array('Spinner', array('separator' => '')))); + } } } else { $options = array('decorators' => static::$defaultElementDecorators); + if ($type === 'submit') { + array_splice($options['decorators'], 1, 0, array(array('Spinner', array('separator' => '')))); + } } $el = parent::createElement($type, $name, $options); diff --git a/library/Icinga/Web/Form/Decorator/Spinner.php b/library/Icinga/Web/Form/Decorator/Spinner.php new file mode 100644 index 000000000..802e001d9 --- /dev/null +++ b/library/Icinga/Web/Form/Decorator/Spinner.php @@ -0,0 +1,45 @@ +getViewRenderer()->view; + } + + /** + * Add a spinner icon to a form element + * + * @param string $content The html rendered so far + * + * @return string The updated html + */ + public function render($content = '') + { + $spinner = ''; + + switch ($this->getPlacement()) { + case self::APPEND: + return $content . $spinner; + case self::PREPEND: + return $spinner . $content; + } + } +} \ No newline at end of file diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less index 82a5f5184..f49c485a6 100644 --- a/public/css/icinga/forms.less +++ b/public/css/icinga/forms.less @@ -107,6 +107,25 @@ form.inline { display: inline; } +div.spinner { + display: inline-block; + margin-top: 0.2em; + margin-left: 0.25em; + + i { + visibility: hidden; + + &.active { + visibility: visible; + } + + &:before { + margin: 0; // Disables wobbling + .animate(spin 2s infinite linear); + } + } +} + button, .button-like { font-size: 0.9em; font-weight: bold; From 291c712b4422318e91e2c8a01cd6b271d411dd7f Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 14:35:40 +0200 Subject: [PATCH 04/59] Fix form element label style --- public/css/icinga/forms.less | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less index f49c485a6..b761f478d 100644 --- a/public/css/icinga/forms.less +++ b/public/css/icinga/forms.less @@ -271,12 +271,13 @@ form div.element { form label { display: inline-block; + margin-top: 0.3em; margin-right: 1em; font-size: 0.9em; width: 10em; } -form div.element > * { +label ~ * { vertical-align: top; } @@ -314,8 +315,8 @@ select.grant-permissions { width: auto; } -label ~ input, label ~ select { - margin-left: 1.35em; +label ~ input, label ~ select, label ~ textarea { + margin-left: 1.3em; } label + i ~ input, label + i ~ select { From 2fe3c6e5cf8c5b35f913bd140c56c4db0e3f336d Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 14:36:55 +0200 Subject: [PATCH 05/59] events.js: Properly handle the default for param `autosubmit' refs #8369 --- public/js/icinga/events.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 71408d712..109eea255 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -246,6 +246,10 @@ encoding = 'application/x-www-form-urlencoded'; } + if (typeof autosubmit === 'undefined') { + autosubmit = false; + } + if ($button.length === 0) { $button = $('input[type=submit]', $form).add('button[type=submit]', $form).first(); } @@ -271,7 +275,7 @@ if (method === 'GET') { var dataObj = $form.serializeObject(); - if (typeof autosubmit === 'undefined' || ! autosubmit) { + if (! autosubmit) { if ($button.length && $button.attr('name') !== 'undefined') { dataObj[$button.attr('name')] = $button.attr('value'); } @@ -289,7 +293,7 @@ $form.find(':input:not(:disabled)').prop('disabled', true); }, 0); - if (! typeof autosubmit === 'undefined' && autosubmit) { + if (autosubmit) { if ($button.length) { // We're autosubmitting the form so the button has not been clicked, however, // to be really safe, we're disabling the button explicitly, just in case.. @@ -310,7 +314,7 @@ data = $form.serializeArray(); } - if (typeof autosubmit === 'undefined' || ! autosubmit) { + if (! autosubmit) { if ($button.length && $button.attr('name') !== 'undefined') { if (encoding === 'multipart/form-data') { data.append($button.attr('name'), $button.attr('value')); From e3d99cb00d5da67154683ef5897263458c104ad7 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 14:38:03 +0200 Subject: [PATCH 06/59] loader.js: Add support for ajax progress timer refs #8369 refs #8848 --- public/js/icinga/loader.js | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/public/js/icinga/loader.js b/public/js/icinga/loader.js index ff63f808a..6a296d03c 100644 --- a/public/js/icinga/loader.js +++ b/public/js/icinga/loader.js @@ -42,13 +42,15 @@ /** * Load the given URL to the given target * - * @param {string} url URL to be loaded - * @param {object} target Target jQuery element - * @param {object} data Optional parameters, usually for POST requests - * @param {string} method HTTP method, default is 'GET' - * @param {string} action How to handle the response ('replace' or 'append'), default is 'replace' + * @param {string} url URL to be loaded + * @param {object} target Target jQuery element + * @param {object} data Optional parameters, usually for POST requests + * @param {string} method HTTP method, default is 'GET' + * @param {string} action How to handle the response ('replace' or 'append'), default is 'replace' + * @param {boolean} autorefresh Whether the cause is a autorefresh or not + * @param {object} progressTimer A timer to be stopped when the request is done */ - loadUrl: function (url, $target, data, method, action, autorefresh) { + loadUrl: function (url, $target, data, method, action, autorefresh, progressTimer) { var id = null; // Default method is GET @@ -131,6 +133,7 @@ req.autorefresh = autorefresh; req.action = action; req.addToHistory = true; + req.progressTimer = progressTimer; if (id) { this.requests[id] = req; @@ -537,6 +540,10 @@ return; } + if (typeof req.progressTimer !== 'undefined') { + this.icinga.timer.unregister(req.progressTimer); + } + // .html() removes outer div we added above this.renderContentToContainer($resp.html(), req.$target, req.action, req.autorefresh); if (oldNotifications) { @@ -638,6 +645,10 @@ req.$target.data('icingaUrl', url); } + if (typeof req.progressTimer !== 'undefined') { + this.icinga.timer.unregister(req.progressTimer); + } + if (req.status > 0) { this.icinga.logger.error( req.status, From fedda16bd4cb2a5f6d4ea6de34c9679bcdfad384 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 14:40:05 +0200 Subject: [PATCH 07/59] js: Use the last button instead of the first one for form submits refs #8369 fixes #9245 --- public/js/icinga/events.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 109eea255..5b5a5ae84 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -227,11 +227,11 @@ icinga.logger.debug('events/submitForm: Button is event.currentTarget'); } - if ($el && ($el.is('input[type=submit]') || $el.is('button[type=submit]'))) { + if ($el && ($el.is('input[type=submit]') || $el.is('button[type=submit]')) && $el.is(':focus')) { $button = $el; } else { icinga.logger.debug( - 'events/submitForm: Can not determine submit button, using the first one in form' + 'events/submitForm: Can not determine submit button, using the last one in form' ); } } @@ -251,7 +251,7 @@ } if ($button.length === 0) { - $button = $('input[type=submit]', $form).add('button[type=submit]', $form).first(); + $button = $('button[type=submit]', $form).add('input[type=submit]', $form).last(); } if ($button.length) { From 7da8ad4e44895a2f442f3c990e1627a9a5656667 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 14:44:49 +0200 Subject: [PATCH 08/59] js: Show activity indicators for form submits refs #8369 --- public/css/icinga/forms.less | 16 ++++++++++++++++ public/js/icinga/events.js | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/public/css/icinga/forms.less b/public/css/icinga/forms.less index b761f478d..510a970a9 100644 --- a/public/css/icinga/forms.less +++ b/public/css/icinga/forms.less @@ -327,6 +327,22 @@ button.noscript-apply { margin-left: 0.5em; } +i.autosubmit-warning { + display: inline-block; + margin-left: 0.2em; + margin-top: 0.25em; + + &.spinning { + .animate(spin 2s infinite linear); + + &:before { + margin: 0; // Disables wobbling + font-size: 90%; // icon-spin6 seems to be bigger than icon-cw + content: '\e874'; // icon-spin6 + } + } +} + html.no-js i.autosubmit-warning { .sr-only; } diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 5b5a5ae84..ce6d62e5d 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -212,6 +212,7 @@ var method = $form.attr('method'); var encoding = $form.attr('enctype'); var $button = $('input[type=submit]:focus', $form).add('button[type=submit]:focus', $form); + var progressTimer; var $target; var data; @@ -332,7 +333,39 @@ // Note that disabled form inputs will not be enabled via JavaScript again $form.find(':input:not(#search):not(:disabled)').prop('disabled', true); - icinga.loader.loadUrl(url, $target, data, method); + // Show a spinner depending on how the form is being submitted + if (autosubmit && typeof $el !== 'undefined' && $el.next().hasClass('autosubmit-warning')) { + $el.next().addClass('spinning'); + } else if ($button.length) { + if ($button.attr('data-progress-label')) { + var isInput = $button.is('input'); + if (isInput) { + $button.prop('value', $button.attr('data-progress-label')); + } else { + $button.html($button.attr('data-progress-label')); + } + + progressTimer = icinga.timer.register(function () { + var label = isInput ? $button.prop('value') : $button.html(); + + if (label.substr(-3) === '...') { + label = label.slice(0, -2); + } else { + label += '.'; + } + + if (isInput) { + $button.prop('value', label); + } else { + $button.html(label); + } + }, null, 100); + } else if ($button.next().hasClass('spinner')) { + $('i', $button.next()).addClass('active'); + } + } + + icinga.loader.loadUrl(url, $target, data, method).progressTimer = progressTimer; event.stopPropagation(); event.preventDefault(); From 275b57cb6927445416b14d7813f8ae42db890329 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 15:04:15 +0200 Subject: [PATCH 09/59] Form: Allow to set a progress label refs #8369 --- library/Icinga/Web/Form.php | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php index 40d6bb409..c5eb413d8 100644 --- a/library/Icinga/Web/Form.php +++ b/library/Icinga/Web/Form.php @@ -81,6 +81,13 @@ class Form extends Zend_Form */ protected $submitLabel; + /** + * Label to use for showing the user an activity indicator when submitting the form + * + * @var string + */ + protected $progressLabel; + /** * The url to redirect to upon success * @@ -263,6 +270,29 @@ class Form extends Zend_Form return $this->submitLabel; } + /** + * Set the label to use for showing the user an activity indicator when submitting the form + * + * @param string $label + * + * @return $this + */ + public function setProgressLabel($label) + { + $this->progressLabel = $label; + return $this; + } + + /** + * Return the label to use for showing the user an activity indicator when submitting the form + * + * @return string + */ + public function getProgressLabel() + { + return $this->progressLabel; + } + /** * Set the url to redirect to upon success * @@ -738,9 +768,10 @@ class Form extends Zend_Form 'submit', 'btn_submit', array( - 'ignore' => true, - 'label' => $submitLabel, - 'decorators' => array( + 'ignore' => true, + 'label' => $submitLabel, + 'data-progress-label' => $this->getProgressLabel(), + 'decorators' => array( 'ViewHelper', array('HtmlTag', array('tag' => 'div')) ) From a77dc3665c68c6504c757df187cffae1566f68a0 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 15:05:02 +0200 Subject: [PATCH 10/59] Form: Show a spinner for ongoing form submits This will only be shown if there's no progress label set. refs #8369 --- library/Icinga/Web/Form.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/Icinga/Web/Form.php b/library/Icinga/Web/Form.php index c5eb413d8..cd262375a 100644 --- a/library/Icinga/Web/Form.php +++ b/library/Icinga/Web/Form.php @@ -773,7 +773,8 @@ class Form extends Zend_Form 'data-progress-label' => $this->getProgressLabel(), 'decorators' => array( 'ViewHelper', - array('HtmlTag', array('tag' => 'div')) + array('Spinner', array('separator' => '')), + array('HtmlTag', array('tag' => 'div', 'class' => 'buttons')) ) ) ); From 3f4221b2490ca9e2158e613864f74e7db9143285 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 15:32:31 +0200 Subject: [PATCH 11/59] js: Use a fixed with for form buttons once a form submit is ongoing ...and a progress label is set. refs #8369 --- public/js/icinga/events.js | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index ce6d62e5d..6a0a5c26b 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -340,18 +340,25 @@ if ($button.attr('data-progress-label')) { var isInput = $button.is('input'); if (isInput) { - $button.prop('value', $button.attr('data-progress-label')); + $button.prop('value', $button.attr('data-progress-label') + '...'); } else { - $button.html($button.attr('data-progress-label')); + $button.html($button.attr('data-progress-label') + '...'); } + // Use a fixed width to prevent the button from wobbling + $button.css('width', $button.css('width')); + progressTimer = icinga.timer.register(function () { var label = isInput ? $button.prop('value') : $button.html(); + var dots = label.substr(-3); - if (label.substr(-3) === '...') { - label = label.slice(0, -2); - } else { - label += '.'; + // Using empty spaces here to prevent centered labels from wobbling + if (dots === '...') { + label = label.slice(0, -2) + ' '; + } else if (dots === '.. ') { + label = label.slice(0, -1) + '.'; + } else if (dots === '. ') { + label = label.slice(0, -2) + '. '; } if (isInput) { From bf1e17702355326452082a67097465bdec993fd3 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 15:32:53 +0200 Subject: [PATCH 12/59] LoginForm: Provide a progress label refs #8369 --- application/forms/Authentication/LoginForm.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/forms/Authentication/LoginForm.php b/application/forms/Authentication/LoginForm.php index f7bae3d1b..9646046f6 100644 --- a/application/forms/Authentication/LoginForm.php +++ b/application/forms/Authentication/LoginForm.php @@ -27,6 +27,7 @@ class LoginForm extends Form $this->setRequiredCue(null); $this->setName('form_login'); $this->setSubmitLabel($this->translate('Login')); + $this->setProgressLabel($this->translate('Logging in')); } /** From 5602d57d0b7c730ff6e8e3ccb62797b92f9cd39e Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 15:48:41 +0200 Subject: [PATCH 13/59] Indicate that the configuration is being validated refs #8369 --- application/forms/Config/ResourceConfigForm.php | 7 ++++--- application/forms/Config/UserBackendConfigForm.php | 7 ++++--- modules/monitoring/library/Monitoring/MonitoringWizard.php | 7 ++++--- modules/setup/library/Setup/WebWizard.php | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/application/forms/Config/ResourceConfigForm.php b/application/forms/Config/ResourceConfigForm.php index 51e1b1bff..db951e67a 100644 --- a/application/forms/Config/ResourceConfigForm.php +++ b/application/forms/Config/ResourceConfigForm.php @@ -344,9 +344,10 @@ class ResourceConfigForm extends ConfigForm 'submit', 'resource_validation', array( - 'ignore' => true, - 'label' => $this->translate('Validate Configuration'), - 'decorators' => array('ViewHelper') + 'ignore' => true, + 'label' => $this->translate('Validate Configuration'), + 'data-progress-label' => $this->translate('Validation In Progress'), + 'decorators' => array('ViewHelper') ) ); $this->addDisplayGroup( diff --git a/application/forms/Config/UserBackendConfigForm.php b/application/forms/Config/UserBackendConfigForm.php index 5ee4674bb..1183ae724 100644 --- a/application/forms/Config/UserBackendConfigForm.php +++ b/application/forms/Config/UserBackendConfigForm.php @@ -464,9 +464,10 @@ class UserBackendConfigForm extends ConfigForm 'submit', 'backend_validation', array( - 'ignore' => true, - 'label' => $this->translate('Validate Configuration'), - 'decorators' => array('ViewHelper') + 'ignore' => true, + 'label' => $this->translate('Validate Configuration'), + 'data-progress-label' => $this->translate('Validation In Progress'), + 'decorators' => array('ViewHelper') ) ); $this->addDisplayGroup( diff --git a/modules/monitoring/library/Monitoring/MonitoringWizard.php b/modules/monitoring/library/Monitoring/MonitoringWizard.php index 0a224610c..4b495c36e 100644 --- a/modules/monitoring/library/Monitoring/MonitoringWizard.php +++ b/modules/monitoring/library/Monitoring/MonitoringWizard.php @@ -120,9 +120,10 @@ class MonitoringWizard extends Wizard implements SetupWizard 'submit', 'backend_validation', array( - 'ignore' => true, - 'label' => t('Validate Configuration'), - 'decorators' => array('ViewHelper') + 'ignore' => true, + 'label' => t('Validate Configuration'), + 'data-progress-label' => t('Validation In Progress'), + 'decorators' => array('ViewHelper') ) ); $page->getDisplayGroup('buttons')->addElement($page->getElement('backend_validation')); diff --git a/modules/setup/library/Setup/WebWizard.php b/modules/setup/library/Setup/WebWizard.php index e3831e673..7b67a2c2f 100644 --- a/modules/setup/library/Setup/WebWizard.php +++ b/modules/setup/library/Setup/WebWizard.php @@ -369,9 +369,10 @@ class WebWizard extends Wizard implements SetupWizard 'submit', 'backend_validation', array( - 'ignore' => true, - 'label' => t('Validate Configuration'), - 'decorators' => array('ViewHelper') + 'ignore' => true, + 'label' => t('Validate Configuration'), + 'data-progress-label' => t('Validation In Progress'), + 'decorators' => array('ViewHelper') ) ); $page->getDisplayGroup('buttons')->addElement($page->getElement('backend_validation')); From 4edf1223646517b36999fd3ee1d8c2667d91581d Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 15:49:25 +0200 Subject: [PATCH 14/59] Show a spinner when deleting comments or downtimes refs #8369 --- .../forms/Command/Object/DeleteCommentCommandForm.php | 2 +- .../forms/Command/Object/DeleteDowntimeCommandForm.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php index 691b7dbed..442b9b2ce 100644 --- a/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/DeleteCommentCommandForm.php @@ -68,7 +68,7 @@ class DeleteCommentCommandForm extends CommandForm 'ignore' => true, 'escape' => false, 'type' => 'submit', - 'class' => 'link-like', + 'class' => 'link-like spinner', 'label' => $this->getView()->icon('trash'), 'title' => $this->translate('Delete this comment'), 'decorators' => array('ViewHelper') diff --git a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php index c58179fe6..27fbae67a 100644 --- a/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php +++ b/modules/monitoring/application/forms/Command/Object/DeleteDowntimeCommandForm.php @@ -68,7 +68,7 @@ class DeleteDowntimeCommandForm extends CommandForm 'ignore' => true, 'escape' => false, 'type' => 'submit', - 'class' => 'link-like', + 'class' => 'link-like spinner', 'label' => $this->getView()->icon('trash'), 'title' => $this->translate('Delete this downtime'), 'decorators' => array('ViewHelper') From 736d715d8c2f81480ada9b35df6525601b5667c5 Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 16:13:12 +0200 Subject: [PATCH 15/59] js: Allow to provide a fallback spinner for forms refs #8369 --- public/js/icinga/events.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/js/icinga/events.js b/public/js/icinga/events.js index 6a0a5c26b..c05acf047 100644 --- a/public/js/icinga/events.js +++ b/public/js/icinga/events.js @@ -369,6 +369,11 @@ }, null, 100); } else if ($button.next().hasClass('spinner')) { $('i', $button.next()).addClass('active'); + } else if ($form.attr('data-progress-element')) { + var $progressElement = $('#' + $form.attr('data-progress-element')); + if ($progressElement.length) { + $('i', $progressElement).addClass('active'); + } } } From 20f144bd4ba2d3ed185fdd35ee4e12a6318c1dba Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 20 Aug 2015 16:13:30 +0200 Subject: [PATCH 16/59] Spinner: Accept option `id' refs #8369 --- library/Icinga/Web/Form/Decorator/Spinner.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/library/Icinga/Web/Form/Decorator/Spinner.php b/library/Icinga/Web/Form/Decorator/Spinner.php index 802e001d9..b47798d26 100644 --- a/library/Icinga/Web/Form/Decorator/Spinner.php +++ b/library/Icinga/Web/Form/Decorator/Spinner.php @@ -31,7 +31,10 @@ class Spinner extends Zend_Form_Decorator_Abstract */ public function render($content = '') { - $spinner = '