diff --git a/datamodels/2.x/itop-core-update/css/itop-core-update.scss b/datamodels/2.x/itop-core-update/css/itop-core-update.scss index a7c0103572..ab1f27dba0 100644 --- a/datamodels/2.x/itop-core-update/css/itop-core-update.scss +++ b/datamodels/2.x/itop-core-update/css/itop-core-update.scss @@ -7,19 +7,8 @@ font-size: 1.17rem; } -#progress { - margin: 5px auto; - display:block; - width: 280px; - height: 20px; - line-height: 20px; - text-align: center; - - .progress { - margin: 0; - } - - .text { - margin: 0; - } -} +#progress_content { + display: flex; + flex-direction: column; + align-items: center; +} \ No newline at end of file diff --git a/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml b/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml index 33ba019e9c..7ea5e0e77c 100644 --- a/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml +++ b/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml @@ -8,11 +8,4 @@ 1 - - - - itop-core-update/css/itop-core-update.scss - - - diff --git a/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php b/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php index 03dc2d9dff..6f6c08eb1f 100644 --- a/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php +++ b/datamodels/2.x/itop-core-update/src/Controller/UpdateController.php @@ -159,6 +159,7 @@ class UpdateController extends Controller ]; $this->AddLinkedScript(utils::GetAbsoluteUrlAppRoot().'setup/jquery.progression.js'); $this->AddSaas('css/backoffice/main.scss'); + $this->AddSaas('env-'.utils::GetCurrentEnvironment().'/itop-core-update/css/itop-core-update.scss'); $this->m_sOperation = 'UpdateCoreFiles'; $this->DisplaySetupPage($aParams); } diff --git a/datamodels/2.x/itop-core-update/templates/UpdateCoreFiles.html.twig b/datamodels/2.x/itop-core-update/templates/UpdateCoreFiles.html.twig index fdb86400f7..70548e30a4 100644 --- a/datamodels/2.x/itop-core-update/templates/UpdateCoreFiles.html.twig +++ b/datamodels/2.x/itop-core-update/templates/UpdateCoreFiles.html.twig @@ -9,9 +9,7 @@ {% UIFieldSet Standard {sLegend:'iTopUpdate:UI:Progress'|dict_s, sId:'installation_progress'} %} {# Todo 3.0 Add Progress bar UIBlock #}
-

- {{ 'iTopUpdate:UI:SetupMessage:Ready'|dict_s }} -

+ {{ 'iTopUpdate:UI:SetupMessage:Ready'|dict_s }}
0%
{% EndUIFieldSet %}