tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CSS: Re-add spinner for autosubmit 

refs #5543
This commit is contained in:
Eric Lippmann 2015-10-01 01:59:56 +02:00
parent b6ac7f0dee
commit 51d6c61bf7
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/Icinga/Web/Form/Decorator/Autosubmit.php
View File

@ -100,7 +100,7 @@ class Autosubmit extends Zend_Form_Decorator_Abstract
: t('Upon its value has changed, this field issues an automatic update of this page.');
$content .= $this->getView()->icon('cw', $warning, array(
'aria-hidden' => $isForm ? 'false' : 'true',
'class' => 'autosubmit-warning'
'class' => 'spinner'
));
if (! $isForm && $this->getAccessible()) {
$content = '<span id="' . $this->getWarningId() . '" class="sr-only">' . $warning . '</span>' . $content;

4
public/css/icinga/spinner.less
View File

@ -1,11 +1,13 @@
/*! Icinga Web 2 | (c) 2013-2015 Icinga Development Team | GPLv2+ */
a.spinner.active > i,
button.spinner.active > i {
button.spinner.active > i,
i.spinner.active {
.animate(spin 2s infinite linear);
&:before {
// icon-spin6
content: '\e874';
margin: 0; // Disables wobbling
}
}

6
public/js/icinga/events.js
View File

@ -334,8 +334,8 @@
$form.find(':input:not(#search):not(:disabled)').prop('disabled', true);
// 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');
if (autosubmit && typeof $el !== 'undefined' && $el.next().hasClass('spinner')) {
$el.next().addClass('active');
} else if ($button.length && $button.is('button') && $button.hasClass('animated')) {
$button.addClass('active');
} else if ($button.length && $button.attr('data-progress-label')) {
@ -376,7 +376,7 @@
if ($progressElement.hasClass('spinner')) {
$('i', $progressElement).addClass('active');
} else {
$('i.autosubmit-warning', $progressElement).addClass('spinning');
$('i.spinner', $progressElement).addClass('active');
}
}
}