diff --git a/ui/index.jsp b/ui/index.jsp index be9e5f8da1d..ddd949d87ea 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -46,8 +46,7 @@ - - + diff --git a/ui/jsp/cluster.jsp b/ui/jsp/cluster.jsp deleted file mode 100644 index 46acf93b443..00000000000 --- a/ui/jsp/cluster.jsp +++ /dev/null @@ -1,285 +0,0 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
-
-
-

- Cluster -

-
-
- -
-
- <%=t.t("details")%>
-
- -
- -
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("zone")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("pod")%>:
-
-
-
-
-
-
-
-
- -
- - - - - - - - - diff --git a/ui/scripts/cloud.core.cluster.js b/ui/scripts/cloud.core.cluster.js deleted file mode 100644 index dcea7c619db..00000000000 --- a/ui/scripts/cloud.core.cluster.js +++ /dev/null @@ -1,79 +0,0 @@ - /** - * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. - * - * This software is licensed under the GNU General Public License v3 or later. - * - * It is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -function afterLoadClusterJSP($leftmenuItem1) { - var objCluster = $leftmenuItem1.data("jsonObj"); - listMidMenuItems(("listHosts&type=Routing&clusterid="+objCluster.id), hostGetSearchParams, "listhostsresponse", "host", "jsp/host.jsp", afterLoadHostJSP, hostToMidmenu, hostToRightPanel, getMidmenuId, false, ("cluster_"+objCluster.id)); - - /* - clearButtonsOnTop(); - - initDialog("dialog_add_host"); - initDialog("dialog_add_pool"); - bindEventHandlerToDialogAddPool($("#dialog_add_pool")); - - clusterJsonToRightPanel($leftmenuItem1); - */ -} - -/* -function clusterJsonToRightPanel($leftmenuItem1) { - var objCluster = $leftmenuItem1.data("jsonObj"); - - clearButtonsOnTop(); - initAddHostButton($("#midmenu_add_host_button"), "cluster_page", $leftmenuItem1); - - initAddPrimaryStorageButton($("#midmenu_add_primarystorage_button"), "cluster_page", $leftmenuItem1); - - listMidMenuItems(("listHosts&type=Routing&clusterid="+objCluster.id), hostGetSearchParams, "listhostsresponse", "host", "jsp/host.jsp", afterLoadHostJSP, hostToMidmenu, hostToRightPanel, getMidmenuId, false, ("cluster_"+objCluster.id)); - - $("#right_panel_content").data("$leftmenuItem1", $leftmenuItem1); - clusterJsonToDetailsTab(); -} -*/ - -/* -function clusterJsonToDetailsTab() { - var $leftmenuItem1 = $("#right_panel_content").data("$leftmenuItem1"); - if($leftmenuItem1 == null) - return; - - var jsonObj = $leftmenuItem1.data("jsonObj"); - if(jsonObj == null) - return; - - $.ajax({ - data: createURL("command=listClusters&id="+jsonObj.id), - dataType: "json", - async: false, - success: function(json) { - var items = json.listclustersresponse.cluster; - if(items != null && items.length > 0) { - jsonObj = items[0]; - $leftmenuItem1.data("jsonObj", jsonObj); - } - } - }); - - var $detailsTab = $("#right_panel_content").find("#tab_content_details"); - $detailsTab.find("#id").text(fromdb(jsonObj.id)); - $detailsTab.find("#name").text(fromdb(jsonObj.name)); - $detailsTab.find("#zonename").text(fromdb(jsonObj.zonename)); - $detailsTab.find("#podname").text(fromdb(jsonObj.podname)); -} -*/ diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js index 571cfd7e19f..10292d7c5fd 100644 --- a/ui/scripts/cloud.core.resource.js +++ b/ui/scripts/cloud.core.resource.js @@ -179,23 +179,9 @@ function buildZoneTree() { $("#leftmenu_cluster_node_template").unbind("click").bind("click", function(event) { selectRowInZoneTree($(this).find("#cluster_header")); - - if(currentRightPanelJSP != "jsp/cluster.jsp") { - removeDialogs(); - - var $thisNode = $(this); - $("#right_panel").load("jsp/cluster.jsp", function(){ - currentRightPanelJSP = "jsp/cluster.jsp"; - - $(this).data("onRefreshFn", function() { - clusterJsonToDetailsTab(); - }); - afterLoadClusterJSP($thisNode); - }); - } - else { - clusterJsonToRightPanel($(this)) - } + + var objCluster = $(this).data("jsonObj"); + listMidMenuItems(("listHosts&type=Routing&clusterid="+objCluster.id), hostGetSearchParams, "listhostsresponse", "host", "jsp/host.jsp", afterLoadHostJSP, hostToMidmenu, hostToRightPanel, getMidmenuId, false, ("cluster_"+objCluster.id)); return false; });