Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3BA9C9AB1 for ; Wed, 6 Mar 2013 18:00:08 +0000 (UTC) Received: (qmail 60625 invoked by uid 500); 6 Mar 2013 18:00:05 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 60594 invoked by uid 500); 6 Mar 2013 18:00:05 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 60543 invoked by uid 99); 6 Mar 2013 18:00:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Mar 2013 18:00:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 74F56830B69; Wed, 6 Mar 2013 18:00:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [1/29] git commit: refs/heads/ui-multiple-nics - CLOUDSTACK-452: cloudstack UI - IPv6 - quick installer - rename fields in quick installer to be consistent with fields in zone wizard. Message-Id: <20130306180005.74F56830B69@tyr.zones.apache.org> Date: Wed, 6 Mar 2013 18:00:05 +0000 (UTC) CLOUDSTACK-452: cloudstack UI - IPv6 - quick installer - rename fields in quick installer to be consistent with fields in zone wizard. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f9e94873 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f9e94873 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f9e94873 Branch: refs/heads/ui-multiple-nics Commit: f9e94873d862c9a44f25a56ed2e19b609571e7b8 Parents: 9c5c475 Author: Jessica Wang Authored: Tue Mar 5 12:07:03 2013 -0800 Committer: Jessica Wang Committed: Tue Mar 5 12:07:55 2013 -0800 ---------------------------------------------------------------------- ui/scripts/installWizard.js | 4 ++-- ui/scripts/ui-custom/installWizard.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f9e94873/ui/scripts/installWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/installWizard.js b/ui/scripts/installWizard.js index a5e13b8..46769fa 100644 --- a/ui/scripts/installWizard.js +++ b/ui/scripts/installWizard.js @@ -56,13 +56,13 @@ }); }, - 'tooltip.addZone.dns1': function(args) { + 'tooltip.addZone.ip4dns1': function(args) { args.response.success({ text: 'message.installWizard.tooltip.addZone.dns1' }); }, - 'tooltip.addZone.dns2': function(args) { + 'tooltip.addZone.ip4dns2': function(args) { args.response.success({ text: 'message.installWizard.tooltip.addZone.dns2' }); http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f9e94873/ui/scripts/ui-custom/installWizard.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/installWizard.js b/ui/scripts/ui-custom/installWizard.js index 923e463..86919f9 100644 --- a/ui/scripts/ui-custom/installWizard.js +++ b/ui/scripts/ui-custom/installWizard.js @@ -413,8 +413,8 @@ nextStepID: 'addPodIntro', form: { name: { label: 'label.name', validation: { required: true } }, - dns1: { label: 'label.dns.1', validation: { required: true } }, - dns2: { label: 'label.dns.2' }, + ip4dns1: { label: 'label.dns.1', validation: { required: true } }, + ip4dns2: { label: 'label.dns.2' }, internaldns1: { label: 'label.internal.dns.1', validation: { required: true } }, internaldns2: { label: 'label.internal.dns.2' } }