apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add missing tooltips

Browse Source 
Add missing doc tooltips for the following dialogs:

-Add VPN customer gateway

-Add ISO

-Enter project token

-Add compute offering

-Add system offering

-Add network offering
This commit is contained in:
Brian Federle 2012-12-07 13:10:36 -08:00
parent 8cee2c578f
commit 5b7b47048b
5 changed files with 183 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/scripts/configuration.js
View File

@ -506,6 +506,7 @@
},
domainId: {
label: 'label.domain',
docID: 'helpSystemOfferingDomain',
dependsOn: 'isPublic',
select: function(args) {
$.ajax({
@ -866,6 +867,7 @@
},
domainId: {
label: 'label.domain',
docID: 'helpDiskOfferingDomain',
dependsOn: 'isPublic',
select: function(args) {
$.ajax({
@ -1352,7 +1354,7 @@
fields: {
name: { label: 'label.name', validation: { required: true }, docID: 'helpNetworkOfferingName' },
displayText: { label: 'label.description', validation: { required: true } },
displayText: { label: 'label.description', validation: { required: true }, docID: 'helpNetworkOfferingDescription' },
networkRate: { label: 'label.network.rate.megabytes', docID: 'helpNetworkOfferingNetworkRate' },
@ -1397,6 +1399,7 @@
useVpc: {
label: 'VPC',
docID: 'helpNetworkOfferingVPC',
isBoolean: true,
onChange: function(args) {
var $checkbox = args.$checkbox;
@ -1542,6 +1545,7 @@
//show or hide upon checked services and selected providers above (begin)
serviceOfferingId: {
label: 'label.system.offering',
docID: 'helpNetworkOfferingSystemOffering',
select: function(args) {
$.ajax({
url: createURL('listServiceOfferings&issystem=true&systemvmtype=domainrouter'),
@ -1576,6 +1580,7 @@
label: "label.redundant.router.capability",
isHidden: true,
dependsOn: 'service.SourceNat.isEnabled',
docID: 'helpNetworkOfferingRedundantRouterCapability',
isBoolean: true
},
@ -1600,6 +1605,7 @@
},
"service.Lb.lbIsolationDropdown": {
label: 'label.LB.isolation',
docID: 'helpNetworkOfferingLBIsolation',
isHidden: true,
select: function(args) {
args.response.success({
@ -1612,6 +1618,7 @@
},
"service.Lb.inlineModeDropdown": {
label: 'Mode',
docID: 'helpNetworkOfferingMode',
select: function(args) {
var items = [];
items.push({id: "false", description: "side by side"});
@ -1628,15 +1635,16 @@
"service.StaticNat.associatePublicIP": {
label: 'Associate Public IP',
docID: 'helpNetworkOfferingAssociatePublicIP',
isBoolean: true,
isHidden: true
},
//show or hide upon checked services and selected providers above (end)
conservemode: { label: 'label.conserve.mode', isBoolean: true },
conservemode: { label: 'label.conserve.mode', isBoolean: true , docID: 'helpNetworkOfferingConserveMode'},
tags: { label: 'label.tags' },
tags: { label: 'label.tags', docID: 'helpNetworkOfferingTags' },
availability: {
label: 'label.availability',

148
ui/scripts/docs.js
View File

@ -174,6 +174,10 @@ cloudStack.docs = {
desc: 'Yes makes the offering available to all domains. No limits the scope to a subdomain; you will be prompted for the subdomain\'s name.',
externalLink: ''
},
helpDiskOfferingDomain: {
desc: 'Select the subdomain in which this offering is available',
externalLink: ''
},
// Add domain
helpDomainName: {
desc: 'Any desired name for the new sub-domain. Must be unique within the current domain.',
@ -361,6 +365,10 @@ cloudStack.docs = {
desc: 'Any desired name for the network offering',
externalLink: ''
},
helpNetworkOfferingDescription: {
desc: 'A short description of the offering that can be displayed to users',
externalLink: ''
},
helpNetworkOfferingNetworkRate: {
desc: 'Allowed data transfer rate in MB per second',
externalLink: ''
@ -377,6 +385,38 @@ cloudStack.docs = {
desc: '(Isolated guest networks only) Indicate whether a VLAN should be specified when this offering is used',
externalLink: ''
},
helpNetworkOfferingVPC: {
desc: 'Specify whether this offering is for a virtual private cloud',
externalLink: ''
},
helpNetworkOfferingSystemOffering: {
desc: 'Choose the system service offering that you want the virtual routers to use in this network',
externalLink: ''
},
helpNetworkOfferingLBIsolation: {
desc: 'Specify what type of load balancer isolation you want for the network: Shared or Dedicated',
externalLink: ''
},
helpNetworkOfferingMode: {
desc: 'Choose Inline or Side by Side to specify whether a firewall is placed in front of the load balancing device (inline) or in parallel with it (side-by-side)',
externalLink: ''
},
helpNetworkOfferingAssociatePublicIP: {
desc: 'Select this option if you want to assign a public IP address to the VMs deployed in the guest network',
externalLink: ''
},
helpNetworkOfferingRedundantRouterCapability: {
desc: 'Select this option if you want to use two virtual routers in the network for uninterrupted connection: one operating as the master virtual router and the other as the backup',
externalLink: ''
},
helpNetworkOfferingConserveMode: {
desc: 'Check this box to use conserve mode, where network resources are allocated only when the first VM starts. You can define more than one service on the same public IP only when conserve mode is on.',
externalLink: ''
},
helpNetworkOfferingTags: {
desc: 'Network tag to specify which physical network to use',
externalLink: ''
},
// Add pod
helpPodZone: {
desc: 'The zone where you want to add the pod',
@ -570,6 +610,10 @@ cloudStack.docs = {
desc: 'Yes makes the offering available to all domains. No limits the scope to a subdomain; you will be prompted for the subdomain\'s name.',
externalLink: ''
},
helpSystemOfferingDomain: {
desc: 'Select the subdomain in which this offering is available',
externalLink: ''
},
// Add tier
helpTierName: {
desc: 'A unique name for the tier',
@ -671,17 +715,121 @@ cloudStack.docs = {
desc: 'The netmask associated with the VPC gateway',
externalLink: ''
},
// Add VPN customer gateway
helpVPNGatewayName: {
desc: 'A unique name for the VPN customer gateway',
externalLink: ''
},
helpVPNGatewayGateway: {
desc: 'The IP address for the remote gateway',
externalLink: ''
},
helpVPNGatewayCIDRList: {
desc: 'The guest CIDR list of the remote subnets. Enter a CIDR or a comma-separated list. Do not overlap the VPC\'s CIDR or another guest CIDR.',
externalLink: ''
},
helpVPNGatewayIPsecPresharedKey: {
desc: 'Enter a secret key value. The endpoints of the VPN share a secret key. This is used to authenticate the customer gateway and the VPC VPN gateway to each other.',
externalLink: ''
},
helpVPNGatewayIKEEncryption: {
desc: 'Enter AES128, AES192, AES256, or 3DES to specify the Internet Key Exchange (IKE) policy for phase-1. Authentication is accomplished with Preshared Keys.',
externalLink: ''
},
helpVPNGatewayIKEHash: {
desc: 'Enter SHA1 or MD5 to specify the IKE hash algorithm for phase-1',
externalLink: ''
},
helpVPNGatewayIKEDH: {
desc: 'Enter Group-5 (1536-bit), Group-2 (1024-bit), or None to specify the public-key cryptography protocol to use. The 1536-bit Diffie-Hellman group is used within IKE to establish session keys.',
externalLink: ''
},
helpVPNGatewayESPEncryption: {
desc: 'Enter AES128, AES192, AES256, or 3DES to specify the Encapsulating Security Payload (ESP) algorithm within phase-2',
externalLink: ''
},
helpVPNGatewayESPHash: {
desc: 'Enter SHA1 or MD5 to specify the Encapsulating Security Payload (ESP) hash for phase-2',
externalLink: ''
},
helpVPNGatewayPerfectForwardSecrecy: {
desc: 'Choose Group-5 (1536-bit), Group-2 (1024-bit), or None to specify whether to enforce a new Diffie-Hellman key exchange and, if so, what size of DH group to use',
externalLink: ''
},
helpVPNGatewayIKELifetime: {
desc: 'The phase-1 lifetime of the security association in seconds. Whenever the time expires, a new phase-1 exchange is performed.',
externalLink: ''
},
helpVPNGatewayESPLifetime: {
desc: 'The phase-2 lifetime of the security association in seconds. Whenever the time expires, a re-key is initiated to provide a new IPsec encryption and authentication session keys.',
externalLink: ''
},
helpVPNGatewayDeadPeerDetection: {
desc: 'Check this to make the virtual router query its IKE peer at regular intervals to ensure continued availability. It is recommended to have the same DPD setting on both sides of the VPN connection.',
externalLink: ''
},
// Copy template
helpCopyTemplateDestination: {
desc: 'The zone to which you want to copy the template',
externalLink: ''
},
// Enter token
helpEnterTokenProjectID: {
desc: 'Unique identifying number for the project. Use the number you received in the invitation email',
externalLink: ''
},
helpEnterTokenToken: {
desc: 'Unique security code that authorizes you to accept the project invitation. Use the token you received in the invitation email',
externalLink: ''
},
// Register template
helpRegisterTemplate: {
desc: '',
externalLink: ''
},
// Register template
helpRegisterTemplate: {
desc: '',
externalLink: ''
},
// Register ISO
helpRegisterISOName: {
desc: 'A unique name for the ISO. This will be visible to users, so choose something descriptive.',
externalLink: ''
},
helpRegisterISODescription: {
desc: 'Display text describing the ISO. This will be visible to users, so choose something descriptive.',
externalLink: ''
},
helpRegisterISOURL: {
desc: 'The Management Server will download the file from the specified URL, such as http://my.web.server/filename.iso',
externalLink: ''
},
helpRegisterISOZone: {
desc: 'Choose the zone where you want the ISO to be available, or All Zones to make it available throughout the cloud',
externalLink: ''
},
helpRegisterISOBootable: {
desc: 'Indicate whether the machine can be booted using this ISO',
externalLink: ''
},
helpRegisterISOOSType: {
desc: 'Operating system of the VM represented by the ISO. If the OS type of the ISO is not listed, choose Other.',
externalLink: ''
},
helpRegisterISOExtractable: {
desc: 'Whether the ISO is extractable or not',
externalLink: ''
},
helpRegisterISOPublic: {
desc: 'Check this to make the ISO accessible to all users. The ISO will appear in the Community ISOs list.',
externalLink: ''
},
helpRegisterISOFeatured: {
desc: 'Check this to make the ISO more prominent for users. The ISO will appear in the Featured ISOs list.',
externalLink: ''
},
// Register template
helpRegisterTemplateName: {
desc: 'A unique name for the template. This will be visible to users, so choose something descriptive.',
externalLink: ''

13
ui/scripts/network.js
View File

@ -4550,6 +4550,7 @@
fields: {
name: {
label: 'label.name',
docID: 'helpVPNGatewayName',
validation: { required: true }
},
gateway: {
@ -4563,21 +4564,25 @@
},
gateway: {
label: 'label.gateway',
docID: 'helpVPNGatewayGateway',
validation: { required: true }
},
cidrlist: {
label: 'label.CIDR.list',
desc:'Please enter a comma separated list of CIDRs if more than one',
docID: 'helpVPNGatewayCIDRList',
validation: { required: true }
},
ipsecpsk: {
label: 'label.IPsec.preshared.key',
docID: 'helpVPNGatewayIPsecPresharedKey',
validation: { required: true }
},
//IKE Policy
ikeEncryption: {
label: 'label.IKE.encryption',
docID: 'helpVPNGatewayIKEEncryption',
select: function(args) {
var items = [];
items.push({id: '3des', description: '3des'});
@ -4589,6 +4594,7 @@
},
ikeHash: {
label: 'label.IKE.hash',
docID: 'helpVPNGatewayIKEHash',
select: function(args) {
var items = [];
items.push({id: 'md5', description: 'md5'});
@ -4598,6 +4604,7 @@
},
ikeDh: {
label: 'label.IKE.DH',
docID: 'helpVPNGatewayIKEDH',
select: function(args) {
var items = [];
items.push({id: '', description: 'None'});
@ -4610,6 +4617,7 @@
//ESP Policy
espEncryption: {
label: 'label.ESP.encryption',
docID: 'helpVPNGatewayESPLifetime',
select: function(args) {
var items = [];
items.push({id: '3des', description: '3des'});
@ -4621,6 +4629,7 @@
},
espHash: {
label: 'label.ESP.hash',
docID: 'helpVPNGatewayESPHash',
select: function(args) {
var items = [];
items.push({id: 'md5', description: 'md5'});
@ -4630,6 +4639,7 @@
},
perfectForwardSecrecy: {
label: 'label.perfect.forward.secrecy',
docID: 'helpVPNGatewayPerfectForwardSecrecy',
select: function(args) {
var items = [];
items.push({id: '', description: 'None'});
@ -4641,17 +4651,20 @@
ikelifetime: {
label: 'label.IKE.lifetime',
docID: 'helpVPNGatewayIKELifetime',
defaultValue: '86400',
validation: { required: false, number: true }
},
esplifetime: {
label: 'label.ESP.lifetime',
docID: 'helpVPNGatewayESPLifetime',
defaultValue: '3600',
validation: { required: false, number: true }
},
dpd: {
label: 'label.dead.peer.detection',
docID: 'helpVPNGatewayDeadPeerDetection',
isBoolean: true,
isChecked: false
}

4
ui/scripts/projects.js
View File

@ -1026,8 +1026,8 @@
createForm: {
desc: 'message.enter.token',
fields: {
projectid: { label: 'label.project.id', validation: { required: true }},
token: { label: 'label.token', validation: { required: true }}
projectid: { label: 'label.project.id', validation: { required: true, docID: 'helpEnterTokenProjectID' }},
token: { label: 'label.token', docID: 'helpEnterTokenToken', validation: { required: true }}
}
},
action: function(args) {

9
ui/scripts/templates.js
View File

@ -836,18 +836,22 @@
fields: {
name: {
label: 'label.name',
docID: 'helpRegisterISOName',
validation: { required: true }
},
description: {
label: 'label.description',
docID: 'helpRegisterISODescription',
validation: { required: true }
},
url: {
label: 'URL',
docID: 'helpRegisterISOURL',
validation: { required: true }
},
zone: {
label: 'label.zone',
docID: 'helpRegisterISOZone',
select: function(args) {
$.ajax({
url: createURL("listZones&available=true"),
@ -870,12 +874,14 @@
isBootable: {
label: "label.bootable",
docID: 'helpRegisterISOBootable',
isBoolean: true,
isChecked: true
},
osTypeId: {
label: 'label.os.type',
docID: 'helpRegisterISOOSType',
dependsOn: 'isBootable',
isHidden: false,
validation: { required: true },
@ -899,17 +905,20 @@
isExtractable: {
label: "extractable",
docID: 'helpRegisterISOExtractable',
isBoolean: true
},
isPublic: {
label: "label.public",
docID: 'helpRegisterISOPublic',
isBoolean: true,
isHidden: true
},
isFeatured: {
label: "label.featured",
docID: 'helpRegisterISOFeatured',
isBoolean: true,
isHidden: true
}