mirror of https://github.com/apache/cloudstack.git
Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss
This commit is contained in:
will
commit
111a92c56c
|
|
@ -929,7 +929,7 @@ CREATE TABLE `cloud`.`load_balancer` (
|
|||
CREATE TABLE `cloud`.`storage_pool` (
|
||||
`id` bigint unsigned UNIQUE NOT NULL,
|
||||
`name` varchar(255) COMMENT 'should be NOT NULL',
|
||||
`uuid` varchar(255) NOT NULL,
|
||||
`uuid` varchar(255),
|
||||
`pool_type` varchar(32) NOT NULL,
|
||||
`port` int unsigned NOT NULL,
|
||||
`data_center_id` bigint unsigned NOT NULL,
|
||||
|
|
|
|||
|
|
@ -3198,7 +3198,7 @@ a:hover.search_button {
|
|||
}
|
||||
|
||||
.network_dgbox {
|
||||
width:440px;
|
||||
width:500px;
|
||||
height:auto;
|
||||
float:left;
|
||||
margin:20px 0 0 10px;
|
||||
|
|
@ -3207,7 +3207,7 @@ a:hover.search_button {
|
|||
}
|
||||
|
||||
.networkdg_zonepanel {
|
||||
width:440px;
|
||||
width:500px;
|
||||
height:75px;
|
||||
float:left;
|
||||
margin:0;
|
||||
|
|
@ -3219,7 +3219,7 @@ a:hover.search_button {
|
|||
height:71px;
|
||||
float:left;
|
||||
background:url(../images/network_zonecloud.gif) no-repeat top left;
|
||||
margin:0 0 0 109px;
|
||||
margin:0 0 0 169px;
|
||||
display:inline;
|
||||
padding:0;
|
||||
}
|
||||
|
|
@ -3246,7 +3246,7 @@ a:hover.search_button {
|
|||
}
|
||||
|
||||
.networkswitchpanel {
|
||||
width:440px;
|
||||
width:500px;
|
||||
height:auto;
|
||||
float:left;
|
||||
margin:0;
|
||||
|
|
@ -3254,7 +3254,7 @@ a:hover.search_button {
|
|||
}
|
||||
|
||||
.networkswitch_titlebox {
|
||||
width:370px;
|
||||
width:430px;
|
||||
height:19px;
|
||||
float:left;
|
||||
background:#fefbdc repeat top left;
|
||||
|
|
@ -3287,7 +3287,7 @@ a:hover.search_button {
|
|||
}
|
||||
|
||||
.networkswitch_midpanel {
|
||||
width:420px;
|
||||
width:480px;
|
||||
height:auto;
|
||||
float:left;
|
||||
background:url(../images/vlan_barbg.gif) repeat-y top left;
|
||||
|
|
@ -3299,7 +3299,7 @@ a:hover.search_button {
|
|||
|
||||
|
||||
.networkswitch_vlanpanel {
|
||||
width:404px;
|
||||
width:464px;
|
||||
height:auto;
|
||||
float:left;
|
||||
margin:35px 0 0 16px;
|
||||
|
|
@ -3308,14 +3308,58 @@ a:hover.search_button {
|
|||
}
|
||||
|
||||
.networkswitch_vlanconnect {
|
||||
width:404px;
|
||||
width:464px;
|
||||
height:12px;
|
||||
float:left;
|
||||
position:relative;
|
||||
background:url(../images/vlan_connect.gif) no-repeat top left;
|
||||
margin:26px 0 0 0;
|
||||
padding:0;
|
||||
}
|
||||
|
||||
.networkswitch_infodropdown {
|
||||
width:200px;
|
||||
height:auto;
|
||||
background:#FFF;
|
||||
border:1px solid #999;
|
||||
position:absolute;
|
||||
top:5px;
|
||||
left:8px;
|
||||
margin:0;
|
||||
padding:0 0 10px 0;
|
||||
}
|
||||
|
||||
.networkswitch_infodropdown_textbox {
|
||||
width:180px;
|
||||
height:auto;
|
||||
float:left;
|
||||
margin:0 0 0 10px;
|
||||
display:inline;
|
||||
padding:0;
|
||||
}
|
||||
|
||||
.networkswitch_infodropdown_textbox li{
|
||||
width:180px;
|
||||
height:auto;
|
||||
float:left;
|
||||
margin:10px 0 0 0;
|
||||
color:#333;
|
||||
font-size:11px;
|
||||
font-weight:bold;
|
||||
list-style:none;
|
||||
display:inline;
|
||||
padding:0;
|
||||
}
|
||||
|
||||
.networkswitch_infodropdown_textbox_label {
|
||||
width:60px;
|
||||
height:auto;
|
||||
float:left;
|
||||
font-weight:normal;
|
||||
margin:1px 0 0 0;
|
||||
padding:0;
|
||||
}
|
||||
|
||||
.networkswitch_vlan_infoicon {
|
||||
width:12px;
|
||||
height:15px;
|
||||
|
|
@ -3333,7 +3377,7 @@ a:hover.search_button {
|
|||
}
|
||||
|
||||
.networkswitch_vlan_detailsbox {
|
||||
width:167px;
|
||||
width:230px;
|
||||
height:auto;
|
||||
float:left;
|
||||
background:#e9e9e9 url(../images/networkswitch_detailsbox.gif) repeat-x top left;
|
||||
|
|
@ -3341,16 +3385,16 @@ a:hover.search_button {
|
|||
border-right:2px solid #d1d1d1;
|
||||
border-left:1px solid #dedede;
|
||||
border-bottom:1px solid #dedede;
|
||||
margin:-20px 0 0 30px;
|
||||
margin:-20px 0 0 20px;
|
||||
display:inline;
|
||||
padding:0 0 8px 0;
|
||||
}
|
||||
|
||||
.networkswitch_vlan_detailsbox_textbox {
|
||||
width:150px;
|
||||
width:225px;
|
||||
height:auto;
|
||||
float:left;
|
||||
margin:6px 0 0 8px;
|
||||
margin:6px 0 0 5px;
|
||||
padding:0;
|
||||
}
|
||||
|
||||
|
|
@ -3377,7 +3421,7 @@ a:hover.search_button {
|
|||
font-size:11px;
|
||||
font-weight:bold;
|
||||
text-align:left;
|
||||
margin:0;
|
||||
margin:-1px 0 0 0;
|
||||
padding:0;
|
||||
}
|
||||
|
||||
|
|
@ -3399,6 +3443,21 @@ a:hover.search_button {
|
|||
background:url(../images/networkswitch_virtualicon.gif) no-repeat top left;
|
||||
}
|
||||
|
||||
.networkswitch_closeicon{
|
||||
width:12px;
|
||||
height:12px;
|
||||
float:left;
|
||||
background:url(../images/search_closeicon.gif) no-repeat top left;
|
||||
margin:-22px 0 0 10px;
|
||||
padding:0;
|
||||
cursor:hand;
|
||||
cursor:pointer;
|
||||
}
|
||||
|
||||
.networkswitch_closeicon{
|
||||
background:url(../images/search_closeicon_hover.gif) no-repeat top left;
|
||||
}
|
||||
|
||||
|
||||
.networkswitch_end {
|
||||
width:43px;
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
Loading…
Reference in New Issue