composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

N°2595 - Reorganize/rename admin. console menus

Browse Source
This commit is contained in:
Eric
2019-12-11 13:59:31 +01:00
parent e7726a17db
commit 7c1a8c90da
14 changed files with 90 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/codeStyles/Project.xml generated
View File

@@ -67,11 +67,6 @@
<option name="SMART_TABS" value="true" /> <option name="SMART_TABS" value="true" />
</indentOptions> </indentOptions>
</codeStyleSettings> </codeStyleSettings>
<codeStyleSettings language="SCSS">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="XML"> <codeStyleSettings language="XML">
<option name="WRAP_ON_TYPING" value="1" /> <option name="WRAP_ON_TYPING" value="1" />
</codeStyleSettings> </codeStyleSettings>

5
application/datamodel.application.xml
View File

@@ -15,5 +15,10 @@
<menu id="AdminTools" xsi:type="MenuGroup" _delta="define"> <menu id="AdminTools" xsi:type="MenuGroup" _delta="define">
<rank>80</rank> <rank>80</rank>
</menu> </menu>
<menu id="System" xsi:type="MenuGroup" _delta="define">
<rank>100</rank>
<enable_class>ResourceSystemMenu</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action>
</menu>
</menus> </menus>
</itop_design> </itop_design>

4
datamodels/2.x/itop-backup/datamodel.itop-backup.xml
View File

@@ -2,8 +2,8 @@
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6"> <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<menus> <menus>
<menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define"> <menu id="BackupStatus" xsi:type="WebPageMenuNode" _delta="define">
<rank>15</rank> <rank>50</rank>
<parent>AdminTools</parent> <parent>System</parent>
<url>status.php</url> <url>status.php</url>
<enable_admin_only>1</enable_admin_only> <enable_admin_only>1</enable_admin_only>
</menu> </menu>

4
datamodels/2.x/itop-backup/en.dict.itop-backup.php
View File

