From a9de7cbd231147a2f34a273486e88bf4e03ec40e Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 13 Oct 2010 17:58:10 -0700 Subject: [PATCH] new UI - remove JQuery accordion widget from left menu. Create our own widget to control left menu. --- ui/new/index.jsp | 1462 ++++++++++++++-------------- ui/new/scripts/cloud.core2.init.js | 17 +- 2 files changed, 731 insertions(+), 748 deletions(-) diff --git a/ui/new/index.jsp b/ui/new/index.jsp index 3d3d5ac5324..0fd257a94d9 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -1,745 +1,717 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -<% -long milliseconds = new Date().getTime(); -%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Cloud.com CloudStack - - - - -
- -
-
-
- -
-
-
-
    -
  1. -
    - -
    -
    -
    2. -
-
- <%=t.t("advanced")%> - -
- - - - - - - - - - - - - -
- - -
-
-
-
-
-
-
-
- -
- -
-
-
-
- -
-
- -
- -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> +<% +long milliseconds = new Date().getTime(); +%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cloud.com CloudStack + + + +
+ +
+
+
+ +
+
+
+
    +
  1. +
    + +
    +
    +
    +
    2. +
+
+ + <%=t.t("advanced")%> + +
+ + + + + + + +
+ + +
+
+
+
+
+
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 3505bfcec21..a667ac39f28 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -1,6 +1,17 @@ -$(document).ready(function() { - - $("#accordion_menu").show(); +$(document).ready(function() { + $("#leftmenu_container").find("#expanded_arrow_icon").bind("click", function(event) { + var $submenu = $(this).parent().parent().siblings(".leftmenu_expandedbox"); + if($submenu.css("display") == "none") { + $(this).removeClass("close").addClass("open"); + $submenu.show(); + } + else { + $(this).removeClass("open").addClass("close"); + $submenu.hide(); + } + return false; + }); + $("#leftmenu_container").show(); var $midmenuItem = $("#midmenu_item"); function listMidMenuItems(leftmenuId, commandString, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSPFn, toMidmenuFn, toRightPanelFn, getMidmenuIdFn) {