Return-Path: 
 <commits-return-45310-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
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 325AA17732
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu, 16 Oct 2014 13:25:41 +0000 (UTC)
Received: (qmail 64881 invoked by uid 500); 16 Oct 2014 13:25:34 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 64834 invoked by uid 500); 16 Oct 2014 13:25:34 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 64142 invoked by uid 99); 16 Oct 2014 13:25:34 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2014 13:25:34 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id C73B49ADEA1; Thu, 16 Oct 2014 13:25:33 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: bhaisaab@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 16 Oct 2014 13:25:43 -0000
Message-Id: <0c2d7a72277b4ee49a610653fb760056@git.apache.org>
In-Reply-To: <613e1faf1a374433b2613446fb63a1e7@git.apache.org>
References: <613e1faf1a374433b2613446fb63a1e7@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [11/50] [abbrv] git commit: updated refs/heads/master to 7072d8d

CLOUDSTACK-7661: VM wizard: Add keyboard language dropdown

(cherry picked from commit f4326aec82dd34da3660c1b089e23e0c50dd21b8)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cfb372a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cfb372a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cfb372a7

Branch: refs/heads/master
Commit: cfb372a771a8b8d63a3b0e1393b44c64a6cc1dea
Parents: 35dab49
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue Oct 7 13:28:29 2014 -0700
Committer: David Nalley <david@gnsa.us>
Committed: Mon Oct 13 00:33:43 2014 -0400

----------------------------------------------------------------------
 ui/index.jsp | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cfb372a7/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index e0b4b78..42973f7 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -401,7 +401,7 @@
                             <div class="content">
                                 <div class="select-container">
                                     <!-- Name -->
-                                    <div class="select vm-instance-name">
+                                    <div class="select odd vm-instance-name">
                                         <div class="name">
                                             <span><fmt:message key="label.name"/> (<fmt:message key="label.optional"/>)</span>
                                         </div>
@@ -410,7 +410,7 @@
                                         </div>
                                     </div>
                                     <!-- Add to group -->
-                                    <div class="select odd">
+                                    <div class="select">
                                         <div class="name">
                                             <span><fmt:message key="label.add.to.group"/> (<fmt:message key="label.optional"/>)</span>
                                         </div>
@@ -418,6 +418,22 @@
                                             <input type="text" name="groupname" class="disallowSpecialCharacters" />
                                         </div>
                                     </div>
+
+                                    <!-- Keyboard Language -->
+                                    <div class="select odd">
+                                        <div class="name">
+                                            <span>Keyboard language</span>
+                                        </div>
+                                        <div class="value">
+                                            <select name="keyboardLanguage">
+                                                <option value=""></option>
+                                                <option value="us">Standard (US) keyboard</option>
+                                                <option value="uk">UK keyboard</option>
+                                                <option value="jp">Japanese keyboard</option>
+                                            </select>
+                                        </div>
+                                    </div>
+
                                     <!-- Zone -->
                                     <div class="select">
                                         <div class="name">