@@ -26,8 +26,8 @@ Dict::Add('EN US', 'English', 'English', array(
'bkp-backup-running' => 'A backup is running. Please wait...', 'bkp-backup-running' => 'A backup is running. Please wait...',
'bkp-restore-running' => 'A restore is running. Please wait...', 'bkp-restore-running' => 'A restore is running. Please wait...',
'Menu:BackupStatus' => 'Scheduled Backups', 'Menu:BackupStatus' => 'Backups',
'bkp-status-title' => 'Scheduled Backups', 'bkp-status-title' => 'Backups',
'bkp-status-checks' => 'Settings and checks', 'bkp-status-checks' => 'Settings and checks',
'bkp-mysqldump-ok' => 'mysqldump is present: %1$s', 'bkp-mysqldump-ok' => 'mysqldump is present: %1$s',
'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.', 'bkp-mysqldump-notfound' => 'mysqldump could not be found: %1$s - Please make sure it is installed and in the path, or edit the configuration file to tune mysql_bindir.',

4
datamodels/2.x/itop-backup/fr.dict.itop-backup.php
View File

@@ -10,8 +10,8 @@ Dict::Add('FR FR', 'French', 'Français', array(
'bkp-backup-running' => 'Une sauvegarde est en cours. Veuillez patienter...', 'bkp-backup-running' => 'Une sauvegarde est en cours. Veuillez patienter...',
'bkp-restore-running' => 'Une restauration des données est en cours. Veuillez patienter...', 'bkp-restore-running' => 'Une restauration des données est en cours. Veuillez patienter...',
'Menu:BackupStatus' => 'Sauvegarde automatique', 'Menu:BackupStatus' => 'Sauvegardes',
'bkp-status-title' => 'Sauvegarde automatique', 'bkp-status-title' => 'Sauvegardes',
'bkp-status-checks' => 'Réglages et vérifications', 'bkp-status-checks' => 'Réglages et vérifications',
'bkp-mysqldump-ok' => 'mysqldump est installé: %1$s', 'bkp-mysqldump-ok' => 'mysqldump est installé: %1$s',
'bkp-mysqldump-notfound' => 'mysqldump n\'a pas été trouvé: %1$s - Veuillez vous assurer que les outils mysql sont installés et qu\'ils sont accessibles en ligne de commande, ou bien éditez le fichier de configuration pour en donner le chemin via mysql_bindir.', 'bkp-mysqldump-notfound' => 'mysqldump n\'a pas été trouvé: %1$s - Veuillez vous assurer que les outils mysql sont installés et qu\'ils sont accessibles en ligne de commande, ou bien éditez le fichier de configuration pour en donner le chemin via mysql_bindir.',

4
datamodels/2.x/itop-config/datamodel.itop-config.xml
View File

@@ -2,8 +2,8 @@
<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6"> <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.6">
<menus> <menus>
<menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define"> <menu id="ConfigEditor" xsi:type="WebPageMenuNode" _delta="define">
<rank>50</rank> <rank>10</rank>
<parent>AdminTools</parent> <parent>Configuration</parent>
<url>config.php</url> <url>config.php</url>
<enable_admin_only>1</enable_admin_only> <enable_admin_only>1</enable_admin_only>
</menu> </menu>

2
datamodels/2.x/itop-config/en.dict.itop-config.php
View File

@@ -23,7 +23,7 @@
Dict::Add('EN US', 'English', 'English', array( Dict::Add('EN US', 'English', 'English', array(
'Menu:ConfigEditor' => 'Configuration', 'Menu:ConfigEditor' => 'General Configuration',
'config-edit-title' => 'Configuration File Editor', 'config-edit-title' => 'Configuration File Editor',
'config-edit-intro' => 'Be very cautious when editing the configuration file.', 'config-edit-intro' => 'Be very cautious when editing the configuration file.',
'config-apply' => 'Apply', 'config-apply' => 'Apply',

2
datamodels/2.x/itop-config/fr.dict.itop-config.php
View File

@@ -7,7 +7,7 @@
*/ */
Dict::Add('FR FR', 'French', 'Français', array( Dict::Add('FR FR', 'French', 'Français', array(
'Menu:ConfigEditor' => 'Configuration', 'Menu:ConfigEditor' => 'Configuration Générale',
'config-edit-title' => 'Editeur du Fichier de Configuration', 'config-edit-title' => 'Editeur du Fichier de Configuration',
'config-edit-intro' => 'Attention: une configuration incorrecte peut rendre iTop inopérant pour tous les utilisateurs!', 'config-edit-intro' => 'Attention: une configuration incorrecte peut rendre iTop inopérant pour tous les utilisateurs!',
'config-apply' => 'Enregistrer', 'config-apply' => 'Enregistrer',

67
datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml
View File

@@ -30,6 +30,16 @@
<presentation/> <presentation/>
<methods/> <methods/>
</class> </class>
<class id="ResourceSystemMenu" _delta="define">
<parent>AbstractResource</parent>
<properties>
<comment>/* System menu access control. */</comment>
<abstract>true</abstract>
<category>grant_by_profile</category>
</properties>
<presentation/>
<methods/>
</class>
</classes> </classes>
<menus> <menus>
<menu id="WelcomeMenu" xsi:type="MenuGroup" _delta="define"> <menu id="WelcomeMenu" xsi:type="MenuGroup" _delta="define">
@@ -87,9 +97,14 @@
<rank>20</rank> <rank>20</rank>
<parent>WelcomeMenu</parent> <parent>WelcomeMenu</parent>
</menu> </menu>
<menu id="UserAccountsMenu" xsi:type="OQLMenuNode" _delta="define"> <menu id="UserManagement" xsi:type="TemplateMenuNode" _delta="define">
<rank>1</rank> <rank>10</rank>
<parent>AdminTools</parent> <parent>AdminTools</parent>
<template_file/>
</menu>
<menu id="UserAccountsMenu" xsi:type="OQLMenuNode" _delta="define">
<rank>11</rank>
<parent>UserManagement</parent>
<oql><![CDATA[SELECT User]]></oql> <oql><![CDATA[SELECT User]]></oql>
<do_search>1</do_search> <do_search>1</do_search>
<search_form_open>1</search_form_open> <search_form_open>1</search_form_open>
@@ -97,71 +112,79 @@
<enable_action>UR_ACTION_MODIFY</enable_action> <enable_action>UR_ACTION_MODIFY</enable_action>
</menu> </menu>
<menu id="ProfilesMenu" xsi:type="OQLMenuNode" _delta="define"> <menu id="ProfilesMenu" xsi:type="OQLMenuNode" _delta="define">
<rank>2</rank> <rank>12</rank>
<parent>AdminTools</parent> <parent>UserManagement</parent>
<oql><![CDATA[SELECT URP_Profiles]]></oql> <oql><![CDATA[SELECT URP_Profiles]]></oql>
<do_search>1</do_search> <do_search>1</do_search>
<enable_class>URP_Profiles</enable_class> <enable_class>URP_Profiles</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action> <enable_action>UR_ACTION_MODIFY</enable_action>
</menu> </menu>
<menu id="NotificationsMenu" xsi:type="WebPageMenuNode" _delta="define">
<rank>3</rank>
<parent>AdminTools</parent>
<url>$pages/notifications.php</url>
<enable_class>Trigger</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action>
</menu>
<menu id="AuditCategories" xsi:type="OQLMenuNode" _delta="define"> <menu id="AuditCategories" xsi:type="OQLMenuNode" _delta="define">
<rank>4</rank> <rank>20</rank>
<parent>AdminTools</parent> <parent>AdminTools</parent>
<oql><![CDATA[SELECT AuditCategory]]></oql> <oql><![CDATA[SELECT AuditCategory]]></oql>
<do_search>1</do_search> <do_search>1</do_search>
<enable_class>AuditCategory</enable_class> <enable_class>AuditCategory</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action> <enable_action>UR_ACTION_MODIFY</enable_action>
</menu> </menu>
<menu id="RunQueriesMenu" xsi:type="WebPageMenuNode" _delta="define"> <menu id="Queries" xsi:type="TemplateMenuNode" _delta="define">
<rank>8</rank> <rank>30</rank>
<parent>AdminTools</parent> <parent>AdminTools</parent>
<template_file/>
</menu>
<menu id="RunQueriesMenu" xsi:type="WebPageMenuNode" _delta="define">
<rank>31</rank>
<parent>Queries</parent>
<url>$pages/run_query.php</url> <url>$pages/run_query.php</url>
<enable_class>ResourceRunQueriesMenu</enable_class> <enable_class>ResourceRunQueriesMenu</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action> <enable_action>UR_ACTION_MODIFY</enable_action>
</menu> </menu>
<menu id="QueryMenu" xsi:type="OQLMenuNode" _delta="define"> <menu id="QueryMenu" xsi:type="OQLMenuNode" _delta="define">
<rank>8.5</rank> <rank>32</rank>
<parent>AdminTools</parent> <parent>Queries</parent>
<oql><![CDATA[SELECT Query]]></oql> <oql><![CDATA[SELECT Query]]></oql>
<do_search>1</do_search> <do_search>1</do_search>
<enable_class>Query</enable_class> <enable_class>Query</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action> <enable_action>UR_ACTION_MODIFY</enable_action>
</menu> </menu>
<menu id="ExportMenu" xsi:type="WebPageMenuNode" _delta="define"> <menu id="ExportMenu" xsi:type="WebPageMenuNode" _delta="define">
<rank>9.5</rank> <rank>33</rank>
<parent>AdminTools</parent> <parent>Queries</parent>
<url>$webservices/export-v2.php?interactive=1</url> <url>$webservices/export-v2.php?interactive=1</url>
<enable_class>ResourceAdminMenu</enable_class> <enable_class>ResourceAdminMenu</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action> <enable_action>UR_ACTION_MODIFY</enable_action>
</menu> </menu>
<menu id="DataModelMenu" xsi:type="WebPageMenuNode" _delta="define"> <menu id="DataModelMenu" xsi:type="WebPageMenuNode" _delta="define">
<rank>10</rank> <rank>40</rank>
<parent>AdminTools</parent> <parent>AdminTools</parent>
<url>$pages/schema.php</url> <url>$pages/schema.php</url>
<enable_class>ResourceRunQueriesMenu</enable_class> <enable_class>ResourceRunQueriesMenu</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action> <enable_action>UR_ACTION_MODIFY</enable_action>
</menu> </menu>
<menu id="UniversalSearchMenu" xsi:type="WebPageMenuNode" _delta="define"> <menu id="UniversalSearchMenu" xsi:type="WebPageMenuNode" _delta="define">
<rank>11</rank> <rank>60</rank>
<parent>AdminTools</parent> <parent>AdminTools</parent>
<url>$pages/UniversalSearch.php</url> <url>$pages/UniversalSearch.php</url>
<enable_class>ResourceAdminMenu</enable_class> <enable_class>ResourceAdminMenu</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action> <enable_action>UR_ACTION_MODIFY</enable_action>
</menu> </menu>
<menu id="Configuration" xsi:type="MenuGroup" _delta="define">
<rank>90</rank>
</menu>
<menu id="DataSources" xsi:type="OQLMenuNode" _delta="define"> <menu id="DataSources" xsi:type="OQLMenuNode" _delta="define">
<rank>12</rank> <rank>20</rank>
<parent>AdminTools</parent> <parent>Configuration</parent>
<oql><![CDATA[SELECT SynchroDataSource]]></oql> <oql><![CDATA[SELECT SynchroDataSource]]></oql>
<do_search>1</do_search> <do_search>1</do_search>
<enable_class>SynchroDataSource</enable_class> <enable_class>SynchroDataSource</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action> <enable_action>UR_ACTION_MODIFY</enable_action>
</menu> </menu>
<menu id="NotificationsMenu" xsi:type="WebPageMenuNode" _delta="define">
<rank>40</rank>
<parent>Configuration</parent>
<url>$pages/notifications.php</url>
<enable_class>Trigger</enable_class>
<enable_action>UR_ACTION_MODIFY</enable_action>
</menu>
</menus> </menus>
</itop_design> </itop_design>

14
datamodels/2.x/itop-welcome-itil/en.dict.itop-welcome-itil.php
View File

@@ -28,7 +28,7 @@ Dict::Add('EN US', 'English', 'English', array(
'Menu:WelcomeMenu+' => 'Welcome to iTop', 'Menu:WelcomeMenu+' => 'Welcome to iTop',
'Menu:WelcomeMenuPage' => 'Welcome', 'Menu:WelcomeMenuPage' => 'Welcome',
'Menu:WelcomeMenuPage+' => 'Welcome to iTop', 'Menu:WelcomeMenuPage+' => 'Welcome to iTop',
'Menu:AdminTools' => 'Admin tools', 'Menu:AdminTools' => 'Administration',
'Menu:AdminTools+' => 'Administration tools', 'Menu:AdminTools+' => 'Administration tools',
'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile', 'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile',
'Menu:DataModelMenu' => 'Data Model', 'Menu:DataModelMenu' => 'Data Model',
@@ -55,6 +55,9 @@ Dict::Add('EN US', 'English', 'English', array(
'Menu:UserAccountsMenu+' => 'User Accounts', 'Menu:UserAccountsMenu+' => 'User Accounts',
'Menu:UserAccountsMenu:Title' => 'User Accounts', 'Menu:UserAccountsMenu:Title' => 'User Accounts',
'Menu:MyShortcuts' => 'My Shortcuts', 'Menu:MyShortcuts' => 'My Shortcuts',
'Menu:UserManagement' => 'User Management',
'Menu:Queries' => 'Queries',
'Menu:Configuration' => 'Configuration',
)); ));
// //
@@ -83,3 +86,12 @@ Dict::Add('EN US', 'English', 'English', array(
'Class:ResourceRunQueriesMenu' => 'Resource Run Queries Menu', 'Class:ResourceRunQueriesMenu' => 'Resource Run Queries Menu',
'Class:ResourceRunQueriesMenu+' => '', 'Class:ResourceRunQueriesMenu+' => '',
)); ));
//
// Class: Action
//
Dict::Add('EN US', 'English', 'English', array(
'Class:ResourceSystemMenu' => 'Resource System Menu',
'Class:ResourceSystemMenu+' => '',
));

14
datamodels/2.x/itop-welcome-itil/fr.dict.itop-welcome-itil.php
View File

@@ -26,7 +26,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Menu:WelcomeMenu+' => 'Bienvenue dans iTop', 'Menu:WelcomeMenu+' => 'Bienvenue dans iTop',
'Menu:WelcomeMenuPage' => 'Bienvenue', 'Menu:WelcomeMenuPage' => 'Bienvenue',
'Menu:WelcomeMenuPage+' => 'Bienvenue dans iTop', 'Menu:WelcomeMenuPage+' => 'Bienvenue dans iTop',
'Menu:AdminTools' => 'Outils d\'admin', 'Menu:AdminTools' => 'Administration',
'Menu:AdminTools+' => 'Outils d\'administration', 'Menu:AdminTools+' => 'Outils d\'administration',
'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.', 'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.',
'Menu:DataModelMenu' => 'Modèle de Données', 'Menu:DataModelMenu' => 'Modèle de Données',
@@ -53,6 +53,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Menu:UserAccountsMenu+' => 'Comptes Utilisateurs', 'Menu:UserAccountsMenu+' => 'Comptes Utilisateurs',
'Menu:UserAccountsMenu:Title' => 'Comptes Utilisateurs', 'Menu:UserAccountsMenu:Title' => 'Comptes Utilisateurs',
'Menu:MyShortcuts' => 'Mes raccourcis', 'Menu:MyShortcuts' => 'Mes raccourcis',
'Menu:UserManagement' => 'Utilisateurs',
'Menu:Queries' => 'Requêtes',
'Menu:Configuration' => 'Configuration',
)); ));
// //
@@ -81,3 +84,12 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Class:ResourceRunQueriesMenu' => 'Menu Requête OQL', 'Class:ResourceRunQueriesMenu' => 'Menu Requête OQL',
'Class:ResourceRunQueriesMenu+' => '', 'Class:ResourceRunQueriesMenu+' => '',
)); ));
//
// Class: Action
//
Dict::Add('FR FR', 'French', 'Français', array(
'Class:ResourceSystemMenu' => 'Menu System',
'Class:ResourceSystemMenu+' => '',
));

3
dictionaries/en.dictionary.itop.ui.php
View File

@@ -900,9 +900,10 @@ Dict::Add('EN US', 'English', 'English', array(
'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link between %1$s and %2$s', 'UI:UserManagement:LinkBetween_User_And_Profile' => 'Link between %1$s and %2$s',
'UI:UserManagement:LinkBetween_User_And_Org' => 'Link between %1$s and %2$s', 'UI:UserManagement:LinkBetween_User_And_Org' => 'Link between %1$s and %2$s',
'Menu:AdminTools' => 'Admin tools', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools' => 'Administration', // Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:AdminTools+' => 'Administration tools', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Administration tools', // Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools?' => 'Tools accessible only to users having the administrator profile', // Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:System' => 'System',
'UI:ChangeManagementMenu' => 'Change Management', 'UI:ChangeManagementMenu' => 'Change Management',
'UI:ChangeManagementMenu+' => 'Change Management', 'UI:ChangeManagementMenu+' => 'Change Management',

1
dictionaries/fr.dictionary.itop.ui.php
View File

@@ -886,6 +886,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Menu:AdminTools' => 'Outils d\'admin', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools' => 'Outils d\'admin', // Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:AdminTools+' => 'Outils d\'administration', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools+' => 'Outils d\'administration', // Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.', // Duplicated into itop-welcome-itil (will be removed from here...) 'Menu:AdminTools?' => 'Ces outils sont accessibles uniquement aux utilisateurs possédant le profil Administrateur.', // Duplicated into itop-welcome-itil (will be removed from here...)
'Menu:System' => 'Système',
'UI:ChangeManagementMenu' => 'Gestion du Changement', 'UI:ChangeManagementMenu' => 'Gestion du Changement',
'UI:ChangeManagementMenu+' => 'Gestion du Changement', 'UI:ChangeManagementMenu+' => 'Gestion du Changement',

2
test/OQL/OQLToSQLAllClassesTest.php
View File

@@ -278,7 +278,7 @@ class OQLToSQLAllCLassesTest extends ItopDataTestCase
return null; return null;
} }
static $aPureAbstractClasses = ['AbstractResource', 'ResourceAdminMenu', 'ResourceRunQueriesMenu', 'ResourceItopIntegrityMenu']; static $aPureAbstractClasses = ['AbstractResource', 'ResourceAdminMenu', 'ResourceRunQueriesMenu', 'ResourceSystemMenu'];
public function OQLSelectProvider() public function OQLSelectProvider()
{ {