Completed the move of dashboards from separate definition files (e.g. overview.xml) into data model files (8 dashboards were concerned on the model 2.x, 6 for the model 1.x)

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

datamodels/1.x/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml

@@ -5292,7 +5292,46 @@
     <menu id="Change:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ChangeManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title></title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByType</title>
+                <query>SELECT Change</query>
+                <group_by>finalclass</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletObjectList">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeUnassigned</title>
+                <query>SELECT Change WHERE status = 'new'</query>
+                <menu>false</menu>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletObjectList">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeWithOutage</title>
+                <query>SELECT Change WHERE outage = 'yes'</query>
+                <menu>false</menu>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewChange" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

datamodels/1.x/itop-change-mgmt-1.0.0/overview.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <layout>DashboardLayoutTwoCols</layout>
-  <title></title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByBars">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-ChangeByType</title>
-          <query>SELECT Change</query>
-          <group_by>finalclass</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletObjectList">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-ChangeUnassigned</title>
-          <query>SELECT Change WHERE status = 'new'</query>
-          <menu>false</menu>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletObjectList">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-ChangeWithOutage</title>
-          <query>SELECT Change WHERE outage = 'yes'</query>
-          <menu>false</menu>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

datamodels/1.x/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml

@@ -1133,7 +1133,46 @@
     <menu id="Incident:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>IncidentManagement</parent>
-      <definition_file>incident-dashboard.xml</definition_file>
+      <definition>
+        <title>UI:IncidentMgmtMenuOverview:Title</title>
+        <layout>DashboardLayoutTwoCols</layout>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-IncidentManagementOverview-IncidentByService</title>
+                <query>SELECT Incident</query>
+                <group_by>service_id</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByPie">
+                <rank>0</rank>
+                <title>UI-IncidentManagementOverview-IncidentByPriority</title>
+                <query>SELECT Incident</query>
+                <group_by>priority</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletObjectList">
+                <rank>0</rank>
+                <title>UI-IncidentManagementOverview-IncidentUnassigned</title>
+                <query>SELECT Incident WHERE status IN ("new", "escalated_tto")</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewIncident" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

datamodels/1.x/itop-incident-mgmt-1.0.0/incident-dashboard.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <title>UI:IncidentMgmtMenuOverview:Title</title>
-  <layout>DashboardLayoutTwoCols</layout>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByBars">
-          <rank>0</rank>
-          <title>UI-IncidentManagementOverview-IncidentByService</title>
-          <query>SELECT Incident</query>
-          <group_by>service_id</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletGroupByPie">
-          <rank>0</rank>
-          <title>UI-IncidentManagementOverview-IncidentByPriority</title>
-          <query>SELECT Incident</query>
-          <group_by>priority</group_by>
-          <style>pie</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletObjectList">
-          <rank>0</rank>
-          <title>UI-IncidentManagementOverview-IncidentUnassigned</title>
-          <query>SELECT Incident WHERE status IN ("new", "escalated_tto")</query>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

datamodels/1.x/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml

@@ -751,7 +751,47 @@
     <menu id="Problem:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ProblemManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title></title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-ProblemManagementOverview-ProblemByService</title>
+                <query>SELECT Problem</query>
+                <group_by>service_id</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByPie">
+                <rank>0</rank>
+                <title>UI-ProblemManagementOverview-ProblemByPriority</title>
+                <query>SELECT Problem</query>
+                <group_by>priority</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletObjectList">
+                <rank>0</rank>
+                <title>UI-ProblemManagementOverview-ProblemUnassigned</title>
+                <query>SELECT Problem WHERE status IN ("new")</query>
+                <menu>true</menu>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewProblem" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

datamodels/1.x/itop-problem-mgmt-1.0.0/overview.xml

