incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: refs/heads/ui-multiple-nics - WIP: Add view all button to NIC
Date Fri, 22 Feb 2013 23:54:06 GMT
Updated Branches:
  refs/heads/ui-multiple-nics df0039368 -> 29f9137e2


WIP: Add view all button to NIC


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

Branch: refs/heads/ui-multiple-nics
Commit: 29f9137e2d18cfe35656d6b9482248761cd9efa0
Parents: df00393
Author: Brian Federle <brian.federle@citrix.com>
Authored: Fri Feb 22 15:53:48 2013 -0800
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Fri Feb 22 15:53:48 2013 -0800

----------------------------------------------------------------------
 ui/scripts/instances.js             |    4 ++++
 ui/scripts/ui/widgets/detailView.js |   10 ++++++++++
 2 files changed, 14 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/29f9137e/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 8a7c7ad..5b448e3 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1242,6 +1242,10 @@
                 }
               }
             ],
+            viewAll: {
+              path: 'network.ipAddresses',
+              attachTo: 'ipaddress'
+            },
             dataProvider: function(args) {
                     $.ajax({
                      url:createURL("listVirtualMachines&details=nics&id=" + args.context.instances[0].id),

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/29f9137e/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index f0cc8fd..7d00bea 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -1034,6 +1034,16 @@
                   actionFilter: actionFilter
                 }
               ).appendTo($tabContent);
+
+              if (tabData.viewAll) {
+                $tabContent.find('tr')
+                  .filter('.' + tabData.viewAll.attachTo).find('td.value')
+                  .append(
+                    $('<div>').addClass('view-all').append(
+                      $('<span>').html('View all IP Addresses')
+                    )
+                  );
+              }
             });
 
             return true;


Mime
View raw message