mirror of
https://github.com/Combodo/iTop.git
synced 2026-02-13 07:24:13 +01:00
Cosmetics on the user portal -reintegrated from trunk
SVN:2.0.1[2777]
This commit is contained in:
@@ -782,6 +782,7 @@ Wenn Aktionen mit Trigger verknüpft sind, bekommt jede Aktion eine Auftragsnumm
|
||||
'Portal:Refresh' => 'Neu laden',
|
||||
'Portal:Back' => 'Zurück',
|
||||
'Portal:WelcomeUserOrg' => 'Wilkommen %1$s, von %2$s',
|
||||
'Portal:TitleDetailsFor_Request' => 'Deails für Benutzeranfrage',
|
||||
'Portal:ShowOngoing' => 'Zeige offene Requests',
|
||||
'Portal:ShowClosed' => 'Zeige geschlossene Requests',
|
||||
'Portal:CreateNewRequest' => 'Einen neuen Request erstellen',
|
||||
|
||||
@@ -943,6 +943,7 @@ When associated with a trigger, each action is given an "order" number, specifyi
|
||||
'Portal:Refresh' => 'Refresh',
|
||||
'Portal:Back' => 'Back',
|
||||
'Portal:WelcomeUserOrg' => 'Welcome %1$s, from %2$s',
|
||||
'Portal:TitleDetailsFor_Request' => 'Details for request',
|
||||
'Portal:ShowOngoing' => 'Show open requests',
|
||||
'Portal:ShowClosed' => 'Show closed requests',
|
||||
'Portal:CreateNewRequest' => 'Create a new request',
|
||||
|
||||
@@ -943,6 +943,7 @@ Cuando se asocien con un disparador, cada acción recibe un número de "orden",
|
||||
'Portal:Refresh' => 'Actualizar',
|
||||
'Portal:Back' => 'Atrás',
|
||||
'Portal:WelcomeUserOrg' => 'Bienvenido %1$s, de %2$s',
|
||||
'Portal:TitleDetailsFor_Request' => 'Detalles de la Solicitud',
|
||||
'Portal:ShowOngoing' => 'Mostrar Requerimientos Abiertos',
|
||||
'Portal:ShowClosed' => 'Mostrar Requerimientos Cerrados',
|
||||
'Portal:CreateNewRequest' => 'Crear Requerimiento',
|
||||
|
||||
@@ -786,6 +786,7 @@ Lors de l\'association à un déclencheur, on attribue à chaque action un numé
|
||||
'Portal:Refresh' => 'Rafraîchir',
|
||||
'Portal:Back' => 'Retour',
|
||||
'Portal:WelcomeUserOrg' => 'Bienvenue %1$s (%2$s)',
|
||||
'Portal:TitleDetailsFor_Request' => 'Détail de la requête',
|
||||
'Portal:ShowOngoing' => 'Requêtes en cours',
|
||||
'Portal:ShowClosed' => 'Requêtes fermées',
|
||||
'Portal:CreateNewRequest' => 'Créer une nouvelle requête',
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -100,8 +100,8 @@ function SelectServiceCategory($oP, $oUserOrg)
|
||||
{
|
||||
$sChecked = "checked";
|
||||
}
|
||||
$oP->p("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_service_id\" $sChecked type=\"radio\" id=\"service_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"service_$id\">".$oService->GetName()."</label></b></p>");
|
||||
$oP->p("<p>".$oService->GetAsHTML('description')."</p></td></tr>");
|
||||
$oP->add("<tr><td style=\"vertical-align:top\"><p><input name=\"attr_service_id\" $sChecked type=\"radio\" id=\"service_$id\" value=\"$id\"></p></td><td style=\"vertical-align:top\"><p><b><label for=\"service_$id\">".$oService->GetName()."</label></b></p>");
|
||||
$oP->add($oService->GetAsHTML('description')."</td></tr>");
|
||||
}
|
||||
$oP->add("</table>\n");
|
||||
|
||||
@@ -157,7 +157,7 @@ function SelectServiceSubCategory($oP, $oUserOrg)
|
||||
|
||||
$oP->add("<td style=\"vertical-align:top\">");
|
||||
$oP->add("<p><b><label for=\"servicesubcategory_$id\">".$oSubService->GetName()."</label></b></p>");
|
||||
$oP->add("<p>".$oSubService->GetAsHTML('description')."</p>");
|
||||
$oP->add($oSubService->GetAsHTML('description'));
|
||||
$oP->add("</td>");
|
||||
$oP->add("</tr>");
|
||||
}
|
||||
@@ -471,10 +471,8 @@ function ListClosedTickets(WebPage $oP)
|
||||
$oSearch->AddCondition('caller_id', $iUser);
|
||||
}
|
||||
$oSet1 = new CMDBObjectSet($oSearch);
|
||||
$oP->add("<p>\n");
|
||||
$oP->add("<h1>".Dict::S('Portal:ClosedRequests')."</h1>\n");
|
||||
$oP->DisplaySet($oSet1, $aZList, Dict::S('Portal:NoClosedRequest'));
|
||||
$oP->add("</p>\n");
|
||||
}
|
||||
|
||||
|
||||
@@ -879,11 +877,13 @@ try
|
||||
switch($sOperation)
|
||||
{
|
||||
case 'show_closed':
|
||||
$oP->set_title(Dict::S('Portal:ShowClosed'));
|
||||
DisplayMainMenu($oP);
|
||||
ShowClosedTickets($oP);
|
||||
break;
|
||||
|
||||
case 'create_request':
|
||||
$oP->set_title(Dict::S('Portal:CreateNewRequest'));
|
||||
DisplayMainMenu($oP);
|
||||
if (!MetaModel::DBIsReadOnly())
|
||||
{
|
||||
@@ -892,12 +892,14 @@ try
|
||||
break;
|
||||
|
||||
case 'details':
|
||||
$oP->set_title(Dict::S('Portal:TitleDetailsFor_Request'));
|
||||
DisplayMainMenu($oP);
|
||||
$oObj = $oP->FindObjectFromArgs(array('UserRequest'));
|
||||
DisplayObject($oP, $oObj, $oUserOrg);
|
||||
break;
|
||||
|
||||
case 'update_request':
|
||||
$oP->set_title(Dict::S('Portal:TitleDetailsFor_Request'));
|
||||
DisplayMainMenu($oP);
|
||||
if (!MetaModel::DBIsReadOnly())
|
||||
{
|
||||
@@ -926,6 +928,7 @@ try
|
||||
|
||||
case 'show_ongoing':
|
||||
default:
|
||||
$oP->set_title(Dict::S('Portal:ShowOngoing'));
|
||||
DisplayMainMenu($oP);
|
||||
ShowOngoingTickets($oP);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user