composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

align style of spinner

Browse Source
This commit is contained in:
acognet
2021-09-24 10:00:10 +02:00
parent f0d3149a1c
commit 722cae240e
9 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/displayblock.class.inc.php
View File

@@ -2335,7 +2335,7 @@ class MenuBlock extends DisplayBlock
// - Refresh
if ($sRefreshAction != '') {
$oActionButton = ButtonUIBlockFactory::MakeAlternativeNeutral('', 'UI:Button:Refresh');
$oActionButton->SetIconClass('fas fa-sync')
$oActionButton->SetIconClass('fas fa-sync-alt')
->SetOnClickJsCode($sRefreshAction)
->SetTooltip(Dict::S('UI:Button:Refresh'))
->AddCSSClasses(['ibo-action-button', 'ibo-regular-action-button']);

4
datamodels/2.x/itop-backup/status.php
View File

@@ -403,7 +403,7 @@ function LaunchBackupNow()
{
if(!$('#waitbackup').length)
{
$('body').append($('<div class="mt-5 text-nowrap" title="$sBackUpNow" id="waitbackup"><i class="ajax-spin fas fa-spinner fa-spin"></i> $sPleaseWaitBackup</div>'));
$('body').append($('<div class="mt-5 text-nowrap" title="$sBackUpNow" id="waitbackup"><i class="ajax-spin fas fa-sync-alt fa-spin"></i> $sPleaseWaitBackup</div>'));
}
$('#waitbackup').dialog();
@@ -432,7 +432,7 @@ function LaunchRestoreNow(sBackupFile, sConfirmationMessage)
}
if(!$('#waitrestore').length)
{
$('body').append($('<div class="mt-5 text-nowrap" title="$sRestore" id="waitrestore"><i class="ajax-spin fas fa-spinner fa-spin"></i> $sPleaseWaitRestore</div>'));
$('body').append($('<div class="mt-5 text-nowrap" title="$sRestore" id="waitrestore"><i class="ajax-spin fas fa-sync-alt fa-spin"></i> $sPleaseWaitRestore</div>'));
}
$('#waitrestore').dialog();

2
datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig
View File

@@ -86,7 +86,7 @@ $("#file").on("change", function(e) {
$("#check-update").on("click", function(e) {
$("#submit-wait").removeClass("ibo-is-hidden");
$(this).prop("disabled", true);
$(".ajax-spin").removeClass("fa-spinner").removeClass("fa-spin").addClass("fa-times");
$(".ajax-spin").removeClass("fa-sync-alt").removeClass("fa-spin").addClass("fa-times");
$(this).parents('form').submit();
e.preventDefault();
e.stopPropagation();

2
dictionaries/en.dictionary.itop.ui.php
View File

@@ -1486,7 +1486,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
// Search form
'UI:Search:Toggle' => 'Minimize / Expand',
'UI:Search:AutoSubmit:DisabledHint' => '<i class="fas fa-sync fa-1x"></i> Auto submit has been disabled for this class',
'UI:Search:AutoSubmit:DisabledHint' => '<i class="fas fa-sync-alt fa-1x"></i> Auto submit has been disabled for this class',
'UI:Search:Obsolescence:DisabledHint' => '<span class="fas fa-eye-slash fa-1x"></span> Based on your preferences, obsolete data are hidden',
'UI:Search:NoAutoSubmit:ExplainText' => 'Add some criterion on the search box or click the search button to view the objects.',
'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Add new criteria',

2
dictionaries/fr.dictionary.itop.ui.php
View File

@@ -1467,7 +1467,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
// Search form
'UI:Search:Toggle' => 'Réduire / Ouvrir',
'UI:Search:AutoSubmit:DisabledHint' => '<i class="fas fa-sync fa-1x"></i> La soumission automatique a été desactivée pour cette classe',
'UI:Search:AutoSubmit:DisabledHint' => '<i class="fas fa-sync-alt fa-1x"></i> La soumission automatique a été desactivée pour cette classe',
'UI:Search:Obsolescence:DisabledHint' => '<span class="fas fa-eye-slash fa-1x"></span> Conformément à vos préférences utilisateur, vous ne voyez pas les données obsolètes',
'UI:Search:NoAutoSubmit:ExplainText' => 'Ajoutez des critères dans le formulaire de recherche ou cliquez sur le bouton rechercher pour voir les objets.',
'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Ajouter un critère',

2
dictionaries/pl.dictionary.itop.ui.php
View File

@@ -1467,7 +1467,7 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
// Search form
'UI:Search:Toggle' => 'Zwiń / Rozwiń',
'UI:Search:AutoSubmit:DisabledHint' => '<i class="fas fa-sync fa-1x"></i> Automatyczne przesyłanie zostało wyłączone dla tej klasy',
'UI:Search:AutoSubmit:DisabledHint' => '<i class="fas fa-sync-alt fa-1x"></i> Automatyczne przesyłanie zostało wyłączone dla tej klasy',
'UI:Search:Obsolescence:DisabledHint' => '<span class="fas fa-eye-slash fa-1x"></span> W oparciu o Twoje preferencje wycofane dane są ukrywane',
'UI:Search:NoAutoSubmit:ExplainText' => 'Dodaj jakieś kryterium w polu wyszukiwania lub kliknij przycisk wyszukiwania, aby wyświetlić obiekty.',
'UI:Search:Criterion:MoreMenu:AddCriteria' => 'Dodaj nowe kryteria',

2
js/search/search_form_handler.js
View File

@@ -708,7 +708,7 @@ $(function()
.appendTo(this.elements.criterion_area.find('.sf_criterion_row:first'));
var sButtonText = (this.options.auto_submit === true) ? Dict.S('UI:Button:Refresh') : Dict.S('UI:Button:Search');
var sButtonIcon = (this.options.auto_submit === true) ? 'fas fa-sync' : 'fas fa-search';
var sButtonIcon = (this.options.auto_submit === true) ? 'fas fa-sync-alt' : 'fas fa-search';
var oButtonElem = $('<div class="sfb_header"></div>')
.append('<a aria-label="' + sButtonText + '" data-tooltip-content="' + sButtonText + '" href="#"><span class="fa-fw ' + sButtonIcon + '"></span></a>')
.appendTo(this.elements.submit_button);

2
sources/application/WebPage/iTopWebPage.php
View File

@@ -397,7 +397,7 @@ JS
// Default values for blockui
$.blockUI.defaults.css = {};
$.blockUI.defaults.message= '<i class="fas fa-fw fa-spin fa-sync"></i>';
$.blockUI.defaults.message= '<i class="fas fa-fw fa-spin fa-sync-alt"></i>';
$.blockUI.defaults.overlayCSS = {}
JS
);

2
templates/base/components/spinner/layout.html.twig
View File

@@ -1,5 +1,5 @@
{# @copyright Copyright (C) 2010-2021 Combodo SARL #}
{# @license http://opensource.org/licenses/AGPL-3.0 #}
{% apply spaceless %}
<i id="{{ oUIBlock.GetId() }}" class="fas fa-spinner fa-spin{% if oUIBlock.IsHidden() %} ibo-is-hidden{% endif %} {% if oUIBlock.GetAdditionalCSSClassesAsString() %}{{ oUIBlock.GetAdditionalCSSClassesAsString() }}{% endif %}" aria-hidden="true"></i>
<i id="{{ oUIBlock.GetId() }}" class="fas fa-sync-alt fa-spin{% if oUIBlock.IsHidden() %} ibo-is-hidden{% endif %} {% if oUIBlock.GetAdditionalCSSClassesAsString() %}{{ oUIBlock.GetAdditionalCSSClassesAsString() }}{% endif %}" aria-hidden="true"></i>
{% endapply %}