Customer Portal: refactoring for the "new ticket" buttons, depending on the installation options (in particular, a full ITIL install has now two buttons)

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

datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml

@@ -11,7 +11,7 @@
 					<static>true</static>
 					<access>public</access>
 					<type>Factory</type>
-					<code><![CDATA[	public function CreateFromServiceSubcategory($oServiceSubcategory)
+					<code><![CDATA[	static public function CreateFromServiceSubcategory($oServiceSubcategory)
 	{
         $sType = $oServiceSubcategory->Get('request_type');
         if ($sType == 'incident')

datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml

@@ -1764,6 +1764,21 @@
 	<module_designs>
 		<module_design id="itop-portal">
 			<bricks>
+				<brick id="create-user-request" xsi:type="Combodo\iTop\Portal\Brick\CreateBrick">
+					<active _delta="redefine">false</active>
+				</brick>
+				<brick id="create-incident-itil" xsi:type="Combodo\iTop\Portal\Brick\CreateBrick" _delta="define">
+					<active>true</active>
+					<rank>3.5</rank>
+					<width>8</width>
+					<modal>true</modal>
+					<title>Portal:CreateNewIncidentItil</title>
+					<class>Incident</class>
+					<!-- Class that will be created with the form -->
+					<rules>
+						<rule id="contact-to-userrequest"/>
+					</rules>
+				</brick>
 				<brick id="services">
 					<levels>
 						<level id="1">

datamodels/2.x/itop-portal-base/portal/src/views/bricks/tile.html.twig

@@ -3,6 +3,10 @@
 
 {% if brick.GetId == 'create-user-request' %}
 	{% set sIcon = 'warning-sign-orange-100px.png' %}
+{% elseif brick.GetId == 'create-user-request-itil' %}
+	{% set sIcon = 'headset-mic-orange-100px.png' %}
+{% elseif brick.GetId == 'create-incident-itil' %}
+	{% set sIcon = 'warning-sign-orange-100px.png' %}
 {% elseif brick.GetId == 'ongoing-tickets-for-portal-user' %}
 	{% set sIcon = 'headset-mic-orange-100px.png' %}
 {% elseif brick.GetId == 'closed-tickets-for-portal-user' %}

datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml

@@ -1858,6 +1858,23 @@
 	</menus>
 	<module_designs>
 		<module_design id="itop-portal">
+			<bricks>
+				<brick id="create-user-request" xsi:type="Combodo\iTop\Portal\Brick\CreateBrick">
+					<active _delta="redefine">false</active>
+				</brick>
+				<brick id="create-user-request-itil" xsi:type="Combodo\iTop\Portal\Brick\CreateBrick" _delta="define">
+					<active>true</active>
+					<rank>3</rank>
+					<width>8</width>
+					<modal>true</modal>
+					<title>Portal:CreateNewRequestItil</title>
+					<class>UserRequest</class>
+					<!-- Class that will be created with the form -->
+					<rules>
+						<rule id="contact-to-userrequest"/>
+					</rules>
+				</brick>
+			</bricks>
 			<classes>
 				<class id="ServiceSubcategory">
 					<scopes>

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

@@ -1016,7 +1016,7 @@
           <modal>true</modal>
           <title>Portal:CreateNewRequest</title>
           <class>UserRequest</class>
-          <!-- Class that will be create created with the form -->
+          <!-- Class that will be created with the form -->
           <rules>
             <rule id="contact-to-userrequest"/>
           </rules>

dictionaries/cs.dictionary.itop.ui.php

@@ -1001,6 +1001,8 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
     'Portal:ShowOngoing' => 'Zobrazit otevřené požadavky',
     'Portal:ShowClosed' => 'Zobrazit uzavřené požadavky',
     'Portal:CreateNewRequest' => 'Vytvořit nový požadavek',
+    'Portal:CreateNewRequestItil' => 'Vytvořit nový požadavek',
+    'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
     'Portal:ChangeMyPassword' => 'Změnit heslo',
     'Portal:Disconnect' => 'Odpojit',
     'Portal:OpenRequests' => 'Mé otevřené požadavky',

dictionaries/da.dictionary.itop.ui.php

@@ -794,6 +794,8 @@ Ved tilknytningen til en trigger, bliver hver handling tildelt et "rækkefølge"
 	'Portal:ShowOngoing' => 'Vis åbne anmodninger',
 	'Portal:ShowClosed' => 'Vis lukkede anmodninger',
 	'Portal:CreateNewRequest' => 'Opret ny anmodning',
+	'Portal:CreateNewRequestItil' => 'Vytvořit nový požadavek',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'Skift password',
 	'Portal:Disconnect' => 'Disconnect',
 	'Portal:OpenRequests' => 'Mine åbne anmodninger',

dictionaries/de.dictionary.itop.ui.php

@@ -814,6 +814,8 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
 	'Portal:ShowOngoing' => 'Zeige offene Requests',
 	'Portal:ShowClosed' => 'Zeige geschlossene Requests',
 	'Portal:CreateNewRequest' => 'Einen neuen Request erstellen',
+	'Portal:CreateNewRequestItil' => 'Einen neuen Request erstellen',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'Mein Passwort ändern',
 	'Portal:Disconnect' => 'Abmelden',
 	'Portal:OpenRequests' => 'Meine offenen Requests',

dictionaries/dictionary.itop.ui.php

@@ -1006,6 +1006,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'Portal:ShowOngoing' => 'Show open requests',
 	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => 'Create a new request',
+	'Portal:CreateNewRequestItil' => 'Create a new request',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report',
 	'Portal:ChangeMyPassword' => 'Change my password',
 	'Portal:Disconnect' => 'Disconnect',
 	'Portal:OpenRequests' => 'My open requests',

dictionaries/es_cr.dictionary.itop.ui.php

@@ -970,6 +970,8 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
 	'Portal:ShowOngoing' => 'Mostrar Requerimientos Abiertos',
 	'Portal:ShowClosed' => 'Mostrar Requerimientos Cerrados',
 	'Portal:CreateNewRequest' => 'Crear Requerimiento',
+	'Portal:CreateNewRequestItil' => 'Crear Requerimiento',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'Cambiar Contraseña',
 	'Portal:Disconnect' => 'Cerrar Sesión',
 	'Portal:OpenRequests' => 'Mis Requerimientos Abiertos',

dictionaries/fr.dictionary.itop.ui.php

@@ -869,6 +869,8 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
 	'Portal:ShowOngoing' => 'Requêtes en cours',
 	'Portal:ShowClosed' => 'Requêtes fermées',
 	'Portal:CreateNewRequest' => 'Créer une nouvelle requête',
+	'Portal:CreateNewRequestItil' => 'Créer une nouvelle requête',
+	'Portal:CreateNewIncidentItil' => 'Indiquer une panne',
 	'Portal:ChangeMyPassword' => 'Changer mon mot de passe',
 	'Portal:Disconnect' => 'Déconnexion',
 	'Portal:OpenRequests' => 'Mes requêtes en cours',

dictionaries/hu.dictionary.itop.ui.php

@@ -714,6 +714,8 @@ Akció kiváltó okhoz rendelésekor kap egy sorszámot , amely meghatározza az
 	'Portal:ShowOngoing' => 'Show open requests',
 	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => 'Új kérés létrehozása',
+	'Portal:CreateNewRequestItil' => 'Új kérés létrehozása',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'Jelszó változtatás',
 	'Portal:Disconnect' => 'Kilépés',
 	'Portal:OpenRequests' => 'Nyitott kéréseim',

dictionaries/it.dictionary.itop.ui.php

@@ -848,6 +848,8 @@ Quando è associata a un trigger, ad ogni azione è assegnato un numero "ordine"
 	'Portal:ShowOngoing' => 'Show open requests',
 	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => 'Crea una nuova richiesta',
+	'Portal:CreateNewRequestItil' => 'Crea una nuova richiesta',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'Cambia la mia password',
 	'Portal:Disconnect' => 'Disconnetti',
 	'Portal:OpenRequests' => 'Le mie richieste aperte',

dictionaries/ja.dictionary.itop.ui.php

@@ -792,6 +792,8 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
 	'Portal:ShowOngoing' => 'オープン中の要求を表示',
 	'Portal:ShowClosed' => 'クローズした要求を表示',
 	'Portal:CreateNewRequest' => '新規要求を作成',
+	'Portal:CreateNewRequestItil' => '新規要求を作成',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'パスワードを変更',
 	'Portal:Disconnect' => '切断する',
 	'Portal:OpenRequests' => '担当のオープン中の要求',

dictionaries/nl.dictionary.itop.ui.php

@@ -978,6 +978,8 @@ Indien gekoppeld aan een Trigger, wordt aan elke actie een "orde" nummer gegeven
 	'Portal:ShowOngoing' => 'Laat lopende aanvragen zien',
 	'Portal:ShowClosed' => 'Laat gesloten aanvragen zien',
 	'Portal:CreateNewRequest' => 'Maak een nieuwe aanvraag aan',
+	'Portal:CreateNewRequestItil' => 'Maak een nieuwe aanvraag aan',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'Verander mijn wachtwoord',
 	'Portal:Disconnect' => 'Disconnect',
 	'Portal:OpenRequests' => 'Mijn lopende aanvragen',

dictionaries/pt_br.dictionary.itop.ui.php

@@ -970,6 +970,8 @@ When associated with a trigger, each action is given an "order" number, specifyi
 	'Portal:ShowOngoing' => 'Mostrar solicitações abertas',
 	'Portal:ShowClosed' => 'Mostrar solicitações fechadas',
 	'Portal:CreateNewRequest' => 'Criar uma nova solicitação',
+	'Portal:CreateNewRequestItil' => 'Criar uma nova solicitação',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'Alterar minha senha',
 	'Portal:Disconnect' => 'Sair',
 	'Portal:OpenRequests' => 'Minhas solicitações abertas',

dictionaries/ru.dictionary.itop.ui.php

@@ -964,6 +964,8 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
 	'Portal:ShowOngoing' => 'Показать открытые запросы',
 	'Portal:ShowClosed' => 'Показать закрытые запросы',
 	'Portal:CreateNewRequest' => 'Создать новый запрос',
+	'Portal:CreateNewRequestItil' => 'Создать новый запрос',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'Изменить мой пароль',
 	'Portal:Disconnect' => 'Отключить',
 	'Portal:OpenRequests' => 'Мои открытые запросы',

dictionaries/tr.dictionary.itop.ui.php

@@ -845,6 +845,8 @@ Tetikleme gerçekleştiriğinde işlemler tanımlanan sıra numarası ile gerçe
 	'Portal:ShowOngoing' => 'Show open requests',
 	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => 'Yeni istek yarat',
+	'Portal:CreateNewRequestItil' => 'Yeni istek yarat',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => 'Şifre değiştir',
 	'Portal:Disconnect' => 'Çıkış',
 	'Portal:OpenRequests' => 'Açık isteklerim',

dictionaries/zh.dictionary.itop.ui.php

@@ -844,6 +844,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
 	'Portal:ShowOngoing' => 'Show open requests',
 	'Portal:ShowClosed' => 'Show closed requests',
 	'Portal:CreateNewRequest' => '创建一个新的请求',
+	'Portal:CreateNewRequestItil' => '创建一个新的请求',
+	'Portal:CreateNewIncidentItil' => 'Create a new incident report~~',
 	'Portal:ChangeMyPassword' => '改变我的密码',
 	'Portal:Disconnect' => '断开',
 	'Portal:OpenRequests' => '我的待解决的请求',