apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - display boolean field as text instead of icon. make Edit button always show.

Browse Source
This commit is contained in:
Jessica Wang 2010-09-16 14:50:01 -07:00
parent 6731dc66f1
commit dbde0cd39b
6 changed files with 44 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ui/new/jsp/instance.jsp
View File

@ -75,12 +75,10 @@
<div class="grid_rows odd"> <div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
<%=t.t("HA")%>:</div> <%=t.t("HA.Enabled")%>:</div>
</div> </div>
<div class="grid_row_cell" style="width: 79%;"> <div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="ha"> <div class="row_celltitles" id="haenable">
<div id="icon">
</div>
</div> </div>
</div> </div>
</div> </div>
@ -127,12 +125,10 @@
<div class="grid_rows odd"> <div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
<%=t.t("ISO")%>:</div> <%=t.t("ISO.attached")%>:</div>
</div> </div>
<div class="grid_row_cell" style="width: 79%;"> <div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="iso"> <div class="row_celltitles" id="iso">
<div id="icon">
</div>
</div> </div>
</div> </div>
</div> </div>

2
ui/new/jsp/iso.jsp
View File

@ -108,8 +108,6 @@
</div> </div>
<div class="grid_row_cell" style="width: 79%;"> <div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="bootable"> <div class="row_celltitles" id="bootable">
<div id="icon">
</div>
</div> </div>
</div> </div>
</div> </div>

8
ui/new/jsp/template.jsp
View File

@ -113,8 +113,6 @@
</div> </div>
<div class="grid_row_cell" style="width: 79%;"> <div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="passwordenabled"> <div class="row_celltitles" id="passwordenabled">
<div id="icon">
</div>
</div> </div>
<select class="select" id="passwordenabled_edit" style="width: 202px; display: none;"> <select class="select" id="passwordenabled_edit" style="width: 202px; display: none;">
<option value="false">No</option> <option value="false">No</option>
@ -129,8 +127,6 @@
</div> </div>
<div class="grid_row_cell" style="width: 79%;"> <div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="ispublic"> <div class="row_celltitles" id="ispublic">
<div id="icon">
</div>
</div> </div>
<select class="select" id="ispublic_edit" style="width: 202px; display: none;"> <select class="select" id="ispublic_edit" style="width: 202px; display: none;">
<option value="true">Yes</option> <option value="true">Yes</option>
@ -145,8 +141,6 @@
</div> </div>
<div class="grid_row_cell" style="width: 79%;"> <div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="isfeatured"> <div class="row_celltitles" id="isfeatured">
<div id="icon">
</div>
</div> </div>
<select class="select" id="isfeatured_edit" style="width: 202px; display: none;"> <select class="select" id="isfeatured_edit" style="width: 202px; display: none;">
<option value="true">Yes</option> <option value="true">Yes</option>
@ -161,8 +155,6 @@
</div> </div>
<div class="grid_row_cell" style="width: 79%;"> <div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="crossZones"> <div class="row_celltitles" id="crossZones">
<div id="icon">
</div>
</div> </div>
</div> </div>
</div> </div>

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

