N°7589 - Move oauth client menu under Integration and revert general configuration

application/datamodel.application.xml

@@ -185,8 +185,8 @@
         <decoration_classes>fas fa-cog</decoration_classes>
       </style>
     </menu>
-    <menu id="ConfigEditor" xsi:type="TemplateMenuNode" _delta="define">
-      <rank>10</rank>
+    <menu id="Integrations" xsi:type="TemplateMenuNode" _delta="define">
+      <rank>15</rank>
       <parent>ConfigurationTools</parent>
       <template_file/>
     </menu>

datamodels/2.x/itop-config/datamodel.itop-config.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.2">
   <menus>
-    <menu id="ConfigFileEditor" xsi:type="WebPageMenuNode" _delta="define">
+    <menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
       <rank>10</rank>
-      <parent>ConfigEditor</parent>
+      <parent>ConfigurationTools</parent>
       <url>config.php</url>
       <enable_admin_only>1</enable_admin_only>
     </menu>

datamodels/2.x/itop-oauth-client/datamodel.itop-oauth-client.xml

@@ -936,7 +936,7 @@ HTML
   <menus>
     <menu id="OAuthClient" xsi:type="OQLMenuNode" _delta="define">
       <rank>100</rank>
-      <parent>ConfigurationTools</parent>
+      <parent>Integrations</parent>
       <oql><![CDATA[SELECT OAuthClient]]></oql>
       <do_search>1</do_search>
       <enable_admin_only>0</enable_admin_only>

dictionaries/cs.dictionary.itop.ui.php

@@ -1463,4 +1463,8 @@ Domény nejčastěji odpovídají skupinám řešitelů, které následně oprav
 	'UI_CountOfObjectsShort' => '%1$d objektů.',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office',
 	'portal:legacy_portal' => 'Uživatelský portál',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations'           => 'Integrations~~',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/da.dictionary.itop.ui.php

@@ -1465,4 +1465,8 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'UI_CountOfObjectsShort' => '%1$d objekter.',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~',
 	'portal:legacy_portal' => 'End-User Portal~~',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations'           => 'Integrations~~',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/de.dictionary.itop.ui.php

@@ -1463,4 +1463,8 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'UI_CountOfObjectsShort' => '%1$d Objekte.',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Backend',
 	'portal:legacy_portal' => 'Endbenutzer-Portal',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations' => 'Integrationen',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/en.dictionary.itop.ui.php

@@ -1713,6 +1713,8 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:Queries'                => 'Queries',
 	'Menu:ConfigurationTools'     => 'Configuration',
 	'Menu:ConfigEditor'           => 'General configuration',
-	'Menu:ConfigEditor+'          => 'Configuration File editors',
+	'Menu:ConfigEditor+'          => 'Configuration File editor',
+	'Menu:Integrations'           => 'Integrations',
+	'Menu:Integrations+'          => '',
 
 ));

dictionaries/es_cr.dictionary.itop.ui.php

@@ -1471,4 +1471,8 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'UI_CountOfObjectsShort' => '%1$d Elemento(s)',
 	'portal:backoffice' => 'Portal de Soporte',
 	'portal:legacy_portal' => 'Portal de Clientes',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations' => 'Integraciones',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/hu.dictionary.itop.ui.php

@@ -1466,4 +1466,8 @@ A művelet eseményindítóhoz rendelésekor kap egy sorszámot , amely meghatá
 	'UI_CountOfObjectsShort' => '%1$d objektum.',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Adminisztrációs felület',
 	'portal:legacy_portal' => 'Végfelhasználói Portál',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations' => 'Integrációk',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/it.dictionary.itop.ui.php

@@ -1467,4 +1467,8 @@ Quando è associata a un trigger, a ogni azione è assegnato un numero "ordine",
 	'UI_CountOfObjectsShort' => '%1$d oggetti.',
 	'portal:backoffice' => 'Interfaccia utente di '.ITOP_APPLICATION_SHORT.' Back-Office',
 	'portal:legacy_portal' => 'Portale per gli utenti finali',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations'           => 'Integrations~~',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/ja.dictionary.itop.ui.php

@@ -1465,4 +1465,8 @@ Domain usually correspond to who is responsible for checking and fixing errors~~
 	'UI_CountOfObjectsShort' => '%1$d オブジェクト。',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~',
 	'portal:legacy_portal' => 'End-User Portal~~',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations'           => 'Integrations~~',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/nl.dictionary.itop.ui.php

@@ -1468,4 +1468,8 @@ Bij die koppeling wordt aan elke actie een volgorde-nummer gegeven. Dit bepaalt
 	'UI_CountOfObjectsShort' => '%1$d objecten.',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface',
 	'portal:legacy_portal' => 'Portaal voor eindgebruikers',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations' => 'Integraties',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/pl.dictionary.itop.ui.php

@@ -1477,4 +1477,8 @@ W przypadku powiązania z wyzwalaczem, każde działanie otrzymuje numer "porzą
 	'core/Operation:Wizard/Title' => 'Konfiguracja OAuth 2.0',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Interfejs użytkownika biurowego',
 	'portal:legacy_portal' => 'Portal użytkownika',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations'           => 'Integrations~~',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/pt_br.dictionary.itop.ui.php

@@ -1465,4 +1465,8 @@ Quando associada a um gatilho, cada ação recebe um número de "ordem", especif
 	'UI_CountOfObjectsShort' => '%1$d objeto(s)',
 	'portal:backoffice' => 'Interface de usuário back-office do '.ITOP_APPLICATION_SHORT,
 	'portal:legacy_portal' => 'Portal do usuário (legado) do '.ITOP_APPLICATION_SHORT,
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations'           => 'Integrations~~',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/ru.dictionary.itop.ui.php

@@ -1466,4 +1466,8 @@ Domain usually correspond to who is responsible for checking and fixing errors~~
 	'UI_CountOfObjectsShort' => '%1$d объектов.',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office интерфейс',
 	'portal:legacy_portal' => 'Пользовательский портал',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations'           => 'Integrations~~',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/sk.dictionary.itop.ui.php

@@ -1462,4 +1462,8 @@ Keď sú priradené spúštačom, každej akcii je dané číslo "príkazu", šp
 	'UI_CountOfObjectsShort' => '%1$d objekt/y/ov.',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.' Back-Office User Interface~~',
 	'portal:legacy_portal' => 'End-User Portal~~',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations'           => 'Integrations~~',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/tr.dictionary.itop.ui.php

@@ -1466,4 +1466,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'UI_CountOfObjectsShort' => '%1$d nesne.',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.'Arka Ofis Kullanıcı Arayüzü',
 	'portal:legacy_portal' => 'Son Kullanıcı Arayüzü',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations'           => 'Integrations~~',
+	'Menu:Integrations+'          => '~~',
 ]);

dictionaries/zh_cn.dictionary.itop.ui.php

@@ -1465,4 +1465,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', [
 	'UI_CountOfObjectsShort' => '%1$d个对象.',
 	'portal:backoffice' => ITOP_APPLICATION_SHORT.'后台用户界面',
 	'portal:legacy_portal' => '终端用户门户',
+	'Menu:ConfigEditor'           => 'General configuration~~',
+	'Menu:ConfigEditor+'          => 'Configuration File editor~~',
+	'Menu:Integrations' => '集成',
+	'Menu:Integrations+'          => '~~',
 ]);