- Menu and templates have been reviewed.

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

application/templates/welcome_menu.html

@@ -173,7 +173,7 @@ function RestorePositions()
 
 <div class="item">
 <p style="text-align:left; font-family:Verdana, Arial, sans-serif; font-size:14px;"><itopstring>UI:WelcomeMenu:MyCalls</itopstring></p>
-<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql" parameters="menu:0">SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id AND status NOT IN ("closed", "resolved")</itopblock>
+<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql" parameters="menu:1">SELECT UserRequest AS i WHERE i.caller_id = :current_contact_id AND status NOT IN ("closed", "resolved")</itopblock>
 </div>
 
 </div>
@@ -191,7 +191,7 @@ function RestorePositions()
 
 <div class="item">
 <p style="text-align:left; font-family:Verdana, Arial, sans-serif; font-size:14px;"><itopstring>UI:WelcomeMenu:MyIncidents</itopstring></p>
-<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql" parameters="menu:0">SELECT Incident AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")</itopblock>
+<itopblock BlockClass="DisplayBlock" type="list" asynchronous="false" encoding="text/oql" parameters="menu:1">SELECT Incident AS i WHERE i.agent_id = :current_contact_id AND status NOT IN ("closed", "resolved")</itopblock>
 </div>
 
 </itopcheck>

modules/itop-config-mgmt-1.0.0/cis_menu.html

