diff --git a/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig b/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig index 1cf402bc72..ceca8923cf 100644 --- a/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig +++ b/datamodels/2.x/itop-core-update/view/ConfirmUpdate.html.twig @@ -1,78 +1,61 @@ {# @copyright Copyright (C) 2010-2019 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} -
+{% apply spaceless %} + +{% UIContentBlock Standard {'sContainerClass':'ibo-update-core display_block display-files'} %} + {% if bSuccess %} -
- {{ 'iTopUpdate:UI:Status'|dict_s }} -
- {{ sQuestion }} -
- + {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Status'|dict_s, 'sId':'update_progress'} %} + {% UIAlert ForSuccess {'sContent':sQuestion} %}{% EndUIAlert %} {% set sVersion = 'UI:iTopVersion:Long'|dict_format(constant('ITOP_APPLICATION'), constant('ITOP_VERSION'), constant('ITOP_REVISION'), constant('ITOP_BUILD_DATE')) %} -

{{ 'iTopUpdate:UI:CurrentVersion'|dict_s }}

-
- {{ sVersion }} -
-
+ {% UIField Large {'sLabel':'iTopUpdate:UI:CurrentVersion'|dict_s, 'sValueHtml':sVersion} %}{% EndUIField %} + {% EndUIFieldSet %} -
- {{ 'iTopUpdate:UI:Backup'|dict_s }} - {% if bDoBackup or bDoFilesArchive %} - {% if bDoBackup %} -

{{ 'iTopUpdate:UI:WithDBBackup'|dict_s }}

-
- {{ sBackupFile }} -
- {% endif %} - {% if bDoFilesArchive %} -

{{ 'iTopUpdate:UI:WithFilesBackup'|dict_s }}

-
- {{ sItopArchive }} -
- {% endif %} - {% else %} -
- {{ 'iTopUpdate:UI:WithoutBackup'|dict_s }} -
+ {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Backup'|dict_s} %} + + {% if bDoBackup or bDoFilesArchive %} + {% if bDoBackup %} + {% UIField Large {'sLabel':'iTopUpdate:UI:WithDBBackup'|dict_s, 'sValueHtml':sBackupFile} %}{% EndUIField %} {% endif %} -
+ {% if bDoFilesArchive %} + {% UIField Large {'sLabel':'iTopUpdate:UI:WithFilesBackup'|dict_s, 'sValueHtml':sItopArchive} %}{% EndUIField %} + {% endif %} + {% else %} + {% UIAlert ForWarning {'sContent':'iTopUpdate:UI:WithoutBackup'|dict_s} %}{% EndUIAlert %} + {% endif %} -
- {{ 'iTopUpdate:UI:Action'|dict_s }} -
- {{ 'iTopUpdate:UI:WarningReadOnlyDuringUpdate'|dict_s }} -
-
-
- -
-
- - - - - - -
-
-
+ {% EndUIFieldSet %} + + {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Action'|dict_s} %} + {% UIAlert ForWarning {'sContent':'iTopUpdate:UI:WarningReadOnlyDuringUpdate'|dict_s} %}{% EndUIAlert %} + {#
#} + {% UIForm Standard {'CSSClasses':'form-inline'} %} + {% UIButton ForSecondaryAction {'sId':'cancel-update', 'sLabel':'iTopUpdate:UI:Cancel'|dict_s, 'bIsSubmit':true} %} + {% EndUIForm %} + {% UIForm Standard {'CSSClasses':'form-inline'} %} + {% UIButton ForPrimaryAction {'sId':'do-update', 'sLabel':'iTopUpdate:UI:DoUpdate'|dict_s, 'bIsSubmit':true} %} + {% UISpinner Standard {'sId':'submit-wait', 'IsHidden':true} %} + {% UIInput ForHidden {'sName':'operation', 'sValue':'UpdateCoreFiles'} %} + {% UIInput ForHidden {'sName':'transaction_id', 'sValue':sTransactionId} %} + {% UIInput ForHidden {'sName':'filename', 'sValue':sName} %} + {% UIInput ForHidden {'sName':'doBackup', 'sValue':bDoBackup} %} + {% UIInput ForHidden {'sName':'doFilesArchive', 'sValue':bDoFilesArchive} %} + {% EndUIForm %} + {#
#} + {% EndUIFieldSet %} {% else %} -
-
-
- {{ sError }} -
-
- -
-

-
- -
+ {% UIFieldSet Standard {'sLegend':''} %} + {% UIAlert ForFailure {'sContent':sError} %}{% EndUIAlert %} + {% UIForm Standard {} %} + {% UIButton ForPrimaryAction {'sLabel':'iTopUpdate:UI:Back'|dict_s, 'bIsSubmit':true} %} + {% EndUIForm %} + {% EndUIFieldSet %} {% endif %} -
+ +{% EndUIContentBlock %} +{% endapply %} \ No newline at end of file diff --git a/datamodels/2.x/itop-core-update/view/DisplayCurrentVersion.html.twig b/datamodels/2.x/itop-core-update/view/DisplayCurrentVersion.html.twig deleted file mode 100644 index cd59b9b88d..0000000000 --- a/datamodels/2.x/itop-core-update/view/DisplayCurrentVersion.html.twig +++ /dev/null @@ -1,10 +0,0 @@ -{# @copyright Copyright (C) 2010-2019 Combodo SARL #} -{# @license http://opensource.org/licenses/AGPL-3.0 #} - -{% set sVersion = 'UI:iTopVersion:Long'|dict_format(constant('ITOP_APPLICATION'), constant('ITOP_VERSION'), constant('ITOP_REVISION'), constant('ITOP_BUILD_DATE')) %} -
-
{{ 'iTopUpdate:UI:CurrentVersion'|dict_s }}
-
-
{{ sVersion }}
-
-
\ No newline at end of file diff --git a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig index faa34c9e98..a7c05174e6 100644 --- a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig +++ b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig @@ -4,108 +4,106 @@ {% UIContentBlock Standard {'sContainerClass':'ibo-update-core'} %} -{% UITitle ForPage {'sTitle':'iTopUpdate:UI:PageTitle'|dict_s} %} + {% UITitle ForPage {'sTitle':'iTopUpdate:UI:PageTitle'|dict_s} %} -{% UIHtml %} -
 
-{% EndUIHtml %} + {% UIHtml %} +
 
+ {% EndUIHtml %} -{% UIContentBlock Standard {'sContainerClass':'display_block display-files'} %} -{% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Status'|dict_s} %} + {% UIContentBlock Standard {'sContainerClass':'display_block display-files'} %} + {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:Status'|dict_s} %} + {% UIAlert ForInformation {'sId':'header-requirements', 'IsCollapsible':false, 'IsClosable':false} %} + {% UIContentBlock Standard {'sContainerClass':'ibo-update-core-header-requirements', 'sId':'can-core-update'} %} + {% UIHtml %} + {{ 'iTopUpdate:UI:CanCoreUpdate:Loading'|dict_s }} + {% EndUIHtml %} + {% UISpinner Standard {} %} + {% EndUIContentBlock %} + {% EndUIAlert %} -{% UIAlert ForInformation {'sId':'header-requirements', 'IsCollapsible':false, 'IsClosable':false} %} -{% UIContentBlock Standard {'sContainerClass':'ibo-update-core-header-requirements', 'sId':'can-core-update'} %} -{% UIHtml %} - {{ 'iTopUpdate:UI:CanCoreUpdate:Loading'|dict_s }} -{% EndUIHtml %} -{% UISpinner Standard {} %} -{% EndUIContentBlock %} -{% EndUIAlert %} + {% UIField Standard {'sLabel':'iTopUpdate:UI:CurrentVersion'|dict_s} %} + {% UIHtml %} + {{ 'UI:iTopVersion:Long'|dict_format(constant('ITOP_APPLICATION'), constant('ITOP_VERSION'), constant('ITOP_REVISION'), constant('ITOP_BUILD_DATE')) }} + {% EndUIHtml %} + {% EndUIField %} -{% UIField Standard {'sLabel':'iTopUpdate:UI:CurrentVersion'|dict_s} %} -{% UIHtml %} - {{ 'UI:iTopVersion:Long'|dict_format(constant('ITOP_APPLICATION'), constant('ITOP_VERSION'), constant('ITOP_REVISION'), constant('ITOP_BUILD_DATE')) }} -{% EndUIHtml %} -{% EndUIField %} + {% UIField Standard {'sLabel':'iTopUpdate:UI:DiskFreeSpace'|dict_s} %} + {% UIHtml %} + {{ sDiskFreeSpace }} + {% EndUIHtml %} + {% EndUIField %} -{% UIField Standard {'sLabel':'iTopUpdate:UI:DiskFreeSpace'|dict_s} %} -{% UIHtml %} - {{ sDiskFreeSpace }} -{% EndUIHtml %} -{% EndUIField %} + {% UIField Standard {'sLabel':'iTopUpdate:UI:ItopDiskSpace'|dict_s, 'ValueId':'itop-disk-space'} %} + {% UISpinner Standard {} %} + {% EndUIField %} -{% UIField Standard {'sLabel':'iTopUpdate:UI:ItopDiskSpace'|dict_s, 'ValueId':'itop-disk-space'} %} -{% UISpinner Standard {} %} -{% EndUIField %} + {% UIField Standard {'sLabel':'iTopUpdate:UI:DBDiskSpace'|dict_s, 'ValueId':'db-disk-space'} %} + {% UISpinner Standard {} %} + {% EndUIField %} -{% UIField Standard {'sLabel':'iTopUpdate:UI:DBDiskSpace'|dict_s, 'ValueId':'db-disk-space'} %} -{% UISpinner Standard {} %} -{% EndUIField %} + {% UIField Standard {'sLabel':'iTopUpdate:UI:FileUploadMaxSize'|dict_s} %} + {% UIHtml %} + {{ sFileUploadMaxSize }} + {% EndUIHtml %} + {% EndUIField %} -{% UIField Standard {'sLabel':'iTopUpdate:UI:FileUploadMaxSize'|dict_s} %} -{% UIHtml %} - {{ sFileUploadMaxSize }} -{% EndUIHtml %} -{% EndUIField %} + {% EndUIFieldSet %} -{% EndUIFieldSet %} + {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:SelectUpdateFile'|dict_s} %} + {% UIForm Standard {} %} + {% UIInput ForHidden {'sName':'operation', 'sValue':'ConfirmUpdate'} %} + {% UIInput ForHidden {'sName':'transaction_id', 'sValue':sTransactionId} %} -{% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:SelectUpdateFile'|dict_s} %} -{% UIForm Standard {} %} -{% UIInput ForHidden {'sName':'operation', 'sValue':'ConfirmUpdate'} %} -{% UIInput ForHidden {'sName':'transaction_id', 'sValue':sTransactionId} %} + {% UIAlert ForFailure {'sId':'header-file-size', 'IsHidden':true} %} + {% UIContentBlock Standard {'sContainerClass':'ibo-file-size-error'} %} + {% UIHtml %} + {{ 'iTopUpdate:Error:FileUploadMaxSizeTooStandard'|dict_s }} + {% EndUIHtml %} + {% EndUIContentBlock %} + {% UIContentBlock Standard {'sContainerClass':'ibo-file-size-error'} %} + {% UIHtml %} + {{ 'iTopUpdate:UI:PostMaxSize'|dict_format(sPostMaxSize) }} + {% EndUIHtml %} + {% EndUIContentBlock %} + {% UIContentBlock Standard {'sContainerClass':'ibo-file-size-error'} %} + {% UIHtml %} + {{ 'iTopUpdate:UI:UploadMaxFileSize'|dict_format(sUploadMaxSize) }} + {% EndUIHtml %} + {% EndUIContentBlock %} + {% EndUIAlert %} -{% UIAlert ForFailure {'sId':'header-file-size', 'IsHidden':true} %} -{% UIContentBlock Standard {'sContainerClass':'ibo-file-size-error'} %} -{% UIHtml %} - {{ 'iTopUpdate:Error:FileUploadMaxSizeTooStandard'|dict_s }} -{% EndUIHtml %} -{% EndUIContentBlock %} -{% UIContentBlock Standard {'sContainerClass':'ibo-file-size-error'} %} -{% UIHtml %} - {{ 'iTopUpdate:UI:PostMaxSize'|dict_format(sPostMaxSize) }} -{% EndUIHtml %} -{% EndUIContentBlock %} -{% UIContentBlock Standard {'sContainerClass':'ibo-file-size-error'} %} -{% UIHtml %} - {{ 'iTopUpdate:UI:UploadMaxFileSize'|dict_format(sUploadMaxSize) }} -{% EndUIHtml %} -{% EndUIContentBlock %} -{% EndUIAlert %} + {% UIContentBlock Standard {'sContainerClass':'upload_container'} %} + {% UIInput Standard {'sType':'file', 'sId':'file', 'sName':'file', 'sValue':''} %} + {% EndUIContentBlock %} -{% UIContentBlock Standard {'sContainerClass':'upload_container'} %} -{% UIInput Standard {'sType':'file', 'sId':'file', 'sName':'file', 'sValue':''} %} -{% EndUIContentBlock %} + {% UIAlert ForWarning {'sId':'dobackup-warning', 'IsHidden':true} %} + {% UIHtml %} + {{ 'iTopUpdate:UI:DoBackup:Warning'|dict_s }} + {% EndUIHtml %} + {% EndUIAlert %} -{% UIAlert ForWarning {'sId':'dobackup-warning', 'IsHidden':true} %} -{% UIHtml %} - {{ 'iTopUpdate:UI:DoBackup:Warning'|dict_s }} -{% EndUIHtml %} -{% EndUIAlert %} + {% UIField Standard {'sLabel':'iTopUpdate:UI:DoBackup:Label'|dict_s, 'sLayout':'large'} %} + {% UIInput Standard {'sType':'checkbox', 'sId':'doBackup', 'sName':'doBackup', 'sValue':'1', 'IsChecked':true} %} + {% EndUIField %} -{% UIField Standard {'sLabel':'iTopUpdate:UI:DoBackup:Label'|dict_s, 'sLayout':'large'} %} -{% UIInput Standard {'sType':'checkbox', 'sId':'doBackup', 'sName':'doBackup', 'sValue':'1', 'IsChecked':true} %} -{% EndUIField %} + {% UIField Standard {'sLabel':'iTopUpdate:UI:DoFilesArchive'|dict_s, 'sLayout':'large'} %} + {% UIInput Standard {'sType':'checkbox', 'sId':'doFilesArchive', 'sName':'doFilesArchive', 'sValue':'1', 'IsChecked':true} %} + {% EndUIField %} -{% UIField Standard {'sLabel':'iTopUpdate:UI:DoFilesArchive'|dict_s, 'sLayout':'large'} %} -{% UIInput Standard {'sType':'checkbox', 'sId':'doFilesArchive', 'sName':'doFilesArchive', 'sValue':'1', 'IsChecked':true} %} -{% EndUIField %} + {% UIContentBlock Standard {'sContainerClass':'ibo_check_update_submit'} %} + {% UIButton ForPrimaryAction {'sLabel':'iTopUpdate:UI:CheckUpdate'|dict_s, 'sId':'check-update', 'bIsSubmit':true, 'IsDisabled':true} %} + {% UISpinner Standard {'sId':'submit-wait', 'IsHidden':true} %} + {% EndUIContentBlock %} -{% UIContentBlock Standard {'sContainerClass':'ibo_check_update_submit'} %} -{% UIButton ForPrimaryAction {'sLabel':'iTopUpdate:UI:CheckUpdate'|dict_s, 'sId':'check-update', 'bIsSubmit':true, 'IsDisabled':true} %} -{% UISpinner Standard {'sId':'submit-wait', 'IsHidden':true} %} -{% EndUIContentBlock %} + {% EndUIForm %} -{% EndUIForm %} + {% EndUIFieldSet %} -{% EndUIFieldSet %} + {% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:History'|dict_s} %} + {% UIDataTable ForResult {'oPage':oPage, 'sListId':'iboupdatehistory', 'oSet':oSet} %}{% EndUIDataTable %} + {% EndUIFieldSet %} -{% UIFieldSet Standard {'sLegend':'iTopUpdate:UI:History'|dict_s} %} -{% UIDataTable ForResult {'oPage':oPage, 'sListId':'iboupdatehistory', 'oSet':oSet} %} -{% EndUIDataTable %} - -{% EndUIFieldSet %} -{% EndUIContentBlock %} + {% EndUIContentBlock %} {% EndUIContentBlock %} {% endapply %} \ No newline at end of file diff --git a/datamodels/2.x/itop-core-update/view/UpdateCoreFiles.html.twig b/datamodels/2.x/itop-core-update/view/UpdateCoreFiles.html.twig index 09838f169a..df3189ad0c 100644 --- a/datamodels/2.x/itop-core-update/view/UpdateCoreFiles.html.twig +++ b/datamodels/2.x/itop-core-update/view/UpdateCoreFiles.html.twig @@ -1,74 +1,81 @@ {# @copyright Copyright (C) 2010-2019 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} -
-
- {{ 'iTopUpdate:UI:Progress'|dict_s }} +{% apply spaceless %} -
-

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

-
0%
-
-
+ {% UIContentBlock Standard {'sContainerClass':'ibo-update-core display_block display-files'} %} -
- {{ 'iTopUpdate:UI:Status'|dict_s }} - - -
- {{ sCurrentVersion }} -
- - {% if bDoBackup %} -
+ {% EndUIHtml %} + {% 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 %} + {% UIAlert ForInformation {'sId':'current_version', 'IsCollapsible':false, 'IsClosable':false} %} + {% UIContentBlock Standard {'sId':'current-version','sContainerClass':'ibo-update-core--current-version'} %} + {% UIHtml %} + {{ sCurrentVersion }} + {% EndUIHtml %} + {% EndUIContentBlock %} + {% EndUIAlert %} -
- - + {% if bDoFilesArchive %} + {% UIContentBlock Standard {'sId':'do_files_archive_done','sContainerClass':'ibo-update-core--archive-done', 'IsHidden':true} %} + {% UIField Large {'sLabel':''iTopUpdate:UI:WithFilesBackup'|dict_s', 'sValueHtml':''} %}{% EndUIField %} + {% UIAlert ForSuccess {'sContent':sItopArchive} %}{% EndUIAlert %} + {% EndUIContentBlock %} + {% endif %} + {% EndUIFieldSet %} -
- -
-
-
+ {% UIFieldSet Standard {'sLegend':''} %} + + {% UIAlert ForFailure {'sId':'setup_error_outer', 'sContent':'', 'IsCollapsible':false, 'IsClosable':false, 'IsHidden':true} %} + {% UIContentBlock Standard {'sId':'setup_error','sContainerClass':'ibo-update-core--error'} %}{% EndUIContentBlock %} + {% if bDoFilesArchive %} + {% UIHtml %} + {{ 'iTopUpdate:UI:RestoreArchive'|dict_format(sItopArchive) }} + {% EndUIHtml %} + {% endif %} + {% if bDoBackup %} + {% UIHtml %} + {{ 'iTopUpdate:UI:RestoreBackup'|dict_format(sBackupFile) }} + {% EndUIHtml %} + {% endif %} + {% UIHtml %} + {{ 'iTopUpdate:UI:MaintenanceModeActive'|dict_s }} + {% EndUIHtml %} + {% EndUIAlert %} + + {% UIContentBlock Standard {'sId':'run_setup','sContainerClass':'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 %} + + {% UIForm Standard {'CSSClasses':'form-inline'} %} + {% UIButton ForPrimaryAction {'sLabel':'iTopUpdate:UI:Continue'|dict_s, 'sId':'setup_continue', 'bIsSubmit':true, 'IsDisabled':false} %} + {% EndUIForm %} + + {% EndUIFieldSet %} + + {% EndUIContentBlock %} +{% endapply %} \ No newline at end of file