diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php index 7b7447f95..7e711e928 100644 --- a/application/displayblock.class.inc.php +++ b/application/displayblock.class.inc.php @@ -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']); diff --git a/datamodels/2.x/itop-backup/status.php b/datamodels/2.x/itop-backup/status.php index 27cea9428..a6d33a4f6 100644 --- a/datamodels/2.x/itop-backup/status.php +++ b/datamodels/2.x/itop-backup/status.php @@ -403,7 +403,7 @@ function LaunchBackupNow() { if(!$('#waitbackup').length) { - $('body').append($('
$sPleaseWaitBackup
')); + $('body').append($('
$sPleaseWaitBackup
')); } $('#waitbackup').dialog(); @@ -432,7 +432,7 @@ function LaunchRestoreNow(sBackupFile, sConfirmationMessage) } if(!$('#waitrestore').length) { - $('body').append($('
$sPleaseWaitRestore
')); + $('body').append($('
$sPleaseWaitRestore
')); } $('#waitrestore').dialog(); diff --git a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig index 4152e5166..d1cc995a9 100644 --- a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig +++ b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig @@ -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(); diff --git a/dictionaries/en.dictionary.itop.ui.php b/dictionaries/en.dictionary.itop.ui.php index 7bee941f6..68cdc411f 100644 --- a/dictionaries/en.dictionary.itop.ui.php +++ b/dictionaries/en.dictionary.itop.ui.php @@ -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' => ' Auto submit has been disabled for this class', + 'UI:Search:AutoSubmit:DisabledHint' => ' Auto submit has been disabled for this class', 'UI:Search:Obsolescence:DisabledHint' => ' 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', diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index c594c19d5..8f5e8d5f4 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/dictionaries/fr.dictionary.itop.ui.php @@ -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' => ' La soumission automatique a été desactivée pour cette classe', + 'UI:Search:AutoSubmit:DisabledHint' => ' La soumission automatique a été desactivée pour cette classe', 'UI:Search:Obsolescence:DisabledHint' => ' 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', diff --git a/dictionaries/pl.dictionary.itop.ui.php b/dictionaries/pl.dictionary.itop.ui.php index f19db4ab4..a1051b833 100644 --- a/dictionaries/pl.dictionary.itop.ui.php +++ b/dictionaries/pl.dictionary.itop.ui.php @@ -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' => ' Automatyczne przesyłanie zostało wyłączone dla tej klasy', + 'UI:Search:AutoSubmit:DisabledHint' => ' Automatyczne przesyłanie zostało wyłączone dla tej klasy', 'UI:Search:Obsolescence:DisabledHint' => ' 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', diff --git a/js/search/search_form_handler.js b/js/search/search_form_handler.js index 4e2fb0c37..ae96fd186 100644 --- a/js/search/search_form_handler.js +++ b/js/search/search_form_handler.js @@ -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 = $('
') .append('') .appendTo(this.elements.submit_button); diff --git a/sources/application/WebPage/iTopWebPage.php b/sources/application/WebPage/iTopWebPage.php index 44d1400ec..9d259e951 100644 --- a/sources/application/WebPage/iTopWebPage.php +++ b/sources/application/WebPage/iTopWebPage.php @@ -397,7 +397,7 @@ JS // Default values for blockui $.blockUI.defaults.css = {}; - $.blockUI.defaults.message= ''; + $.blockUI.defaults.message= ''; $.blockUI.defaults.overlayCSS = {} JS ); diff --git a/templates/base/components/spinner/layout.html.twig b/templates/base/components/spinner/layout.html.twig index 69c1dc583..b03508a48 100644 --- a/templates/base/components/spinner/layout.html.twig +++ b/templates/base/components/spinner/layout.html.twig @@ -1,5 +1,5 @@ {# @copyright Copyright (C) 2010-2021 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} {% apply spaceless %} - + {% endapply %} \ No newline at end of file