@@ -167,6 +167,18 @@ a.summary:hover {
 <itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Subnet</itopblock>
 </div><!-- element -->
 
+<div class="element">
+<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT BusinessProcess</itopblock>
+</div><!-- element -->
+
+<div class="element">
+<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT ApplicationSolution</itopblock>
+</div><!-- element -->
+
+<div class="element">
+<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Group</itopblock>
+</div><!-- element -->
+
 </div><!-- item -->
 </div><!-- menu_3 -->
 

modules/itop-config-mgmt-1.0.0/contacts_menu.html

@@ -1,22 +1,122 @@
-<h1><itopstring>UI:ContactsMenu:Title</itopstring></h1>
-<table border="0" padding="5" class="layout" width="100%">
+<style>
+.main_container {
+	width: 100%;
+	border: 0;
+	overflow-y: hidden;
+	overflow-x: hidden;
+	margin-bottom: 5px;
+	margin-top: 5px;
+	border-bottom: #ccc 1px solid;
+	border-top: #ccc 1px solid;
+}
+.main_header {
+	width:100%;
+	height: 60px;
+	background-color: #F1F1F6;
+}
+.main_header h1 {
+	color: #1C94C4;
+	margin-top:0;
+	margin-bottom:0;
+	padding-top: 10px;
+	padding-bottom: 10px;p
+	font-size: 16px;
+	line-height: 16px;
+}
+.main_header img {
+	margin-top: 10px;
+	margin-right: 10px;
+	float:left;
+}
+.item {
+	overflow-y: auto;
+	overflow-x: hidden;
+	background-color: #fff;
+	padding: 5px;
+	height: auto;
+}
+.main_menu {
+	overflow-y: auto;
+	overflow-x: hidden;
+	height: auto;
+	background-color: #eee;
+	width: 100%;
+}
+.element {
+	display: inline-block;
+	height: auto;
+}
+.element a {
+	font-size: 10px;
+}
+.element a.actions {
+	font-size: 16px;
+	text-decoration: none;
+	background: transparent;
+	color: #666;
+}
+.element a img {
+	border: 0;
+}
+.summary-details {
+	float:right;
+	margin-top: 5px;
+}
+
+.summary-details td {
+	text-align: center;
+	background: transparent;
+	padding: 5px;
+}
+.summary-details th {
+	text-align: center;
+	background: #CCC;
+	padding: 5px;
+	color: #eee;
+}
+a.summary {
+	text-decoration: none;
+	background: transparent;
+	color: #666;
+}
+a.summary:hover {
+	text-decoration: underline;
+}
+</style>
+<div id="contacts_menu">
+
+<!-- ######################################### -->
+
+<div id="menu_1" class="main_container">
+
+<div class="main_header drag_handle" id="config_devices">
+<img src="../modules/itop-config-mgmt-1.0.0/images/team.png"/>
+<itopblock BlockClass="DisplayBlock" type="summary" asynchronous="false" encoding="text/oql" parameters="title[block]:Menu_Contact;context_filter:1;label[block]:Menu_ConfigManagement_AllContacts;status[block]:status;status_codes[block]:active,inactive">SELECT Contact</itopblock>
+</div><!-- Drag Handle -->
+
+<div class="item">
+<table style="width:100%;text-align:center">
 <tr>
-<td class="dashboard">
-<h2><itopstring>UI-ContactsMenu-ContactsByLocation</itopstring></h2>
-<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:location_id" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
+<td style="width:50%">
+
+<div class="element">
+<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Team</itopblock>
+</div><!-- element -->
+
+<div class="element">
+<itopblock BlockClass="DisplayBlock" type="actions" asynchronous="false" encoding="text/oql" parameters="context_filter:1">SELECT Person</itopblock>
+</div><!-- element -->
+
 </td>
-<td class="dashboard">
+<td style="width:50%">
 <itopblock BlockClass="DisplayBlock" type="open_flash_chart" parameters="chart_type:pie;chart_title:UI-ContactsMenu-ContactsByLocation;group_by:location_name" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
 </td>
-</tr>
-<tr>
-<td class="dashboard">
-<h2><itopstring>UI-ContactsMenu-ContactsByType</itopstring></h2>
-<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:finalclass" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
-</td>
-<td class="dashboard">
-<h2><itopstring>UI-ContactsMenu-ContactsByStatus</itopstring></h2>
-<itopblock BlockClass="DisplayBlock" type="count" parameters="group_by:status" asynchronous="false" encoding="text/oql">SELECT Contact</itopblock>
-</td>
-</tr>
-</table>
+</tr></table>
+
+</div><!-- item -->
+
+</div><!-- menu_1 -->
+
+<!-- ######################################### -->
+
+</div>

modules/itop-config-mgmt-1.0.0/en.dict.itop-config-mgmt.php

@@ -1046,7 +1046,9 @@ Dict::Add('EN US', 'English', 'English', array(
 'Menu:ConfigManagement:SWAndApps' => 'Software and Applications',
 'Menu:ConfigManagement:Misc' => 'Miscellaneous',
 'Menu:Group' => 'Groups of CIs',
-'Menu:Group+' => 'Groups of CIs',
+'Menu:Group+' => 'Groups of CIs',
+'Menu:ConfigManagement:Shortcuts' => 'Shortcuts',
+'Menu:ConfigManagement:AllContacts' => 'All contacts: %1$d',
 
 ));
 ?>

modules/itop-config-mgmt-1.0.0/es_cr.dict.itop-config-mgmt.php

@@ -1015,5 +1015,7 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
 'Menu:PC+' => 'Todos los PCs (Computadores de Personales',
 'Menu:Group' => 'Grupos de ICs',
 'Menu:Group+' => 'Grupos de ICs',
+'Menu:ConfigManagement:Shortcuts' => 'Atajos',
+'Menu:ConfigManagement:AllContacts' => 'Todos los Contactos: %1$d',
 ));
 ?>

modules/itop-config-mgmt-1.0.0/fr.dict.itop-config-mgmt.php

@@ -1019,5 +1019,7 @@ Dict::Add('FR FR', 'French', 'Français', array(
 'Menu:ConfigManagement:Misc' => 'Divers',
 'Menu:Group' => 'Groupes de CIs',
 'Menu:Group+' => 'Groupes de CIs',
+'Menu:ConfigManagement:Shortcuts' => 'Raccourcis',
+'Menu:ConfigManagement:AllContacts' => 'Tous les contacts: %1$d',
 ));
 ?>

modules/itop-config-mgmt-1.0.0/model.itop-config-mgmt.php

