diff --git a/application/dashboard.class.inc.php b/application/dashboard.class.inc.php index a7833ade9..1f6836314 100644 --- a/application/dashboard.class.inc.php +++ b/application/dashboard.class.inc.php @@ -145,7 +145,7 @@ abstract class Dashboard public function Render($oPage, $bEditMode = false, $aExtraParams = array()) { - $oPage->add('

'.$this->sTitle.'

'); + $oPage->add('

'.Dict::S($this->sTitle).'

'); $oLayout = new $this->sLayoutClass; $oLayout->Render($oPage, $this->aDashlets, $bEditMode, $aExtraParams); if (!$bEditMode) diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php index 931062de5..18cb71418 100644 --- a/application/dashlet.class.inc.php +++ b/application/dashlet.class.inc.php @@ -379,7 +379,7 @@ class DashletGroupBy extends Dashlet break; case 'table': default: - $sHtmlTitle = htmlentities($sTitle, ENT_QUOTES, 'UTF-8'); // done in the itop block + $sHtmlTitle = htmlentities(Dict::S($sTitle), ENT_QUOTES, 'UTF-8'); // done in the itop block $sXML = ''.$sQuery.''; break; } diff --git a/datamodel/itop-config-mgmt-1.0.0/config-dashboard.xml b/datamodel/itop-config-mgmt-1.0.0/config-dashboard.xml new file mode 100644 index 000000000..5a1f56a54 --- /dev/null +++ b/datamodel/itop-config-mgmt-1.0.0/config-dashboard.xml @@ -0,0 +1,25 @@ + + +UI:ConfigMgmtMenuOverview:Title +DashboardLayoutTwoCols + + + UI-ConfigMgmtMenuOverview-FunctionalCIbyStatus + SELECT FunctionalCI + status + + + + UI-ConfigMgmtMenuOverview-FunctionalCIByType + SELECT FunctionalCI + finalclass + + + + UI-ConfigMgmtMenuOverview-FunctionalCIByType + SELECT FunctionalCI + finalclass + + + + \ No newline at end of file diff --git a/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml b/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml index efafe3cd9..4291546d6 100644 --- a/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml +++ b/datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml @@ -4195,10 +4195,10 @@ 20 - + 0 ConfigManagement - overview.html + config-dashboard.xml 1 diff --git a/datamodel/itop-config-mgmt-1.0.0/overview.html b/datamodel/itop-config-mgmt-1.0.0/overview.html deleted file mode 100644 index 5de67c0b2..000000000 --- a/datamodel/itop-config-mgmt-1.0.0/overview.html +++ /dev/null @@ -1,21 +0,0 @@ -

UI:ConfigMgmtMenuOverview:Title

- - - - - - - - -
-SELECT FunctionalCI - -SELECT FunctionalCI -
-

UI-ConfigMgmtMenuOverview-FunctionalCIByType

-SELECT FunctionalCI -		 -  -
- - diff --git a/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml b/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml index 8603099db..20ae8a871 100644 --- a/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml +++ b/datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml @@ -991,10 +991,10 @@ 40 - + 0 IncidentManagement - overview.html + incident-dashboard.xml 1 diff --git a/datamodel/itop-incident-mgmt-1.0.0/incident-dashboard.xml b/datamodel/itop-incident-mgmt-1.0.0/incident-dashboard.xml new file mode 100644 index 000000000..572d2b5b7 --- /dev/null +++ b/datamodel/itop-incident-mgmt-1.0.0/incident-dashboard.xml @@ -0,0 +1,23 @@ + + +UI:IncidentMgmtMenuOverview:Title +DashboardLayoutTwoCols + + + UI-IncidentManagementOverview-IncidentByService + SELECT Incident + service_name + + + + UI-IncidentManagementOverview-IncidentByPriority + SELECT Incident + priority + + + + UI-IncidentManagementOverview-IncidentUnassigned + SELECT Incident WHERE status IN ("new", "escalated_tto") + + + \ No newline at end of file diff --git a/datamodel/itop-incident-mgmt-1.0.0/overview.html b/datamodel/itop-incident-mgmt-1.0.0/overview.html deleted file mode 100644 index e5c5c8074..000000000 --- a/datamodel/itop-incident-mgmt-1.0.0/overview.html +++ /dev/null @@ -1,20 +0,0 @@ -

UI:IncidentMgmtMenuOverview:Title

- - - - - - - - - -
-SELECT Incident - -SELECT Incident -
-

UI-IncidentManagementOverview-IncidentUnassigned

-SELECT Incident WHERE status IN ("new", "escalated_tto") -		 -
- diff --git a/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml b/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml index 138fc4944..2290ea590 100644 --- a/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml +++ b/datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml @@ -961,10 +961,10 @@ 30 - + 0 RequestManagement - overview.html + request-dashboard.xml 1 diff --git a/datamodel/itop-request-mgmt-1.0.0/overview.html b/datamodel/itop-request-mgmt-1.0.0/overview.html deleted file mode 100644 index eaf0b921c..000000000 --- a/datamodel/itop-request-mgmt-1.0.0/overview.html +++ /dev/null @@ -1,21 +0,0 @@ -

UI:RequestMgmtMenuOverview:Title

- - - - - - - - - -
-SELECT UserRequest - -SELECT UserRequest -
-

UI-RequestManagementOverview-RequestUnassigned

-SELECT UserRequest WHERE status IN ("new", "escalated_tto") -		 -  -
- diff --git a/datamodel/itop-request-mgmt-1.0.0/request-dashboard.xml b/datamodel/itop-request-mgmt-1.0.0/request-dashboard.xml new file mode 100644 index 000000000..5d89359f3 --- /dev/null +++ b/datamodel/itop-request-mgmt-1.0.0/request-dashboard.xml @@ -0,0 +1,23 @@ + + +UI:RequestMgmtMenuOverview:Title +DashboardLayoutTwoCols + + + UI-RequestManagementOverview-RequestByService + SELECT UserRequest + service_name + + + + UI-RequestManagementOverview-RequestByPriority + SELECT UserRequest + priority + + + + UI-RequestManagementOverview-RequestUnassigned + SELECT UserRequest WHERE status IN ("new", "escalated_tto") + + + \ No newline at end of file diff --git a/pages/ajax.render.php b/pages/ajax.render.php index 28533482b..d7c4b9fec 100644 --- a/pages/ajax.render.php +++ b/pages/ajax.render.php @@ -626,7 +626,7 @@ try break; case 'dashboard_editor': - $sId = utils::ReadParam('id', ''); + $sId = utils::ReadParam('id', '', false, 'raw_data'); $idx = ApplicationMenu::GetMenuIndexById($sId); $oMenu = ApplicationMenu::GetMenuNode($idx); $oMenu->RenderEditor($oPage); @@ -682,7 +682,7 @@ try break; case 'save_dashboard': - $sDashboardId = utils::ReadParam('dashboard_id', ''); + $sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data'); $aParams = array(); $aParams['layout_class'] = utils::ReadParam('layout_class', ''); $aParams['title'] = utils::ReadParam('title', '', false, 'raw_data'); @@ -695,7 +695,7 @@ try break; case 'render_dashboard': - $sDashboardId = utils::ReadParam('dashboard_id', ''); + $sDashboardId = utils::ReadParam('dashboard_id', '', false, 'raw_data'); $aParams = array(); $aParams['layout_class'] = utils::ReadParam('layout_class', ''); $aParams['title'] = utils::ReadParam('title', '', false, 'raw_data'); diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php index 26d333753..41f564268 100644 --- a/setup/compiler.class.inc.php +++ b/setup/compiler.class.inc.php @@ -817,6 +817,12 @@ EOF; $sNewMenu = "new WebPageMenuNode('$sMenuId', $sUrlSpec, $sParentSpec, $fRank);"; break; + case 'DashboardMenuNode': + $sTemplateFile = $oMenu->GetChildText('definition_file'); + $sTemplateSpec = $this->PathToPHP($sTemplateFile, $sModuleRelativeDir); + $sNewMenu = "new DashboardMenuNode('$sMenuId', $sTemplateSpec, $sParentSpec, $fRank);"; + break; + case 'TemplateMenuNode': $sTemplateFile = $oMenu->GetChildText('template_file'); $sTemplateSpec = $this->PathToPHP($sTemplateFile, $sModuleRelativeDir);