apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 02:22:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

cloudstack 3.0 new UI - system page - localize host section.

Browse Source
This commit is contained in:
Jessica Wang 2012-02-15 14:42:13 -08:00
parent 62c4133ed0
commit 3536a2e941
4 changed files with 118 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/WEB-INF/classes/resources/messages.properties
View File

@ -1156,4 +1156,10 @@ reserved.system.gateway=Reserved system gateway
reserved.system.netmask=Reserved system netmask reserved.system.netmask=Reserved system netmask
start.reserved.system.IP=Start Reserved system IP start.reserved.system.IP=Start Reserved system IP
end.reserved.system.IP=End Reserved system IP end.reserved.system.IP=End Reserved system IP
label.clusters=Clusters
cluster.name=Cluster Name
host.MAC=Host MAC
agent.username=Agent Username
agent.password=Agent Password
confirm.action.force.reconnect=Please confirm that you want to force reconnect this host.
resource.state=Resource state

9
client/WEB-INF/classes/resources/messages_ja.properties
View File

@ -1159,5 +1159,10 @@ reserved.system.gateway=予約システムのゲートウェイ
reserved.system.netmask=予約システムのネットマスク reserved.system.netmask=予約システムのネットマスク
start.reserved.system.IP=予約システムのIPを起動します。 start.reserved.system.IP=予約システムのIPを起動します。
end.reserved.system.IP=最後の予約システムのIP end.reserved.system.IP=最後の予約システムのIP
label.clusters=クラスタ
cluster.name=クラスタ名
host.MAC=ホストのMAC
agent.username=エージェントのユーザー名
agent.password=エージェントのパスワード
confirm.action.force.reconnect=このホストを再接続を強制することを確認してください。
resource.state=リソースの状態

9
ui/index.jsp
View File

@ -2708,6 +2708,13 @@ dictionary = {
'reserved.system.gateway': '<fmt:message key="reserved.system.gateway" />', 'reserved.system.gateway': '<fmt:message key="reserved.system.gateway" />',
'reserved.system.netmask': '<fmt:message key="reserved.system.netmask" />', 'reserved.system.netmask': '<fmt:message key="reserved.system.netmask" />',
'start.reserved.system.IP': '<fmt:message key="start.reserved.system.IP" />', 'start.reserved.system.IP': '<fmt:message key="start.reserved.system.IP" />',
'end.reserved.system.IP': '<fmt:message key="end.reserved.system.IP" />' 'end.reserved.system.IP': '<fmt:message key="end.reserved.system.IP" />',
'label.clusters': '<fmt:message key="label.clusters" />',
'cluster.name': '<fmt:message key="cluster.name" />',
'host.MAC': '<fmt:message key="host.MAC" />',
'agent.username': '<fmt:message key="agent.username" />',
'agent.password': '<fmt:message key="agent.password" />',
'confirm.action.force.reconnect': '<fmt:message key="confirm.action.force.reconnect" />',
'resource.state': '<fmt:message key="resource.state" />'
}; };
</script> </script>

235
ui/scripts/system.js
View File

