Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8404E109B6 for ; Wed, 12 Jun 2013 09:12:53 +0000 (UTC) Received: (qmail 27917 invoked by uid 500); 12 Jun 2013 09:12:53 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 27708 invoked by uid 500); 12 Jun 2013 09:12:52 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 27279 invoked by uid 99); 12 Jun 2013 09:12:47 -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, 12 Jun 2013 09:12:47 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 56AB18A360D; Wed, 12 Jun 2013 09:12:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: weizhou@apache.org To: commits@cloudstack.apache.org Date: Wed, 12 Jun 2013 09:12:50 -0000 Message-Id: <0402df6d22994b96a252020a7353ead4@git.apache.org> In-Reply-To: <04a8bb66b2e4427794f70ea2c4d5175c@git.apache.org> References: <04a8bb66b2e4427794f70ea2c4d5175c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/8] git commit: updated refs/heads/disk_io_throttling to 9b88582 CLOUDSTACK UI - network menu - create guest network dialog - change label. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a59067e9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a59067e9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a59067e9 Branch: refs/heads/disk_io_throttling Commit: a59067e94f7095a2448d342d5eed0ffee5f066c0 Parents: 40982cc Author: Jessica Wang Authored: Mon Jun 10 13:43:07 2013 -0700 Committer: Jessica Wang Committed: Mon Jun 10 13:43:07 2013 -0700 ---------------------------------------------------------------------- ui/scripts/network.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a59067e9/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 9e60cbc..61468fc 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -320,8 +320,8 @@ title: 'label.guest.networks', listView: { actions: { - add: { //add Isolated guest network (can't add Shared guest network here) - label: 'Add Isolated Guest Network', + add: { + label: 'Add Isolated Guest Network with SourceNat', preFilter: function(args) { //Isolated networks is only supported in Advanced (SG-disabled) zone if(args.context.zoneType != 'Basic') @@ -331,8 +331,7 @@ }, createForm: { - title: 'Add Isolated Guest Network', - desc: 'Add Isolated Guest Network with SourceNat', + title: 'Add Isolated Guest Network with SourceNat', fields: { name: { label: 'label.name', validation: { required: true }, docID: 'helpGuestNetworkName' }, displayText: { label: 'label.display.text', validation: { required: true }, docID: 'helpGuestNetworkDisplayText'},