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

N°5658 - Fix spinning wheel appearing on all application upgrade buttons - fix css

Browse Source
This commit is contained in:
Eric Espie
2023-05-03 10:49:08 +02:00
parent d86b3dba0e
commit befef6c71e
4 changed files with 7 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
datamodels/2.x/itop-core-update/css/itop-core-update.scss
View File

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

7
datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml
View File

@@ -8,11 +8,4 @@
<enable_admin_only>1</enable_admin_only>
</menu>
</menus>
<branding>
<themes_common>
<stylesheets>
<stylesheet id="itop-core-update-style" _delta="define">itop-core-update/css/itop-core-update.scss</stylesheet>
</stylesheets>
</themes_common>
</branding>
</itop_design>

1
datamodels/2.x/itop-core-update/src/Controller/UpdateController.php
View File

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

4
datamodels/2.x/itop-core-update/templates/UpdateCoreFiles.html.twig
View File

@@ -9,9 +9,7 @@
{% UIFieldSet Standard {sLegend:'iTopUpdate:UI:Progress'|dict_s, sId:'installation_progress'} %}
{# Todo 3.0 Add Progress bar UIBlock #}
<div id="progress_content">
<p class="center">
<span id="setup_msg">{{ 'iTopUpdate:UI:SetupMessage:Ready'|dict_s }}</span>
</p>
<span id="setup_msg">{{ 'iTopUpdate:UI:SetupMessage:Ready'|dict_s }}</span>
<div id="progress">0%</div>
</div>
{% EndUIFieldSet %}