@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <layout>DashboardLayoutTwoCols</layout>
-  <title></title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByBars">
-          <rank>0</rank>
-          <title>UI-ProblemManagementOverview-ProblemByService</title>
-          <query>SELECT Problem</query>
-          <group_by>service_id</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletGroupByPie">
-          <rank>0</rank>
-          <title>UI-ProblemManagementOverview-ProblemByPriority</title>
-          <query>SELECT Problem</query>
-          <group_by>priority</group_by>
-          <style>pie</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletObjectList">
-          <rank>0</rank>
-          <title>UI-ProblemManagementOverview-ProblemUnassigned</title>
-          <query>SELECT Problem WHERE status IN ("new")</query>
-          <menu>true</menu>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>
-

datamodels/1.x/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml

@@ -1093,7 +1093,46 @@
     <menu id="UserRequest:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>RequestManagement</parent>
-      <definition_file>request-dashboard.xml</definition_file>
+      <definition>
+        <title>UI:RequestMgmtMenuOverview:Title</title>
+        <layout>DashboardLayoutTwoCols</layout>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-RequestByService</title>
+                <query>SELECT UserRequest</query>
+                <group_by>service_id</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByPie">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-RequestByPriority</title>
+                <query>SELECT UserRequest</query>
+                <group_by>priority</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletObjectList">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-RequestUnassigned</title>
+                <query>SELECT UserRequest WHERE status IN ("new", "escalated_tto")</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewUserRequest" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

datamodels/1.x/itop-request-mgmt-1.0.0/request-dashboard.xml

@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <title>UI:RequestMgmtMenuOverview:Title</title>
-  <layout>DashboardLayoutTwoCols</layout>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByBars">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-RequestByService</title>
-          <query>SELECT UserRequest</query>
-          <group_by>service_id</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletGroupByPie">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-RequestByPriority</title>
-          <query>SELECT UserRequest</query>
-          <group_by>priority</group_by>
-          <style>pie</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletObjectList">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-RequestUnassigned</title>
-          <query>SELECT UserRequest WHERE status IN ("new", "escalated_tto")</query>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

datamodels/1.x/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml

@@ -2034,7 +2034,32 @@
     <menu id="Service:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ServiceManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <title>UI:ServiceMgmtMenuOverview:Title</title>
+        <layout>DashboardLayoutTwoCols</layout>
+        <cells>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI-ServiceManagementOverview-CustomerContractToRenew</title>
+                <query>SELECT CustomerContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI-ServiceManagementOverview-ProviderContractToRenew</title>
+                <query>SELECT ProviderContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="ProviderContract" xsi:type="OQLMenuNode" _delta="define">
       <rank>1</rank>

datamodels/1.x/itop-service-mgmt-1.0.0/overview.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <title>UI:ServiceMgmtMenuOverview:Title</title>
-  <layout>DashboardLayoutTwoCols</layout>
-  <cells>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletObjectList">
-          <rank>1</rank>
-          <title>UI-ServiceManagementOverview-CustomerContractToRenew</title>
-          <query>SELECT CustomerContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletObjectList">
-          <rank>1</rank>
-          <title>UI-ServiceManagementOverview-ProviderContractToRenew</title>
-          <query>SELECT ProviderContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

