Merge branch 'master' of https://github.com/01org/virtual-storage-man…

…ager
intel · Jul 31, 2015 · 009385d · 009385d
2 parents 5e3e385 + eaa4162
commit 009385d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/source/vsm-dashboard/static/dashboard/css/e7aedb582487.css b/source/vsm-dashboard/static/dashboard/css/e7aedb582487.css
@@ -5716,7 +5716,7 @@ h2 {
 /* Login Splash Page */
 #splash .login {
   background-color: #337AB7;
-  background: url('/static/dashboard/img/logo-splash.png') no-repeat center 35px;
+  background: url('/static/dashboard/img/logo-splash.png') no-repeat left 35px;
   position: absolute;
   top: 80px;
   left: 50%;

diff --git a/source/vsm-dashboard/static/dashboard/js/dashboard.js b/source/vsm-dashboard/static/dashboard/js/dashboard.js
@@ -584,8 +584,8 @@ function GenerateLineOption(){
     var option = {
         grid :{
             x:40,
-            y:55,
-            height:'60%',
+            y:20,
+            height:'80%',
             width:'85%',
         },
         tooltip:{
@@ -652,8 +652,8 @@ function GenerateCPUOption(timestampList,legendList,seriesList){
     var option = {
         grid :{
             x:40,
-            y:55,
-            height:'60%',
+            y:20,
+            height:'80%',
             width:'85%',
         },
         tooltip:{
@@ -696,8 +696,8 @@ function GenerateInitCPUOption(){
     var option = {
         grid :{
             x:40,
-            y:55,
-            height:'60%',
+            y:20,
+            height:'80%',
             width:'85%',
         },
         tooltip:{
@@ -732,6 +732,11 @@ function GenerateInitCPUOption(){
                 boundaryGap: [0.5, 0.5]
             }
         ],
+        dataZoom:{
+            show:false,
+            start:30,
+            end:100
+        },
         series : [
             {
                 name:'--',
@@ -749,8 +754,8 @@ function GetLantencyOption(){
     option = {
         grid :{
             x:40,
-            y:55,
-            height:'60%',
+            y:20,
+            height:'80%',
             width:'85%',
         },
         tooltip:{
@@ -821,8 +826,8 @@ function GetBandwidthOption(){
     option = {
         grid :{
             x:40,
-            y:55,
-            height:'60%',
+            y:20,
+            height:'80%',
             width:'85%',
         },
         tooltip:{

diff --git a/source/vsm-dashboard/vsm_dashboard/dashboards/vsm/templates/vsm/flocking/_createcluster.html b/source/vsm-dashboard/vsm_dashboard/dashboards/vsm/templates/vsm/flocking/_createcluster.html
@@ -30,7 +30,7 @@
 {% endblock %}
 
 {% block modal-footer %}
-  <input class="btn btn-primary pull-right create-cluster-commit" type="submit" value="{% trans "CreateCluster" %}" />
-  <input class="btn btn-primary pull-right integrateCluster-cluster-commit" type="submit" value="{% trans "integrateCluster" %}" style="display:none" />
-  <a href="{% url 'horizon:vsm:clustermgmt:index' %}" class="btn secondary cancel close">{% trans "Cancel" %}</a>
+  <input class="btn btn-primary create-cluster-commit" type="submit" value="{% trans "CreateCluster" %}" /> 
+  <input class="btn btn-primary integrateCluster-cluster-commit" type="submit" value="{% trans "integrateCluster" %}" style="display:none" />
+  <a href="{% url 'horizon:vsm:clustermgmt:index' %}" class="btn btn-default">{% trans "Cancel" %}</a>
 {% endblock %}
diff --git a/ubuntu14/vsm-dashboard/static/dashboard/css/ubuntu.css b/ubuntu14/vsm-dashboard/static/dashboard/css/ubuntu.css
@@ -3798,7 +3798,6 @@ h2 {
 
   #splash .login {
     background-color: #337AB7;
-    background: url('/static/dashboard/img/logo-splash.png?1465d65190df') no-repeat center 35px;
     position: absolute;
     top: 80px;
     left: 50%;