Return-Path: 
 <commits-return-17647-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 5BB3410030
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Sun, 21 Apr 2013 17:03:14 +0000 (UTC)
Received: (qmail 55958 invoked by uid 500); 21 Apr 2013 17:03:13 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 55904 invoked by uid 500); 21 Apr 2013 17:03:13 -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 55700 invoked by uid 99); 21 Apr 2013 17:03:13 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 21 Apr 2013 17:03:13 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 9261C81BFBF; Sun, 21 Apr 2013 17:03:12 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: tsp@apache.org
To: commits@cloudstack.apache.org
Date: Sun, 21 Apr 2013 17:03:12 -0000
Message-Id: <2337005039b4446abd856c58122c68cf@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [01/49] git commit: updated refs/heads/marvin_refactor to 0b5fe9a

Updated Branches:
  refs/heads/marvin_refactor 23dd00b04 -> 0b5fe9a90


Add zone filter drop-down to header (needs styling)


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

Branch: refs/heads/marvin_refactor
Commit: 4b853ccdc74ba7f247d48a604e8fb0d7051ee528
Parents: 7efbcfa
Author: Brian Federle <brian.federle@citrix.com>
Authored: Wed Apr 10 13:09:43 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Wed Apr 10 13:09:43 2013 -0700

----------------------------------------------------------------------
 ui/index.jsp                       |    1 +
 ui/scripts/ui-custom/zoneFilter.js |   31 +++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b853ccd/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 3b8f378..003790e 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1659,6 +1659,7 @@ under the License.
     <script type="text/javascript" src="scripts/events.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/regions.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/regions.js?t=<%=now%>"></script>
+    <script type="text/javascript" src="scripts/ui-custom/zoneFilter.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/ipRules.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/enableStaticNAT.js?t=<%=now%>"></script>
     <script type="text/javascript" src="scripts/ui-custom/securityRules.js?t=<%=now%>"></script>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4b853ccd/ui/scripts/ui-custom/zoneFilter.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneFilter.js b/ui/scripts/ui-custom/zoneFilter.js
new file mode 100644
index 0000000..d298e4f
--- /dev/null
+++ b/ui/scripts/ui-custom/zoneFilter.js
@@ -0,0 +1,31 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+(function($, cloudStack) {
+  $(window).bind('cloudStack.ready', function() {
+    var $header = $('#header .controls');
+    var $zoneFilter = $('<div>').addClass('zone-filter');
+    var $zoneTypeSelect = $('<select>').append(
+      $('<option>').attr('value', 'basic').html(_l('Basic')),
+      $('<option>').attr('value', 'advanced').html(_l('Advanced'))
+    );
+
+    $zoneTypeSelect.appendTo($zoneFilter);
+    $zoneFilter.insertAfter($header.find('#user'));
+  });
+}(jQuery, cloudStack));      
+