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

new UI - template page, ISO page - add middle menu icons.

This commit is contained in:
Jessica Wang 2010-09-13 17:52:05 -07:00
parent b86382c385
commit b137b08731
8 changed files with 45 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/new/scripts/cloud.core2.account.js
View File

@ -6,13 +6,13 @@ function accountToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
$midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));
$midmenuItem1.data("jsonObj", jsonObj);
var iconContainer = $midmenuItem1.find("#icon_container").show();
var $iconContainer = $midmenuItem1.find("#icon_container").show();
if (jsonObj.accounttype == roleTypeUser)
iconContainer.find("#icon").attr("src", "images/midmenuicon_account_user.png");
$iconContainer.find("#icon").attr("src", "images/midmenuicon_account_user.png");
else if (jsonObj.accounttype == roleTypeAdmin)
iconContainer.find("#icon").attr("src", "images/midmenuicon_account_admin.png");
$iconContainer.find("#icon").attr("src", "images/midmenuicon_account_admin.png");
else if (jsonObj.accounttype == roleTypeDomainAdmin)
iconContainer.find("#icon").attr("src", "images/midmenuicon_account_domain.png");
$iconContainer.find("#icon").attr("src", "images/midmenuicon_account_domain.png");
$midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.domain.substring(0,25));

8
ui/new/scripts/cloud.core2.event.js
View File

@ -6,13 +6,13 @@ function eventToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
$midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));
$midmenuItem1.data("jsonObj", jsonObj);
var iconContainer = $midmenuItem1.find("#icon_container").show();
var $iconContainer = $midmenuItem1.find("#icon_container").show();
if(jsonObj.level == "INFO")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png");
$iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png");
else if(jsonObj.level == "ERROR")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png");
$iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png");
else if(jsonObj.level == "WARN")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png");
$iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png");
$midmenuItem1.find("#first_row").text(jsonObj.description.substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));

23
ui/new/scripts/cloud.core2.instance.js
View File

@ -329,19 +329,20 @@ function clickInstanceGroupHeader($arrowIcon) {
midmenuItem.find("#icon").attr("src", "images/status_gray.png");
}
function vmToMidmenu(json, $midmenuItem, toRightPanelFn) {
$midmenuItem.data("jsonObj", json);
$midmenuItem.data("toRightPanelFn", toRightPanelFn);
$midmenuItem.attr("id", ("midmenuItem_"+json.id));
function vmToMidmenu(json, $midmenuItem1, toRightPanelFn) {
$midmenuItem1.data("jsonObj", json);
$midmenuItem1.data("toRightPanelFn", toRightPanelFn);
$midmenuItem1.attr("id", ("midmenuItem_"+json.id));
$midmenuItem.find("#icon").attr("src", "images/status_gray.png");
$midmenuItem.find("#icon_container").show();
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/status_gray.png");
var vmName = getVmName(json.name, json.displayname);
$midmenuItem.find("#first_row").text(vmName);
//$midmenuItem.find("#second_row_label").text("IP Address:");
$midmenuItem.find("#second_row").text(json.ipaddress);
updateVirtualMachineStateInMidMenu(json, $midmenuItem);
$midmenuItem.bind("click", function(event) {
$midmenuItem1.find("#first_row").text(vmName);
//$midmenuItem1.find("#second_row_label").text("IP Address:");
$midmenuItem1.find("#second_row").text(json.ipaddress);
updateVirtualMachineStateInMidMenu(json, $midmenuItem1);
$midmenuItem1.bind("click", function(event) {
var $t = $(this);
vmToRightPanel($t);
return false;

4
ui/new/scripts/cloud.core2.ipaddress.js
View File

@ -6,8 +6,8 @@ function ipToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
$midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));
$midmenuItem1.data("jsonObj", jsonObj);
var iconContainer = $midmenuItem1.find("#icon_container").show();
iconContainer.find("#icon").attr("src", "images/midmenuicon_network_networkgroup.png");
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_network_networkgroup.png");
$midmenuItem1.find("#first_row").text(jsonObj.ipaddress.substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.account.substring(0,25));

13
ui/new/scripts/cloud.core2.iso.js
View File

@ -5,16 +5,9 @@ function afterLoadIsoJSP() {
function isoToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
$midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));
$midmenuItem1.data("jsonObj", jsonObj);
/*
var iconContainer = $midmenuItem1.find("#icon_container").show();
if(jsonObj.level == "INFO")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png");
else if(jsonObj.level == "ERROR")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png");
else if(jsonObj.level == "WARN")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png");
*/
var $iconContainer = $midmenuItem1.find("#icon_container").show();
setIconByOsType(jsonObj.ostypename, $iconContainer.find("#icon"));
$midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.zonename.substring(0,25));

4
ui/new/scripts/cloud.core2.snapshot.js
View File

@ -6,8 +6,8 @@ function snapshotToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
$midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));
$midmenuItem1.data("jsonObj", jsonObj);
var iconContainer = $midmenuItem1.find("#icon_container").show();
iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png");
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_snapshots.png");
$midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.volumename.substring(0,25));

20
ui/new/scripts/cloud.core2.template.js
View File

@ -5,16 +5,16 @@ function afterLoadTemplateJSP() {
function templateToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
$midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));
$midmenuItem1.data("jsonObj", jsonObj);
var $iconContainer = $midmenuItem1.find("#icon_container").show();
setIconByOsType(jsonObj.ostypename, $iconContainer.find("#icon"));
/*
var iconContainer = $midmenuItem1.find("#icon_container").show();
if(jsonObj.level == "INFO")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png");
else if(jsonObj.level == "ERROR")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png");
else if(jsonObj.level == "WARN")
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png");
*/
iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png");
$midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.zonename.substring(0,25));
@ -48,4 +48,16 @@ function templateToRigntPanel($midmenuItem) {
$rightPanelContent.find("#size").text(convertBytes(parseInt(jsonObj.size)));
setDateField(jsonObj.created, $rightPanelContent.find("#created"));
}
//setIconByOsType() is shared by template page and ISO page
function setIconByOsType(osType, $field) {
if (osType == null || osType.length == 0)
return;
if (osType.match("^CentOS") != null)
$field.attr("src", "images/midmenuicon_template_centos.png");
else if (osType.match("^Windows") != null)
$field.attr("src", "images/midmenuicon_template_windows.png");
else
$field.attr("src", "images/midmenuicon_template_linux.png");
}

4
ui/new/scripts/cloud.core2.volume.js
View File

@ -26,8 +26,8 @@ function volumeToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) {
$midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id));
$midmenuItem1.data("jsonObj", jsonObj);
var iconContainer = $midmenuItem1.find("#icon_container").show();
iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png");
var $iconContainer = $midmenuItem1.find("#icon_container").show();
$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png");
$midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25));
$midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25));