From 5d3009646a63a1f74d7101f9ec8c0b5c778ecb95 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Sat, 18 Jul 2020 12:04:42 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B03182=20-=20Datamodel:=20Add=20icon=20to?= =?UTF-8?q?=20menu=20groups?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/datamodel.application.xml | 14 +++++++++++++- application/itopwebpage.class.inc.php | 1 + .../datamodel.itop-change-mgmt-itil.xml | 5 ++++- .../datamodel.itop-change-mgmt.xml | 5 ++++- .../datamodel.itop-config-mgmt.xml | 8 +++++++- datamodels/2.x/itop-hub-connector/menus.php | 2 +- .../datamodel.itop-incident-mgmt-itil.xml | 5 ++++- .../datamodel.itop-knownerror-mgmt.xml | 5 ++++- .../datamodel.itop-problem-mgmt.xml | 5 ++++- .../datamodel.itop-request-mgmt-itil.xml | 5 ++++- .../datamodel.itop-request-mgmt.xml | 5 ++++- .../datamodel.itop-service-mgmt-provider.xml | 5 ++++- .../datamodel.itop-service-mgmt.xml | 5 ++++- 13 files changed, 58 insertions(+), 12 deletions(-) diff --git a/application/datamodel.application.xml b/application/datamodel.application.xml index b8c634773..380eee2dd 100644 --- a/application/datamodel.application.xml +++ b/application/datamodel.application.xml @@ -1,5 +1,5 @@ - + cmdbAbstractObject @@ -55,6 +55,9 @@ 10 + 10 @@ -148,6 +151,9 @@ 90 + 20 @@ -166,11 +172,17 @@ 80 + 100 ResourceSystemMenu UR_ACTION_MODIFY + diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php index 3c4ffd308..92bf37e9e 100644 --- a/application/itopwebpage.class.inc.php +++ b/application/itopwebpage.class.inc.php @@ -109,6 +109,7 @@ class iTopWebPage extends NiceWebPage implements iTabbedPage $this->add_linked_stylesheet("../css/magnific-popup.css"); $this->add_linked_stylesheet("../css/c3.min.css"); $this->add_linked_stylesheet("../css/font-awesome/css/all.min.css"); + $this->add_linked_stylesheet("../css/font-combodo/font-combodo.css"); $this->add_linked_stylesheet("../js/ckeditor/plugins/codesnippet/lib/highlight/styles/obsidian.css"); // TODO: Add only what's necessary 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 924326acb..33498b9ee 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 @@ -1,5 +1,5 @@ - + Ticket @@ -4456,6 +4456,9 @@ 50 + 0 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 f3aa760b1..ba825474b 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 @@ -1,5 +1,5 @@ - + Ticket @@ -735,6 +735,9 @@ 50 + 0 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 af44aa376..32d508c64 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 @@ -1,5 +1,5 @@ - + cmdbAbstractObject @@ -8098,6 +8098,9 @@ UR_ACTION_MODIFY UR_ALLOWED_YES + 10 @@ -8122,6 +8125,9 @@ 20 + 1 diff --git a/datamodels/2.x/itop-hub-connector/menus.php b/datamodels/2.x/itop-hub-connector/menus.php index b6754d5ef..56d548748 100644 --- a/datamodels/2.x/itop-hub-connector/menus.php +++ b/datamodels/2.x/itop-hub-connector/menus.php @@ -22,7 +22,7 @@ class ItopHubMenusHandler extends ModuleHandlerAPI $sRootUrl = utils::GetAbsoluteUrlAppRoot().'pages/exec.php?exec_module=itop-hub-connector&exec_page=launch.php'; $sMyExtensionsUrl = utils::GetAbsoluteUrlAppRoot().'pages/exec.php?exec_module=itop-hub-connector&exec_page=myextensions.php'; - $oHubMenu = new MenuGroup('iTopHub', 999 /* fRank */); + $oHubMenu = new MenuGroup('iTopHub', 999 /* fRank */, 'fc fc-itophub-icon fc-1-5x'); $fRank = 1; new WebPageMenuNode('iTopHub:Register', $sRootUrl.'&target=view_dashboard', $oHubMenu->GetIndex(), $fRank++); new WebPageMenuNode('iTopHub:MyExtensions', $sMyExtensionsUrl, $oHubMenu->GetIndex(), $fRank++); 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 170c60245..438800651 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 @@ -1,5 +1,5 @@ - + Ticket @@ -1665,6 +1665,9 @@ 35 + 0 diff --git a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml index 956a2b88c..18615843b 100755 --- a/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml +++ b/datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml @@ -1,5 +1,5 @@ - + cmdbAbstractObject @@ -606,6 +606,9 @@ 42 + 5 diff --git a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml index ee7faa8e3..d0d7cbca4 100755 --- a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml +++ b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml @@ -1,5 +1,5 @@ - + Ticket @@ -685,6 +685,9 @@ 42 + 5 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 780221659..051be1e49 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 @@ -1,5 +1,5 @@ - + Ticket @@ -1808,6 +1808,9 @@ 30 + 0 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 c6fa37e45..317a97795 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 @@ -1,5 +1,5 @@ - + Ticket @@ -1826,6 +1826,9 @@ 30 + 0 diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml index e623d2689..79dac4563 100755 --- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml +++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml @@ -1,5 +1,5 @@ - + @@ -2440,6 +2440,9 @@ public function PrefillSearchForm(&$aContextParam) 60 + 0 diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml index 20aa4680c..a6d50d78a 100755 --- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml +++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml @@ -1,5 +1,5 @@ - + @@ -2433,6 +2433,9 @@ public function PrefillSearchForm(&$aContextParam) 60 + 0