datamodels/1.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+  <menus>
+    <menu id="WelcomeMenu" xsi:type="MenuGroup" _delta="define">
+      <rank>10</rank>
+    </menu>
+    <menu id="WelcomeMenuPage" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>10</rank>
+      <parent>WelcomeMenu</parent>
+      <definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title></title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletHeaderDynamic">
+                <rank>0</rank>
+                <title>UI:ConfigurationManagementMenu</title>
+                <icon>itop-config-mgmt-1.0.0/images/database.png</icon>
+                <subtitle>UI:WelcomeMenu:AllConfigItems</subtitle>
+                <query>SELECT FunctionalCI</query>
+                <group_by>status</group_by>
+                <values>implementation,production,obsolete</values>
+              </dashlet>
+              <dashlet id="2" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>BusinessProcess</class>
+              </dashlet>
+              <dashlet id="3" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Contact</class>
+              </dashlet>
+              <dashlet id="4" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>Location</class>
+              </dashlet>
+              <dashlet id="5" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>Server</class>
+              </dashlet>
+              <dashlet id="6" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>DatabaseInstance</class>
+              </dashlet>
+              <dashlet id="7" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>NetworkDevice</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="8" xsi:type="DashletHeaderDynamic">
+                <rank>0</rank>
+                <title>Menu:RequestManagement</title>
+                <icon>itop-request-mgmt-1.0.0/images/user-request-deadline.png</icon>
+                <subtitle>UI:WelcomeMenu:AllOpenRequests</subtitle>
+                <query>SELECT UserRequest WHERE status != "closed"</query>
+                <group_by>status</group_by>
+                <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
+              </dashlet>
+              <dashlet id="9" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI:WelcomeMenu:MyCalls</title>
+                <query>SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id AND status NOT IN ("closed", "resolved")</query>
+                <menu>true</menu>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="10" xsi:type="DashletHeaderDynamic">
+                <rank>0</rank>
+                <title>Menu:IncidentManagement</title>
+                <icon>itop-incident-mgmt-1.0.0/images/incident-escalated.png</icon>
+                <subtitle>UI:WelcomeMenu:OpenIncidents</subtitle>
+                <query>SELECT Incident WHERE status != "closed"</query>
+                <group_by>status</group_by>
+                <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
+              </dashlet>
+              <dashlet id="11" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI:WelcomeMenu:MyIncidents</title>
+                <query>SELECT Incident AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")</query>
+                <menu>true</menu>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+    <menu id="MyShortcuts" xsi:type="ShortcutContainerMenuNode" _delta="define">
+      <rank>20</rank>
+      <parent>WelcomeMenu</parent>
+    </menu>
+  </menus>
+</itop_design>

datamodels/1.x/itop-welcome-itil/main.itop-welcome-itil.php

