From 3830d2414c4fe85cdaa08b214efe1b2383fcc868 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Wed, 25 May 2016 13:07:50 +0000 Subject: [PATCH] New portal: Finalized the texts in the home view (and menus) SVN:trunk[4146] --- .../datamodel.itop-knownerror-mgmt.xml | 3 ++- .../en.dict.itop-knownerror-mgmt.php | 3 ++- .../fr.dict.itop-knownerror-mgmt.php | 3 ++- .../2.x/itop-tickets/datamodel.itop-tickets.xml | 12 ++++++------ datamodels/2.x/itop-tickets/en.dict.itop-tickets.php | 5 +++++ datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php | 5 +++++ dictionaries/dictionary.itop.ui.php | 2 -- dictionaries/fr.dictionary.itop.ui.php | 2 -- 8 files changed, 22 insertions(+), 13 deletions(-) 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 d55db839eb..96f31acaa7 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 @@ -609,7 +609,8 @@ 12 - <default>Brick:Portal:FAQ:Title</default> + <navigation_menu>Brick:Portal:FAQ:Menu</navigation_menu> + <home>Brick:Portal:FAQ:Title</home> Brick:Portal:FAQ:Title+ diff --git a/datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php index f19b7c7fb9..7622842950 100755 --- a/datamodels/2.x/itop-knownerror-mgmt/en.dict.itop-knownerror-mgmt.php +++ b/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+' => '

In a hurry?

Check out the list of most common questions and (maybe) find the expected answer right away.

', )); diff --git a/datamodels/2.x/itop-knownerror-mgmt/fr.dict.itop-knownerror-mgmt.php b/datamodels/2.x/itop-knownerror-mgmt/fr.dict.itop-knownerror-mgmt.php index f836e278ac..00115c6a06 100755 --- a/datamodels/2.x/itop-knownerror-mgmt/fr.dict.itop-knownerror-mgmt.php +++ b/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+' => '

Vous êtes pressé ?

Consultez la liste des questions les plus fréquentes et vous trouverez (peut-être) immédiatement la réponse à votre besoin.

', )); diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml index 176a28bf4f..d5f49a06b9 100755 --- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml +++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml @@ -1028,9 +1028,9 @@ 10 - <default>Portal:CreateNewRequest</default> + <default>Brick:Portal:NewRequest:Title</default> - Portal:CreateNewRequest+ + Brick:Portal:NewRequest:Title+ fc fc-new-request fc-2x @@ -1106,9 +1106,9 @@ 6 - <default>Portal:ShowOngoing</default> + <default>Brick:Portal:OngoingRequests:Title</default> - Portal:ShowOngoing+ + Brick:Portal:OngoingRequests:Title+ fc fc-ongoing-request fc-2x @@ -1159,9 +1159,9 @@ 12 - <default>Portal:ShowClosed</default> + <default>Brick:Portal:ClosedRequests:Title</default> - Portal:ShowClosed+ + fc fc-closed-request fc-2x diff --git a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php index c53705120e..8e42cbcb53 100755 --- a/datamodels/2.x/itop-tickets/en.dict.itop-tickets.php +++ b/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+' => '

Need help?

Pick from the services catalog and submit your request to our support teams.

', + 'Brick:Portal:OngoingRequests:Title' => 'Ongoing requests', + 'Brick:Portal:OngoingRequests:Title+' => '

Follow up with your ongoing requests.

Check the progress, add comments, attach documents, acknowledge the solution.

', + 'Brick:Portal:ClosedRequests:Title' => 'Closed requests', )); diff --git a/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php b/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php index 4c1702449b..4aa3bb3d72 100755 --- a/datamodels/2.x/itop-tickets/fr.dict.itop-tickets.php +++ b/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+' => '

Besoin d\'assistance ?

Choisissez un service (assistance ou dépannage) et soumettez votre requête à nos équipes de support.

', + 'Brick:Portal:OngoingRequests:Title' => 'Requêtes en cours', + 'Brick:Portal:OngoingRequests:Title+' => '

Suivez vos requêtes en cours.

Consultez l\'avancement, ajoutez des commentaires ou des pièces jointes, validez la solution.

', + 'Brick:Portal:ClosedRequests:Title' => 'Requêtes fermées', )); diff --git a/dictionaries/dictionary.itop.ui.php b/dictionaries/dictionary.itop.ui.php index eaff0ac163..b853d9ee98 100644 --- a/dictionaries/dictionary.itop.ui.php +++ b/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', diff --git a/dictionaries/fr.dictionary.itop.ui.php b/dictionaries/fr.dictionary.itop.ui.php index 2ea7b1509f..514709dc16 100644 --- a/dictionaries/fr.dictionary.itop.ui.php +++ b/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',