From 01cb88a661e1c7530cda9b98cbafb7f176f5fe3e Mon Sep 17 00:00:00 2001 From: Molkobain Date: Tue, 17 Dec 2019 11:15:00 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B02314=20Regression:=20Add=20progress=20ba?= =?UTF-8?q?r=20color=20change=20while=20on=20going=20to=20show=20user=20it?= =?UTF-8?q?'s=20not=20stucked?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/setup.css | 19 ++++++++++-- css/setup.scss | 37 ++++++++++++++++------- setup/wizardsteps.class.inc.php | 52 +++++++++------------------------ 3 files changed, 58 insertions(+), 50 deletions(-) diff --git a/css/setup.css b/css/setup.css index a4df0632a..0e81f5936 100644 --- a/css/setup.css +++ b/css/setup.css @@ -15,11 +15,20 @@ * * You should have received a copy of the GNU Affero General Public License */ - /* Helpers classes */ .center { text-align: center; } +/* Animations */ +@keyframes progress_bar_color_ongoing { + from { + background-color: #fbd38d; + } + to { + background-color: #f4c56e; + } +} +/* Theme */ body { background-color: #eee; color: #1a202c; @@ -147,10 +156,16 @@ table.formTable { background-color: #edf2f7 !important; } #progress .progress { - transition: background-color 0.2s ease-in-out; + color: #000 !important; + /* !important to overload jQuery UI style */ + background-color: #fbd38d !important; + /* !important to overload jQuery UI style */ + animation: progress_bar_color_ongoing 0.8s infinite alternate; } #progress .progress.progress-error { background-color: #e53e3e !important; + /* !important to overload jQuery UI style */ + animation: none; } h3.clickable { background: url(../images/plus.gif) no-repeat left; diff --git a/css/setup.scss b/css/setup.scss index 486b4a2d8..beb1cbb0e 100644 --- a/css/setup.scss +++ b/css/setup.scss @@ -28,25 +28,38 @@ $link-hover-color: #EA7D1E !default; // Messages to the user $message-default-border-color: #4A5568 !default; $message-default-text-color: #1A202C !default; -$message-default-background-color: #F7FAFC !default; +$message-default-bg-color: #F7FAFC !default; $message-valid-border-color: #48BB78 !default; $message-valid-text-color: #276749 !default; -$message-valid-background-color: #F0FFF4 !default; +$message-valid-bg-color: #F0FFF4 !default; $message-warning-border-color: #ED8936 !default; $message-warning-text-color: #C05621 !default; -$message-warning-background-color: #FFFAF0 !default; +$message-warning-bg-color: #FFFAF0 !default; $message-error-border-color: #E53E3E !default; $message-error-text-color: #C53030 !default; -$message-error-background-color: #FFF5F5 !default; +$message-error-bg-color: #FFF5F5 !default; + +// Compilation progress bar +$progress-bar-color: #000000 !default; +$progress-bar-ongoing-1-bg-color: #FBD38D !default; +$progress-bar-ongoing-2-bg-color: #F4C56E !default; +$progress-bar-error-bg-color: #E53E3E !default; /* Helpers classes */ .center { text-align: center; } +/* Animations */ +@keyframes progress_bar_color_ongoing { + from { background-color: $progress-bar-ongoing-1-bg-color; } + to { background-color: $progress-bar-ongoing-2-bg-color; } +} + +/* Theme */ body { background-color: #eee; color: $default-font-color; @@ -179,9 +192,13 @@ table.formTable { background-color: #EDF2F7 !important; .progress{ - transition: background-color 0.2s ease-in-out; + color: $progress-bar-color !important; /* !important to overload jQuery UI style */ + background-color: $progress-bar-ongoing-1-bg-color !important; /* !important to overload jQuery UI style */ + animation: progress_bar_color_ongoing 0.8s infinite alternate; + &.progress-error{ - background-color: #E53E3E !important; + background-color: $progress-bar-error-bg-color !important; /* !important to overload jQuery UI style */ + animation: none; } } } @@ -197,23 +214,23 @@ h3.clickable.open { } .message{ color: $message-default-text-color; - background-color: $message-default-background-color; + background-color: $message-default-bg-color; border-left: 4px solid $message-default-border-color; padding: 10px; &.message-valid{ color: $message-valid-text-color; - background-color: $message-valid-background-color; + background-color: $message-valid-bg-color; border-color: $message-valid-border-color; } &.message-warning{ color: $message-warning-text-color; - background-color: $message-warning-background-color; + background-color: $message-warning-bg-color; border-color: $message-warning-border-color; } &.message-error{ color: $message-error-text-color; - background-color: $message-error-background-color; + background-color: $message-error-bg-color; border-color: $message-error-border-color; } >.message-title { diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php index 5ca1d3711..c960f8a04 100644 --- a/setup/wizardsteps.class.inc.php +++ b/setup/wizardsteps.class.inc.php @@ -1,44 +1,20 @@ - /** - * All the steps of the iTop installation wizard + * Copyright (C) 2013-2019 Combodo SARL * - * @copyright Copyright (C) 2010-2017 Combodo SARL - * @license http://opensource.org/licenses/AGPL-3.0 + * This file is part of iTop. * - * Steps order (can be retrieved using \WizardController::DumpStructure) : + * iTop is free software; you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. * - * WizStepWelcome - * WizStepInstallOrUpgrade - * + + - * | | - * v +-----> - * WizStepLicense WizStepDetectedInfo - * WizStepDBParams + + - * WizStepAdminAccount | | - * WizStepMiscParams v +------> - * + WizStepLicense2 +--> WizStepUpgradeMiscParams - * | + - * +---> <-----------------------------------+ - * WizStepModulesChoice - * WizStepSummary - * WizStepDone + * iTop is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License */ require_once(APPROOT.'setup/setuputils.class.inc.php'); @@ -2441,7 +2417,7 @@ JS $("#wiz_form").data("installation_status", "running"); WizardUpdateButtons(); $('#setup_msg').html('$sMessage'); - $('#progress').progression( {Current:{$aRes['percentage-completed']}, Maximum: 100, aBackground: '#FBD38D', aTextColor: '#000000'} ); + $('#progress').progression( {Current:{$aRes['percentage-completed']}, Maximum: 100} ); //$("#percentage").html('{$aRes['percentage-completed']} % completed
{$aRes['next-step-label']}'); ExecuteStep('{$aRes['next-step']}'); @@ -2454,7 +2430,7 @@ EOF $oPage->add_ready_script( <<