@@ -1627,8 +1627,6 @@ new TemplateMenuNode('ConfigManagementOverview', '../modules/itop-config-mgmt-1.
 $oContactNode = new TemplateMenuNode('Contact', '../modules/itop-config-mgmt-1.0.0/contacts_menu.html', $oConfigManagementGroup->GetIndex(), 1 /* fRank */);
 new NewObjectMenuNode('NewContact', 'Contact', $oContactNode->GetIndex(), 1 /* fRank */);
 new SearchMenuNode('SearchContacts', 'Contact', $oContactNode->GetIndex(), 2 /* fRank */);
-new OQLMenuNode('Person', 'SELECT Person', $oContactNode->GetIndex(), 3 /* fRank */);
-new OQLMenuNode('Team', 'SELECT Team', $oContactNode->GetIndex(), 4 /* fRank */);
 
 new OQLMenuNode('Document', 'SELECT Document', $oConfigManagementGroup->GetIndex(), 2 /* fRank */, true /* bSearch */);
 new OQLMenuNode('Location', 'SELECT Location', $oConfigManagementGroup->GetIndex(), 3 /* fRank */, true /* bSearch */);
@@ -1639,20 +1637,12 @@ $oCINode = new TemplateMenuNode('ConfigManagementCI', '../modules/itop-config-mg
 new NewObjectMenuNode('NewCI', 'FunctionalCI', $oCINode->GetIndex(), 0 /* fRank */);
 new SearchMenuNode('SearchCIs', 'FunctionalCI', $oCINode->GetIndex(), 1 /* fRank */);
 
-new OQLMenuNode('BusinessProcess', 'SELECT BusinessProcess', $oCINode->GetIndex(), 2 /* fRank */);
-new OQLMenuNode('ApplicationSolution', 'SELECT ApplicationSolution', $oCINode->GetIndex(), 3 /* fRank */);
-
-//$oSWNode = new TemplateMenuNode('ConfigManagementSoftware', '', $oCINode->GetIndex(), 4 /* fRank */);
-//new OQLMenuNode('Licence', 'SELECT Licence', $oSWNode->GetIndex(), 0 /* fRank */);
-//new OQLMenuNode('Patch', 'SELECT Patch', $oSWNode->GetIndex(), 1 /* fRank */);
-//new OQLMenuNode('ApplicationInstance', 'SELECT SoftwareInstance', $oSWNode->GetIndex(), 2 /* fRank */);
-
-$oHWNode = new TemplateMenuNode('ConfigManagementHardware', '', $oCINode->GetIndex(), 5 /* fRank */);
-//new OQLMenuNode('Subnet', 'SELECT Subnet', $oHWNode->GetIndex(), 0 /* fRank */);
-new OQLMenuNode('NetworkDevice', 'SELECT NetworkDevice', $oHWNode->GetIndex(), 1 /* fRank */);
-new OQLMenuNode('Server', 'SELECT Server', $oHWNode->GetIndex(), 2 /* fRank */);
-new OQLMenuNode('Printer', 'SELECT Printer', $oHWNode->GetIndex(), 3 /* fRank */);
-//new OQLMenuNode('MobilePhone', 'SELECT MobilePhone', $oHWNode->GetIndex(), 4 /* fRank */);
-new OQLMenuNode('PC', 'SELECT PC', $oHWNode->GetIndex(), 5 /* fRank */);
+$oShortcutsNode = new TemplateMenuNode('ConfigManagement:Shortcuts', '', $oConfigManagementGroup->GetIndex(), 6 /* fRank */);
+new OQLMenuNode('Server', 'SELECT Server', $oShortcutsNode->GetIndex(), 1 /* fRank */);
+new OQLMenuNode('NetworkDevice', 'SELECT NetworkDevice', $oShortcutsNode->GetIndex(), 2 /* fRank */);
+new OQLMenuNode('Printer', 'SELECT Printer', $oShortcutsNode->GetIndex(), 3 /* fRank */);
+new OQLMenuNode('PC', 'SELECT PC', $oShortcutsNode->GetIndex(), 4 /* fRank */);
+new OQLMenuNode('BusinessProcess', 'SELECT BusinessProcess', $oShortcutsNode->GetIndex(), 5 /* fRank */);
+new OQLMenuNode('ApplicationSolution', 'SELECT ApplicationSolution', $oShortcutsNode->GetIndex(), 6 /* fRank */);
 
 ?>