new UI - hide middle menu when clicking zone node, pod node, systemVM node, dashboard. show middle menu otherwise.

This commit is contained in:
Jessica Wang 2010-10-19 10:19:09 -07:00
parent 947c2ca16d
commit 743f58fb0c
4 changed files with 14 additions and 12 deletions

View File

@ -2092,7 +2092,7 @@ a:hover.search_button {
} }
.main_contentarea { .main_contentarea_with_midmenu {
width:auto; width:auto;
min-height:1000px; min-height:1000px;
height:auto; height:auto;
@ -2100,7 +2100,7 @@ a:hover.search_button {
padding:0; padding:0;
} }
.main_contentarea_dashboard { .main_contentarea_without_midmenu {
width:auto; width:auto;
min-height:1000px; min-height:1000px;
height:auto; height:auto;

View File

@ -69,6 +69,8 @@ $(document).ready(function() {
selectLeftMenu($(this)); selectLeftMenu($(this));
hideMiddleMenu(); hideMiddleMenu();
$("#right_panel").removeClass("main_contentarea").addClass("main_contentarea_dashboard");
$("#right_panel").load("jsp/dashboard.jsp", function(){ $("#right_panel").load("jsp/dashboard.jsp", function(){
afterLoadDashboardJSP(); afterLoadDashboardJSP();
}); });
@ -78,7 +80,7 @@ $(document).ready(function() {
$("#leftmenu_domain").bind("click", function(event) { $("#leftmenu_domain").bind("click", function(event) {
selectLeftMenu($(this)); selectLeftMenu($(this));
showMiddleMenuWithoutSearch(); showMiddleMenu();
disableMultipleSelectionInMidMenu(); disableMultipleSelectionInMidMenu();
clearMiddleMenu(); clearMiddleMenu();

View File

@ -540,16 +540,12 @@ var $expandedFirstLevelMenu, $expandedSecondLevelMenu;
var selected_midmenu_id = null; var selected_midmenu_id = null;
function hideMiddleMenu() { function hideMiddleMenu() {
$("#middle_menu, #search_panel, #middle_menu_pagination").hide(); $("#middle_menu, #search_panel, #middle_menu_pagination").hide();
$("#right_panel").removeClass("main_contentarea").addClass("main_contentarea_dashboard"); $("#midmenu_container").empty();
$("#right_panel").removeClass("main_contentarea_with_midmenu").addClass("main_contentarea_without_midmenu");
} }
function showMiddleMenu() { function showMiddleMenu() {
$("#middle_menu, #search_panel, #middle_menu_pagination").show(); $("#middle_menu, #search_panel, #middle_menu_pagination").show();
$("#right_panel").removeClass("main_contentarea_dashboard").addClass("main_contentarea"); $("#right_panel").removeClass("main_contentarea_without_midmenu").addClass("main_contentarea_with_midmenu");
}
function showMiddleMenuWithoutSearch() {
$("#middle_menu").show();
$("#search_panel, #middle_menu_pagination").hide();
$("#right_panel").removeClass("main_contentarea_dashboard").addClass("main_contentarea");
} }
// adding middle menu item *** // adding middle menu item ***

View File

@ -77,6 +77,7 @@ function buildZoneTree() {
selectLeftMenu(target.parent().parent().parent()); selectLeftMenu(target.parent().parent().parent());
var jsonObj = target.data("jsonObj"); var jsonObj = target.data("jsonObj");
showPage($("#zone_page"), jsonObj); showPage($("#zone_page"), jsonObj);
hideMiddleMenu();
zoneJsonToDetailsTab(jsonObj); zoneJsonToDetailsTab(jsonObj);
zoneJsonToNetworkTab(jsonObj); zoneJsonToNetworkTab(jsonObj);
zoneJsonToSecondaryStorageTab(jsonObj); zoneJsonToSecondaryStorageTab(jsonObj);
@ -86,6 +87,7 @@ function buildZoneTree() {
selectLeftMenu(target.parent().parent().parent()); selectLeftMenu(target.parent().parent().parent());
var jsonObj = target.data("jsonObj"); var jsonObj = target.data("jsonObj");
showPage($("#pod_page"), jsonObj); showPage($("#pod_page"), jsonObj);
hideMiddleMenu();
podJsonToDetailsTab(jsonObj); podJsonToDetailsTab(jsonObj);
break; break;
@ -93,6 +95,7 @@ function buildZoneTree() {
selectLeftMenu(target.parent().parent().parent()); selectLeftMenu(target.parent().parent().parent());
var jsonObj = target.data("jsonObj"); var jsonObj = target.data("jsonObj");
showPage($("#cluster_page"), jsonObj); showPage($("#cluster_page"), jsonObj);
showMiddleMenu();
clusterJsonToDetailsTab(jsonObj); clusterJsonToDetailsTab(jsonObj);
var clusterId = jsonObj.id; var clusterId = jsonObj.id;
$("#midmenu_container").empty(); $("#midmenu_container").empty();
@ -104,6 +107,7 @@ function buildZoneTree() {
selectLeftMenu(target.parent().parent().parent()); selectLeftMenu(target.parent().parent().parent());
var jsonObj = target.data("jsonObj"); var jsonObj = target.data("jsonObj");
showPage($("#systemvm_page"), jsonObj); showPage($("#systemvm_page"), jsonObj);
hideMiddleMenu();
systemvmJsonToDetailsTab(jsonObj); systemvmJsonToDetailsTab(jsonObj);
break; break;