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

new UI - ISO page - remove edit button, add Edit ISO link into action menu

This commit is contained in:
Jessica Wang 2010-10-19 17:37:55 -07:00
parent a007cf2495
commit 09f2836dd9
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,10 +24,7 @@
<%=t.t("Details")%></div>
</div>
<div id="tab_content_details">
<div class="grid_actionpanel">
<div class="grid_editbox" id="edit_button">
</div>
<div class="grid_actionpanel">
<div class="gridheader_loaderbox" id="spinning_wheel" style="border: 1px solid #999;
display: none;">
<div class="gridheader_loader" id="Div1">

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

@ -84,11 +84,6 @@ function afterLoadIsoJSP() {
return false;
});
//edit button ***
var $readonlyFields = $detailsTab.find("#name, #displaytext");
var $editFields = $detailsTab.find("#name_edit, #displaytext_edit");
initializeEditFunction($readonlyFields, $editFields, doUpdateIso);
//populate dropdown ***
var addIsoZoneField = $("#dialog_add_iso #add_iso_zone");
if (isAdmin())
@ -219,10 +214,11 @@ function isoJsonToDetailsTab(jsonObj) {
// "Edit", "Copy", "Create VM"
if ((isUser() && jsonObj.ispublic == "true" && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.isready == "false") {
$("#edit_button").hide();
//$("#edit_button").hide();
}
else {
$("#edit_button").show();
buildActionLinkForDetailsTab("Edit ISO", isoActionMap, $actionMenu, midmenuId);
//$("#edit_button").show();
buildActionLinkForDetailsTab("Copy ISO", isoActionMap, $actionMenu, midmenuId);
noAvailableActions = false;
}
@ -274,6 +270,9 @@ function isoClearDetailsTab() {
}
var isoActionMap = {
"Edit ISO": {
dialogBeforeActionFn : doEditISO
},
"Delete ISO": {
isAsyncJob: true,
asyncJobResponse: "deleteisosresponse",
@ -303,7 +302,31 @@ var isoActionMap = {
}
}
function doUpdateIso() {
function doEditISO() {
var $detailsTab = $("#right_panel_content #tab_content_details");
var $readonlyFields = $detailsTab.find("#name, #displaytext");
var $editFields = $detailsTab.find("#name_edit, #displaytext_edit");
$readonlyFields.hide();
$editFields.show();
$detailsTab.find("#cancel_button, #save_button").show();
$detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){
$editFields.hide();
$readonlyFields.show();
$("#save_button, #cancel_button").hide();
return false;
});
$detailsTab.find("#save_button").unbind("click").bind("click", function(event){
doEditISO2($detailsTab);
$editFields.hide();
$readonlyFields.show();
$("#save_button, #cancel_button").hide();
return false;
});
}
function doEditISO2($detailsTab) {
var $detailsTab = $("#right_panel_content #tab_content_details");
// validate values

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

@ -280,7 +280,6 @@ function templateJsonToDetailsTab(jsonObj) {
// action Edit, Copy, Create VM
if ((isUser() && jsonObj.ispublic == "true" && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.id==DomRTemplateId || jsonObj.isready == "false") {
//template.find("#template_edit_container, #template_copy_container, #template_create_vm_container").hide();
//$("#edit_button").hide();
}
else {