New portal: Finalized the texts in the home view (and menus)

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@4146 a333f486-631f-4898-b8df-5754b55c2be0

datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml

@@ -609,7 +609,8 @@
 		  </rank>
           <width>12</width>
 			<title>
-				<default>Brick:Portal:FAQ:Title</default>
+              <navigation_menu>Brick:Portal:FAQ:Menu</navigation_menu>
+			  <home>Brick:Portal:FAQ:Title</home>
 			</title>
 			<description>Brick:Portal:FAQ:Title+</description>
 			<decoration_class>

datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php

@@ -186,6 +186,7 @@ Dict::Add('EN US', 'English', 'English', array(
 	'Menu:FAQ' => 'FAQs',
 	'Menu:FAQ+' => 'All FAQs',
 
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
 	'Brick:Portal:FAQ:Title' => 'Frequently Asked Questions',
-	'Brick:Portal:FAQ:Title+' => 'Search for the right answer within the knowledge base',
+	'Brick:Portal:FAQ:Title+' => '<p>In a hurry?</p><p>Check out the list of most common questions and (maybe) find the expected answer right away.</p>',
 ));

datamodels/2.x/itop-knownerror-mgmt/fr.dict.itop-knownerror-mgmt.php

@@ -159,6 +159,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'Menu:FAQ' => 'FAQs',
 	'Menu:FAQ+' => 'Toutes les  FAQs',
 
+	'Brick:Portal:FAQ:Menu' => 'FAQ',
 	'Brick:Portal:FAQ:Title' => 'Foire Aux Questions',
-	'Brick:Portal:FAQ:Title+' => 'Recherchez la réponse à vos questions dans la base de connaissances',
+	'Brick:Portal:FAQ:Title+' => '<p>Vous êtes pressé&nbsp;?</p><p>Consultez la liste des questions les plus fréquentes et vous trouverez (peut-être) immédiatement la réponse à votre besoin.</p>',
 ));

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

@@ -1028,9 +1028,9 @@
             <default>10</default>
           </rank>
           <title>
-            <default>Portal:CreateNewRequest</default>
+            <default>Brick:Portal:NewRequest:Title</default>
           </title>
-          <description>Portal:CreateNewRequest+</description>
+          <description>Brick:Portal:NewRequest:Title+</description>
           <decoration_class>
             <default>fc fc-new-request fc-2x</default>
           </decoration_class>
@@ -1106,9 +1106,9 @@
 		  </rank>
           <width>6</width>
           <title>
-			  <default>Portal:ShowOngoing</default>
+			  <default>Brick:Portal:OngoingRequests:Title</default>
 		  </title>
-		  <description>Portal:ShowOngoing+</description>
+		  <description>Brick:Portal:OngoingRequests:Title+</description>
 		  <decoration_class>
 			  <default>fc fc-ongoing-request fc-2x</default>
 		  </decoration_class>
@@ -1159,9 +1159,9 @@
           </visible>
           <width>12</width>
           <title>
-			  <default>Portal:ShowClosed</default>
+			  <default>Brick:Portal:ClosedRequests:Title</default>
 		  </title>
-		  <description>Portal:ShowClosed+</description>
+		  <description></description>
 		  <decoration_class>
 			  <default>fc fc-closed-request fc-2x</default>
 		  </decoration_class>

datamodels/2.x/itop-tickets/en.dict.itop-tickets.php

@@ -242,4 +242,9 @@ Dict::Add('EN US', 'English', 'English', array(
 	'portal:itop-portal' => 'Standard portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
 	'Page:DefaultTitle' => 'iTop - User portal',
 	'Brick:Portal:UserProfile:Title' => 'My profile',
+	'Brick:Portal:NewRequest:Title' => 'New request',
+	'Brick:Portal:NewRequest:Title+' => '<p>Need help?</p><p>Pick from the services catalog and submit your request to our support teams.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Follow up with your ongoing requests.</p><p>Check the progress, add comments, attach documents, acknowledge the solution.</p>',
+	'Brick:Portal:ClosedRequests:Title' => 'Closed requests',
 ));

datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php

@@ -227,4 +227,9 @@ Dict::Add('FR FR', 'French', 'Français', array(
 	'portal:itop-portal' => 'Portail standard', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
 	'Page:DefaultTitle' => 'iTop - Portail utilisateur',
 	'Brick:Portal:UserProfile:Title' => 'Mon profil',
+	'Brick:Portal:NewRequest:Title' => 'Nouvelle requête',
+	'Brick:Portal:NewRequest:Title+' => '<p>Besoin d\'assistance&nbsp;?</p><p>Choisissez un service (assistance ou dépannage) et soumettez votre requête à nos équipes de support.</p>',
+	'Brick:Portal:OngoingRequests:Title' => 'Requêtes en cours',
+	'Brick:Portal:OngoingRequests:Title+' => '<p>Suivez vos requêtes en cours.</p><p>Consultez l\'avancement, ajoutez des commentaires ou des pièces jointes, validez la solution.</p>',
+	'Brick:Portal:ClosedRequests:Title' => 'Requêtes fermées',
 ));

dictionaries/dictionary.itop.ui.php

@@ -1006,10 +1006,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
 	'Portal:TitleDetailsFor_Request' => 'Details for request',
 	'Portal:ShowOngoing' => 'Show open requests',
-	'Portal:ShowOngoing+' => 'Requests being processed',
 	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => 'Create a new request',
-	'Portal:CreateNewRequest+' => 'Select a service and submit your request',
 	'Portal:CreateNewRequestItil' => 'Create a new request',
 	'Portal:CreateNewIncidentItil' => 'Create a new incident report',
 	'Portal:ChangeMyPassword' => 'Change my password',

dictionaries/fr.dictionary.itop.ui.php

@@ -869,10 +869,8 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'Portal:WelcomeUserOrg' => 'Bienvenue %1$s (%2$s)',
 	'Portal:TitleDetailsFor_Request' => 'Détail de la requête',
 	'Portal:ShowOngoing' => 'Requêtes en cours',
-	'Portal:ShowOngoing+' => 'Liste des requêtes en cours de traitement',
 	'Portal:ShowClosed' => 'Requêtes fermées',
 	'Portal:CreateNewRequest' => 'Créer une nouvelle requête',
-	'Portal:CreateNewRequest+' => 'Sélectionnez un service et soumettez votre requête',
 	'Portal:CreateNewRequestItil' => 'Créer une nouvelle requête',
 	'Portal:CreateNewIncidentItil' => 'Indiquer une panne',
 	'Portal:ChangeMyPassword' => 'Changer mon mot de passe',