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

N°2314 Regression: Add progress bar color change while on going to show user it's not stucked

Browse Source
This commit is contained in:
Molkobain
2019-12-17 11:15:00 +01:00
parent 5ef32b6b31
commit 01cb88a661
3 changed files with 58 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
css/setup.css
View File

@@ -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;

37
css/setup.scss
View File

@@ -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 {

52
setup/wizardsteps.class.inc.php
View File

@@ -1,44 +1,20 @@
<?php
// Copyright (C) 2010-2017 Combodo SARL
//
// This file is part of iTop.
//
// 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.
//
// 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
// along with iTop. If not, see <http://www.gnu.org/licenses/>
/**
* 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<br/>{$aRes['next-step-label']}');
ExecuteStep('{$aRes['next-step']}');
@@ -2454,7 +2430,7 @@ EOF
$oPage->add_ready_script(
<<<EOF
$("#wiz_form").data("installation_status", "completed");
$('#progress').progression( {Current:100, Maximum: 100, aBackground: '#FBD38D', aTextColor: '#000000'} );
$('#progress').progression( {Current:100, Maximum: 100} );
WizardUpdateButtons();
$("#btn_next").unbind("click.install");
$("#btn_next").click();