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 2013/10/25 00:56:25 UTC
[01/12] git commit: updated refs/heads/ui-restyle to e13c32f
Updated Branches:
refs/heads/ui-restyle 500c798f7 -> e13c32f34
UI > Instance Wizard > Step 4 > correct label from "Data Disk Offering" to "Disk Offering" since selected disk offering here refers to root disk volume when selected template is of ISO format, data disk volume otherwise.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1be4fff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1be4fff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1be4fff
Branch: refs/heads/ui-restyle
Commit: a1be4fffe51b0b47a4e2358aaeba1ef2f84f41da
Parents: c5fdf29
Author: Jessica Wang <je...@apache.org>
Authored: Thu Oct 24 11:29:03 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Oct 24 11:29:47 2013 -0700
----------------------------------------------------------------------
ui/index.jsp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1be4fff/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 20859b4..7a1cfaa 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -94,7 +94,7 @@
<li class="first"><span class="number">1</span><span><fmt:message key="label.setup"/></span><span class="arrow"></span></li>
<li><span class="number">2</span><span class="multiline"><fmt:message key="label.select.a.template"/></span><span class="arrow"></span></li>
<li><span class="number">3</span><span class="multiline"><fmt:message key="label.compute.offering"/></span><span class="arrow"></span></li>
- <li><span class="number">4</span><span class="multiline"><fmt:message key="label.data.disk.offering"/></span><span class="arrow"></span></li>
+ <li><span class="number">4</span><span class="multiline"><fmt:message key="label.disk.offering"/></span><span class="arrow"></span></li>
<li><span class="number">5</span><span><fmt:message key="label.affinity"/></span><span class="arrow"></span></li>
<li><span class="number">6</span><span><fmt:message key="label.menu.network"/></span><span class="arrow"></span></li>
<li class="last"><span class="number">7</span><span><fmt:message key="label.review"/></span></li>
@@ -421,10 +421,10 @@
<a href="3"><fmt:message key="label.edit"/></a>
</div>
</div>
- <!-- Data disk offering -->
+ <!-- Disk offering -->
<div class="select">
<div class="name">
- <span><fmt:message key="label.data.disk.offering"/></span>
+ <span><fmt:message key="label.disk.offering"/></span>
</div>
<div class="value">
<span wizard-field="disk-offering"></span>
[03/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
CLOUDSTACK-4649: UI > Edit Instance, Edit Template > fix a bug that XenServer Tools Version 6.1+ field didn't get updated correctly.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/25924520
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/25924520
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/25924520
Branch: refs/heads/ui-restyle
Commit: 259245200d21fd642633dab54fc9e775ef2a12a5
Parents: ed0fbcc
Author: Jessica Wang <je...@apache.org>
Authored: Thu Oct 24 14:25:21 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Oct 24 14:25:21 2013 -0700
----------------------------------------------------------------------
ui/scripts/instances.js | 34 +++++++++++++++++++++++++++++++---
ui/scripts/templates.js | 32 ++++++++++++++++++++++++++++++--
2 files changed, 61 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25924520/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6e545fc..b729c4b 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -853,12 +853,40 @@
url: createURL('addResourceDetail'),
data: {
resourceType: 'uservm',
- resourceId: 3,
+ resourceId: args.context.instances[0].id,
'details[0].key': 'hypervisortoolsversion',
'details[0].value': (args.data.xenserverToolsVersion61plus == "on") ? 'xenserver61' : 'xenserver56'
},
- success: function(json) {
- //do nothing
+ success: function(json) {
+ var jobId = json.addResourceDetailresponse.jobid;
+ var addResourceDetailIntervalID = setInterval(function() {
+ $.ajax({
+ url: createURL("queryAsyncJobResult&jobid=" + jobId),
+ dataType: "json",
+ success: function(json) {
+ var result = json.queryasyncjobresultresponse;
+
+ if (result.jobstatus == 0) {
+ return; //Job has not completed
+ } else {
+ clearInterval(addResourceDetailIntervalID);
+
+ if (result.jobstatus == 1) {
+ //do nothing
+ } else if (result.jobstatus == 2) {
+ cloudStack.dialog.notice({
+ message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + _s(result.jobresult.errortext)
+ });
+ }
+ }
+ },
+ error: function(XMLHttpResponse) {
+ cloudStack.dialog.notice({
+ message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + parseXMLHttpResponse(XMLHttpResponse)
+ });
+ }
+ });
+ }, g_queryAsyncJobResultInterval);
}
});
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25924520/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 922c87e..d4655e7 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -670,12 +670,40 @@
url: createURL('addResourceDetail'),
data: {
resourceType: 'template',
- resourceId: 1,
+ resourceId: args.context.templates[0].id,
'details[0].key': 'hypervisortoolsversion',
'details[0].value': (args.data.xenserverToolsVersion61plus == "on") ? 'xenserver61' : 'xenserver56'
},
success: function(json) {
- //do nothing
+ var jobId = json.addResourceDetailresponse.jobid;
+ var addResourceDetailIntervalID = setInterval(function() {
+ $.ajax({
+ url: createURL("queryAsyncJobResult&jobid=" + jobId),
+ dataType: "json",
+ success: function(json) {
+ var result = json.queryasyncjobresultresponse;
+
+ if (result.jobstatus == 0) {
+ return; //Job has not completed
+ } else {
+ clearInterval(addResourceDetailIntervalID);
+
+ if (result.jobstatus == 1) {
+ //do nothing
+ } else if (result.jobstatus == 2) {
+ cloudStack.dialog.notice({
+ message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + _s(result.jobresult.errortext)
+ });
+ }
+ }
+ },
+ error: function(XMLHttpResponse) {
+ cloudStack.dialog.notice({
+ message: "Failed to update XenServer Tools Version 6.1+ field. Error: " + parseXMLHttpResponse(XMLHttpResponse)
+ });
+ }
+ });
+ }, g_queryAsyncJobResultInterval);
}
});
}
[08/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
Quickview: Better styling
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3734af14
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3734af14
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3734af14
Branch: refs/heads/ui-restyle
Commit: 3734af1402f703c31fa7a94282ed1c884bb481c2
Parents: f185eac
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 24 15:52:43 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 24 15:52:54 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 43 +++++++++++++++++--------------------------
1 file changed, 17 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3734af14/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 9e89c12..8e48c2a 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -1307,7 +1307,6 @@ div.list-view td.state.off span {
.quick-view-tooltip {
width: 470px;
display: inline-block;
- margin-left: -462px;
padding-top: 50px;
}
@@ -1316,20 +1315,16 @@ div.list-view td.state.off span {
position: absolute;
top: 71px;
left: 10px;
- color: #5A6977;
- /*+text-shadow:0px 1px #EAEAEA;*/
- -moz-text-shadow: 0px 1px #EAEAEA;
- -webkit-text-shadow: 0px 1px #EAEAEA;
- -o-text-shadow: 0px 1px #EAEAEA;
- text-shadow: 0px 1px #EAEAEA;
+ color: #808080;
+ font-weight: 100;
}
.quick-view-tooltip > div.title .icon {
position: relative;
- top: -3px;
+ top: -2px;
background: url(../images/sprites.png) no-repeat -42px -67px;
float: right;
- padding: 5px 21px 0 1px;
+ padding: 0px 13px 0 0px;
}
.quick-view-tooltip .loading-overlay {
@@ -1348,8 +1343,8 @@ div.list-view td.state.off span {
.quick-view-tooltip .container {
border: 1px solid #9EA2A5;
- background: #CCCFD6;
- width: 470px;
+ background: #FFFFFF;
+ width: 478px;
min-height: 100px;
height: auto;
overflow: hidden;
@@ -1367,10 +1362,10 @@ div.list-view td.state.off span {
.quick-view-tooltip .detail-view .main-groups {
width: 456px;
- height: 152px;
+ height: 170px;
position: absolute;
- top: 55px;
padding-top: 7px;
+ top: 55px;
border: 1px solid #808080;
border-left: none;
border-right: none;
@@ -1404,7 +1399,7 @@ div.list-view td.state.off span {
.quick-view-tooltip .detail-view .details {
display: inline-block;
height: auto;
- padding-bottom: 209px;
+ padding-bottom: 224px;
}
.quick-view-tooltip .detail-view .detail-group {
@@ -1427,14 +1422,9 @@ div.list-view td.state.off span {
}
.quick-view-tooltip .detail-view .detail-group table td.name {
- color: #3E5F7F !important;
+ color: #000000 !important;
padding: 0px 29px 0px 5px !important;
font-size: 13px;
- /*+text-shadow:0px 1px #DBDBDB;*/
- -moz-text-shadow: 0px 1px #DBDBDB;
- -webkit-text-shadow: 0px 1px #DBDBDB;
- -o-text-shadow: 0px 1px #DBDBDB;
- text-shadow: 0px 1px #DBDBDB;
}
.quick-view-tooltip .detail-view .detail-group table td.value {
@@ -1455,7 +1445,7 @@ div.list-view td.state.off span {
.quick-view-tooltip .detail-view .detail-group .main-groups table td.value span {
height: 25px;
- top: 0px;
+ top: 7px;
}
.quick-view-tooltip .detail-view .detail-group.actions {
@@ -1517,15 +1507,17 @@ div.list-view td.state.off span {
height: auto;
background: none;
vertical-align: top;
+ position: relative;
+ top: 27px;
float: left;
}
.quick-view-tooltip .detail-view .detail-group.actions td.view-all {
position: relative;
left: 0px;
+ top: 26px;
float: left;
- height: 22px;
- border-top: 1px solid #808080;
+ height: 26px;
/*+box-shadow:inset 0px 1px #FFFFFF;*/
-moz-box-shadow: inset 0px 1px #FFFFFF;
-webkit-box-shadow: inset 0px 1px #FFFFFF;
@@ -1980,7 +1972,7 @@ div.detail-group td.view-all a {
font-size: 13px;
display: block;
text-decoration: none;
- color: #268BE3;
+ color: #145A98;
/*+text-shadow:0px 1px 2px #FFFFFF;*/
-moz-text-shadow: 0px 1px 2px #FFFFFF;
-webkit-text-shadow: 0px 1px 2px #FFFFFF;
@@ -2063,7 +2055,7 @@ div.detail-group.actions tr {
}
div.detail-group.actions td {
- height: 47px;
+ height: 50px;
vertical-align: middle;
}
@@ -2109,7 +2101,6 @@ div.detail-group.actions td {
.detail-group table td.detail-actions.full-length {
display: block;
width: 99%;
- border-bottom: 1px solid #AAAAAA;
float: left;
}
[11/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
Detail view UI: make view all links have hyperlink style
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1b7f5106
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1b7f5106
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1b7f5106
Branch: refs/heads/ui-restyle
Commit: 1b7f5106b69904efc6e5fb3a1d65806fabd60a23
Parents: 71a38b7
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 24 15:38:05 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 24 15:52:54 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1b7f5106/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 760c444..9e89c12 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -135,7 +135,7 @@ table thead th.sorted.asc {
table tbody td,
table th {
- padding: 9px 5px 4px;
+ padding: 10px 5px 8px;
border-right: 1px solid #BFBFBF;
color: #495A76;
clear: none;
@@ -457,7 +457,7 @@ body.login {
}
#browser div.panel div.detail-view .toolbar {
- width: 594px;
+ width: 100%;
}
div.list-view table tbody td span {
@@ -1977,25 +1977,17 @@ div.detail-group td.view-all div.view-all {
}
div.detail-group td.view-all a {
- background: url(../images/gradients.png) repeat-x 0px -529px;
- font-size: 11px;
+ font-size: 13px;
display: block;
- height: 27px;
text-decoration: none;
- color: #4C5D6C;
+ color: #268BE3;
/*+text-shadow:0px 1px 2px #FFFFFF;*/
-moz-text-shadow: 0px 1px 2px #FFFFFF;
-webkit-text-shadow: 0px 1px 2px #FFFFFF;
-o-text-shadow: 0px 1px 2px #FFFFFF;
text-shadow: 0px 1px 2px #FFFFFF;
float: left;
- padding: 0 1px;
- border-left: 1px solid #9B9EA2;
- /*+border-radius:5px 0 0 5px;*/
- -moz-border-radius: 5px 0 0 5px;
- -webkit-border-radius: 5px 0 0 5px;
- -khtml-border-radius: 5px 0 0 5px;
- border-radius: 5px 0 0 5px;
+ font-weight: 100;
}
div.detail-group td.view-all:hover a {
@@ -2009,7 +2001,13 @@ div.detail-group td.view-all a span {
top: 7px;
}
+div.detail-group td.view-all:hover a span {
+ text-decoration: underline;
+ color: #000000;
+}
+
div.detail-group td.view-all div.view-all div.end {
+ display: none;
float: left;
width: 15px;
height: 25px;
@@ -2045,16 +2043,9 @@ div.details .main-groups label.error {
.detail-view td.view-all.multiple {
max-width: 145px;
- height: 17px;
display: block;
float: left;
- margin: 8px 2px 8px 8px;
- border: none !important;
- /*+box-shadow:none;*/
- -moz-box-shadow: none !important;
- -webkit-box-shadow: none !important;
- -o-box-shadow: none !important;
- box-shadow: none !important;
+ height: 28px;
}
/*** Actions*/
@@ -2072,7 +2063,7 @@ div.detail-group.actions tr {
}
div.detail-group.actions td {
- height: 43px;
+ height: 47px;
vertical-align: middle;
}
[09/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
Make header width 100%; body stays 1024px centered.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2dd5e2d7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2dd5e2d7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2dd5e2d7
Branch: refs/heads/ui-restyle
Commit: 2dd5e2d7c7983c16d0f9c330cb94e2202f834eea
Parents: d178b25
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 24 15:31:12 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 24 15:52:54 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 163 +++++++++++++++++++++++++++-----------------
1 file changed, 100 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2dd5e2d7/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 291ed77..760c444 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -46,6 +46,7 @@ div.toolbar,
/*+}*/
body {
+ min-width: 1024px;
font-family: sans-serif;
height: 769px !important;
overflow: auto;
@@ -60,12 +61,22 @@ body.install-wizard {
background: #FFFFFF url(../images/bg-login.png);
}
-#container {
+#main-area {
width: 1024px;
+ height: 728px;
+ margin: auto;
+ border: 1px solid #D4D4D4;
+ /*+box-shadow:0px -5px 11px #B7B7B7;*/
+ -moz-box-shadow: 0px -5px 11px #B7B7B7;
+ -webkit-box-shadow: 0px -5px 11px #B7B7B7;
+ -o-box-shadow: 0px -5px 11px #B7B7B7;
+ box-shadow: 0px -5px 11px #B7B7B7;
+}
+
+#container {
+ /*[empty]width:;*/
height: 783px;
margin: auto;
- border: 1px solid #E2E2E2;
- border-top: none;
position: relative;
}
@@ -124,7 +135,7 @@ table thead th.sorted.asc {
table tbody td,
table th {
- padding: 9px 5px 4px 5px;
+ padding: 9px 5px 4px;
border-right: 1px solid #BFBFBF;
color: #495A76;
clear: none;
@@ -2204,8 +2215,11 @@ div.detail-group.actions td {
/*Header*/
#header {
+ width: 100%;
height: 56px;
background: #DFDFDF url(../images/bg-header.png) repeat-x;
+ z-index: 10000;
+ position: relative;
}
#header div.button {
@@ -6018,7 +6032,7 @@ label.error {
.multi-wizard.instance-wizard .section.custom-size {
position: relative;
- background: white;
+ background: #FFFFFF;
padding: 7px;
border-radius: 4px;
}
@@ -6497,8 +6511,9 @@ label.error {
text-align: center;
/*+placement:shift 0px 153px;*/
position: relative;
- left: -10px;
+ left: 0px;
top: 153px;
+ left: -10px;
/*+text-shadow:0px 1px #FFFFFF;*/
-moz-text-shadow: 0px 1px #FFFFFF;
-webkit-text-shadow: 0px 1px #FFFFFF;
@@ -9866,8 +9881,9 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t
color: #838181;
/*+placement:shift 488px 9px;*/
position: relative;
- left: 480px;
+ left: 488px;
top: 9px;
+ left: 480px;
margin: 19px 0 0 40px;
}
@@ -12286,97 +12302,118 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
}
.accounts-wizard table {
- margin: 0;
- width: 100%;
- table-layout: fixed;
+ margin: 0;
+ width: 100%;
+ table-layout: fixed;
}
+
.accounts-wizard .ui-button {
- display: inline-block !important;
- float: none !important;
+ display: inline-block !important;
+ float: none !important;
}
+
.accounts-wizard td:last-child {
- border: none;
+ border: none;
}
+
.accounts-wizard tbody tr:nth-child(even) {
- background: #DFE1E3;
+ background: #DFE1E3;
}
+
.accounts-wizard tbody tr:nth-child(odd) {
- background: #F2F0F0;
+ background: #F2F0F0;
}
+
.accounts-wizard .content {
- display: inline-block;
+ display: inline-block;
}
+
.accounts-wizard .content:last-child {
- margin-left: 14px;
+ margin-left: 14px;
}
+
.accounts-wizard .input-area {
- width: 320px;
- font-size: 13px;
- color: #485867;
- text-shadow: 0px 2px 1px #FFFFFF;
+ width: 320px;
+ font-size: 13px;
+ color: #485867;
+ text-shadow: 0px 2px 1px #FFFFFF;
}
+
.ldap-account-choice {
- border: none !important;
- border-radius: 0 0 0 0 !important;
+ border: none !important;
+ border-radius: 0 0 0 0 !important;
}
+
.manual-account-details .name {
- margin-top: 2px;
- width: 100px;
- float: left;
- padding-bottom:10px;
+ margin-top: 2px;
+ width: 100px;
+ float: left;
+ padding-bottom: 10px;
}
+
.manual-account-details {
- height: auto !important;
- overflow: visible !important;
- overflow-x: visible !important;
+ height: auto !important;
+ overflow: visible !important;
+ overflow-x: visible !important;
}
+
.manual-account-details label.error {
- display: block;
- font-size: 10px;
+ display: block;
+ font-size: 10px;
}
+
.manual-account-details .value {
- float: left;
+ float: left;
}
+
.manual-account-details .form-item:after {
- content:".";
- display: block;
- clear: both;
- visibility: hidden;
- line-height: 0;
- height: 0;
+ content: ".";
+ display: block;
+ clear: both;
+ visibility: hidden;
+ line-height: 0;
+ height: 0;
}
+
.manual-account-details .form-item {
- padding: 5px;
- width: 100%;
- -webkit-box-sizing: border-box;
- -moz-box-sizing: border-box;
- box-sizing: border-box;
+ padding: 5px;
+ width: 100%;
+ -webkit-box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ box-sizing: border-box;
}
-.manual-account-details select, .manual-account-details input {
- width: 150px;
+
+.manual-account-details select,
+.manual-account-details input {
+ width: 150px;
}
+
.manual-account-details input {
- background: #F6F6F6;
- -moz-border-radius: 4px;
- -webkit-border-radius: 4px;
- -khtml-border-radius: 4px;
- border-radius: 4px;
- border-radius: 4px 4px 4px 4px;
- border: 1px solid #AFAFAF;
- -moz-box-shadow: inset 0px 1px #727272;
- -webkit-box-shadow: inset 0px 1px #727272;
- -o-box-shadow: inset 0px 1px #727272;
- box-shadow: inset 0px 1px #727272;
- -moz-box-shadow: inset 0px 1px 0px #727272;
- -webkit-box-shadow: inset 0px 1px 0px #727272;
- -o-box-shadow: inset 0px 1px 0px #727272;
+ background: #F6F6F6;
+ -moz-border-radius: 4px;
+ -webkit-border-radius: 4px;
+ -khtml-border-radius: 4px;
+ border-radius: 4px;
+ border-radius: 4px 4px 4px 4px;
+ border: 1px solid #AFAFAF;
+ -moz-box-shadow: inset 0px 1px #727272;
+ -webkit-box-shadow: inset 0px 1px #727272;
+ -o-box-shadow: inset 0px 1px #727272;
+ box-shadow: inset 0px 1px #727272;
+ -moz-box-shadow: inset 0px 1px 0px #727272;
+ -webkit-box-shadow: inset 0px 1px 0px #727272;
+ -o-box-shadow: inset 0px 1px 0px #727272;
}
+
.manual-account-details > *:nth-child(even) {
- background: #DFE1E3;
+ background: #DFE1E3;
}
+
.manual-account-details > *:nth-child(odd) {
- background: #F2F0F0;
+ background: #F2F0F0;
}
+
.manual-account-details .value {
- display: inline-block;
+ display: inline-block;
}
+
[02/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
CLOUDSTACK-4950: fix the problem to support sessions to multiple vCenter instance
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ed0fbcc8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ed0fbcc8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ed0fbcc8
Branch: refs/heads/ui-restyle
Commit: ed0fbcc81c1928062054190ffcfab8bb59969cc2
Parents: a1be4ff
Author: Kelven Yang <ke...@gmail.com>
Authored: Thu Oct 24 11:41:49 2013 -0700
Committer: Kelven Yang <ke...@gmail.com>
Committed: Thu Oct 24 11:42:41 2013 -0700
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/util/VmwareClient.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed0fbcc8/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
----------------------------------------------------------------------
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
index b20217a..d1adbc2 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
@@ -88,8 +88,6 @@ public class VmwareClient {
}
};
HttpsURLConnection.setDefaultHostnameVerifier(hv);
-
- vimService = new VimService();
} catch (Exception e) {
}
}
@@ -107,7 +105,7 @@ public class VmwareClient {
}
private ManagedObjectReference SVC_INST_REF = new ManagedObjectReference();
- private static VimService vimService;
+ private VimService vimService;
private VimPortType vimPort;
private String serviceCookie;
private final String SVC_INST_NAME = "ServiceInstance";
@@ -127,6 +125,7 @@ public class VmwareClient {
SVC_INST_REF.setType(SVC_INST_NAME);
SVC_INST_REF.setValue(SVC_INST_NAME);
+ vimService = new VimService();
vimPort = vimService.getVimPort();
Map<String, Object> ctxt = ((BindingProvider) vimPort).getRequestContext();
[05/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
Update logo
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0ef8b877
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0ef8b877
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0ef8b877
Branch: refs/heads/ui-restyle
Commit: 0ef8b8770ac4e9b22df0fffedabf8a8d0dbfd793
Parents: 6df1998
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 24 15:21:30 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 24 15:22:02 2013 -0700
----------------------------------------------------------------------
ui/css/cloudstack3.css | 6 +++---
ui/images/logo-login-oss.png | Bin 4567 -> 22165 bytes
ui/images/logo.png | Bin 3886 -> 21781 bytes
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ef8b877/ui/css/cloudstack3.css
----------------------------------------------------------------------
diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index fd6e6f3..291ed77 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -403,11 +403,11 @@ body.login {
}
.login .logo {
- width: 243px;
+ width: 250px;
height: 31px;
float: left;
margin: 72px 0 0 209px;
- background: url(../images/logo-login.png) no-repeat -7px 0px;
+ background: url(../images/logo-login.png) no-repeat 0 0;
}
.login.nologo .logo {
@@ -2215,7 +2215,7 @@ div.detail-group.actions td {
}
#header.nologo div.logo {
- width: 170px;
+ width: 210px;
height: 47px;
position: relative;
float: left;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ef8b877/ui/images/logo-login-oss.png
----------------------------------------------------------------------
diff --git a/ui/images/logo-login-oss.png b/ui/images/logo-login-oss.png
index c008108..e0f3767 100644
Binary files a/ui/images/logo-login-oss.png and b/ui/images/logo-login-oss.png differ
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ef8b877/ui/images/logo.png
----------------------------------------------------------------------
diff --git a/ui/images/logo.png b/ui/images/logo.png
index bc5294c..f36a9cb 100644
Binary files a/ui/images/logo.png and b/ui/images/logo.png differ
[07/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
Quickview: Fix positioning
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f185eac4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f185eac4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f185eac4
Branch: refs/heads/ui-restyle
Commit: f185eac4b555fffe709902f18563881634de6ed7
Parents: 1b7f510
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 24 15:52:34 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 24 15:52:54 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/listView.js | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f185eac4/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index 36baa95..21d03b1 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -1387,8 +1387,7 @@
});
$quickViewTooltip.css({
position: 'absolute',
- left: $tr.width() + ($quickViewTooltip.width() -
- ($quickViewTooltip.width() / 2)),
+ left: $tr.offset().left + $tr.width() - $quickViewTooltip.width(),
top: $quickView.offset().top - 50,
zIndex: $tr.closest('.panel').zIndex() + 1
});
[10/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
Browser widget: Modify behavior
-For better screen real-estate, make all
browser panes open to full width of content area by default, unless
partial: true is passed in options
-Remove animation effect, for quicker browsing
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/71a38b74
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/71a38b74
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/71a38b74
Branch: refs/heads/ui-restyle
Commit: 71a38b74c383e475c9c55a0221d67b94c21157ad
Parents: 2dd5e2d
Author: Brian Federle <br...@citrix.com>
Authored: Wed Oct 2 12:17:00 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 24 15:52:54 2013 -0700
----------------------------------------------------------------------
ui/scripts/ui/widgets/cloudBrowser.js | 52 +++++++++++-------------------
ui/scripts/ui/widgets/treeView.js | 1 +
2 files changed, 20 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71a38b74/ui/scripts/ui/widgets/cloudBrowser.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/cloudBrowser.js b/ui/scripts/ui/widgets/cloudBrowser.js
index a5f253b..ffb5f15 100644
--- a/ui/scripts/ui/widgets/cloudBrowser.js
+++ b/ui/scripts/ui/widgets/cloudBrowser.js
@@ -95,7 +95,7 @@
*/
width: function($container, options) {
options = options ? options : {};
- var width = $container.find('div.panel').size() < 1 || options.maximized == true ?
+ var width = $container.find('div.panel').size() < 1 || !options.partial ?
$container.width() : $container.width() - $container.width() / 4;
return width;
@@ -105,7 +105,7 @@
* Get left position
*/
position: function($container, options) {
- return $container.find('div.panel').size() <= 1 || options.maximized == true ?
+ return $container.find('div.panel').size() <= 1 || !options.partial ?
0 : _panel.width($container, options) - _panel.width($container, options) / 1.5;
},
@@ -160,7 +160,7 @@
var $panel = $('<div>').addClass('panel').css({
position: 'absolute',
width: _panel.width($container, {
- maximized: options.maximized
+ partial: options.partial
}),
zIndex: _panel.topIndex($container)
}).append(
@@ -168,8 +168,6 @@
$('<div>').addClass('shadow')
).append(options.data);
- if (options.maximized) $panel.addClass('always-maximized');
-
return $panel;
}
};
@@ -195,12 +193,10 @@
var $toRemove = _panel.higher($container, $panel);
var complete = args.complete;
- if ($panel.hasClass('maximized')) return false;
-
_breadcrumb.filter($toRemove).remove();
_breadcrumb.filter($panel.siblings()).removeClass('active');
_breadcrumb.filter($panel).addClass('active');
- _breadcrumb.filter($('div.panel')).find('span').animate({
+ _breadcrumb.filter($('div.panel')).find('span').css({
opacity: 1
});
_breadcrumb.filter(
@@ -209,7 +205,7 @@
.addClass('reduced')
).removeClass('active maximized');
- $toRemove.animate(
+ $toRemove.css(
_panel.initialState($container), {
duration: 500,
complete: function() {
@@ -220,7 +216,7 @@
}
);
$toShow.show();
- $panel.animate({
+ $panel.css({
left: _panel.position($container, {
maximized: $panel.hasClass('always-maximized')
})
@@ -241,25 +237,18 @@
_breadcrumb.filter($panel).removeClass('maximized');
$panel.removeClass('maximized');
$panel.addClass('reduced');
- _breadcrumb.filter($panel.siblings()).find('span').animate({
+ _breadcrumb.filter($panel.siblings()).find('span').css({
opacity: 1
});
- $toHide.animate({
+ $toHide.css({
left: _panel.position($container, {})
- }, {
- duration: 500
});
$shadow.show();
} else {
_breadcrumb.filter($panel).addClass('maximized');
$panel.removeClass('reduced');
$panel.addClass('maximized');
- _breadcrumb.filter($panel.siblings()).find('span').animate({
- opacity: 0.5
- });
- $toHide.animate(_panel.initialState($container), {
- duration: 500
- });
+ $toHide.css(_panel.initialState($container));
$shadow.hide();
}
},
@@ -275,7 +264,7 @@
// Create panel
$panel = _panel.create(this.element, {
- maximized: args.maximizeIfSelected,
+ partial: args.partial,
data: args.data
});
@@ -315,7 +304,8 @@
// Panel slide-in
targetPosition = _panel.position($container, {
- maximized: args.maximizeIfSelected
+ maximized: args.maximizeIfSelected,
+ partial: args.partial
});
if (!$panel.index()) {
// Just show immediately if this is the first panel
@@ -325,20 +315,16 @@
if (args.complete) args.complete($panel, _breadcrumb.filter($panel));
} else {
// Animate slide-in
- $panel.animate({
+ $panel.css({
left: targetPosition
- }, {
- duration: duration,
- easing: 'easeOutCirc',
- complete: function() {
- // Hide panels
- $panel.siblings().filter(function() {
- return $(this).width() == $panel.width();
- });
+ });
- if ($panel.is(':visible') && args.complete) args.complete($panel);
- }
+ // Hide panels
+ $panel.siblings().filter(function() {
+ return $(this).width() == $panel.width();
});
+
+ if ($panel.is(':visible') && args.complete) args.complete($panel);
};
return $panel;
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/71a38b74/ui/scripts/ui/widgets/treeView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/treeView.js b/ui/scripts/ui/widgets/treeView.js
index 80a03e2..8b75a69 100644
--- a/ui/scripts/ui/widgets/treeView.js
+++ b/ui/scripts/ui/widgets/treeView.js
@@ -110,6 +110,7 @@
$treeView.find('li .name').removeClass('selected');
$target.addClass('selected');
$browser.cloudBrowser('addPanel', {
+ partial: true,
title: $target.html(),
data: '',
parent: $treeView.closest('div.panel'),
[06/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
Move LockMasterListener initialization to earlier in the code
This is not perfect fix but should address 99% of the issues. The only
time an issue could happen is if something in the bootstrap or system
context tried to lock a row. Which shouldn't happen at the moment. If
we find that to be an issue, the LockMasterListener could move to system
context and be inject here.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d178b25d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d178b25d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d178b25d
Branch: refs/heads/ui-restyle
Commit: d178b25daa484dda44bb34e63cb719d1c3cc1519
Parents: 0ef8b87
Author: Darren Shepherd <da...@gmail.com>
Authored: Thu Oct 24 15:34:38 2013 -0700
Committer: Darren Shepherd <da...@gmail.com>
Committed: Thu Oct 24 15:35:21 2013 -0700
----------------------------------------------------------------------
server/src/com/cloud/server/ManagementServerImpl.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d178b25d/server/src/com/cloud/server/ManagementServerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java
index 1c68523..e00c182 100755
--- a/server/src/com/cloud/server/ManagementServerImpl.java
+++ b/server/src/com/cloud/server/ManagementServerImpl.java
@@ -599,6 +599,8 @@ import com.cloud.vm.dao.VMInstanceDao;
public class ManagementServerImpl extends ManagerBase implements ManagementServer {
public static final Logger s_logger = Logger.getLogger(ManagementServerImpl.class.getName());
+ private static final LockMasterListener s_lockMasterListener = new LockMasterListener(ManagementServerNode.getManagementServerId());
+
@Inject
public AccountManager _accountMgr;
@Inject
@@ -818,7 +820,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe
public boolean start() {
s_logger.info("Startup CloudStack management server...");
- _clusterMgr.registerListener(new LockMasterListener(ManagementServerNode.getManagementServerId()));
+ _clusterMgr.registerListener(s_lockMasterListener);
enableAdminUser("password");
return true;
[12/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
Merge branch 'asf-master' into ui-restyle
Conflicts:
ui/scripts/ui/widgets/listView.js
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e13c32f3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e13c32f3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e13c32f3
Branch: refs/heads/ui-restyle
Commit: e13c32f34d46d9ac380a7d952e2a351c398b4b21
Parents: 500c798 3734af1
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 24 15:56:13 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Oct 24 15:56:13 2013 -0700
----------------------------------------------------------------------
.../com/cloud/server/ManagementServerImpl.java | 4 +-
ui/css/cloudstack3.css | 241 ++++++++++---------
ui/images/logo-login-oss.png | Bin 4567 -> 22165 bytes
ui/images/logo.png | Bin 3886 -> 21781 bytes
ui/index.jsp | 6 +-
ui/scripts/instances.js | 34 ++-
ui/scripts/templates.js | 40 ++-
.../hypervisor/vmware/util/VmwareClient.java | 5 +-
8 files changed, 203 insertions(+), 127 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e13c32f3/ui/index.jsp
----------------------------------------------------------------------
[04/12] git commit: updated refs/heads/ui-restyle to e13c32f
Posted by bf...@apache.org.
UI > Edit Template, Edit ISO > can't update template/ISO in only one zone. It always get updated in all zones.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6df19986
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6df19986
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6df19986
Branch: refs/heads/ui-restyle
Commit: 6df19986455f7fd7982e8396d2eef121b32cd307
Parents: 2592452
Author: Jessica Wang <je...@apache.org>
Authored: Thu Oct 24 14:58:23 2013 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Oct 24 14:58:23 2013 -0700
----------------------------------------------------------------------
ui/scripts/templates.js | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df19986/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index d4655e7..f45c2d2 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -600,7 +600,7 @@
//***** updateTemplate *****
var data = {
id: args.context.templates[0].id,
- zoneid: args.context.templates[0].zoneid,
+ //zoneid: args.context.templates[0].zoneid, //can't update template/ISO in only one zone. It always get updated in all zones.
name: args.data.name,
displaytext: args.data.displaytext,
ostypeid: args.data.ostypeid,
@@ -620,7 +620,7 @@
//***** updateTemplatePermissions *****
var data = {
id: args.context.templates[0].id,
- zoneid: args.context.templates[0].zoneid
+ //zoneid: args.context.templates[0].zoneid //can't update template/ISO in only one zone. It always get updated in all zones.
};
//if args.data.ispublic is undefined, do not pass ispublic to API call.
@@ -1419,7 +1419,7 @@
//***** updateIso *****
var data = {
id: args.context.isos[0].id,
- zoneid: args.context.isos[0].zoneid,
+ //zoneid: args.context.isos[0].zoneid, //can't update template/ISO in only one zone. It always get updated in all zones.
name: args.data.name,
displaytext: args.data.displaytext,
ostypeid: args.data.ostypeid
@@ -1437,7 +1437,7 @@
//***** updateIsoPermissions *****
var data = {
id: args.context.isos[0].id,
- zoneid: args.context.isos[0].zoneid
+ //zoneid: args.context.isos[0].zoneid //can't update template/ISO in only one zone. It always get updated in all zones.
};
//if args.data.ispublic is undefined, do not pass ispublic to API call.
if (args.data.ispublic == "on") {