@@ -44,11 +44,6 @@ class ItopWelcome extends ModuleHandlerAPI
 {
 	public static function OnMenuCreation()
 	{
-		$oWelcomeMenu = new MenuGroup('WelcomeMenu', 10 /* fRank */);
-		new DashboardMenuNode('WelcomeMenuPage', dirname(__FILE__).'/welcome_menu.xml', $oWelcomeMenu->GetIndex() /* oParent */, 10 /* fRank */);
-
-		new ShortcutContainerMenuNode('MyShortcuts', $oWelcomeMenu->GetIndex(), 20 /* fRank */);
-		
 		$oToolsMenu = new MenuGroup('DataAdministration', 70 /* fRank */, 'Organization', UR_ACTION_MODIFY, UR_ALLOWED_YES|UR_ALLOWED_DEPENDS);
 		new WebPageMenuNode('CSVImportMenu', utils::GetAbsoluteUrlAppRoot().'pages/csvimport.php', $oToolsMenu->GetIndex(), 1 /* fRank */);
 		

datamodels/1.x/itop-welcome-itil/module.itop-welcome-itil.php

@@ -22,6 +22,7 @@ SetupWebPage::AddModule(
 		//
 		'datamodel' => array(
 			'main.itop-welcome-itil.php',
+			'model.itop-welcome-itil.php',
 		),
 		'webservice' => array(
 			//'webservices.itop-welcome-itil.php',

datamodels/1.x/itop-welcome-itil/welcome_menu.xml

@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <layout>DashboardLayoutOneCol</layout>
-  <title></title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletHeaderDynamic">
-          <rank>0</rank>
-          <title>UI:ConfigurationManagementMenu</title>
-          <icon>itop-config-mgmt-1.0.0/images/database.png</icon>
-          <subtitle>UI:WelcomeMenu:AllConfigItems</subtitle>
-          <query>SELECT FunctionalCI</query>
-          <group_by>status</group_by>
-          <values>implementation,production,obsolete</values>
-        </dashlet>
-        <dashlet id="2" xsi:type="DashletBadge">
-          <rank>1</rank>
-          <class>BusinessProcess</class>
-        </dashlet>
-        <dashlet id="3" xsi:type="DashletBadge">
-          <rank>2</rank>
-          <class>Contact</class>
-        </dashlet>
-        <dashlet id="4" xsi:type="DashletBadge">
-          <rank>3</rank>
-          <class>Location</class>
-        </dashlet>
-        <dashlet id="5" xsi:type="DashletBadge">
-          <rank>4</rank>
-          <class>Server</class>
-        </dashlet>
-        <dashlet id="6" xsi:type="DashletBadge">
-          <rank>5</rank>
-          <class>DatabaseInstance</class>
-        </dashlet>
-        <dashlet id="7" xsi:type="DashletBadge">
-          <rank>6</rank>
-          <class>NetworkDevice</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="8" xsi:type="DashletHeaderDynamic">
-          <rank>0</rank>
-          <title>Menu:RequestManagement</title>
-          <icon>itop-request-mgmt-1.0.0/images/user-request-deadline.png</icon>
-          <subtitle>UI:WelcomeMenu:AllOpenRequests</subtitle>
-          <query>SELECT UserRequest WHERE status != "closed"</query>
-          <group_by>status</group_by>
-          <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
-        </dashlet>
-        <dashlet id="9" xsi:type="DashletObjectList">
-          <rank>1</rank>
-          <title>UI:WelcomeMenu:MyCalls</title>
-          <query>SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id AND status NOT IN ("closed", "resolved")</query>
-          <menu>true</menu>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="10" xsi:type="DashletHeaderDynamic">
-          <rank>0</rank>
-          <title>Menu:IncidentManagement</title>
-          <icon>itop-incident-mgmt-1.0.0/images/incident-escalated.png</icon>
-          <subtitle>UI:WelcomeMenu:OpenIncidents</subtitle>
-          <query>SELECT Incident WHERE status != "closed"</query>
-          <group_by>status</group_by>
-          <values>new,assigned,escalated_tto,escalated_ttr,resolved</values>
-        </dashlet>
-        <dashlet id="11" xsi:type="DashletObjectList">
-          <rank>1</rank>
-          <title>UI:WelcomeMenu:MyIncidents</title>
-          <query>SELECT Incident AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")</query>
-          <menu>true</menu>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>
-

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

@@ -5435,7 +5435,60 @@
     <menu id="Change:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ChangeManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:ChangeMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByCategory-last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>finalclass</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-Last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>start_date:day_of_month</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByDomain-last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>finalclass</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByStatus-last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>status</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewChange" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

datamodels/2.x/itop-change-mgmt-itil/overview.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <layout>DashboardLayoutTwoCols</layout>
-  <title>UI:ChangeMgmtMenuOverview:Title</title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-ChangeByCategory-last-7-days</title>
-          <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-          <group_by>finalclass</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletGroupByBars">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-Last-7-days</title>
-          <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-          <group_by>start_date:day_of_month</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-ChangeByDomain-last-7-days</title>
-          <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-          <group_by>finalclass</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="3">
-      <rank>3</rank>
-      <dashlets>
-        <dashlet id="4" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-ChangeByStatus-last-7-days</title>
-          <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(),
-            INTERVAL 7 DAY)</query>
-          <group_by>status</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>
-

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

@@ -880,7 +880,60 @@
     <menu id="Change:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ChangeManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:ChangeMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByCategory-last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>category</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-Last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>start_date:day_of_month</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByDomain-last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>finalclass</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-ChangeManagementOverview-ChangeByStatus-last-7-days</title>
+                <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
+                <group_by>status</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewChange" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

datamodels/2.x/itop-change-mgmt/overview.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <layout>DashboardLayoutTwoCols</layout>
-  <title>UI:ChangeMgmtMenuOverview:Title</title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-ChangeByCategory-last-7-days</title>
-          <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-          <group_by>category</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletGroupByBars">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-Last-7-days</title>
-          <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-          <group_by>start_date:day_of_month</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-ChangeByDomain-last-7-days</title>
-          <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(), INTERVAL 7 DAY)</query>
-          <group_by>finalclass</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="3">
-      <rank>3</rank>
-      <dashlets>
-        <dashlet id="4" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-ChangeManagementOverview-ChangeByStatus-last-7-days</title>
-          <query>SELECT Change WHERE creation_date &gt; DATE_SUB(NOW(),
-            INTERVAL 7 DAY)</query>
-          <group_by>status</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

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

@@ -1956,7 +1956,67 @@
     <menu id="Incident:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>IncidentManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:IncidentMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByPie">
+                <title>UI-IncidentManagementOverview-IncidentByPriority-last-14-days</title>
+                <query>SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>priority</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByBars">
+                <title>UI-IncidentManagementOverview-Last-14-days</title>
+                <query>SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>start_date:day_of_month</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletGroupByTable">
+                <title>UI-IncidentManagementOverview-OpenIncidentByStatus</title>
+                <query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>status</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletGroupByTable">
+                <title>UI-IncidentManagementOverview-OpenIncidentByAgent</title>
+                <query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>agent_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="5" xsi:type="DashletGroupByTable">
+                <title>UI-IncidentManagementOverview-OpenIncidentByCustomer</title>
+                <query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>org_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewIncident" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

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

@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <layout>DashboardLayoutTwoCols</layout>
-  <title>UI:IncidentMgmtMenuOverview:Title</title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByPie">
-          <title>UI-IncidentManagementOverview-IncidentByPriority-last-14-days</title>
-          <query>SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-          <group_by>priority</group_by>
-          <style>pie</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletGroupByBars">
-          <title>UI-IncidentManagementOverview-Last-14-days</title>
-          <query>SELECT Incident WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-          <group_by>start_date:day_of_month</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletGroupByTable">
-          <title>UI-IncidentManagementOverview-OpenIncidentByStatus</title>
-          <query>SELECT Incident WHERE status NOT IN
-            ('closed','rejected')</query>
-          <group_by>status</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="3">
-      <rank>3</rank>
-      <dashlets>
-        <dashlet id="4" xsi:type="DashletGroupByTable">
-          <title>UI-IncidentManagementOverview-OpenIncidentByAgent</title>
-          <query>SELECT Incident WHERE status NOT IN
-            ('closed','rejected')</query>
-          <group_by>agent_id</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="4">
-      <rank>4</rank>
-      <dashlets>
-        <dashlet id="5" xsi:type="DashletGroupByTable">
-          <title>UI-IncidentManagementOverview-OpenIncidentByCustomer</title>
-          <query>SELECT Incident WHERE status NOT IN ('closed','rejected')</query>
-          <group_by>org_id</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

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

@@ -738,7 +738,47 @@
     <menu id="Problem:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ProblemManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:ProblemMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-ProblemManagementOverview-ProblemByService</title>
+                <query>SELECT Problem</query>
+                <group_by>service_id</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByPie">
+                <rank>0</rank>
+                <title>UI-ProblemManagementOverview-ProblemByPriority</title>
+                <query>SELECT Problem</query>
+                <group_by>priority</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletObjectList">
+                <rank>0</rank>
+                <title>UI-ProblemManagementOverview-ProblemUnassigned</title>
+                <query>SELECT Problem WHERE status IN ("new")</query>
+                <menu>false</menu>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewProblem" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

datamodels/2.x/itop-problem-mgmt/overview.xml

@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <layout>DashboardLayoutTwoCols</layout>
-  <title>UI:ProblemMgmtMenuOverview:Title</title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByBars">
-          <rank>0</rank>
-          <title>UI-ProblemManagementOverview-ProblemByService</title>
-          <query>SELECT Problem</query>
-          <group_by>service_id</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletGroupByPie">
-          <rank>0</rank>
-          <title>UI-ProblemManagementOverview-ProblemByPriority</title>
-          <query>SELECT Problem</query>
-          <group_by>priority</group_by>
-          <style>pie</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletObjectList">
-          <rank>0</rank>
-          <title>UI-ProblemManagementOverview-ProblemUnassigned</title>
-          <query>SELECT Problem WHERE status IN ("new")</query>
-          <menu>false</menu>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

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

@@ -2303,7 +2303,84 @@
     <menu id="UserRequest:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>RequestManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:RequestMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByPie">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-RequestByType-last-14-days</title>
+                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>request_type</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-Last-14-days</title>
+                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>start_date:day_of_month</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByStatus</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>status</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByAgent</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>agent_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="5" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByType</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>finalclass</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="5">
+            <rank>5</rank>
+            <dashlets>
+              <dashlet id="6" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByCustomer</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>org_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewUserRequest" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

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

@@ -1,86 +0,0 @@
-<?xml version="1.0"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <layout>DashboardLayoutTwoCols</layout>
-  <title>UI:RequestMgmtMenuOverview:Title</title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByPie">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-RequestByType-last-14-days</title>
-          <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14
-            DAY) &lt; start_date</query>
-          <group_by>request_type</group_by>
-          <style>pie</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletGroupByBars">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-Last-14-days</title>
-          <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14
-            DAY)
-            &lt; start_date</query>
-          <group_by>start_date:day_of_month</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-OpenRequestByStatus</title>
-          <query>SELECT UserRequest WHERE status NOT IN
-            ('closed','rejected')</query>
-          <group_by>status</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="3">
-      <rank>3</rank>
-      <dashlets>
-        <dashlet id="4" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-OpenRequestByAgent</title>
-          <query>SELECT UserRequest WHERE status NOT IN
-            ('closed','rejected')</query>
-          <group_by>agent_id</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="4">
-      <rank>4</rank>
-      <dashlets>
-        <dashlet id="5" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-OpenRequestByType</title>
-          <query>SELECT UserRequest WHERE status NOT IN
-            ('closed','rejected')</query>
-          <group_by>finalclass</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="5">
-      <rank>5</rank>
-      <dashlets>
-        <dashlet id="6" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-OpenRequestByCustomer</title>
-          <query>SELECT UserRequest WHERE status NOT IN
-            ('closed','rejected')</query>
-          <group_by>org_id</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

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

