composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-22 10:08:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°3567 - Migrate backoffice pages to new UIBlock system : App. upgrade (fix last button)

Browse Source
This commit is contained in:
Eric
2021-02-01 17:19:02 +01:00
parent 749ab51651
commit 694899980c
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
datamodels/2.x/itop-core-update/view/UpdateCoreFiles.html.twig
View File

@@ -16,7 +16,7 @@
{% EndUIFieldSet %}
{% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Status'|dict_s} %}
{% UIField Large {'sId':'new_version', 'sLabel':'iTopUpdate:UI:NewVersion'|dict_s, 'ValueId':'db-disk-space', 'IsHidden':true} %}{% EndUIField %}
{% UIField Large {'sId':'new_version', 'sLabel':'iTopUpdate:UI:NewVersion'|dict_s, 'IsHidden':true} %}{% EndUIField %}
{% UIAlert ForInformation {'sId':'current_version', 'IsCollapsible':false, 'IsClosable':false} %}
{% UIContentBlock Standard {'sId':'current-version','aContainerClasses':['ibo-update-core--current-version']} %}
{{ sCurrentVersion }}
@@ -52,19 +52,21 @@
{{ 'iTopUpdate:UI:MaintenanceModeActive'|dict_s }}
{% EndUIAlert %}
{% UIContentBlock Standard {'sId':'run_setup','aContainerClasses':['ibo-update-core--run-setup'], 'IsHidden':true} %}
{% UIContentBlock Standard {sId:"", aContainerClasses:["ibo-setup--button-bar"]} %}
{% UIContentBlock Standard {'sId':'run_setup','aContainerClasses':['ibo-update-core--run-setup'], 'IsHidden':true} %}
{% UIForm Standard {'CSSClasses':['form-inline']} %}
{% UIInput ForHidden {'sName':'operation', 'sValue':'RunSetup'} %}
{% UIInput ForHidden {'sName':'authent', 'sValue':sSetupToken} %}
{% UIInput ForHidden {'sName':'', 'sValue':''} %}
{% UIButton ForPrimaryAction {'sLabel':'iTopUpdate:UI:RunSetup'|dict_s, 'sId':'run_setup', 'bIsSubmit':true, 'IsDisabled':false} %}
{% EndUIForm %}
{% EndUIContentBlock %}
{% UIContentBlock Standard {sId:"", aContainerClasses:["ibo-setup--button-spacer"]} %}{% EndUIContentBlock %}
{% UIForm Standard {'CSSClasses':['form-inline']} %}
{% UIInput ForHidden {'sName':'operation', 'sValue':'RunSetup'} %}
{% UIInput ForHidden {'sName':'authent', 'sValue':sSetupToken} %}
{% UIInput ForHidden {'sName':'', 'sValue':''} %}
{% UIButton ForPrimaryAction {'sLabel':'iTopUpdate:UI:RunSetup'|dict_s, 'sId':'run_setup', 'bIsSubmit':true, 'IsDisabled':false} %}
{% UIButton ForPrimaryAction {'sLabel':'iTopUpdate:UI:Continue'|dict_s, 'sId':'setup_continue', 'bIsSubmit':true, 'IsDisabled':true} %}
{% EndUIForm %}
{% EndUIContentBlock %}
{% UIForm Standard {'CSSClasses':['form-inline']} %}
{% UIButton ForPrimaryAction {'sLabel':'iTopUpdate:UI:Continue'|dict_s, 'sId':'setup_continue', 'bIsSubmit':true, 'IsDisabled':true} %}
{% EndUIForm %}
{% EndUIFieldSet %}
{% EndUIContentBlock %}

5
datamodels/2.x/itop-core-update/view/UpdateCoreFiles.ready.js.twig
View File

@@ -112,12 +112,13 @@ function ExecNextStep() {
else
{
$.ajax(oGetCurrentVersion);
$("#setup_continue").removeAttr("disabled");
$("#setup_continue").prop("disabled", false);
$('#installation_progress').hide(300);
$('#new_version').removeClass("ibo-is-hidden");
$("#current_version").removeClass("message-info").addClass("message-valid");
$("#current_version").removeClass("ibo-is-information").addClass("ibo-is-success");
}
}
$("#setup_continue").prop("disabled", true);
ExecNextStep();

2
templates/base/components/button/layout.html.twig
View File

@@ -8,7 +8,7 @@
type="{{ oUIBlock.GetType() }}"
name="{{ oUIBlock.GetName() }}"
value="{{ oUIBlock.GetValue() }}"
{% if oUIBlock.IsDisabled() is same as(true) %} disabled {% endif %}
{% if oUIBlock.IsDisabled() %} disabled {% endif %}
{% if oUIBlock.GetTooltip() is not empty %} data-tooltip-content="{{ oUIBlock.GetTooltip() }}" {% endif %}
>
{% if oUIBlock.GetIconClass() is not empty %}