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-vpc-redesign to f9b843d
Date Tue, 07 May 2013 23:11:55 GMT
Updated Branches:
  refs/heads/ui-vpc-redesign 9c68b0937 -> f9b843d74


Add tier 'view all' icon


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

Branch: refs/heads/ui-vpc-redesign
Commit: f9b843d7449a1466ebb0f6f86e0c8b567206a713
Parents: 9c68b09
Author: Brian Federle <brian.federle@citrix.com>
Authored: Tue May 7 16:11:45 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Tue May 7 16:11:45 2013 -0700

----------------------------------------------------------------------
 ui/images/sprites.png  |  Bin 192407 -> 192511 bytes
 ui/modules/vpc/vpc.css |   40 +++++++++++++++++++++++++++++++++++++---
 ui/modules/vpc/vpc.js  |    3 ++-
 3 files changed, 39 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9b843d7/ui/images/sprites.png
----------------------------------------------------------------------
diff --git a/ui/images/sprites.png b/ui/images/sprites.png
index 132588d..2c30b58 100644
Binary files a/ui/images/sprites.png and b/ui/images/sprites.png differ

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9b843d7/ui/modules/vpc/vpc.css
----------------------------------------------------------------------
diff --git a/ui/modules/vpc/vpc.css b/ui/modules/vpc/vpc.css
index d5ad6b2..95f0111 100644
--- a/ui/modules/vpc/vpc.css
+++ b/ui/modules/vpc/vpc.css
@@ -41,7 +41,10 @@
 }
 
 .vpc-network-chart .tier-item .header {
+  width: 100%;
+  float: left;
   padding: 7px 0 6px;
+  position: relative;
   /*+box-shadow:inset 0px 1px 1px #FFFFFF;*/
   -moz-box-shadow: inset 0px 1px 1px #FFFFFF;
   -webkit-box-shadow: inset 0px 1px 1px #FFFFFF;
@@ -51,9 +54,37 @@
   border-bottom: 1px solid #40639E;
 }
 
+.vpc-network-chart .tier-item .header .detail-link {
+  cursor: pointer;
+  background: #435667 url(../../images/sprites.png) -428px -83px;
+  /*+box-shadow:inset 0px 1px 4px #2F2F2F;*/
+  -moz-box-shadow: inset 0px 1px 4px #2F2F2F;
+  -webkit-box-shadow: inset 0px 1px 4px #2F2F2F;
+  -o-box-shadow: inset 0px 1px 4px #2F2F2F;
+  box-shadow: inset 0px 1px 4px #2F2F2F;
+  width: 16px;
+  height: 16px;
+  float: right;
+  /*+placement:shift -8px 2px;*/
+  position: relative;
+  left: -8px;
+  top: 2px;
+  /*+border-radius:10px;*/
+  -moz-border-radius: 10px;
+  -webkit-border-radius: 10px;
+  -khtml-border-radius: 10px;
+  border-radius: 10px;
+}
+
+.vpc-network-chart .tier-item .header .detail-link:hover {
+  background-color: #454545;
+}
+
 .vpc-network-chart .tier-item .header .title {
   margin-left: 9px;
-  max-width: 268px;
+  width: 268px;
+  height: 20px;
+  float: left;
   overflow: hidden;
 }
 
@@ -69,7 +100,7 @@
 
 .vpc-network-chart .tier-item .content {
   width: 100%;
-  height: 83%;
+  height: 100%;
   /*+box-shadow:inset 0px 1px 1px #FFFFFF;*/
   -moz-box-shadow: inset 0px 1px 1px #FFFFFF;
   -webkit-box-shadow: inset 0px 1px 1px #FFFFFF;
@@ -136,7 +167,10 @@
 }
 
 .vpc-network-chart .tier-item .content .info {
-  padding: 9px 0 10px 10px;
+  /*+placement:shift 10px 5px;*/
+  position: relative;
+  left: 10px;
+  top: 5px;
 }
 
 .vpc-network-chart .tier-item .content .info .cidr-label {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f9b843d7/ui/modules/vpc/vpc.js
----------------------------------------------------------------------
diff --git a/ui/modules/vpc/vpc.js b/ui/modules/vpc/vpc.js
index ee9e148..69cf795 100644
--- a/ui/modules/vpc/vpc.js
+++ b/ui/modules/vpc/vpc.js
@@ -10,6 +10,7 @@
       var $dashboard = elems.dashboard({
         dashboardItems: dashboardItems
       });
+      var $detailLink = $('<div>').addClass('detail-link');
       var $info = $('<div>').addClass('info');
       var $cidrLabel = $('<span>').addClass('cidr-label');
       var $cidr = $('<span>').addClass('cidr');
@@ -17,7 +18,7 @@
       $cidrLabel.html('CIDR: ');
       $cidr.html(tier.cidr);
       $title.find('span').html(tier.displayname ? tier.displayname : tier.name);
-      $header.append($title);
+      $header.append($title, $detailLink);
       $info.append($cidrLabel, $cidr);
       $content.append($dashboard, $info);
       $tier.append($header, $content);


Mime
View raw message