etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new UI - resources page - add system VM under each zone.

This commit is contained in:
Jessica Wang 2010-10-11 10:10:14 -07:00
parent deb01d6ba8
commit 85c25acf4b
4 changed files with 71 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ui/new/css/main.css
View File

@ -3407,6 +3407,15 @@ a:hover.search_button {
padding:0;
}
.zonetree_systemvmicon {
width:22px;
height:18px;
float:left;
background:url(../images/zone_systemvmicon.png) no-repeat top left;
font-weight:bold;
margin:3px 0 0 5px;
padding:0;
}
.zonetree_links {
width:auto;

BIN
ui/new/images/zone_systemvmicon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

14
ui/new/jsp/resource.jsp
View File

@ -295,6 +295,8 @@
</div>
<div id="zone_content" style="display:none">
<div id="pods_container">
</div>
<div id="systemvms_container">
</div>
</div>
</div>
@ -319,3 +321,15 @@
</div>
</div>
<!-- Pod Template (end) -->
<!-- SystemVM Template (begin) -->
<div id="systemvm_template" style="display:none">
<div id="row_container">
<div class="zonetree_secondlevel">
<div class="zonetree_systemvmicon"></div>
<p>System VM:<div class="zonetree_links" id="systemvm_name">(System VM name)</div></p>
</div>
</div>
</div>
<!-- SystemVM Template (end) -->

64
ui/new/scripts/cloud.core2.resource.js
View File

@ -12,13 +12,13 @@ function afterLoadResourceJSP() {
data: createURL("command=listZones&available=true&response=json"+maxPageSize),
dataType: "json",
success: function(json) {
var zones = json.listzonesresponse.zone;
var grid = $("#zonetree1 #zones_container").empty();
if (zones != null && zones.length > 0) {
for (var i = 0; i < zones.length; i++) {
var template = $("#zone_template").clone(true).attr("id", "zone_"+zones[i].id);
zoneJSONToTemplate(zones[i], template);
grid.append(template.show());
var items = json.listzonesresponse.zone;
var container = $("#zonetree1 #zones_container").empty();
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
var template = $("#zone_template").clone(true).attr("id", "zone_"+items[i].id);
zoneJSONToTemplate(items[i], template);
container.append(template.show());
}
}
}
@ -42,17 +42,33 @@ function afterLoadResourceJSP() {
template.find("#zone_name").data("vlan", json.vlan);
$.ajax({
data: createURL("command=listPods&zoneid="+zoneid+"&response=json"),
data: createURL("command=listPods&zoneid="+zoneid+"&response=json"),
dataType: "json",
success: function(json) {
var pods = json.listpodsresponse.pod;
var grid = template.find("#pods_container").empty();
if (pods != null && pods.length > 0) {
for (var i = 0; i < pods.length; i++) {
var podTemplate = $("#pod_template").clone(true).attr("id", "pod_"+pods[i].id);
podJSONToTemplate(pods[i], podTemplate);
grid.append(podTemplate.show());
forceLogout = false;
var items = json.listpodsresponse.pod;
var container = template.find("#pods_container").empty();
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
var podTemplate = $("#pod_template").clone(true).attr("id", "pod_"+items[i].id);
podJSONToTemplate(items[i], podTemplate);
container.append(podTemplate.show());
forceLogout = false; // We don't force a logout if pod(s) exit.
}
}
}
});
$.ajax({
data: createURL("command=listSystemVms&zoneid="+zoneid+"&response=json"),
dataType: "json",
success: function(json) {
var items = json.listsystemvmsresponse.systemvm;
var container = template.find("#systemvms_container").empty();
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
var systemvmTemplate = $("#systemvm_template").clone(true).attr("id", "systemvm_"+items[i].id);
systemvmJSONToTemplate(items[i], systemvmTemplate);
container.append(systemvmTemplate.show());
}
}
}
@ -85,6 +101,22 @@ function afterLoadResourceJSP() {
podName.data("gateway", json.gateway);
}
function systemvmJSONToTemplate(json, template) {
template.data("id", json.id).data("name", json.name);
var systeymvmName = template.find("#systemvm_name").text(json.name);
systeymvmName.data("systemvmtype", json.systemvmtype);
systeymvmName.data("name", json.name);
systeymvmName.data("zonename", json.zonename);
systeymvmName.data("activeviewersessions", json.activeviewersessions);
systeymvmName.data("publicip", json.publicip);
systeymvmName.data("privateip", json.privateip);
systeymvmName.data("hostname", json.hostname);
systeymvmName.data("gateway", json.gateway);
systeymvmName.data("created", json.created);
systeymvmName.data("state", json.state);
}
$("#zone_template").bind("click", function(event) {
var template = $(this);
var target = $(event.target);