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-restyle to 20c3e09
Date Mon, 07 Oct 2013 21:53:42 GMT
Updated Branches:
  refs/heads/ui-restyle 61167c51b -> 20c3e0926


WIP style dashboard


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

Branch: refs/heads/ui-restyle
Commit: 20c3e0926c27d8e212e92b9f780a6d70d87cf213
Parents: 61167c5
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon Oct 7 14:53:31 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon Oct 7 14:53:31 2013 -0700

----------------------------------------------------------------------
 ui/scripts/ui-custom/dashboard.js |   4 +-
 ui/stylesheets/_dashboard.scss    | 126 +++++++++++++++++++++++++++++++++
 ui/stylesheets/cloudstack.scss    |   1 +
 3 files changed, 129 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20c3e092/ui/scripts/ui-custom/dashboard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/dashboard.js b/ui/scripts/ui-custom/dashboard.js
index 7ee2eb7..8e85fa0 100644
--- a/ui/scripts/ui-custom/dashboard.js
+++ b/ui/scripts/ui-custom/dashboard.js
@@ -135,8 +135,8 @@
          */
         var pieChart = function($container, data) {
             $container.css({
-                width: 70,
-                height: 66
+                width: 100,
+                height: 100
             });
             $.plot($container, data, {
                 width: 100,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20c3e092/ui/stylesheets/_dashboard.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/_dashboard.scss b/ui/stylesheets/_dashboard.scss
new file mode 100644
index 0000000..c357242
--- /dev/null
+++ b/ui/stylesheets/_dashboard.scss
@@ -0,0 +1,126 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+// Admin dashboard
+.dashboard.admin {
+    .sub.alerts {
+        width: 50%;
+        float: left;
+        padding: 15px;
+
+        ul {
+            height: 200px;
+            overflow: auto;
+            padding: 0;
+            border: 1px solid #ededed;
+            margin-top: 0px;
+
+            li {
+                @include row;
+                
+                list-style: none;
+                border-bottom: 1px solid #ededed;
+                padding: 5px;
+                margin: 10px;
+
+                .title {
+                    @include row;
+                    
+                    margin: 0 0 20px;
+                    font-weight: bold;
+                }
+
+                p {
+                    margin: 0;
+                    padding: 0;
+                    color: lighten(black, 25%);
+                    white-space: no-wrap;
+                }
+            }
+        }
+
+        .top {
+            @include row;
+            @include csui-toolbar;
+            
+            min-height: 55px;
+
+            .title {
+                float: left;
+                padding-top: 8px;
+            }
+            
+            .button.view-all {
+                @include csui-button;
+                
+                float: right;
+            }
+        }
+    }
+
+    .zone-stats {
+        @include row;
+
+        margin: 15px;
+
+        ul {
+            padding: 0;
+            
+            li {
+                width: 200px;
+                height: 200px;
+                margin: 15px;
+                padding: 20px;
+                list-style: none;
+                float: left;
+                border: 1px solid #ccc;
+                position: relative;
+
+                .pie-chart-container {
+                    position: absolute;
+                    left: 15px;
+                    top: 50px;
+                    width: 100px;
+                    height: 100px;
+
+                    .percent-label {
+                        position: absolute;
+                        top: 30px;
+                        width: 100%;
+                        text-align: center;
+                        font-size: 24px;
+                        color: lighten(black, 25%);
+                    }
+                }
+                
+                .info {
+                    white-space: nowrap;
+                    position: absolute;
+                    top: 150px;
+
+                    .name {
+                        color: darken(#ccc, 30%);
+                    }
+
+                    .value {
+                        font-size: 18px;
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/20c3e092/ui/stylesheets/cloudstack.scss
----------------------------------------------------------------------
diff --git a/ui/stylesheets/cloudstack.scss b/ui/stylesheets/cloudstack.scss
index 0821f86..a19e914 100644
--- a/ui/stylesheets/cloudstack.scss
+++ b/ui/stylesheets/cloudstack.scss
@@ -16,6 +16,7 @@
 // under the License.
 @import "csui/csui";
 @import "browser";
+@import "dashboard";
 @import "icons";
 
 html body > .login {


Mime
View raw message