mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Syntax fixes for IE7
This commit is contained in:
bfederle
parent
1b2150498a
commit
f076a4a8a7
@ -3,11 +3,11 @@
|
||||
title: 'Events',
|
||||
id: 'events',
|
||||
sectionSelect: {
|
||||
preFilter: function(args) {
|
||||
if(isAdmin())
|
||||
preFilter: function(args) {
|
||||
if(isAdmin())
|
||||
return ["events", "alerts"];
|
||||
else
|
||||
return ["events"];
|
||||
return ["events"];
|
||||
},
|
||||
label: 'Select view'
|
||||
},
|
||||
@ -24,7 +24,7 @@
|
||||
username: { label: 'Initiated By' },
|
||||
created: { label: 'Date', converter: cloudStack.converters.toLocalDate }
|
||||
},
|
||||
dataProvider: function(args) {
|
||||
dataProvider: function(args) {
|
||||
$.ajax({
|
||||
url: createURL("listEvents&page="+args.page+"&pagesize="+pageSize),
|
||||
dataType: "json",
|
||||
@ -47,7 +47,7 @@
|
||||
created: { label: 'Date', converter: cloudStack.converters.toLocalDate }
|
||||
}
|
||||
],
|
||||
dataProvider: function(args) {
|
||||
dataProvider: function(args) {
|
||||
args.response.success({data: args.context.events[0]});
|
||||
}
|
||||
}
|
||||
@ -61,7 +61,7 @@
|
||||
listView: {
|
||||
id: 'alerts',
|
||||
label: 'Alerts',
|
||||
fields: {
|
||||
fields: {
|
||||
description: { label: 'Description' },
|
||||
sent: { label: 'Date', converter: cloudStack.converters.toLocalDate }
|
||||
},
|
||||
@ -88,10 +88,10 @@
|
||||
sent: { label: 'Date', converter: cloudStack.converters.toLocalDate }
|
||||
}
|
||||
],
|
||||
dataProvider: function(args) {
|
||||
dataProvider: function(args) {
|
||||
args.response.success({data: args.context.alerts[0]});
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -214,8 +214,8 @@
|
||||
|
||||
detailView: {
|
||||
name: 'Guest network details',
|
||||
viewAll: {
|
||||
path: 'network.ipAddresses',
|
||||
viewAll: {
|
||||
path: 'network.ipAddresses',
|
||||
label: 'IP addresses',
|
||||
preFilter: function(args) {
|
||||
if (args.context.networks[0].state == 'Destroyed') return false;
|
||||
@ -247,7 +247,7 @@
|
||||
|
||||
//args.data.networkofferingid is null when networkofferingid field is hidden
|
||||
if(args.data.networkofferingid != null && args.data.networkofferingid != args.context.networks[0].networkofferingid)
|
||||
array1.push("&networkofferingid=" + todb(args.data.networkofferingid));
|
||||
array1.push("&networkofferingid=" + todb(args.data.networkofferingid));
|
||||
|
||||
//args.data.networkdomain is null when networkdomain field is hidden
|
||||
if(args.data.networkdomain != null && args.data.networkdomain != args.context.networks[0].networkdomain)
|
||||
@ -271,24 +271,24 @@
|
||||
}
|
||||
});
|
||||
},
|
||||
notification: {
|
||||
notification: {
|
||||
poll: pollAsyncJobResult
|
||||
}
|
||||
},
|
||||
|
||||
'restart': {
|
||||
|
||||
'restart': {
|
||||
label: 'Restart network',
|
||||
action: function(args) {
|
||||
action: function(args) {
|
||||
$.ajax({
|
||||
url: createURL("restartNetwork&cleanup=true&id=" + args.context.networks[0].id),
|
||||
dataType: "json",
|
||||
async: true,
|
||||
success: function(json) {
|
||||
success: function(json) {
|
||||
var jid = json.restartnetworkresponse.jobid;
|
||||
args.response.success(
|
||||
{_custom:
|
||||
{jobId: jid,
|
||||
getUpdatedItem: function(json) {
|
||||
getUpdatedItem: function(json) {
|
||||
return json.queryasyncjobresultresponse.jobresult.network;
|
||||
}
|
||||
}
|
||||
@ -307,9 +307,9 @@
|
||||
},
|
||||
notification: {
|
||||
poll: pollAsyncJobResult
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
destroy: {
|
||||
label: 'Delete network',
|
||||
messages: {
|
||||
@ -361,18 +361,18 @@
|
||||
zone = json.listzonesresponse.zone[0];
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
if(zone.networktype == "Basic") {
|
||||
hiddenFields.push("account");
|
||||
hiddenFields.push("gateway");
|
||||
//hiddenFields.push("netmask");
|
||||
//hiddenFields.push("netmask");
|
||||
}
|
||||
|
||||
if(args.context.networks[0].type == "Isolated") {
|
||||
hiddenFields.push("networkofferingdisplaytext");
|
||||
hiddenFields.push("networkdomaintext");
|
||||
hiddenFields.push("gateway");
|
||||
//hiddenFields.push("netmask");
|
||||
//hiddenFields.push("netmask");
|
||||
}
|
||||
else { //selectedGuestNetworkObj.type == "Shared"
|
||||
hiddenFields.push("networkofferingid");
|
||||
@ -398,7 +398,7 @@
|
||||
},
|
||||
state: {
|
||||
label: 'State'
|
||||
},
|
||||
},
|
||||
restartrequired: {
|
||||
label: 'Restart required',
|
||||
converter: function(booleanValue) {
|
||||
@ -407,7 +407,7 @@
|
||||
else if(booleanValue == false)
|
||||
return "No";
|
||||
}
|
||||
},
|
||||
},
|
||||
vlan: { label: 'VLAN ID' },
|
||||
scope: { label: 'Scope' },
|
||||
//networkofferingdisplaytext: { label: 'Network offering' },
|
||||
@ -419,7 +419,7 @@
|
||||
args.response.success({ data: [] });
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
var items = [];
|
||||
$.ajax({
|
||||
url: createURL("listNetworkOfferings&networkid=" + args.context.networks[0].id),
|
||||
@ -446,9 +446,9 @@
|
||||
args.response.success({data: items});
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
gateway: { label: 'Gateway' },
|
||||
//netmask: { label: 'Netmask' },
|
||||
//netmask: { label: 'Netmask' },
|
||||
cidr: { label: 'CIDR' },
|
||||
networkdomaintext: {
|
||||
label: 'Network domain'
|
||||
@ -470,7 +470,7 @@
|
||||
data: args.context.networks[0]
|
||||
});
|
||||
}
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -86,7 +86,7 @@
|
||||
invitations: function() {
|
||||
return $('<div>').addClass('management-invite').data('tab-title', 'Invitations');
|
||||
},
|
||||
|
||||
|
||||
resources: function() {
|
||||
var $resources = $('<div>').addClass('resources').data('tab-title', 'Resources');
|
||||
var $form = $('<form>');
|
||||
@ -101,7 +101,7 @@
|
||||
var resource = this;
|
||||
var $field = $('<div>').addClass('field');
|
||||
var $label = $('<label>').attr({
|
||||
for: resource.type
|
||||
'for': resource.type
|
||||
}).html(resource.label);
|
||||
var $input = $('<input>').attr({
|
||||
type: 'text',
|
||||
@ -397,7 +397,7 @@
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
// Save button
|
||||
var $saveButton = $nextButton.clone().appendTo($review);
|
||||
$saveButton.html('Save');
|
||||
@ -414,7 +414,7 @@
|
||||
|
||||
return $review;
|
||||
});
|
||||
|
||||
|
||||
$(':ui-dialog').dialog('option', 'position', 'center');
|
||||
});
|
||||
$laterButton.html('Close').appendTo($userManagement);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user