From 028a3ccec8d90510294f8b4a4f02e85e03bf5cae Mon Sep 17 00:00:00 2001 From: Eric Date: Wed, 13 Jan 2021 08:58:27 +0100 Subject: [PATCH] =?UTF-8?q?N=C2=B02677=20-=20Add=20style=20definition=20fo?= =?UTF-8?q?r=20classes=20(too=20much=20style)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datamodel.itop-change-mgmt-itil.xml | 26 --- .../datamodel.itop-change-mgmt.xml | 26 --- .../datamodel.itop-config-mgmt.xml | 6 - .../view/DisplayCurrentVersion.html.twig | 10 +- .../view/SelectUpdateFile.html.twig | 213 ++++++++---------- .../view/SelectUpdateFile.ready.js.twig | 16 +- .../datamodel.itop-enduser-devices.xml | 2 - .../datamodel.itop-incident-mgmt-itil.xml | 16 -- .../portal/vendor/composer/ClassLoader.php | 6 +- .../datamodel.itop-request-mgmt-itil.xml | 10 - .../datamodel.itop-request-mgmt.xml | 18 -- .../data.sample.servicefamilies.xml | 2 - .../data.sample.services.xml | 6 - .../data.sample.servicefamilies.xml | 2 - .../data.sample.services.xml | 6 - .../datamodel.itop-virtualization-mgmt.xml | 2 - .../datamodel.itop-welcome-itil.xml | 2 - 17 files changed, 114 insertions(+), 255 deletions(-) diff --git a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml index ef5ec06c9..dd2209583 100755 --- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml +++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml @@ -279,23 +279,17 @@ 1 HIGHLIGHT_CLASS_NONE - 2 HIGHLIGHT_CLASS_NONE - 3 HIGHLIGHT_CLASS_NONE - @@ -4665,9 +4659,7 @@ AND (C.id != :this->id) ]]> Tickets:Related:OpenChanges - DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - @@ -4706,9 +4696,7 @@ AND (C.id != :this->id) ]]> Tickets:Related:OpenChanges - DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - @@ -4747,9 +4733,7 @@ AND (C.id != :this->id) ]]> Tickets:Related:OpenChanges - DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - @@ -4791,9 +4773,7 @@ AND (L.impact_code != 'not_impacted') ]]> Tickets:Related:OpenChanges - DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - @@ -4826,9 +4804,7 @@ AND (L.impact_code != 'not_impacted') ]]> Tickets:Related:OpenChanges - DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - diff --git a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml index 74504c75a..2daed02de 100755 --- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml +++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml @@ -210,23 +210,17 @@ 1 HIGHLIGHT_CLASS_NONE - 2 HIGHLIGHT_CLASS_NONE - 3 HIGHLIGHT_CLASS_NONE - @@ -921,9 +915,7 @@ AND (C.id != :this->id) ]]> Tickets:Related:OpenChanges - yes @@ -940,9 +932,7 @@ AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - no @@ -966,9 +956,7 @@ AND (C.id != :this->id) ]]> Tickets:Related:OpenChanges - yes @@ -985,9 +973,7 @@ AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - no @@ -1011,9 +997,7 @@ AND (C.id != :this->id) ]]> Tickets:Related:OpenChanges - yes @@ -1030,9 +1014,7 @@ AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - no @@ -1059,9 +1041,7 @@ AND (L.impact_code != 'not_impacted') ]]> Tickets:Related:OpenChanges - yes @@ -1077,9 +1057,7 @@ AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - no @@ -1098,9 +1076,7 @@ AND (L.impact_code != 'not_impacted') ]]> Tickets:Related:OpenChanges - yes @@ -1116,9 +1092,7 @@ AND (C.end_date < NOW() AND C.end_date > DATE_SUB(NOW(), INTERVAL 3 DAY )) ]]> Tickets:Related:RecentChanges - no diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml index 6f2094501..5474cf5de 100755 --- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml +++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml @@ -6555,9 +6555,7 @@ 0 Menu:ConfigManagement:AllDevices - Menu_ConfigManagement_AllDevices @@ -6576,9 +6574,7 @@ 0 Menu:ConfigManagement:SWAndApps - 1 @@ -6628,9 +6624,7 @@ 0 Menu:ConfigManagement:Misc - 1 diff --git a/datamodels/2.x/itop-core-update/view/DisplayCurrentVersion.html.twig b/datamodels/2.x/itop-core-update/view/DisplayCurrentVersion.html.twig index 457d8eab2..cd59b9b88 100644 --- a/datamodels/2.x/itop-core-update/view/DisplayCurrentVersion.html.twig +++ b/datamodels/2.x/itop-core-update/view/DisplayCurrentVersion.html.twig @@ -2,9 +2,9 @@ {# @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 }}
+
+
{{ '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 09bd5b4ed..4641f53f6 100644 --- a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig +++ b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig @@ -1,134 +1,121 @@ {# @copyright Copyright (C) 2010-2019 Combodo SARL #} {# @license http://opensource.org/licenses/AGPL-3.0 #} +{% UIBlock Combodo\iTop\Application\UI\Base\Component\Html\Html %} +

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

+{% EndUIBlock %} +{#
 
#} -

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

+{#
#} +{#
#} +{# {{ 'iTopUpdate:UI:Status'|dict_s }} #} -
-
- {{ 'iTopUpdate:UI:Status'|dict_s }} +{#
#} +{#
#} +{# {{ 'iTopUpdate:UI:CanCoreUpdate:Loading'|dict_s }} #} +{#
#} +{#
#} -
-
- {{ 'iTopUpdate:UI:CanCoreUpdate:Loading'|dict_s }} -
-
+{# {{ include('DisplayCurrentVersion.html.twig') }} #} - - - - - - -
+{#
#} +{#
{{ 'iTopUpdate:UI:DiskFreeSpace'|dict_s }}
#} +{#
#} +{#
{{ sDiskFreeSpace }}
#} +{#
#} +{#
#} - {{ include('DisplayCurrentVersion.html.twig') }} +{#
#} +{#
{{ 'iTopUpdate:UI:ItopDiskSpace'|dict_s }}
#} +{#
#} +{#
#} +{#
#} +{#
#} -
-
-
{{ 'iTopUpdate:UI:DiskFreeSpace'|dict_s }}
-
{{ sDiskFreeSpace }}
-
-
+{#
#} +{#
{{ 'iTopUpdate:UI:DBDiskSpace'|dict_s }}
#} +{#
#} +{#
#} -
-
-
{{ 'iTopUpdate:UI:ItopDiskSpace'|dict_s }}
-
-
-
+{#
#} +{#
{{ 'iTopUpdate:UI:FileUploadMaxSize'|dict_s }}
#} +{#
{{ sFileUploadMaxSize }}
#} +{#
#} -
-
-
{{ 'iTopUpdate:UI:DBDiskSpace'|dict_s }}
-
-
-
+{# #} -
-
-
{{ 'iTopUpdate:UI:FileUploadMaxSize'|dict_s }}
-
{{ sFileUploadMaxSize }}
-
-
-
+{#
#} +{# {{ 'iTopUpdate:UI:SelectUpdateFile'|dict_s }} #} -
+{#
#} +{# #} +{# #} -
- {{ 'iTopUpdate:UI:SelectUpdateFile'|dict_s }} +{# #} -
- - - +{#
#} +{#
#} +{#
#} +{# #} +{#
#} +{#
#} - +{# #} +{#
#} +{# #} +{# #} +{#
#} +{#
#} +{# #} +{# #} +{#
#} +{#
#} +{#

#} +{# #} +{#
#} -
-
-
- -
-
+{#
#} +{# {{ 'iTopUpdate:UI:History'|dict_s }} #} - -
- - -
-
- - -
-
-

- -
-
+{#
#} +{# {% for aInstall in aPreviousInstall %} #} +{# {% if loop.first %} #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} +{# {% endif %} #} -
- {{ 'iTopUpdate:UI:History'|dict_s }} +{# {% if (loop.index0 % 2) == 0 %} #} +{# {% set sRowClass = "odd" %} #} +{# {% else %} #} +{# {% set sRowClass = "even" %} #} +{# {% endif %} #} -
- {% for aInstall in aPreviousInstall %} - {% if loop.first %} -
{{ 'Class:ModuleInstallation/Attribute:name'|dict_s }}{{ 'Class:ModuleInstallation/Attribute:version'|dict_s }}{{ 'Class:ModuleInstallation/Attribute:installed'|dict_s }}{{ 'Class:ModuleInstallation/Attribute:comment'|dict_s }}
- - - - - - - {% endif %} +{# #} +{# #} +{# #} +{# #} +{# #} +{# #} - {% if (loop.index0 % 2) == 0 %} - {% set sRowClass = "odd" %} - {% else %} - {% set sRowClass = "even" %} - {% endif %} +{# {% if loop.last %} #} +{#
{{ 'Class:ModuleInstallation/Attribute:name'|dict_s }}{{ 'Class:ModuleInstallation/Attribute:version'|dict_s }}{{ 'Class:ModuleInstallation/Attribute:installed'|dict_s }}{{ 'Class:ModuleInstallation/Attribute:comment'|dict_s }}
{{ aInstall.name }}{{ aInstall.version }}{{ aInstall.installed }}{{ aInstall.comment }}
#} +{# {% endif %} #} +{# {% endfor %} #} +{#
#} +{# #} - - {{ aInstall.name }} - {{ aInstall.version }} - {{ aInstall.installed }} - {{ aInstall.comment }} - - - {% if loop.last %} - - {% endif %} - {% endfor %} -
- - -
+{# #} \ No newline at end of file diff --git a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig index f52ac52cb..94b2cbcfa 100644 --- a/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig +++ b/datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig @@ -10,19 +10,15 @@ $.ajax({ "operation": "CanUpdateCore" }, dataType: "json", - success: function(data) - { + success: function (data) { var oRequirements = $("#header-requirements"); var oCanCoreUpdate = $("#can-core-update"); oCanCoreUpdate.html(data.sMessage); - oRequirements.removeClass("message_info"); - if (data.bStatus) - { - oRequirements.addClass("message_ok"); - } - else - { - oRequirements.addClass("message_error"); + oRequirements.removeClass("ibo-is-information"); + if (data.bStatus) { + oRequirements.addClass("ibo-is-success"); + } else { + oRequirements.addClass("ibo-is-failure"); } } }); diff --git a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml index 7b1a8d44b..a0c149621 100644 --- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml +++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml @@ -1390,9 +1390,7 @@ 0 Menu:ConfigManagement:EndUsers - 1 diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml index e91caebd5..93a2f250e 100755 --- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml +++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml @@ -482,23 +482,17 @@ 1 HIGHLIGHT_CLASS_WARNING - 2 HIGHLIGHT_CLASS_CRITICAL - 3 HIGHLIGHT_CLASS_NONE - @@ -1958,9 +1952,7 @@ AND (I.id != :this->id) ]]> Tickets:Related:OpenIncidents - yes @@ -1982,9 +1974,7 @@ AND (I.id != :this->id) ]]> Tickets:Related:OpenIncidents - yes @@ -2006,9 +1996,7 @@ AND (I.id != :this->id) ]]> Tickets:Related:OpenIncidents - yes @@ -2033,9 +2021,7 @@ AND (L.impact_code != 'not_impacted') ]]> Tickets:Related:OpenIncidents - yes @@ -2052,9 +2038,7 @@ AND (L.impact_code != 'not_impacted') ]]> Tickets:Related:OpenIncidents - yes diff --git a/datamodels/2.x/itop-portal-base/portal/vendor/composer/ClassLoader.php b/datamodels/2.x/itop-portal-base/portal/vendor/composer/ClassLoader.php index 75f02a82a..bfe94b0cb 100644 --- a/datamodels/2.x/itop-portal-base/portal/vendor/composer/ClassLoader.php +++ b/datamodels/2.x/itop-portal-base/portal/vendor/composer/ClassLoader.php @@ -45,8 +45,8 @@ namespace Composer\Autoload; * * @author Fabien Potencier * @author Jordi Boggiano - * @see http://www.php-fig.org/psr/psr-0/ - * @see http://www.php-fig.org/psr/psr-4/ + * @see https://www.php-fig.org/psr/psr-0/ + * @see https://www.php-fig.org/psr/psr-4/ */ class ClassLoader { @@ -68,7 +68,7 @@ class ClassLoader public function getPrefixes() { if (!empty($this->prefixesPsr0)) { - return call_user_func_array('array_merge', $this->prefixesPsr0); + return call_user_func_array('array_merge', array_values($this->prefixesPsr0)); } return array(); diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml index 80d40074c..91ab1260f 100755 --- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml +++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml @@ -534,23 +534,17 @@ 1 HIGHLIGHT_CLASS_WARNING - 2 HIGHLIGHT_CLASS_CRITICAL - 3 HIGHLIGHT_CLASS_NONE - @@ -1880,9 +1874,7 @@ 0 Organization:Overview:UserRequests - Menu:UserRequest:OpenRequests SELECT UserRequest WHERE status != "closed" AND org_id=:this->id status @@ -1929,9 +1921,7 @@ 0 Menu:RequestManagement - Menu:UserRequest:OpenRequests SELECT UserRequest WHERE status != "closed" status diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml index bd5afb4a2..07fee727c 100755 --- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml +++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml @@ -565,23 +565,17 @@ 1 HIGHLIGHT_CLASS_WARNING - 2 HIGHLIGHT_CLASS_CRITICAL - 3 HIGHLIGHT_CLASS_NONE - @@ -1924,9 +1918,7 @@ 0 Organization:Overview:UserRequests - Menu:UserRequest:OpenRequests SELECT UserRequest WHERE status != "closed" AND org_id=:this->id status @@ -1973,9 +1965,7 @@ 0 Menu:RequestManagement - Menu:UserRequest:OpenRequests SELECT UserRequest WHERE status != "closed" status @@ -2149,9 +2139,7 @@ AND (R.id != :this->id) ]]> Tickets:Related:OpenIncidents - yes @@ -2175,9 +2163,7 @@ AND (R.id != :this->id) ]]> Tickets:Related:OpenIncidents - yes @@ -2204,9 +2190,7 @@ AND (L.impact_code != 'not_impacted') ]]> Tickets:Related:OpenIncidents - yes @@ -2225,9 +2209,7 @@ AND (L.impact_code != 'not_impacted') ]]> Tickets:Related:OpenIncidents - yes diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.servicefamilies.xml b/datamodels/2.x/itop-service-mgmt-provider/data.sample.servicefamilies.xml index 388b8ab8f..7f956f030 100644 --- a/datamodels/2.x/itop-service-mgmt-provider/data.sample.servicefamilies.xml +++ b/datamodels/2.x/itop-service-mgmt-provider/data.sample.servicefamilies.xml @@ -2,7 +2,6 @@ IT Services - \ No newline at end of file diff --git a/datamodels/2.x/itop-service-mgmt-provider/data.sample.services.xml b/datamodels/2.x/itop-service-mgmt-provider/data.sample.services.xml index ca6a9e24f..19ffcfce9 100755 --- a/datamodels/2.x/itop-service-mgmt-provider/data.sample.services.xml +++ b/datamodels/2.x/itop-service-mgmt-provider/data.sample.services.xml @@ -6,7 +6,6 @@ 3 Ordering of new hardware (Desktop computer, laptop computer, monitor, mouse, keyboard...) and support in case of hardware failure. production - Software @@ -22,7 +20,6 @@ 3 Management of computer software and applications. Installation, upgrade, troubleshooting and removal of software. production - Telecom and connectivity @@ -38,7 +34,6 @@ 3 Ordering and configuration of new mobile phones, computer connectivity requests, cabling, etc... production - diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.servicefamilies.xml b/datamodels/2.x/itop-service-mgmt/data.sample.servicefamilies.xml index 29c0a1cad..f54d811ea 100644 --- a/datamodels/2.x/itop-service-mgmt/data.sample.servicefamilies.xml +++ b/datamodels/2.x/itop-service-mgmt/data.sample.servicefamilies.xml @@ -2,7 +2,6 @@ IT Services - diff --git a/datamodels/2.x/itop-service-mgmt/data.sample.services.xml b/datamodels/2.x/itop-service-mgmt/data.sample.services.xml index ca6a9e24f..19ffcfce9 100755 --- a/datamodels/2.x/itop-service-mgmt/data.sample.services.xml +++ b/datamodels/2.x/itop-service-mgmt/data.sample.services.xml @@ -6,7 +6,6 @@ 3 Ordering of new hardware (Desktop computer, laptop computer, monitor, mouse, keyboard...) and support in case of hardware failure. production - Software @@ -22,7 +20,6 @@ 3 Management of computer software and applications. Installation, upgrade, troubleshooting and removal of software. production - Telecom and connectivity @@ -38,7 +34,6 @@ 3 Ordering and configuration of new mobile phones, computer connectivity requests, cabling, etc... production - diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml index e868c621b..02e31f945 100644 --- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml +++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml @@ -901,9 +901,7 @@ 0 Menu:ConfigManagement:virtualization - 1 diff --git a/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml b/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml index 5a2528a9a..dcb7e1587 100644 --- a/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml +++ b/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml @@ -14,9 +14,7 @@ 0 Menu:ConfigManagementCI - 3