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 2012/06/29 22:36:29 UTC
git commit: VPC UI: Add link to site-to-site VPN
Updated Branches:
refs/heads/master 683b7d782 -> 49c3c8b2e
VPC UI: Add link to site-to-site VPN
Add link in tooltip for site-to-site VPN, which opens a new panel
showing the list view. This draws from the existing 'siteToSiteVpn'
network subsection, so no modification should be required to the
existing list view.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/49c3c8b2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/49c3c8b2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/49c3c8b2
Branch: refs/heads/master
Commit: 49c3c8b2e3ea8e889f86fd836bf66134b91f0d6a
Parents: 683b7d7
Author: Brian Federle <br...@citrix.com>
Authored: Fri Jun 29 13:35:47 2012 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Fri Jun 29 13:36:07 2012 -0700
----------------------------------------------------------------------
ui/scripts/ui-custom/vpc.js | 37 +++++++++++++++++++++++++++++++++++--
ui/scripts/vpc.js | 5 +++++
2 files changed, 40 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/49c3c8b2/ui/scripts/ui-custom/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/vpc.js b/ui/scripts/ui-custom/vpc.js
index a8ed4d1..a4934bc 100644
--- a/ui/scripts/ui-custom/vpc.js
+++ b/ui/scripts/ui-custom/vpc.js
@@ -17,6 +17,8 @@
(function($, cloudStack) {
var elems = {
vpcConfigureTooltip: function(args) {
+ var $browser = args.$browser;
+ var siteToSiteVPN = args.siteToSiteVPN;
var links = {
'ip-addresses': 'IP Addresses',
'gateways': 'Gateways',
@@ -34,6 +36,24 @@
$link.append($label);
$link.appendTo($links);
+
+ // Link event
+ $link.click(function() {
+ switch (id) {
+ case 'site-to-site-vpn':
+ $browser.cloudBrowser('addPanel', {
+ title: 'Site-to-site VPNs',
+ maximizeIfSelected: true,
+ complete: function($panel) {
+ $panel.listView(
+ $.isFunction(siteToSiteVPN.listView) ?
+ siteToSiteVPN.listView() : siteToSiteVPN.listView
+ );
+ }
+ });
+ break;
+ }
+ });
});
$tooltip.append($links);
@@ -57,6 +77,8 @@
return $tooltip;
},
vpcConfigureArea: function(args) {
+ var $browser = args.$browser;
+ var siteToSiteVPN = args.siteToSiteVPN;
var $config = $('<div>').addClass('config-area');
var $configIcon = $('<span>').addClass('icon').html(' ');
@@ -64,7 +86,10 @@
// Tooltip event
$configIcon.mouseover(function() {
- var $tooltip = elems.vpcConfigureTooltip();
+ var $tooltip = elems.vpcConfigureTooltip({
+ $browser: $browser,
+ siteToSiteVPN: siteToSiteVPN
+ });
// Make sure tooltip is center aligned with icon
$tooltip.css({ left: $configIcon.position().left });
@@ -203,6 +228,8 @@
return $tier;
},
chart: function(args) {
+ var $browser = args.$browser;
+ var siteToSiteVPN = args.siteToSiteVPN;
var tiers = args.tiers;
var vmListView = args.vmListView;
var actions = args.actions;
@@ -217,7 +244,10 @@
$('<span>').html(vpcName)
)
.append(
- elems.vpcConfigureArea({})
+ elems.vpcConfigureArea({
+ $browser: $browser,
+ siteToSiteVPN: siteToSiteVPN
+ })
);
var showAddTierDialog = function() {
@@ -490,6 +520,7 @@
cloudStack.uiCustom.vpc = function(args) {
var vmListView = args.vmListView;
var tierArgs = args.tiers;
+ var siteToSiteVPN = args.siteToSiteVPN;
return function(args) {
var context = args.context;
@@ -512,6 +543,8 @@
success: function(args) {
var tiers = args.data.tiers;
var $chart = elems.chart({
+ $browser: $browser,
+ siteToSiteVPN: siteToSiteVPN,
vmListView: vmListView,
context: context,
actions: tierArgs.actions,
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/49c3c8b2/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index ad0b020..0b0e738 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -374,6 +374,11 @@
}
}
},
+ siteToSiteVPN: {
+ listView: function() {
+ return cloudStack.sections.network.sections.siteToSiteVpn;
+ }
+ },
tiers: {
actionPreFilter: function(args) {
var tier = args.context.tiers[0];