incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1498750 - in /incubator/ambari/trunk/ambari-web/app: styles/ templates/main/ templates/main/dashboard/widgets/ views/main/ views/main/dashboard/
Date Tue, 02 Jul 2013 01:11:29 GMT
Author: yusaku
Date: Tue Jul  2 01:11:28 2013
New Revision: 1498750

URL: http://svn.apache.org/r1498750
Log:
AMBARI-2480. Dashboard page has a lot of footer padding. (Xi Wang via yusaku)

Modified:
    incubator/ambari/trunk/ambari-web/app/styles/application.less
    incubator/ambari/trunk/ambari-web/app/templates/main/dashboard.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
    incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs
    incubator/ambari/trunk/ambari-web/app/views/main/dashboard.js
    incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js

Modified: incubator/ambari/trunk/ambari-web/app/styles/application.less
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/styles/application.less?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/styles/application.less (original)
+++ incubator/ambari/trunk/ambari-web/app/styles/application.less Tue Jul  2 01:11:28 2013
@@ -39,7 +39,7 @@ html, body {
 @footer-height: 100px;
 
 #main {
-  overflow: visible;
+  overflow: hidden;
   padding-bottom: @footer-height;
   min-width: 980px;
 }
@@ -1935,6 +1935,8 @@ table.graphs {
       color: #666666;
     }
     .filter-components{
+      overflow: auto;
+      height: 375px;
       color: #333333;
       right: 0;
       left: auto;
@@ -2055,7 +2057,13 @@ table.graphs {
       font-size: 12px;
       text-align: left;
     }
-
+    .thumbnail .icon-remove-sign{
+      color: #000000;
+      text-shadow: #fff 0px 0px 15px;
+      position: relative;
+      left: -17px;
+      top: -7px;
+    }
     .thumbnail .widget-content{
       text-align: center;
       font-size: 35px;
@@ -2095,16 +2103,10 @@ table.graphs {
       .corner-icon{
         display:block;
         text-decoration: none;
-        .icon-remove-sign{
-          color: #000000;
-          text-shadow: #fff 0px 0px 15px;
-          position:absolute;
-          margin-left: -17px;
-          margin-top: -7px;
-        }
       }
       .caption{
         color: #ffffff;
+        margin-left: -5px;
         text-shadow: #000 0px 0px 15px;
       }
       .rickshaw_legend{
@@ -2153,16 +2155,10 @@ table.graphs {
       .corner-icon{
         display:block;
         text-decoration: none;
-        .icon-remove-sign{
-          color: #000000;
-          text-shadow: #fff 0px 0px 15px;
-          position:absolute;
-          margin-left: -17px;
-          margin-top: -7px;
-        }
       }
       .caption{
         color: #ffffff;
+        margin-left: -5px;
         text-shadow: #000 0px 0px 15px;
       }
       .widget-content{
@@ -2180,13 +2176,6 @@ table.graphs {
       .corner-icon{
         display:block;
         text-decoration: none;
-        .icon-remove-sign{
-          color: #000000;
-          text-shadow: #fff 0px 0px 15px;
-          position:absolute;
-          margin-left: -17px;
-          margin-top: -7px;
-        }
       }
       .hidden-info{
         display: block;
@@ -2194,19 +2183,18 @@ table.graphs {
       .hidden-info-three-line{
         display: block;
       }
+      .caption{
+        color: #ffffff;
+        margin-left: -5px;
+      }
       .widget-content{
         display: none;
       }
       .widget-content-isNA{
         display: none;
       }
-      .caption{
-        color: #ffffff;
-      }
     }
 
-
-
     .thumbnail .widget-content .svg {
       position:relative;
     }

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard.hbs?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard.hbs Tue Jul  2 01:11:28
2013
@@ -21,16 +21,16 @@
       <div class="span6">
         <div class="row">
           <div class="span6">
-              <div class="box">
-                  <div class="box-header">
-                      <h4>{{t dashboard.services}}</h4>
-                  </div>
-                  <dl class="dl-horizontal services">
-                    {{#each item in view.content}}
-                      {{view item.viewName serviceBinding="item.model"}}
-                    {{/each}}
-                  </dl>
+            <div class="box">
+              <div class="box-header">
+                <h4>{{t dashboard.services}}</h4>
               </div>
+              <dl class="dl-horizontal services">
+                {{#each item in view.content}}
+                  {{view item.viewName serviceBinding="item.model"}}
+                {{/each}}
+              </dl>
+            </div>
           </div>
         </div>
       </div>

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/cluster_metrics.hbs
Tue Jul  2 01:11:28 2013
@@ -18,7 +18,7 @@
 
 <div class="cluster-metrics">
   <li class="thumbnail row">
-    <a class="corner-icon" href="#" {{action deleteWidget target="view"}}>
+    <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
         <i class="icon-remove-sign icon-large"></i>
     </a>
     <div class="caption span10">{{view.title}}</div>

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hbase_links.hbs
Tue Jul  2 01:11:28 2013
@@ -18,7 +18,7 @@
 
 <div class="links">
   <li class="thumbnail row">
-    <a class="corner-icon" href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign
icon-large"></i></a>
+    <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}><i
class="icon-remove-sign icon-large"></i></a>
     <div class="caption span10"> {{view.title}}</div>
 
     <div class="widget-content" >

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/hdfs_links.hbs
Tue Jul  2 01:11:28 2013
@@ -18,7 +18,7 @@
 
 <div class="links">
   <li class="thumbnail row">
-    <a class="corner-icon" href="#" {{action deleteWidget target="view"}}>
+    <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     <div class="caption span10"> {{view.title}}</div>

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_links.hbs
Tue Jul  2 01:11:28 2013
@@ -18,7 +18,7 @@
 
 <div class="links">
   <li class="thumbnail row">
-    <a class="corner-icon" href="#" {{action deleteWidget target="view"}}>
+    <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     <div class="caption span10"> {{view.title}}</div>

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/mapreduce_slots.hbs
Tue Jul  2 01:11:28 2013
@@ -18,7 +18,7 @@
 
 <div class="has-hidden-info">
   <li class="thumbnail row" >
-    <a class="corner-icon" href="#" {{action deleteWidget target="view"}}><i class="icon-remove-sign
icon-large"></i></a>
+    <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}><i
class="icon-remove-sign icon-large"></i></a>
     <div class="caption span10"> {{view.title}}</div>
 
     <div class="hidden-info">

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/pie_chart.hbs Tue
Jul  2 01:11:28 2013
@@ -18,7 +18,7 @@
 
 <div class="has-hidden-info">
   <li class="thumbnail row">
-    <a class="corner-icon" href="#" {{action deleteWidget target="view"}}>
+    <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     <div class="caption span10">{{view.title}}</div>

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
Tue Jul  2 01:11:28 2013
@@ -18,7 +18,7 @@
 
 <div class="has-hidden-info">
   <li class="thumbnail row" >
-    <a class="corner-icon" href="#" {{action deleteWidget target="view"}}>
+    <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     <div class="caption span10"> {{view.title}}</div>

Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs Tue
Jul  2 01:11:28 2013
@@ -18,7 +18,7 @@
 
 <div class="has-hidden-info">
   <li class="thumbnail row" >
-    <a class="corner-icon" href="#" {{action deleteWidget target="view"}}>
+    <a class="corner-icon span1" href="#" {{action deleteWidget target="view"}}>
       <i class="icon-remove-sign icon-large"></i>
     </a>
     <div class="caption span11"> {{view.title}} </div>

Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard.js?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard.js Tue Jul  2 01:11:28 2013
@@ -151,7 +151,6 @@ App.MainDashboardView = Em.View.extend({
             visibleWidgets.pushObject(new_obj);
             hiddenWidgets.removeObject(item);
           }, this);
-
         } else {
           //save in persist
           parent.getUserPref(parent.get('persistKey'));
@@ -168,12 +167,11 @@ App.MainDashboardView = Em.View.extend({
           }, this);
           hiddenWidgets.forEach(function(item){
             newValue.hidden.push([item.id, item.displayName]);
-          },this);
+          }, this);
 
           parent.postUserPref(parent.get('persistKey'), newValue);
           parent.translateToReal(newValue);
         }
-
       }
     })
   }),

Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js?rev=1498750&r1=1498749&r2=1498750&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js Tue Jul  2 01:11:28
2013
@@ -58,12 +58,12 @@ App.DashboardWidgetView = Em.View.extend
 
   deleteWidget: function (event) {
     var parent = this.get('parentView');
-    if(App.testMode) {
-      //update view on dashboard
-      var obj_class = parent.widgetsMapper(this.id);
-      parent.get('visibleWidgets').removeObject(obj_class);
-      parent.get('hiddenWidgets').pushObject(Em.Object.create({displayName: this.title, id:
this.id, checked: false}));
-    }else{
+    //update view on dashboard
+    var obj_class = parent.widgetsMapper(this.id);
+    parent.get('visibleWidgets').removeObject(obj_class);
+    parent.get('hiddenWidgets').pushObject(Em.Object.create({displayName: this.title, id:
this.id, checked: false}));
+
+    if (!App.testMode) {
       //reconstruct new persist value then post in persist
       parent.getUserPref(parent.get('persistKey'));
       var oldValue = parent.get('currentPrefObject');
@@ -81,7 +81,6 @@ App.DashboardWidgetView = Em.View.extend
       }
       newValue.hidden.push([deletedId, this.title]);
       parent.postUserPref(parent.get('persistKey'), newValue);
-      parent.translateToReal(newValue);
     }
 
   },



Mime
View raw message