From 45c201c250950ecef6c5351bddda53ab039360fb Mon Sep 17 00:00:00 2001
From: Romain Quetiez <romain.quetiez@combodo.com>
Date: Wed, 30 Jun 2010 15:40:47 +0000
Subject: [PATCH] Finalized menus for Service management

SVN:trunk[512]
---
 application/menunode.class.inc.php            |  4 ++--
 dictionaries/fr.dictionary.itop.ui.php        |  7 ------
 .../en.dict.itop-service-mgmt.php             | 22 +++++++++++++++++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/application/menunode.class.inc.php b/application/menunode.class.inc.php
index 1a641f0c9..578ccc36c 100644
--- a/application/menunode.class.inc.php
+++ b/application/menunode.class.inc.php
@@ -268,12 +268,12 @@ abstract class MenuNode
 	
 	public function GetTitle()
 	{
-		return Dict::S("Menu:$this->sMenuId+");
+		return Dict::S("Menu:$this->sMenuId");
 	}
 	
 	public function GetLabel()
 	{
-		return Dict::S("Menu:$this->sMenuId");
+		return Dict::S("Menu:$this->sMenuId+");
 	}
 	
 	public function GetIndex()
diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php
index 0aaa6ff5d..dd1c1e0dd 100644
--- a/dictionaries/fr.dictionary.itop.ui.php
+++ b/dictionaries/fr.dictionary.itop.ui.php
@@ -764,13 +764,6 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'Menu:RunQueriesMenu' => 'Requêtes OQL',
 	'Menu:RunQueriesMenu+' => 'Executer une requête OQL',
 	
-	'UI:ServiceManagementMenu' => 'Gestion des Services',
-	'UI:ServiceManagementMenu+' => 'Gestion des Services',
-	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
-	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
-	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
-	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
-		
 	'Menu:AdvancedToolsMenu' => 'Outils',
 	'Menu:AdvancedToolsMenu+' => 'Outils Avancés',
 	
diff --git a/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php b/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php
index 664500a39..176dea7e3 100644
--- a/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php
+++ b/modules/itop-service-mgmt-1.0.0/en.dict.itop-service-mgmt.php
@@ -54,7 +54,29 @@ Dict::Add('EN US', 'English', 'English', array(
 'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contracts by service level',
 'UI-ServiceManagementMenu-ContractsByStatus' => 'Contracts by status',
 'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contracts ending in less then 30 days',
+
+'Menu:ServiceType' => 'Service Types',
+'Menu:ServiceType+' => 'Service Types',
+'Menu:ProviderContract' => 'Provider Contracts',
+'Menu:ProviderContract+' => 'Provider Contracts',
+'Menu:CustomerContract' => 'Customer Contracts',
+'Menu:CustomerContract+' => 'Customer Contracts',
+'Menu:Service' => 'Services',
+'Menu:Service+' => 'Services',
+'Menu:SLA' => 'SLAs',
+'Menu:SLA+' => 'SLAs',
+'Menu:ServiceLevel' => 'Service levels',
+'Menu:ServiceLevel+' => 'Service levels',
+
 ));
 
+/*
+	'UI:ServiceManagementMenu' => 'Gestion des Services',
+	'UI:ServiceManagementMenu+' => 'Gestion des Services',
+	'UI:ServiceManagementMenu:Title' => 'Résumé des services & contrats',
+	'UI-ServiceManagementMenu-ContractsBySrvLevel' => 'Contrats par niveau de service',
+	'UI-ServiceManagementMenu-ContractsByStatus' => 'Contrats par état',
+	'UI-ServiceManagementMenu-ContractsEndingIn30Days' => 'Contrats se terminant dans moins de 30 jours',
+*/
 
 ?>