@ -377,36 +377,44 @@ function clickInstanceGroupHeader($arrowIcon) {
} }
function vmToRightPanel($midmenuItem) { function vmToRightPanel($midmenuItem) {
//details tab var json = $midmenuItem.data("jsonObj");
if($midmenuItem.find("#info_icon").css("display") != "none") { vmJsonToDetailsTab(json, $midmenuItem);
$rightPanelContent.find("#after_action_info").text($midmenuItem.data("afterActionInfo"));
if($midmenuItem.find("#info_icon").hasClass("error"))
$rightPanelContent.find("#after_action_info_container").addClass("errorbox");
else
$rightPanelContent.find("#after_action_info_container").removeClass("errorbox");
$rightPanelContent.find("#after_action_info_container").show();
}
else {
$rightPanelContent.find("#after_action_info").text("");
$rightPanelContent.find("#after_action_info_container").hide();
} }
var jsonObj = $midmenuItem.data("jsonObj"); function vmJsonToDetailsTab(jsonObj, $midmenuItem){
var $detailsTab = $("#right_panel_content #tab_content_details");
$detailsTab.data("jsonObj", jsonObj);
//details tab
if($midmenuItem.find("#info_icon").css("display") != "none") {
$detailsTab.find("#after_action_info").text($midmenuItem.data("afterActionInfo"));
if($midmenuItem.find("#info_icon").hasClass("error"))
$detailsTab.find("#after_action_info_container").addClass("errorbox");
else
$detailsTab.find("#after_action_info_container").removeClass("errorbox");
$detailsTab.find("#after_action_info_container").show();
}
else {
$detailsTab.find("#after_action_info").text("");
$detailsTab.find("#after_action_info_container").hide();
}
var vmName = getVmName(jsonObj.name, jsonObj.displayname); var vmName = getVmName(jsonObj.name, jsonObj.displayname);
$rightPanelHeader.find("#vm_name").text(fromdb(vmName)); $rightPanelHeader.find("#vm_name").text(fromdb(vmName));
updateVirtualMachineStateInRightPanel(jsonObj.state); updateVirtualMachineStateInRightPanel(jsonObj.state);
$rightPanelContent.find("#ipAddress").text(jsonObj.ipaddress); $detailsTab.find("#ipAddress").text(jsonObj.ipaddress);
$rightPanelContent.find("#zoneName").text(fromdb(jsonObj.zonename)); $detailsTab.find("#zoneName").text(fromdb(jsonObj.zonename));
$rightPanelContent.find("#templateName").text(fromdb(jsonObj.templatename)); $detailsTab.find("#templateName").text(fromdb(jsonObj.templatename));
$rightPanelContent.find("#serviceOfferingName").text(fromdb(jsonObj.serviceofferingname)); $detailsTab.find("#serviceOfferingName").text(fromdb(jsonObj.serviceofferingname));
$rightPanelContent.find("#created").text(jsonObj.created); $detailsTab.find("#created").text(jsonObj.created);
$rightPanelContent.find("#account").text(fromdb(jsonObj.account)); $detailsTab.find("#account").text(fromdb(jsonObj.account));
$rightPanelContent.find("#domain").text(fromdb(jsonObj.domain)); $detailsTab.find("#domain").text(fromdb(jsonObj.domain));
$rightPanelContent.find("#hostName").text(fromdb(jsonObj.hostname)); $detailsTab.find("#hostName").text(fromdb(jsonObj.hostname));
$rightPanelContent.find("#group").text(fromdb(jsonObj.group)); $detailsTab.find("#group").text(fromdb(jsonObj.group));
setBooleanField(jsonObj.haenable, $rightPanelContent.find("#ha")); setBooleanField(jsonObj.haenable, $detailsTab.find("#haenable"));
setBooleanField((jsonObj.isoid != null && jsonObj.isoid.length > 0), $rightPanelContent.find("#iso")); setBooleanField((jsonObj.isoid != null && jsonObj.isoid.length > 0), $detailsTab.find("#iso"));
//volume tab //volume tab
//if (getHypervisorType() == "kvm") //if (getHypervisorType() == "kvm")
@ -418,7 +426,7 @@ function clickInstanceGroupHeader($arrowIcon) {
success: function(json) { success: function(json) {
var items = json.listvolumesresponse.volume; var items = json.listvolumesresponse.volume;
if (items != null && items.length > 0) { if (items != null && items.length > 0) {
var container = $rightPanelContent.find("#tab_content_volume").empty(); var container = $detailsTab.find("#tab_content_volume").empty();
var template = $("#volume_tab_template"); var template = $("#volume_tab_template");
for (var i = 0; i < items.length; i++) { for (var i = 0; i < items.length; i++) {
var newTemplate = template.clone(true); var newTemplate = template.clone(true);

10
ui/new/scripts/cloud.core2.js
View File

@ -513,12 +513,12 @@ function todb(val) {
var midmenuItemCount = 20; var midmenuItemCount = 20;
function setBooleanField(value, $field) { function setBooleanField(value, $field) {
if(value == "true") if(value == "true" || value == true)
$field.find("#icon").removeClass("cross_icon").addClass("tick_icon").show(); $field.text("Yes").show();
else if(value == "false") else if(value == "false" || value == false)
$field.find("#icon").removeClass("tick_icon").addClass("cross_icon").show(); $field.text("No").show();
else else
$field.find("#icon").hide(); $field.hide();
} }
function clearLeftMenu() { function clearLeftMenu() {

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

@ -10,7 +10,6 @@ function afterLoadTemplateJSP() {
$("#edit_button").bind("click", function(event){ $("#edit_button").bind("click", function(event){
$readonlyFields.hide(); $readonlyFields.hide();
$editFields.show(); $editFields.show();
$(this).hide();
$("#cancel_button, #save_button").show() $("#cancel_button, #save_button").show()
return false; return false;
}); });
@ -18,7 +17,6 @@ function afterLoadTemplateJSP() {
$editFields.hide(); $editFields.hide();
$readonlyFields.show(); $readonlyFields.show();
$("#save_button, #cancel_button").hide(); $("#save_button, #cancel_button").hide();
$("#edit_button").show();
return false; return false;
}); });
$("#save_button").bind("click", function(event){ $("#save_button").bind("click", function(event){
@ -26,7 +24,6 @@ function afterLoadTemplateJSP() {
$editFields.hide(); $editFields.hide();
$readonlyFields.show(); $readonlyFields.show();
$("#save_button, #cancel_button").hide(); $("#save_button, #cancel_button").hide();
$("#edit_button").show();
return false; return false;
}); });