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/08 22:56:42 UTC
[1/6] git commit: updated refs/heads/ui-restyle to c56e59f
Updated Branches:
refs/heads/ui-restyle 940d0a417 -> c56e59f2c
Fix button layout
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e307ba5f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e307ba5f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e307ba5f
Branch: refs/heads/ui-restyle
Commit: e307ba5f8e4be767e66e18e8c90dc13fa907191b
Parents: 940d0a4
Author: Brian Federle <br...@citrix.com>
Authored: Tue Oct 8 13:37:20 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Oct 8 13:37:20 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/csui/_wizard.scss | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e307ba5f/ui/stylesheets/csui/_wizard.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_wizard.scss b/ui/stylesheets/csui/_wizard.scss
index d452813..536a421 100644
--- a/ui/stylesheets/csui/_wizard.scss
+++ b/ui/stylesheets/csui/_wizard.scss
@@ -60,15 +60,19 @@
.button {
@include csui-button;
+ @include span-columns(2);
- float: left;
- margin-right: 10px;
+ &.previous {
+ @include shift(6);
+ }
+
+ &.cancel {
+ }
&.next {
@include csui-button-cta;
float: right;
- margin-right: 0px;
}
}
}
[4/6] git commit: updated refs/heads/ui-restyle to c56e59f
Posted by bf...@apache.org.
Instance wizard: Add missing descriptions
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93d41b92
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93d41b92
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93d41b92
Branch: refs/heads/ui-restyle
Commit: 93d41b92621f91bfd4657fe4bab27b6c6cd61ea1
Parents: 62551a9
Author: Brian Federle <br...@citrix.com>
Authored: Tue Oct 8 13:56:00 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Oct 8 13:56:00 2013 -0700
----------------------------------------------------------------------
client/WEB-INF/classes/resources/messages.properties | 2 ++
ui/dictionary.jsp | 2 ++
ui/index.jsp | 14 ++++++++++++--
3 files changed, 16 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93d41b92/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 4b54acb..0cc7b52 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,8 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
+message.select.compute.offering=Please select a compute offering to associate with this instance.
+message.select.disk.offering=(Optional) Select an additional disk offering to attach to this instance.
label.home=Home
label.use.default.language=Use default language
label.delete.events=Delete events
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93d41b92/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 2b07a2f..7d26332 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,8 @@ under the License.
<% long now = System.currentTimeMillis(); %>
<script language="javascript">
dictionary = {
+'message.select.compute.offering': '<fmt:message key="message.select.compute.offering" />',
+'message.select.disk.offering': '<fmt:message key="message.select.disk.offering" />',
'label.home': '<fmt:message key="label.home" />',
'label.use.default.language': '<fmt:message key="label.use.default.language" />',
'label.delete.events': '<fmt:message key="label.delete.events" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93d41b92/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index f168cc9..60580a5 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -187,6 +187,9 @@ under the License.
<!-- Step 3: Service Offering -->
<div class="step service-offering" wizard-step-id="service-offering">
+ <div class="main-desc">
+ <p><fmt:message key="message.select.compute.offering"/></p>
+ </div>
<div class="content">
<div class="select-container">
</div>
@@ -195,7 +198,10 @@ under the License.
<!-- Step 4: Data Disk Offering -->
<div class="step data-disk-offering" wizard-step-id="data-disk-offering">
- <div class="content">
+ <div class="main-desc">
+ <p><fmt:message key="message.select.disk.offering"/></p>
+ </div>
+ <div class="content">
<div class="section no-thanks">
<input type="radio" name="diskofferingid" value="0" />
<label><fmt:message key="label.no.thanks"/></label>
@@ -222,7 +228,11 @@ under the License.
<!-- Step 5: Affinity groups -->
<div class="step affinity" wizard-step-id="affinity">
- <div class="content">
+ <div class="main-desc">
+ <p><fmt:message key="message.select.affinity.groups"/></p>
+ </div>
+
+ <div class="content">
<!-- Existing offerings -->
<div class="select-container"></div>
</div>
[6/6] git commit: updated refs/heads/ui-restyle to c56e59f
Posted by bf...@apache.org.
Detail view: store tab BG color in $csui-tab-bg for resuse in other styles
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c56e59f2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c56e59f2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c56e59f2
Branch: refs/heads/ui-restyle
Commit: c56e59f2cdafb38ec8efa961b0dc071e2fdcb39f
Parents: c81b9fc
Author: Brian Federle <br...@citrix.com>
Authored: Tue Oct 8 13:56:33 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Oct 8 13:56:33 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/csui/_details.scss | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c56e59f2/ui/stylesheets/csui/_details.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_details.scss b/ui/stylesheets/csui/_details.scss
index 2ef9417..70cdaef 100644
--- a/ui/stylesheets/csui/_details.scss
+++ b/ui/stylesheets/csui/_details.scss
@@ -15,6 +15,8 @@
// specific language governing permissions and limitations
// under the License.
+$csui-tab-bg: lighten(#ccc, 15%);
+
@mixin csui-tab {
float: left;
list-style: none;
@@ -30,7 +32,7 @@
}
@mixin csui-tab-active {
- background: lighten(#ccc, 15%);
+ background: $csui-tab-bg;
border-radius: 8px 8px 0 0;
margin: 0;
@@ -53,7 +55,7 @@
}
@mixin csui-details {
- background: lighten(#ccc, 15%);
+ background: $csui-tab-bg;
padding: 10px;
border-bottom: 1px solid #ccc;
}
[2/6] git commit: updated refs/heads/ui-restyle to c56e59f
Posted by bf...@apache.org.
Fix order of instance wizard buttons
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5cb2ed33
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5cb2ed33
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5cb2ed33
Branch: refs/heads/ui-restyle
Commit: 5cb2ed33870b497840518691523374416b27eb8b
Parents: e307ba5
Author: Brian Federle <br...@citrix.com>
Authored: Tue Oct 8 13:37:37 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Oct 8 13:37:37 2013 -0700
----------------------------------------------------------------------
ui/index.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5cb2ed33/ui/index.jsp
----------------------------------------------------------------------
diff --git a/ui/index.jsp b/ui/index.jsp
index 7d1d748..f168cc9 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -471,8 +471,8 @@ under the License.
</div>
<!-- Buttons -->
<div class="buttons">
- <div class="button previous"><span><fmt:message key="label.previous"/></span></div>
<div class="button cancel"><span><fmt:message key="label.cancel"/></span></div>
+ <div class="button previous"><span><fmt:message key="label.previous"/></span></div>
<div class="button next"><span><fmt:message key="label.next"/></span></div>
</div>
</div>
[3/6] git commit: updated refs/heads/ui-restyle to c56e59f
Posted by bf...@apache.org.
Tabs: Make all jquery UI tabs apply appearance by default
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/62551a93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/62551a93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/62551a93
Branch: refs/heads/ui-restyle
Commit: 62551a93b5dbe2b8d0eedf4355165d1ba590e894
Parents: 5cb2ed3
Author: Brian Federle <br...@citrix.com>
Authored: Tue Oct 8 13:38:06 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Oct 8 13:38:06 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/csui/_details.scss | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/62551a93/ui/stylesheets/csui/_details.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/csui/_details.scss b/ui/stylesheets/csui/_details.scss
index b0ee36c..2ef9417 100644
--- a/ui/stylesheets/csui/_details.scss
+++ b/ui/stylesheets/csui/_details.scss
@@ -20,12 +20,25 @@
list-style: none;
padding: 15px 40px;
margin: 0px;
+
+ a {
+ &:hover {
+ color: black;
+ text-decoration: none;
+ }
+ }
}
@mixin csui-tab-active {
background: lighten(#ccc, 15%);
border-radius: 8px 8px 0 0;
margin: 0;
+
+ a {
+ color: black;
+ text-decoration: none;
+ cursor: default;
+ }
}
@mixin csui-tabs {
@@ -43,4 +56,23 @@
background: lighten(#ccc, 15%);
padding: 10px;
border-bottom: 1px solid #ccc;
+}
+
+// jQuery UI tabs
+ul.ui-tabs-nav {
+ @include csui-tabs;
+
+ li {
+ @include csui-tab;
+
+ &.ui-state-active {
+ @include csui-tab-active;
+ }
+ }
+}
+
+.ui-tabs-panel {
+ &.ui-tabs-hide {
+ display: none;
+ }
}
\ No newline at end of file
[5/6] git commit: updated refs/heads/ui-restyle to c56e59f
Posted by bf...@apache.org.
Style select containers
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c81b9fc9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c81b9fc9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c81b9fc9
Branch: refs/heads/ui-restyle
Commit: c81b9fc9216724a58a597916e9b791880dcc3365
Parents: 93d41b9
Author: Brian Federle <br...@citrix.com>
Authored: Tue Oct 8 13:56:11 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Tue Oct 8 13:56:11 2013 -0700
----------------------------------------------------------------------
ui/stylesheets/_instance-wizard.scss | 38 +++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c81b9fc9/ui/stylesheets/_instance-wizard.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/_instance-wizard.scss b/ui/stylesheets/_instance-wizard.scss
index 62a4e1d..25a157b 100644
--- a/ui/stylesheets/_instance-wizard.scss
+++ b/ui/stylesheets/_instance-wizard.scss
@@ -15,4 +15,42 @@
// specific language governing permissions and limitations
// under the License.
.multi-wizard.instance-wizard {
+ .select-container {
+ background: $csui-tab-bg;
+ padding: 10px;
+ height: 375px;
+ overflow: auto;
+ border-radius: 0 0 3px 3px;
+ margin: 0px 0;
+
+ .select {
+ @include row;
+
+ padding: 12px;
+ margin: 10px;
+ background: white;
+ border-radius: 3px;
+
+ input {
+ @include span-columns(1);
+
+ margin: 5px 0;
+ }
+
+ .select-desc {
+ @include span-columns(11);
+
+ .name {
+ font-weight: bold;
+ font-size: 14px;
+ }
+
+ .desc {
+ margin: 4px 0;
+ font-size: 12px;
+ color: gray;
+ }
+ }
+ }
+ }
}
\ No newline at end of file