cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bfede...@apache.org
Subject git commit: updated refs/heads/ui-ucs to dda2860
Date Fri, 17 May 2013 17:47:23 GMT
Updated Branches:
  refs/heads/ui-ucs [created] dda28609f


Add new infrastructure icon for UCS


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

Branch: refs/heads/ui-ucs
Commit: dda28609f72d346c4b1ee3a5a69af38b65ea1cf4
Parents: 5646f5e
Author: Brian Federle <bfederle@gmail.com>
Authored: Fri May 17 10:47:15 2013 -0700
Committer: Brian Federle <bfederle@gmail.com>
Committed: Fri May 17 10:47:15 2013 -0700

----------------------------------------------------------------------
 ui/css/cloudstack3.css                |    5 +++
 ui/images/bg-system-chart-compute.png |  Bin 85957 -> 94812 bytes
 ui/scripts/system.js                  |   51 ++++++++++++++++++++++++++++
 ui/scripts/ui-custom/zoneChart.js     |    7 ++++
 4 files changed, 63 insertions(+), 0 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dda28609/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 7f6df22..57da08d 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -4952,6 +4952,11 @@ Dialogs*/
   top: 497px;
 }
 
+.system-chart.compute ul.resources li.ucs {
+  left: 199px;
+  top: 406px;
+}
+
 /** Network*/
 .system-chart.network {
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dda28609/ui/images/bg-system-chart-compute.png
----------------------------------------------------------------------
diff --git a/ui/images/bg-system-chart-compute.png b/ui/images/bg-system-chart-compute.png
index 1125e80..36c7cd4 100644
Binary files a/ui/images/bg-system-chart-compute.png and b/ui/images/bg-system-chart-compute.png
differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dda28609/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 11365c1..6338adb 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5760,6 +5760,57 @@
 
               return listView;
             },
+
+            ucs: function() {
+              var listView = $.extend(true, {}, cloudStack.sections.system.subsections['secondary-storage'].listView,
{
+                dataProvider: function (args) {
+                  var searchByArgs = args.filterBy.search.value.length ?
+                    '&name=' + args.filterBy.search.value : '';
+
+                  var data = { 
+                    type: 'SecondaryStorage', 
+                    page: args.page, 
+                    pageSize: pageSize, 
+                    listAll: true 
+                  };                  
+
+                  $.ajax({
+                    url: createURL('listHosts' + searchByArgs),
+                    data: data,
+                    success: function (json) {
+                      args.response.success({ data: json.listhostsresponse.host });
+                    },
+                    error: function (json) {
+                      args.response.error(parseXMLHttpResponse(json));
+                    }
+                  });
+                },
+
+                detailView: {
+                  updateContext: function (args) {
+                    var zone;
+
+                    $.ajax({
+                      url: createURL('listZones'),
+                      data: { id: args.context.secondarystorages[0].zoneid },
+                      async: false,
+                      success: function (json) {
+                        zone = json.listzonesresponse.zone[0];
+                      }
+                    });
+
+                    selectedZoneObj = zone;
+
+                    return {
+                      zones: [zone]
+                    };
+                  }
+                }
+              });
+
+              return listView;
+            },
+            
             secondaryStorage: function() {
               var listView = $.extend(true, {}, cloudStack.sections.system.subsections['secondary-storage'].listView,
{
                 dataProvider: function (args) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dda28609/ui/scripts/ui-custom/zoneChart.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneChart.js b/ui/scripts/ui-custom/zoneChart.js
index 12ba6aa..a54ebbc 100644
--- a/ui/scripts/ui-custom/zoneChart.js
+++ b/ui/scripts/ui-custom/zoneChart.js
@@ -141,6 +141,13 @@
             }
           },
 
+          ucs: {
+            label: 'UCS',
+            viewAll: {
+              action: actions.listView('ucs', context)
+            }
+          },
+
           secondaryStorage: {
             label: 'Secondary Storage',
             viewAll: {


Mime
View raw message