chukwa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ey...@apache.org
Subject svn commit: r1369520 - in /incubator/chukwa/trunk: CHANGES.txt src/main/web/hicc/index.jsp
Date Sun, 05 Aug 2012 03:02:16 GMT
Author: eyang
Date: Sun Aug  5 03:02:16 2012
New Revision: 1369520

URL: http://svn.apache.org/viewvc?rev=1369520&view=rev
Log:
CHUKWA-637. Fixed default cluster selection in hicc. (Eric Yang)

Modified:
    incubator/chukwa/trunk/CHANGES.txt
    incubator/chukwa/trunk/src/main/web/hicc/index.jsp

Modified: incubator/chukwa/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/CHANGES.txt?rev=1369520&r1=1369519&r2=1369520&view=diff
==============================================================================
--- incubator/chukwa/trunk/CHANGES.txt (original)
+++ incubator/chukwa/trunk/CHANGES.txt Sun Aug  5 03:02:16 2012
@@ -22,6 +22,8 @@ Trunk (unreleased changes)
 
   BUGS
 
+    CHUKWA-637. Fixed default cluster selection in hicc. (Eric Yang)
+
     CHUKWA-654. Added additional check for getting row key. (Saisai Shao via Eric Yang)
 
     CHUKWA-652. Fixed JSON error in utilization.descriptor. (Saisai Shao via Eric Yang)

Modified: incubator/chukwa/trunk/src/main/web/hicc/index.jsp
URL: http://svn.apache.org/viewvc/incubator/chukwa/trunk/src/main/web/hicc/index.jsp?rev=1369520&r1=1369519&r2=1369520&view=diff
==============================================================================
--- incubator/chukwa/trunk/src/main/web/hicc/index.jsp (original)
+++ incubator/chukwa/trunk/src/main/web/hicc/index.jsp Sun Aug  5 03:02:16 2012
@@ -40,10 +40,13 @@
     }
     String cluster = "none";
     try{
-      if(session.getAttribute("cluster")==null) {
+      if(session.getAttribute("cluster")==null ||
+         session.getAttribute("cluster").equals("none")) {
         ClusterConfig cc = new ClusterConfig();
         Iterator ci = cc.getClusters();
         cluster = (String) ci.next();
+      } else {
+        cluster = (String) session.getAttribute("cluster");
       }
     } catch(Exception e) {
     }
@@ -131,6 +134,9 @@ function toggle_view_all() {
     <td align="left" nowrap class="portal_top_nav_bar" nowrap> </td></tr>
 </table>
 <% } %>
+<% if(request.getParameter("embed")!=null) { %>
+<div id="hide-menubar" style="display:none;">
+<% } %>
 <table width="100%" cellpadding=0 cellspacing=0 class="menubar">
 <tr><td>
 <div id="menu">
@@ -161,6 +167,9 @@ function toggle_view_all() {
 </td><td align="right"><a href='#' onmouseover='javascript:build_permlink();'
id='permlink' class='glossy_icon'><img id='permlink_icon' src='/hicc/images/server_link.png'
border=0></a> <a href='#' onclick='toggle_view_all()' class='glossy_icon'><img
id='view_all' src='/hicc/images/stop.png' border=0></a>  <a href='#' onclick='_currentView.getCurrentPage().refresh_all();'
class='glossy_icon'><img src='/hicc/images/refresh.png' border=0></a>&nbsp;</div>
 </td></tr>
 </table>
+<% if(request.getParameter("embed")!=null) { %>
+  </div>
+<% } %>
 <table width="100%" cellpadding=0 cellspacing=0>
 <tr><td colspan="3">
 <!-- first page for manage view -->
@@ -217,7 +226,7 @@ Select the widget from the widget tree t
 </tr>
 </table>
 </td></tr>
-<tr><td bgcolor="white" id="workspaceContainer" colspan="3">
+<tr><td id="workspaceContainer" colspan="3">
 <!-- content location -->
 </td></tr>
 </table>



Mime
View raw message