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
Salvatore Orlando
parent
94dea8aadb
commit
b2c712b8c7
|
|
@ -1390,7 +1390,42 @@ label.installWizard.title=Hello and Welcome to CloudStack™.
|
|||
=======
|
||||
=======
|
||||
#new labels (begin) **********************************************************************************************
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> cddbc4d... cloudstack 3.0 new UI - localization - move new labels on the top.
|
||||
=======
|
||||
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
|
||||
label.sticky.mode=Mode
|
||||
label.sticky.length=Length
|
||||
label.sticky.holdtime=Hold time
|
||||
label.sticky.request-learn=Request learn
|
||||
label.sticky.prefix=Prefix
|
||||
label.sticky.nocache=No cache
|
||||
label.sticky.indirect=Indirect
|
||||
label.sticky.postonly=Post only
|
||||
label.sticky.domain=Domain
|
||||
state.Allocating=Allocating
|
||||
state.Migrating=Migrating
|
||||
error.please.specify.physical.network.tags=Network offerings is not available until you specify tags for this physical network.
|
||||
#new labels (end) ************************************************************************************************
|
||||
|
||||
|
||||
state.Stopping=Stopping
|
||||
message.add.load.balancer.under.ip=The load balancer rule has been added under IP:
|
||||
message.select.instance=Please select an instance.
|
||||
label.select=Select
|
||||
label.select.vm.for.static.nat=Select VM for static NAT
|
||||
label.select.instance=Select instance
|
||||
label.nat.port.range=NAT Port Range
|
||||
label.static.nat.vm.details=Static NAT VM Details
|
||||
label.edit.lb.rule=Edit LB rule
|
||||
>>>>>>> 240dabe... Navigation organizational changes
|
||||
message.migrate.instance.to.host=Please confirm that you want to migrate instance to another host.
|
||||
label.migrate.instance.to.host=Migrate instance to another host
|
||||
message.migrate.instance.to.ps=Please confirm that you want to migrate instance to another primary storage.
|
||||
|
|
@ -1684,7 +1719,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
|
||||
|
|
@ -2621,7 +2656,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.
|
||||
|
|
|
|||
|
|
@ -267,7 +267,11 @@
|
|||
|
||||
<!-- Service offering -->
|
||||
<div class="select-desc field service-offering hide-if-unselected">
|
||||
<<<<<<< HEAD
|
||||
<div class="name"><fmt:message key="label.network.offering"/></div>
|
||||
=======
|
||||
<div class="name"><fmt:message key="label.compute.offering"/></div>
|
||||
>>>>>>> 240dabe... Navigation organizational changes
|
||||
<div class="desc">
|
||||
<select name="new-network-networkofferingid">
|
||||
</select>
|
||||
|
|
@ -1857,6 +1861,7 @@
|
|||
dictionary = {
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
'message.setup.physical.network.during.zone.creation.basic': '<fmt:message key="message.setup.physical.network.during.zone.creation.basic"/>',
|
||||
'label.traffic.label': '<fmt:message key="label.traffic.label"/>',
|
||||
'label.management.ips': '<fmt:message key="label.management.ips"/>',
|
||||
|
|
@ -1877,6 +1882,8 @@ dictionary = {
|
|||
'label.guest': '<fmt:message key="label.guest"/>',
|
||||
'label.network.service.providers': '<fmt:message key="label.network.service.providers"/>',
|
||||
'message.launch.zone': '<fmt:message key="message.launch.zone"/>',
|
||||
=======
|
||||
>>>>>>> 240dabe... Navigation organizational changes
|
||||
'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"/>',
|
||||
|
|
|
|||
|
|
@ -961,6 +961,7 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
},
|
||||
|
||||
hypervisorCapabilities: {
|
||||
|
|
@ -1050,6 +1051,8 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
=======
|
||||
>>>>>>> 240dabe... Navigation organizational changes
|
||||
},
|
||||
|
||||
networkOfferings: {
|
||||
|
|
@ -1427,7 +1430,11 @@
|
|||
|
||||
//show or hide upon checked services and selected providers above (begin)
|
||||
serviceOfferingId: {
|
||||
<<<<<<< HEAD
|
||||
label: 'label.system.offering',
|
||||
=======
|
||||
label: 'label.compute.offering',
|
||||
>>>>>>> 240dabe... Navigation organizational changes
|
||||
select: function(args) {
|
||||
$.ajax({
|
||||
url: createURL('listServiceOfferings&issystem=true&systemvmtype=domainrouter'),
|
||||
|
|
|
|||
|
|
@ -29,6 +29,42 @@
|
|||
action: function(args) {
|
||||
var name = args.data.jsonObj.name;
|
||||
var value = args.data.value;
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
$.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;
|
||||
}
|
||||
>>>>>>> 240dabe... Navigation organizational changes
|
||||
|
||||
$.ajax({
|
||||
url: createURL(
|
||||
|
|
|
|||
|
|
@ -1575,10 +1575,20 @@
|
|||
}
|
||||
});
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
},
|
||||
|
||||
/*
|
||||
isoid: {
|
||||
=======
|
||||
},
|
||||
|
||||
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 },
|
||||
isoid: {
|
||||
>>>>>>> 240dabe... Navigation organizational changes
|
||||
label: 'label.attached.iso',
|
||||
isEditable: false,
|
||||
converter: function(isoid) {
|
||||
|
|
|
|||
|
|
@ -3723,6 +3723,7 @@
|
|||
}
|
||||
},
|
||||
|
||||
<<<<<<< HEAD
|
||||
disable: {
|
||||
label: 'label.action.disable.zone',
|
||||
messages: {
|
||||
|
|
@ -3752,6 +3753,19 @@
|
|||
args.complete();
|
||||
}
|
||||
}
|
||||
=======
|
||||
compute: {
|
||||
title: 'label.compute.and.storage',
|
||||
custom: cloudStack.uiCustom.systemChart('compute')
|
||||
},
|
||||
network: {
|
||||
title: 'label.network',
|
||||
custom: cloudStack.uiCustom.systemChart('network')
|
||||
},
|
||||
resources: {
|
||||
title: 'label.resources',
|
||||
custom: cloudStack.uiCustom.systemChart('resources')
|
||||
>>>>>>> 240dabe... Navigation organizational changes
|
||||
},
|
||||
|
||||
'remove': {
|
||||
|
|
|
|||
Loading…
Reference in New Issue