@ -4440,19 +4440,13 @@
}, },
enable: { enable: {
label: 'Enable pod', //Jes label: 'label.action.enable.pod',
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Are you sure you want to enable this pod?'; return 'message.action.enable.pod';
},
success: function(args) {
return 'This pod is being enabled.';
}, },
notification: function(args) { notification: function(args) {
return 'Enabling pod'; return 'label.action.enable.pod';
},
complete: function(args) {
return 'Pod has been enabled.';
} }
}, },
action: function(args) { action: function(args) {
@ -4477,19 +4471,13 @@
}, },
disable: { disable: {
label: 'Disable pod', label: 'label.action.disable.pod',
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Are you sure you want to disable this pod?'; return 'message.action.disable.pod';
},
success: function(args) {
return 'This pod is being disabled.';
}, },
notification: function(args) { notification: function(args) {
return 'Disabling pod'; return 'label.action.disable.pod';
},
complete: function(args) {
return 'Pod has been disabled.';
} }
}, },
action: function(args) { action: function(args) {
@ -4517,16 +4505,10 @@
label: 'label.delete' , label: 'label.delete' ,
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Please confirm that you want to delete this pod.'; return 'message.action.delete.pod';
},
success: function(args) {
return 'pod is being deleted.';
}, },
notification: function(args) { notification: function(args) {
return 'Deleting pod'; return 'label.action.delete.pod';
},
complete: function(args) {
return 'Pod has been deleted.';
} }
}, },
action: function(args) { action: function(args) {
@ -4554,15 +4536,15 @@
{ {
id: { label: 'label.id' }, id: { label: 'label.id' },
netmask: { label: 'label.netmask', isEditable: true }, netmask: { label: 'label.netmask', isEditable: true },
startip: { label: 'Start IP Range', isEditable: true }, startip: { label: 'start.IP', isEditable: true },
endip: { label: 'End IP Range', isEditable: true }, endip: { label: 'end.IP', isEditable: true },
gateway: { label: 'label.gateway', isEditable: true }, gateway: { label: 'label.gateway', isEditable: true },
allocationstate: { allocationstate: {
converter: function(str) { converter: function(str) {
// For localization // For localization
return str; return str;
}, },
label: 'Allocation Status' label: 'allocation.state'
} }
} }
], ],
@ -4576,15 +4558,15 @@
}, },
ipAllocations: { ipAllocations: {
title: 'IP Allocations', title: 'label.ip.allocations',
multiple: true, multiple: true,
fields: [ fields: [
{ {
id: { label: 'label.id' }, id: { label: 'label.id' },
gateway: { label: 'label.gateway' }, gateway: { label: 'label.gateway' },
netmask: { label: 'label.netmask' }, netmask: { label: 'label.netmask' },
startip: { label: 'Start IP range' }, startip: { label: 'start.IP' },
endip: { label: 'End IP range' } endip: { label: 'end.IP' }
} }
], ],
dataProvider: function(args) { dataProvider: function(args) {
@ -4603,7 +4585,7 @@
} }
}, },
clusters: { clusters: {
title: 'Clusters', title: 'label.clusters',
listView: { listView: {
id: 'clusters', id: 'clusters',
section: 'clusters', section: 'clusters',
@ -4663,26 +4645,14 @@
actions: { actions: {
add: { add: {
label: 'Add cluster', label: 'label.add.cluster',
messages: { messages: {
confirm: function(args) {
return 'Are you sure you want to add a cluster?';
},
success: function(args) {
return 'Your new cluster is being created.';
},
notification: function(args) { notification: function(args) {
return 'Creating new cluster'; return 'label.add.cluster';
},
complete: function(args) {
return 'Cluster has been created successfully!';
} }
}, },
createForm: { createForm: {
title: 'Add cluster', title: 'label.add.cluster',
desc: 'Please fill in the following data to add a new cluster.',
fields: { fields: {
hypervisor: { hypervisor: {
label: 'label.hypervisor', label: 'label.hypervisor',
@ -4746,26 +4716,26 @@
} }
}, },
name: { name: {
label: 'Cluster Name', label: 'cluster.name',
validation: { required: true } validation: { required: true }
}, },
//hypervisor==VMWare begins here //hypervisor==VMWare begins here
vCenterHost: { vCenterHost: {
label: 'vCenter Host', label: 'label.vcenter.host',
validation: { required: true } validation: { required: true }
}, },
vCenterUsername: { vCenterUsername: {
label: 'vCenter Username', label: 'label.vcenter.username',
validation: { required: true } validation: { required: true }
}, },
vCenterPassword: { vCenterPassword: {
label: 'vCenter Password', label: 'label.vcenter.password',
validation: { required: true }, validation: { required: true },
isPassword: true isPassword: true
}, },
vCenterDatacenter: { vCenterDatacenter: {
label: 'vCenter Datacenter', label: 'label.vcenter.datacenter',
validation: { required: true } validation: { required: true }
} }
//hypervisor==VMWare ends here //hypervisor==VMWare ends here
@ -4835,23 +4805,17 @@
}, },
detailView: { detailView: {
viewAll: { path: '_zone.hosts', label: 'Hosts' }, viewAll: { path: '_zone.hosts', label: 'label.hosts' },
actions: { actions: {
enable: { enable: {
label: 'Enable cluster', label: 'label.action.enable.cluster',
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Are you sure you want to enable this cluster?'; return 'message.action.enable.cluster';
},
success: function(args) {
return 'This cluster is being enabled.';
}, },
notification: function(args) { notification: function(args) {
return 'Enabling cluster'; return 'label.action.enable.cluster';
},
complete: function(args) {
return 'Cluster has been enabled.';
} }
}, },
action: function(args) { action: function(args) {
@ -4876,19 +4840,13 @@
}, },
disable: { disable: {
label: 'Disable cluster', label: 'label.action.disable.cluster',
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Are you sure you want to disable this cluster?'; return 'message.action.disable.cluster';
},
success: function(args) {
return 'This cluster is being disabled.';
}, },
notification: function(args) { notification: function(args) {
return 'Disabling cluster'; return 'label.action.disable.cluster';
},
complete: function(args) {
return 'Cluster has been disabled.';
} }
}, },
action: function(args) { action: function(args) {
@ -4913,19 +4871,13 @@
}, },
manage: { manage: {
label: 'Manage cluster', label: 'label.action.manage.cluster',
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Are you sure you want to manage this cluster?'; return 'message.action.manage.cluster';
},
success: function(args) {
return 'This cluster is being managed.';
}, },
notification: function(args) { notification: function(args) {
return 'Managing cluster'; return 'label.action.manage.cluster';
},
complete: function(args) {
return 'Cluster has been managed.';
} }
}, },
action: function(args) { action: function(args) {
@ -4950,19 +4902,13 @@
}, },
unmanage: { unmanage: {
label: 'Unmanage cluster', label: 'label.action.unmanage.cluster',
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Are you sure you want to unmanage this cluster?'; return 'message.action.unmanage.cluster';
},
success: function(args) {
return 'This cluster is being unmanaged.';
}, },
notification: function(args) { notification: function(args) {
return 'Unmanaging cluster'; return 'label.action.unmanage.cluster';
},
complete: function(args) {
return 'Cluster has been unmanaged.';
} }
}, },
action: function(args) { action: function(args) {
@ -4987,19 +4933,13 @@
}, },
'delete': { 'delete': {
label: 'label.delete' , label: 'label.action.delete.cluster' ,
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Please confirm that you want to delete this cluster.'; return 'message.action.delete.cluster';
},
success: function(args) {
return 'Cluster is being deleted.';
}, },
notification: function(args) { notification: function(args) {
return 'Deleting cluster'; return 'label.action.delete.cluster';
},
complete: function(args) {
return 'Cluster has been deleted.';
} }
}, },
action: function(args) { action: function(args) {
@ -5030,7 +4970,7 @@
zonename: { label: 'label.zone' }, zonename: { label: 'label.zone' },
podname: { label: 'label.pod' }, podname: { label: 'label.pod' },
hypervisortype: { label: 'label.hypervisor' }, hypervisortype: { label: 'label.hypervisor' },
clustertype: { label: 'Cluster type' }, clustertype: { label: 'label.cluster.type' },
//allocationstate: { label: 'allocation.state' }, //allocationstate: { label: 'allocation.state' },
//managedstate: { label: 'Managed State' }, //managedstate: { label: 'Managed State' },
state: { label: 'label.state' } state: { label: 'label.state' }
@ -5048,7 +4988,7 @@
} }
}, },
hosts: { hosts: {
title: 'Hosts', title: 'label.hosts',
id: 'hosts', id: 'hosts',
listView: { listView: {
section: 'hosts', section: 'hosts',
@ -5093,11 +5033,10 @@
actions: { actions: {
add: { add: {
label: 'Add host', label: 'label.add.host',
createForm: { createForm: {
title: 'Add new host', title: 'label.add.host',
desc: 'Please fill in the following information to add a new host for the specified zone configuration.',
fields: { fields: {
//always appear (begin) //always appear (begin)
podId: { podId: {
@ -5248,13 +5187,13 @@
//input_group="general" starts here //input_group="general" starts here
hostname: { hostname: {
label: 'Host name', label: 'label.host.name',
validation: { required: true }, validation: { required: true },
isHidden: true isHidden: true
}, },
username: { username: {
label: 'User name', label: 'label.username',
validation: { required: true }, validation: { required: true },
isHidden: true isHidden: true
}, },
@ -5269,7 +5208,7 @@
//input_group="VMWare" starts here //input_group="VMWare" starts here
vcenterHost: { vcenterHost: {
label: 'ESX/ESXi Host', label: 'label.esx.host',
validation: { required: true }, validation: { required: true },
isHidden: true isHidden: true
}, },
@ -5277,22 +5216,22 @@
//input_group="BareMetal" starts here //input_group="BareMetal" starts here
baremetalCpuCores: { baremetalCpuCores: {
label: '# of CPU Cores', label: 'label.num.cpu.cores',
validation: { required: true }, validation: { required: true },
isHidden: true isHidden: true
}, },
baremetalCpu: { baremetalCpu: {
label: 'CPU (in MHz)', label: 'label.cpu.mhz',
validation: { required: true }, validation: { required: true },
isHidden: true isHidden: true
}, },
baremetalMemory: { baremetalMemory: {
label: 'Memory (in MB)', label: 'label.memory.mb',
validation: { required: true }, validation: { required: true },
isHidden: true isHidden: true
}, },
baremetalMAC: { baremetalMAC: {
label: 'Host MAC', label: 'host.MAC',
validation: { required: true }, validation: { required: true },
isHidden: true isHidden: true
}, },
@ -5300,12 +5239,12 @@
//input_group="OVM" starts here //input_group="OVM" starts here
agentUsername: { agentUsername: {
label: 'Agent Username', label: 'agent.username',
validation: { required: false }, validation: { required: false },
isHidden: true isHidden: true
}, },
agentPassword: { agentPassword: {
label: 'Agent Password', label: 'agent.password',
validation: { required: true }, validation: { required: true },
isHidden: true, isHidden: true,
isPassword: true isPassword: true
@ -5314,7 +5253,7 @@
//always appear (begin) //always appear (begin)
hosttags: { hosttags: {
label: 'Host tags', label: 'label.host.tags',
validation: { required: false } validation: { required: false }
} }
//always appear (end) //always appear (end)
@ -5393,7 +5332,7 @@
messages: { messages: {
notification: function(args) { notification: function(args) {
return 'Added new host'; return 'label.add.host';
} }
} }
} }
@ -5430,7 +5369,7 @@
}, },
enableMaintenanceMode: { enableMaintenanceMode: {
label: 'Enable Maintenace' , label: 'label.action.enable.maintenance.mode',
action: function(args) { action: function(args) {
$.ajax({ $.ajax({
url: createURL("prepareHostForMaintenance&id=" + args.context.hosts[0].id), url: createURL("prepareHostForMaintenance&id=" + args.context.hosts[0].id),
@ -5455,16 +5394,10 @@
}, },
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Enabling maintenance mode will cause a live migration of all running instances on this host to any available host.'; return 'message.action.host.enable.maintenance.mode';
},
success: function(args) {
return 'Maintenance is being enabled.';
}, },
notification: function(args) { notification: function(args) {
return 'Enabling maintenance'; return 'label.action.enable.maintenance.mode';
},
complete: function(args) {
return 'Maintenance has been enabled.';
} }
}, },
notification: { notification: {
@ -5473,7 +5406,7 @@
}, },
cancelMaintenanceMode: { cancelMaintenanceMode: {
label: 'Cancel Maintenace' , label: 'label.action.cancel.maintenance.mode' ,
action: function(args) { action: function(args) {
$.ajax({ $.ajax({
url: createURL("cancelHostMaintenance&id=" + args.context.hosts[0].id), url: createURL("cancelHostMaintenance&id=" + args.context.hosts[0].id),
@ -5498,16 +5431,10 @@
}, },
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Please confirm that you want to cancel this maintenance.'; return 'message.action.cancel.maintenance.mode';
},
success: function(args) {
return 'Maintenance is being cancelled.';
}, },
notification: function(args) { notification: function(args) {
return 'Cancelling maintenance'; return 'label.action.cancel.maintenance.mode';
},
complete: function(args) {
return 'Maintenance has been cancelled.';
} }
}, },
notification: { notification: {
@ -5516,7 +5443,7 @@
}, },
forceReconnect: { forceReconnect: {
label: 'Force Reconnect' , label: 'label.action.force.reconnect',
action: function(args) { action: function(args) {
$.ajax({ $.ajax({
url: createURL("reconnectHost&id=" + args.context.hosts[0].id), url: createURL("reconnectHost&id=" + args.context.hosts[0].id),
@ -5541,16 +5468,10 @@
}, },
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Please confirm that you want to force reconnect this host.'; return 'confirm.action.force.reconnect';
},
success: function(args) {
return 'Host is being force reconnected.';
}, },
notification: function(args) { notification: function(args) {
return 'Force reconnecting host'; return 'label.action.force.reconnect';
},
complete: function(args) {
return 'Host has been force reconnected.';
} }
}, },
notification: { notification: {
@ -5559,19 +5480,13 @@
}, },
'delete': { 'delete': {
label: 'Remove host' , label: 'label.action.remove.host' ,
messages: { messages: {
confirm: function(args) { confirm: function(args) {
return 'Please confirm that you want to remove this host.'; return 'message.action.remove.host';
},
success: function(args) {
return 'Host is being removed.';
}, },
notification: function(args) { notification: function(args) {
return 'Removing host'; return 'label.action.remove.host';
},
complete: function(args) {
return 'Host has been removed.';
} }
}, },
preFilter: function(args) { preFilter: function(args) {
@ -5580,10 +5495,10 @@
} }
}, },
createForm: { createForm: {
title: 'Remove host', title: 'label.action.remove.host',
fields: { fields: {
isForced: { isForced: {
label: 'Force Remove', label: 'force.remove',
isBoolean: true, isBoolean: true,
isHidden: true isHidden: true
} }
@ -5610,7 +5525,7 @@
} }
}, },
tabs: { tabs: { //Jes
details: { details: {
title: 'label.details', title: 'label.details',
fields: [ fields: [
@ -5619,20 +5534,20 @@
}, },
{ {
id: { label: 'label.id' }, id: { label: 'label.id' },
resourcestate: { label: 'Resource state' }, resourcestate: { label: 'resource.state' },
state: { label: 'label.state' }, state: { label: 'label.state' },
type: { label: 'label.type' }, type: { label: 'label.type' },
zonename: { label: 'label.zone' }, zonename: { label: 'label.zone' },
podname: { label: 'label.pod' }, podname: { label: 'label.pod' },
clustername: { label: 'label.cluster' }, clustername: { label: 'label.cluster' },
ipaddress: { label: 'label.ip.address' }, ipaddress: { label: 'label.ip.address' },
version: { label: 'Version' }, version: { label: 'label.version' },
hosttags: { hosttags: {
label: 'Host tags', label: 'label.host.tags',
isEditable: true isEditable: true
}, },
oscategoryid: { oscategoryid: {
label: 'OS Preference', label: 'label.os.preference',
isEditable: true, isEditable: true,
select: function(args) { select: function(args) {
$.ajax({ $.ajax({
@ -5650,7 +5565,7 @@
}); });
} }
}, },
disconnected: { label: 'Last disconnected' } disconnected: { label: 'label.last.disconnected' }
} }
], ],
@ -5666,7 +5581,7 @@
} }
} }
}, },
'primary-storage': { 'primary-storage': { //Jes
title: 'Primary Storage', title: 'Primary Storage',
id: 'primarystorages', id: 'primarystorages',
listView: { listView: {