@@ -2285,7 +2285,84 @@
     <menu id="UserRequest:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>RequestManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <layout>DashboardLayoutTwoCols</layout>
+        <title>UI:RequestMgmtMenuOverview:Title</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletGroupByPie">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-RequestByType-last-14-days</title>
+                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>request_type</group_by>
+                <style>pie</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletGroupByBars">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-Last-14-days</title>
+                <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
+                <group_by>start_date:day_of_month</group_by>
+                <style>bars</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="1">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="3" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByStatus</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>status</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByAgent</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>agent_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="5" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByType</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>finalclass</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4">
+            <rank>5</rank>
+            <dashlets>
+              <dashlet id="6" xsi:type="DashletGroupByTable">
+                <rank>0</rank>
+                <title>UI-RequestManagementOverview-OpenRequestByCustomer</title>
+                <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
+                <group_by>org_id</group_by>
+                <style>table</style>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewUserRequest" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>1</rank>

datamodels/2.x/itop-request-mgmt/overview.xml

@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <layout>DashboardLayoutTwoCols</layout>
-  <title>UI:RequestMgmtMenuOverview:Title</title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletGroupByPie">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-RequestByType-last-14-days</title>
-          <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-          <group_by>request_type</group_by>
-          <style>pie</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletGroupByBars">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-Last-14-days</title>
-          <query>SELECT UserRequest WHERE DATE_SUB(NOW(), INTERVAL 14 DAY) &lt; start_date</query>
-          <group_by>start_date:day_of_month</group_by>
-          <style>bars</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="1">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="3" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-OpenRequestByStatus</title>
-          <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-          <group_by>status</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>3</rank>
-      <dashlets>
-        <dashlet id="4" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-OpenRequestByAgent</title>
-          <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-          <group_by>agent_id</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="3">
-      <rank>4</rank>
-      <dashlets>
-        <dashlet id="5" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-OpenRequestByType</title>
-          <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-          <group_by>finalclass</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="4">
-      <rank>5</rank>
-      <dashlets>
-        <dashlet id="6" xsi:type="DashletGroupByTable">
-          <rank>0</rank>
-          <title>UI-RequestManagementOverview-OpenRequestByCustomer</title>
-          <query>SELECT UserRequest WHERE status NOT IN ('closed','rejected')</query>
-          <group_by>org_id</group_by>
-          <style>table</style>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml

