You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/04/10 22:10:03 UTC
git commit: updated refs/heads/ui-mixed-zone-management to 4b853cc
Updated Branches:
refs/heads/ui-mixed-zone-management 7efbcfa9b -> 4b853ccdc
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/ui-mixed-zone-management
Commit: 4b853ccdc74ba7f247d48a604e8fb0d7051ee528
Parents: 7efbcfa
Author: Brian Federle <br...@citrix.com>
Authored: Wed Apr 10 13:09:43 2013 -0700
Committer: Brian Federle <br...@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));
+