Author: yusaku
Date: Fri Jan 11 02:31:46 2013
New Revision: 1431826
URL: http://svn.apache.org/viewvc?rev=1431826&view=rev
Log:
AMBARI-1124. Boxes on services page need min height or something to keep it
from visually cutting off info. (Srimanth Gunturi via yusaku)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1431826&r1=1431825&r2=1431826&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri Jan 11 02:31:46 2013
@@ -675,6 +675,9 @@ AMBARI-666 branch (unreleased changes)
BUG FIXES
+ AMBARI-1124. Boxes on services page need min height or something to keep
+ it from visually cutting off info. (Srimanth Gunturi via yusaku)
+
AMBARI-1123. Ambari heatmaps and host information shows infinity for disk
space used. (Srimanth Gunturi via yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js?rev=1431826&r1=1431825&r2=1431826&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
(original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/service/info/summary.js
Fri Jan 11 02:31:46 2013
@@ -379,7 +379,15 @@ App.MainServiceInfoSummaryView = Em.View
if (summaryTable && alertsList) {
var rows = $(summaryTable).find('tr');
if (rows != null && rows.length > 0) {
- $(alertsList).attr('style', "height:" + summaryTable.clientHeight +
"px;");
+ var minimumHeight = 50;
+ var calculatedHeight = summaryTable.clientHeight;
+ if (calculatedHeight < minimumHeight) {
+ $(alertsList).attr('style', "height:" + minimumHeight + "px;");
+ $(summaryTable).append('<tr><td></td></tr>');
+ $(summaryTable).attr('style', "height:" + minimumHeight + "px;");
+ } else {
+ $(alertsList).attr('style', "height:" + calculatedHeight + "px;");
+ }
} else if (alertsList.clientHeight > 0) {
$(summaryTable).append('<tr><td></td></tr>');
$(summaryTable).attr('style', "height:" + alertsList.clientHeight +
"px;");
