19026639 solaris.css doesn't display network topology pop-ups correctly
19031443 nova package needs a require dependency on library/python-2/sqlalchemy
19031678 The Instances pop-up in Network Topology should remove 'open console'
--- a/components/openstack/horizon/files/branding/css/solaris.css Fri Jun 20 18:04:48 2014 -0700
+++ b/components/openstack/horizon/files/branding/css/solaris.css Mon Jun 23 08:41:07 2014 -0600
@@ -2037,20 +2037,9 @@
}
.btn-danger {
background: #0074CD;
- font-weight: bold;
- /*background-image: -moz-linear-gradient(top, #ee5f5b, #bd362f);
- background-image: -ms-linear-gradient(top, #ee5f5b, #bd362f);
- background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));
- background-image: -webkit-linear-gradient(top, #ee5f5b, #bd362f);
- background-image: -o-linear-gradient(top, #ee5f5b, #bd362f);
- background-image: linear-gradient(top, #ee5f5b, #bd362f);
- background-repeat: repeat-x;
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);
- border-color: #bd362f #bd362f #802420;
- border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
- filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);*/
- border: 1px solid #0074CD;
- color: #FFFFFF
+ /*font-weight: bold;*/
+ border: 1px solid #0074CD;
+ color: #FFFFFF
}
.btn-danger.active,
@@ -2183,7 +2172,8 @@
}
.topologyNavi .btn-group {
margin-left: 5px;
- float: right;
+ margin-top: 5px;
+ float: left;
}
.btn-group:before,
.btn-group:after {
@@ -6037,6 +6027,185 @@
.topologyNavi {
height: 80px;
}
+
+.topologyBalloon {
+ display: none;
+ background: #ffffff;
+ position: absolute;
+ left: 100px;
+ top: 20px;
+ z-index: 600;
+ border-radius: 5px;
+ color: #333333;
+ min-width: 200px;
+ line-height: 1.2;
+ font-size: 11px;
+ -webkit-box-shadow: 0px 1px 6px #777777;
+ -moz-box-shadow: 0px 1px 6px #777777;
+ box-shadow: 0px 1px 6px #777777;
+}
+.topologyBalloon.on {
+ display: block;
+}
+.topologyBalloon .vnc_window {
+ margin-left: 10px;
+}
+.topologyBalloon .closeTopologyBalloon {
+ font-size: 16px;
+ line-height: 1;
+ display: block;
+ position: absolute;
+ font-weight: bold;
+ right: 6px;
+ top: 0px;
+ cursor: pointer;
+ padding: 3px;
+ color: #aaaaaa;
+}
+.topologyBalloon .closeTopologyBalloon:hover {
+ color: #777777;
+ text-decoration: none;
+}
+.topologyBalloon .contentBody {
+ padding: 8px 8px 0;
+}
+.topologyBalloon span.active:before, .topologyBalloon span.down:before {
+ content: "";
+ width: 9px;
+ height: 9px;
+ display: inline-block;
+ background: #0d925b;
+ margin-right: 3px;
+ border-radius: 10px;
+ vertical-align: middle;
+}
+.topologyBalloon span.down:before {
+ background: #e64b41;
+}
+.topologyBalloon .footer {
+ background: #efefef;
+ border-top: 1px solid #d9d9d9;
+ padding: 8px;
+ border-radius: 0px 0px 7px 7px;
+}
+.topologyBalloon .footer .footerInner {
+ display: table;
+ width: 100%;
+}
+.topologyBalloon .footer .cell {
+ display: table-cell;
+ padding-right: 10px;
+}
+.topologyBalloon .footer .link {
+ font-size: 12px;
+}
+.topologyBalloon .footer .delete {
+ padding-right: 0;
+ text-align: right;
+}
+.topologyBalloon .footer .delete .btn:before {
+ content: "Delete ";
+}
+.topologyBalloon .footer .delete .btn.deleting:before {
+ content: "Deleting ";
+}
+.topologyBalloon .footer .delete .btn.instance:before {
+ content: "Terminate ";
+}
+.topologyBalloon .footer .delete .btn.instance.deleting:before {
+ content: "Terminating ";
+}
+.topologyBalloon table.detaiInfoTable {
+ margin: 0px 0px 8px 0px;
+
+}
+.topologyBalloon table.detaiInfoTable caption {
+ text-align: left;
+ font-size: 16px;
+ font-weight: bold;
+ margin-bottom: 3px;
+}
+.topologyBalloon table.detaiInfoTable th, .topologyBalloon table.detaiInfoTable td {
+ text-align: left;
+ vertical-align: middle;
+ padding-bottom: 3px;
+ background: transparent;
+}
+.topologyBalloon table.detaiInfoTable th {
+ color: #999999;
+ padding-right: 8px;
+ width: 80px;
+}
+.topologyBalloon table.detaiInfoTable th span {
+ vertical-align: middle;
+ width: 80px;
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: inline-block;
+}
+.topologyBalloon table.detaiInfoTable th.device {
+ text-align: right;
+ font-size: 12px;
+ color: #333333;
+ padding-left: 12px;
+}
+.topologyBalloon table.detaiInfoTable td {
+ padding-right: 5px;
+ white-space: nowrap;
+}
+.topologyBalloon table.detaiInfoTable td.delete {
+ padding-right: 0;
+ text-align: right;
+}
+.topologyBalloon table.detaiInfoTable .btn {
+ line-height: 1.4;
+}
+.topologyBalloon table.detaiInfoTable .btn:before {
+ content: "Delete ";
+}
+.topologyBalloon table.detaiInfoTable .btn.deleting:before {
+ content: "Deleting ";
+}
+.topologyBalloon:before {
+ border-top: 7px solid transparent;
+ border-bottom: 7px solid transparent;
+ border-right: 9px solid #bbbbbb;
+ display: block;
+ position: absolute;
+ top: 30px;
+ left: -9px;
+ width: 0;
+ height: 0;
+ content: "";
+}
+.topologyBalloon:after {
+ border-top: 6px solid transparent;
+ border-bottom: 6px solid transparent;
+ border-right: 8px solid #ffffff;
+ display: block;
+ position: absolute;
+ top: 31px;
+ left: -8px;
+ width: 0;
+ height: 0;
+ content: "";
+}
+.topologyBalloon.leftPosition:before {
+ border-right: none;
+ border-left: 9px solid #bbbbbb;
+ right: -9px;
+ top: 30px;
+ left: auto;
+}
+.topologyBalloon.leftPosition:after {
+ border-right: none;
+ border-left: 8px solid #ffffff;
+ right: -8px;
+ top: 31px;
+ left: auto;
+}
+
.quota-dynamic {
height: 200px;
min-width: 840px;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/components/openstack/horizon/patches/06-remove-console.patch Mon Jun 23 08:41:07 2014 -0600
@@ -0,0 +1,15 @@
+In-house patch to remove the ">> open console" link from instance
+elements in the Network Topology screen. This patch is
+Solaris-specific and not suitable for upstream contribution.
+
+--- horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html.orig 2014-06-20 08:04:57.394535111 -0600
++++ horizon-2013.2.3/openstack_dashboard/dashboards/project/network_topology/templates/network_topology/client_side/_balloon_container.html 2014-06-20 08:05:47.621066190 -0600
+@@ -16,7 +16,6 @@
+ <div class="cell link">
+ <a href="[[url]]">» view [[type]] details</a>
+ [[#console_id]]
+- <a href="[[url]][[console]]" class="vnc_window">» open console</a>
+ [[/console_id]]
+ </div>
+ <div class="cell delete">
+
--- a/components/openstack/nova/nova.p5m Fri Jun 20 18:04:48 2014 -0700
+++ b/components/openstack/nova/nova.p5m Mon Jun 23 08:41:07 2014 -0600
@@ -874,6 +874,9 @@
# force a dependency on six; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/six-26
+# force a dependency on sqlalchemy; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/sqlalchemy-26
+
# force a dependency on stevedore; pkgdepend work is needed to flush this out.
depend type=require fmri=library/python/stevedore-26
--- a/components/openstack/nova/resolve.deps Fri Jun 20 18:04:48 2014 -0700
+++ b/components/openstack/nova/resolve.deps Mon Jun 23 08:41:07 2014 -0600
@@ -1,7 +1,6 @@
install/archive
library/python/eventlet-26
library/python/oslo.config-26
-library/python/sqlalchemy-26
library/python/sqlalchemy-migrate-26
library/python/webob-26
runtime/python-26