mirror of https://github.com/apache/cloudstack.git
Navigation organizational changes
-Rename 'System' -> 'Infrastructure' -Rename 'service offering' -> 'compute offering' (including all associated labels) -Rename 'Configuration' -> 'Service Offerings' -Move hypervisor capabilities under global settings -Rename 'Compute' -> 'Compute and storage'
This commit is contained in:
Brian Federle
parent
2992c608c4
commit
240dabea4b
|
|
@ -1,4 +1,9 @@
|
|||
#new labels (begin) **********************************************************************************************
|
||||
label.add.compute.offering=Add compute offering
|
||||
label.compute.offering=Compute offering
|
||||
label.compute.offerings=Compute offerings
|
||||
label.select.offering=Select offering
|
||||
label.menu.infrastructure=Infrastructure
|
||||
label.sticky.tablesize=Table size
|
||||
label.sticky.expire=Expires
|
||||
label.sticky.cookie-name=Cookie name
|
||||
|
|
@ -317,7 +322,7 @@ label.guest.type=Guest Type
|
|||
label.specify.IP.ranges=Specify IP ranges
|
||||
label.conserve.mode=Conserve mode
|
||||
label.created.by.system=Created by system
|
||||
label.menu.system.service.offerings=System Service Offerings
|
||||
label.menu.system.service.offerings=System Offerings
|
||||
label.add.system.service.offering=Add System Service Offering
|
||||
label.redundant.router.capability=Redundant router capability
|
||||
label.supported.source.NAT.type=Supported Source NAT type
|
||||
|
|
@ -1254,7 +1259,7 @@ message.add.pod=Add a new pod for zone <b><span id="add_pod_zone_name"></span></
|
|||
message.add.primary.storage=Add a new Primary Storage for zone <b><span id="zone_name"></span></b>, pod <b><span id="pod_name"></span></b>
|
||||
message.add.primary=Please specify the following parameters to add a new primary storage
|
||||
message.add.secondary.storage=Add a new storage for zone <b><span id="zone_name"></span></b>
|
||||
message.add.service.offering=Please fill in the following data to add a new service offering.
|
||||
message.add.service.offering=Please fill in the following data to add a new compute offering.
|
||||
message.add.template=Please enter the following data to create your new template
|
||||
message.add.volume=Please fill in the following data to add a new volume.
|
||||
message.additional.networks.desc=Please select additional network(s) that your virtual instance will be connected to.
|
||||
|
|
|
|||
11
ui/index.jsp
11
ui/index.jsp
|
|
@ -68,7 +68,7 @@
|
|||
<ul>
|
||||
<li class="first"><span class="number">1</span><span><fmt:message key="label.setup"/></span><span class="arrow"></span></li>
|
||||
<li><span class="number">2</span><span class="multiline"><fmt:message key="label.select.a.template"/></span><span class="arrow"></span></li>
|
||||
<li><span class="number">3</span><span class="multiline"><fmt:message key="label.service.offering"/></span><span class="arrow"></span></li>
|
||||
<li><span class="number">3</span><span class="multiline"><fmt:message key="label.compute.offering"/></span><span class="arrow"></span></li>
|
||||
<li><span class="number">4</span><span class="multiline"><fmt:message key="label.data.disk.offering"/></span><span class="arrow"></span></li>
|
||||
<li><span class="number">5</span><span><fmt:message key="label.menu.network"/></span><span class="arrow"></span></li>
|
||||
<li class="last"><span class="number">6</span><span><fmt:message key="label.review"/></span></li>
|
||||
|
|
@ -260,7 +260,7 @@
|
|||
|
||||
<!-- Service offering -->
|
||||
<div class="select-desc field service-offering hide-if-unselected">
|
||||
<div class="name"><fmt:message key="label.service.offering"/></div>
|
||||
<div class="name"><fmt:message key="label.compute.offering"/></div>
|
||||
<div class="desc">
|
||||
<select name="new-network-networkofferingid">
|
||||
</select>
|
||||
|
|
@ -362,7 +362,7 @@
|
|||
<!-- Service offering -->
|
||||
<div class="select odd">
|
||||
<div class="name">
|
||||
<span><fmt:message key="label.service.offering"/></span>
|
||||
<span><fmt:message key="label.compute.offering"/></span>
|
||||
</div>
|
||||
<div class="value">
|
||||
<span wizard-field="service-offering"></span>
|
||||
|
|
@ -1614,6 +1614,11 @@
|
|||
|
||||
<script language="javascript">
|
||||
dictionary = {
|
||||
'label.compute.offering': '<fmt:message key="label.compute.offering"/>',
|
||||
'label.add.compute.offering': '<fmt:message key="label.add.compute.offering"/>',
|
||||
'label.compute.offerings': '<fmt:message key="label.compute.offerings"/>',
|
||||
'label.select.offering': '<fmt:message key="label.select.offering"/>',
|
||||
'label.menu.infrastructure': '<fmt:message key="label.menu.infrastructure"/>',
|
||||
'label.sticky.domain': '<fmt:message key="label.sticky.domain"/>',
|
||||
'label.sticky.postonly': '<fmt:message key="label.sticky.postonly"/>',
|
||||
'label.sticky.indirect': '<fmt:message key="label.sticky.indirect"/>',
|
||||
|
|
|
|||
|
|
@ -4,15 +4,15 @@
|
|||
var networkServiceObjs = [], serviceCheckboxNames = [];
|
||||
|
||||
cloudStack.sections.configuration = {
|
||||
title: 'label.configuration',
|
||||
title: 'label.menu.service.offerings',
|
||||
id: 'configuration',
|
||||
sectionSelect: {
|
||||
label: 'label.select-view'
|
||||
label: 'label.select.offering'
|
||||
},
|
||||
sections: {
|
||||
serviceOfferings: {
|
||||
type: 'select',
|
||||
title: 'label.menu.service.offerings',
|
||||
title: 'label.compute.offerings',
|
||||
listView: {
|
||||
id: 'serviceOfferings',
|
||||
label: 'label.menu.service.offerings',
|
||||
|
|
@ -25,19 +25,19 @@
|
|||
|
||||
actions: {
|
||||
add: {
|
||||
label: 'label.add.service.offering',
|
||||
label: 'label.add.compute.offering',
|
||||
|
||||
messages: {
|
||||
confirm: function(args) {
|
||||
return 'message.add.service.offering';
|
||||
},
|
||||
notification: function(args) {
|
||||
return 'label.add.service.offering';
|
||||
return 'label.add.compute.offering';
|
||||
}
|
||||
},
|
||||
|
||||
createForm: {
|
||||
title: 'label.add.service.offering',
|
||||
title: 'label.add.compute.offering',
|
||||
fields: {
|
||||
name: {
|
||||
label: 'label.name',
|
||||
|
|
@ -892,95 +892,7 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
hypervisorCapabilities: {
|
||||
type: 'select',
|
||||
title: 'label.hypervisor.capabilities',
|
||||
listView: {
|
||||
id: 'hypervisorCapabilities',
|
||||
label: 'label.hypervisor.capabilities',
|
||||
fields: {
|
||||
hypervisor: { label: 'label.hypervisor' },
|
||||
hypervisorversion: { label: 'label.hypervisor.version' },
|
||||
maxguestslimit: { label: 'label.max.guest.limit' }
|
||||
},
|
||||
dataProvider: function(args) {
|
||||
var array1 = [];
|
||||
if(args.filterBy != null) {
|
||||
if(args.filterBy.search != null && args.filterBy.search.by != null && args.filterBy.search.value != null) {
|
||||
switch(args.filterBy.search.by) {
|
||||
case "name":
|
||||
if(args.filterBy.search.value.length > 0)
|
||||
array1.push("&keyword=" + args.filterBy.search.value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
url: createURL("listHypervisorCapabilities&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
|
||||
dataType: "json",
|
||||
async: true,
|
||||
success: function(json) {
|
||||
var items = json.listhypervisorcapabilitiesresponse.hypervisorCapabilities;
|
||||
args.response.success({data:items});
|
||||
},
|
||||
error: function(data) {
|
||||
args.response.error(parseXMLHttpResponse(data));
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
detailView: {
|
||||
name: 'label.details',
|
||||
actions: {
|
||||
edit: {
|
||||
label: 'label.edit',
|
||||
action: function(args) {
|
||||
var array1 = [];
|
||||
array1.push("&maxguestslimit=" + todb(args.data.maxguestslimit));
|
||||
$.ajax({
|
||||
url: createURL("updateHypervisorCapabilities&id=" + args.context.hypervisorCapabilities[0].id + array1.join("")),
|
||||
dataType: "json",
|
||||
success: function(json) {
|
||||
var item = json.updatehypervisorcapabilitiesresponse['null'];
|
||||
args.response.success({data: item});
|
||||
},
|
||||
error: function(data) {
|
||||
args.response.error(parseXMLHttpResponse(data));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
tabs: {
|
||||
details: {
|
||||
title: 'label.details',
|
||||
fields: [
|
||||
{
|
||||
id: { label: 'label.id' },
|
||||
hypervisor: { label: 'label.hypervisor' },
|
||||
hypervisorversion: { label: 'label.hypervisor.version' },
|
||||
maxguestslimit: {
|
||||
label: 'label.max.guest.limit',
|
||||
isEditable: true
|
||||
}
|
||||
}
|
||||
],
|
||||
dataProvider: function(args) {
|
||||
args.response.success(
|
||||
{
|
||||
data:args.context.hypervisorCapabilities[0]
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
|
||||
networkOfferings: {
|
||||
type: 'select',
|
||||
|
|
@ -1245,7 +1157,7 @@
|
|||
|
||||
//show or hide upon checked services and selected providers above (begin)
|
||||
serviceOfferingId: {
|
||||
label: 'label.service.offering',
|
||||
label: 'label.compute.offering',
|
||||
select: function(args) {
|
||||
$.ajax({
|
||||
url: createURL('listServiceOfferings&issystem=true'),
|
||||
|
|
|
|||
|
|
@ -2,58 +2,154 @@
|
|||
cloudStack.sections['global-settings'] = {
|
||||
title: 'label.menu.global.settings',
|
||||
id: 'global-settings',
|
||||
listView: {
|
||||
label: 'label.menu.global.settings',
|
||||
actions: {
|
||||
edit: {
|
||||
label: 'label.change.value',
|
||||
action: function(args) {
|
||||
var name = args.data.jsonObj.name;
|
||||
var value = args.data.value;
|
||||
sectionSelect: {
|
||||
label: 'label.select-view'
|
||||
},
|
||||
sections: {
|
||||
globalSettings: {
|
||||
type: 'select',
|
||||
title: 'label.menu.global.settings',
|
||||
listView: {
|
||||
label: 'label.menu.global.settings',
|
||||
actions: {
|
||||
edit: {
|
||||
label: 'label.change.value',
|
||||
action: function(args) {
|
||||
var name = args.data.jsonObj.name;
|
||||
var value = args.data.value;
|
||||
|
||||
$.ajax({
|
||||
url: createURL(
|
||||
'updateConfiguration&name=' + name + '&value=' + value
|
||||
),
|
||||
dataType: 'json',
|
||||
async: true,
|
||||
success: function(json) {
|
||||
var item = json.updateconfigurationresponse.configuration;
|
||||
cloudStack.dialog.notice({ message: _l('message.restart.mgmt.server') });
|
||||
args.response.success({data: item});
|
||||
},
|
||||
error: function(json) {
|
||||
args.response.error(parseXMLHttpResponse(json));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
fields: {
|
||||
name: { label: 'label.name', id: true },
|
||||
description: { label: 'label.description' },
|
||||
value: { label: 'label.value', editable: true }
|
||||
},
|
||||
dataProvider: function(args) {
|
||||
var data = {
|
||||
page: args.page,
|
||||
pagesize: pageSize
|
||||
};
|
||||
|
||||
if (args.filterBy.search.value) {
|
||||
data.name = args.filterBy.search.value;
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
url: createURL(
|
||||
'updateConfiguration&name=' + name + '&value=' + value
|
||||
),
|
||||
dataType: 'json',
|
||||
url: createURL('listConfigurations'),
|
||||
data: data,
|
||||
dataType: "json",
|
||||
async: true,
|
||||
success: function(json) {
|
||||
var item = json.updateconfigurationresponse.configuration;
|
||||
cloudStack.dialog.notice({ message: _l('message.restart.mgmt.server') });
|
||||
args.response.success({data: item});
|
||||
},
|
||||
error: function(json) {
|
||||
args.response.error(parseXMLHttpResponse(json));
|
||||
success: function(json) {
|
||||
var items = json.listconfigurationsresponse.configuration;
|
||||
args.response.success({ data: items });
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
fields: {
|
||||
name: { label: 'label.name', id: true },
|
||||
description: { label: 'label.description' },
|
||||
value: { label: 'label.value', editable: true }
|
||||
},
|
||||
dataProvider: function(args) {
|
||||
var data = {
|
||||
page: args.page,
|
||||
pagesize: pageSize
|
||||
};
|
||||
hypervisorCapabilities: {
|
||||
type: 'select',
|
||||
title: 'label.hypervisor.capabilities',
|
||||
listView: {
|
||||
id: 'hypervisorCapabilities',
|
||||
label: 'label.hypervisor.capabilities',
|
||||
fields: {
|
||||
hypervisor: { label: 'label.hypervisor' },
|
||||
hypervisorversion: { label: 'label.hypervisor.version' },
|
||||
maxguestslimit: { label: 'label.max.guest.limit' }
|
||||
},
|
||||
dataProvider: function(args) {
|
||||
var array1 = [];
|
||||
if(args.filterBy != null) {
|
||||
if(args.filterBy.search != null && args.filterBy.search.by != null && args.filterBy.search.value != null) {
|
||||
switch(args.filterBy.search.by) {
|
||||
case "name":
|
||||
if(args.filterBy.search.value.length > 0)
|
||||
array1.push("&keyword=" + args.filterBy.search.value);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$.ajax({
|
||||
url: createURL("listHypervisorCapabilities&page=" + args.page + "&pagesize=" + pageSize + array1.join("")),
|
||||
dataType: "json",
|
||||
async: true,
|
||||
success: function(json) {
|
||||
var items = json.listhypervisorcapabilitiesresponse.hypervisorCapabilities;
|
||||
args.response.success({data:items});
|
||||
},
|
||||
error: function(data) {
|
||||
args.response.error(parseXMLHttpResponse(data));
|
||||
}
|
||||
});
|
||||
},
|
||||
|
||||
if (args.filterBy.search.value) {
|
||||
data.name = args.filterBy.search.value;
|
||||
}
|
||||
detailView: {
|
||||
name: 'label.details',
|
||||
actions: {
|
||||
edit: {
|
||||
label: 'label.edit',
|
||||
action: function(args) {
|
||||
var array1 = [];
|
||||
array1.push("&maxguestslimit=" + todb(args.data.maxguestslimit));
|
||||
$.ajax({
|
||||
url: createURL("updateHypervisorCapabilities&id=" + args.context.hypervisorCapabilities[0].id + array1.join("")),
|
||||
dataType: "json",
|
||||
success: function(json) {
|
||||
var item = json.updatehypervisorcapabilitiesresponse['null'];
|
||||
args.response.success({data: item});
|
||||
},
|
||||
error: function(data) {
|
||||
args.response.error(parseXMLHttpResponse(data));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
|
||||
$.ajax({
|
||||
url: createURL('listConfigurations'),
|
||||
data: data,
|
||||
dataType: "json",
|
||||
async: true,
|
||||
success: function(json) {
|
||||
var items = json.listconfigurationsresponse.configuration;
|
||||
args.response.success({ data: items });
|
||||
tabs: {
|
||||
details: {
|
||||
title: 'label.details',
|
||||
fields: [
|
||||
{
|
||||
id: { label: 'label.id' },
|
||||
hypervisor: { label: 'label.hypervisor' },
|
||||
hypervisorversion: { label: 'label.hypervisor.version' },
|
||||
maxguestslimit: {
|
||||
label: 'label.max.guest.limit',
|
||||
isEditable: true
|
||||
}
|
||||
}
|
||||
],
|
||||
dataProvider: function(args) {
|
||||
args.response.success(
|
||||
{
|
||||
data:args.context.hypervisorCapabilities[0]
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1183,7 +1183,7 @@
|
|||
desc: '',
|
||||
fields: {
|
||||
serviceOffering: {
|
||||
label: 'label.service.offering',
|
||||
label: 'label.compute.offering',
|
||||
select: function(args) {
|
||||
$.ajax({
|
||||
url: createURL("listServiceOfferings&VirtualMachineId=" + args.context.instances[0].id),
|
||||
|
|
@ -1522,7 +1522,7 @@
|
|||
}
|
||||
},
|
||||
|
||||
serviceofferingname: { label: 'label.service.offering', isEditable: false },
|
||||
serviceofferingname: { label: 'label.compute.offering', isEditable: false },
|
||||
group: { label: 'label.group', isEditable: true },
|
||||
hostname: { label: 'label.host', isEditable: false},
|
||||
haenable: { label: 'label.ha.enabled', isEditable: false, converter:cloudStack.converters.toBooleanText },
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@
|
|||
};
|
||||
|
||||
cloudStack.sections.system = {
|
||||
title: 'label.menu.system',
|
||||
title: 'label.menu.infrastructure',
|
||||
id: 'system',
|
||||
|
||||
// System dashboard
|
||||
|
|
@ -2032,7 +2032,7 @@
|
|||
desc: '',
|
||||
fields: {
|
||||
serviceOfferingId: {
|
||||
label: 'label.service.offering',
|
||||
label: 'label.compute.offering',
|
||||
select: function(args) {
|
||||
$.ajax({
|
||||
url: createURL("listServiceOfferings&issystem=true&systemvmtype=domainrouter"),
|
||||
|
|
@ -2192,7 +2192,7 @@
|
|||
guestipaddress: { label: 'label.guest.ip' },
|
||||
linklocalip: { label: 'label.linklocal.ip' },
|
||||
hostname: { label: 'label.host' },
|
||||
serviceofferingname: { label: 'label.service.offering' },
|
||||
serviceofferingname: { label: 'label.compute.offering' },
|
||||
networkdomain: { label: 'label.network.domain' },
|
||||
domain: { label: 'label.domain' },
|
||||
account: { label: 'label.account' },
|
||||
|
|
@ -3395,7 +3395,7 @@
|
|||
},
|
||||
|
||||
compute: {
|
||||
title: 'label.compute',
|
||||
title: 'label.compute.and.storage',
|
||||
custom: cloudStack.uiCustom.systemChart('compute')
|
||||
},
|
||||
network: {
|
||||
|
|
|
|||
Loading…
Reference in New Issue