@@ -2286,7 +2286,32 @@
     <menu id="Service:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ServiceManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <title>UI:ServiceMgmtMenuOverview:Title</title>
+        <layout>DashboardLayoutTwoCols</layout>
+        <cells>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI-ServiceManagementOverview-CustomerContractToRenew</title>
+                <query>SELECT CustomerContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI-ServiceManagementOverview-ProviderContractToRenew</title>
+                <query>SELECT ProviderContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="CustomerContract" xsi:type="OQLMenuNode" _delta="define">
       <rank>1</rank>

datamodels/2.x/itop-service-mgmt-provider/overview.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <title>UI:ServiceMgmtMenuOverview:Title</title>
-  <layout>DashboardLayoutTwoCols</layout>
-  <cells>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletObjectList">
-          <rank>1</rank>
-          <title>UI-ServiceManagementOverview-CustomerContractToRenew</title>
-          <query>SELECT CustomerContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletObjectList">
-          <rank>1</rank>
-          <title>UI-ServiceManagementOverview-ProviderContractToRenew</title>
-          <query>SELECT ProviderContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>

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

@@ -2280,7 +2280,32 @@
     <menu id="Service:Overview" xsi:type="DashboardMenuNode" _delta="define">
       <rank>0</rank>
       <parent>ServiceManagement</parent>
-      <definition_file>overview.xml</definition_file>
+      <definition>
+        <title>UI:ServiceMgmtMenuOverview:Title</title>
+        <layout>DashboardLayoutTwoCols</layout>
+        <cells>
+          <cell id="1">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI-ServiceManagementOverview-CustomerContractToRenew</title>
+                <query>SELECT CustomerContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="2">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="2" xsi:type="DashletObjectList">
+                <rank>1</rank>
+                <title>UI-ServiceManagementOverview-ProviderContractToRenew</title>
+                <query>SELECT ProviderContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="CustomerContract" xsi:type="OQLMenuNode" _delta="define">
       <rank>1</rank>

datamodels/2.x/itop-service-mgmt/overview.xml

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<dashboard xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <title>UI:ServiceMgmtMenuOverview:Title</title>
-  <layout>DashboardLayoutTwoCols</layout>
-  <cells>
-    <cell id="1">
-      <rank>1</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletObjectList">
-          <rank>1</rank>
-          <title>UI-ServiceManagementOverview-CustomerContractToRenew</title>
-          <query>SELECT CustomerContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="2">
-      <rank>2</rank>
-      <dashlets>
-        <dashlet id="2" xsi:type="DashletObjectList">
-          <rank>1</rank>
-          <title>UI-ServiceManagementOverview-ProviderContractToRenew</title>
-          <query>SELECT ProviderContract AS c WHERE c.end_date &lt; DATE_ADD(NOW(), INTERVAL 30 DAY)</query>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-</dashboard>