Skip to content
This repository has been archived by the owner. It is now read-only.
Permalink
Browse files
CHUKWA-696. Improve hicc stylesheets for form input. (Eric Yang) 
git-svn-id: https://svn.apache.org/repos/asf/incubator/chukwa/trunk@1519322 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
@macroadster
macroadster committed Sep 1, 2013
1 parent 4095f2d commit 8b6ba133a11d2af0013000c0dd692924fb4aecf0
Showing 14 changed files with 46 additions and 45 deletions.
2 CHANGES.txt
View file
@@ -26,6 +26,8 @@ Release 0.6 - Unreleased

IMPROVEMENTS

CHUKWA-696. Improve hicc stylesheets for form input. (Eric Yang)

CHUKWA-693. Updated Hadoop, ZooKeeper and HBase version for 0.6.0 release. (Eric Yang)

CHUKWA-686. Added FileTailingAdaptorPreserveLines adaptor. (Sourygna Luangsay via Eric Yang)
2 src/main/web/hicc/css/default.css
View file
@@ -39,7 +39,7 @@ A.sectionLink:hover {font-family:Arial;color:#FFFFFF;text-decoration:none;}
A.sectionLink:link {font-family:Arial;color:#FFFFFF;text-decoration:none;}


body {font-family:Arial;background-color:#ffffff;}
body {font-family:Oswald,Arial;background-color:#ffffff;}
.error input {color:#FFCCCC;}
.messageTable {font:normal 11px Arial;background-color:#999999;border-style:solid;border-top:0;border-bottom:0;border-width:1px;border-color:#777772;}
.messageTableContent {font:normal 11px Arial;background-color:#FFFFFF;color:#1E4F66;text-align:left;}
8 src/main/web/hicc/index.jsp
View file
@@ -87,7 +87,7 @@
<link href="css/menu.css" rel="stylesheet" type="text/css">
<link href="css/tab.css" rel="stylesheet" type="text/css">
<link href="css/timeframe.css" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="formalize.css" />
<link href="css/formalize.css" rel="stylesheet" type="text/css" />
<!-- all the necessary js files -->
<script type="text/javascript" src="./js/yahoo-dom-event.js"></script>
<script type="text/javascript" src="./js/treeview-min.js"></script>
@@ -106,7 +106,7 @@
<script type="text/javascript" src="/hicc/js/slider.js"></script>
<script type="text/javascript" src="/hicc/js/swfobject.js"></script>
<script type="text/javascript" src="/hicc/js/time.js"></script>
<script src="js/jquery.formalize.js"></script>
<script type="text/javascript" src="/hicc/js/jquery.formalize.js"></script>

<script type="text/javascript">
var _users_list=''; //'[% users_list_json %]'.evalJSON();
@@ -181,7 +181,7 @@ function toggle_view_all() {
<table width="100%" class="titlebar"><tr><td width="16"><span class="glossy_icon"><a href="#" onClick="javascript:manage_content('close'); return false;" class='glossy_icon'><img src="images/bullet_arrow_top.png" alig
n="absmiddle"></a></span></td><td>Dashboard</td></tr></table>
<table id="views_list" class="portal_table" cellspacing="0" cellpadding="2" width="100%">
<tr><th width="32"></th><th width="15%" align="center">Permission</th><th>View Name</th><th>Owner</th></tr>
<tr><th width="60"></th><th width="15%" align="center">Permission</th><th>View Name</th><th>Owner</th></tr>
</table></td></tr>
</table>
</div>
@@ -195,7 +195,7 @@ n="absmiddle"></a></span></td><td>Dashboard</td></tr></table>
<tr><td class="table-subhead" align="center">Widgets Catalog</td><td class="table-subhead" align="center">Widget Details</td></tr>
<tr><td valign="top" width="250" class="white">
<table class="menu_table"><tr><td>
<div id="myWidgetContainer" style="width: 250px; height: 300px; border: none;overflow: auto;>
<div id="myWidgetContainer" style="width: 250px; height: 400px; border: none;overflow: auto;>
<span id="treePlaceHolder"
style="background-color:#F00; color:#FFF;">
Loading tree widget...
37 src/main/web/hicc/js/workspace/workspace.js
View file
@@ -197,7 +197,6 @@ portalView.prototype = {
tabPageInputTitle.type='text';
tabPageInputTitle.id='page_rename_'+t;
tabPageInputTitle.value=title;
tabPageInputTitle.className='FormInput';
tabPageInputTitle.onblur=function() {
var id=this.id.substring(12);
renamePageForm(id);
@@ -447,7 +446,7 @@ portalWidget.prototype = {
label=param.label;
}
label=label;
content+='<tr><td valign="top">'+label+':<\/td><td>';
content+='<tr><td>'+label+':<\/td><td>';
if (param.type=='string') {
content+='<input type="text" id="'+param_id+'" value="' + param.value + '" size="20" maxlength="255"\/>'
} else if (param.type=='text') {
@@ -510,7 +509,7 @@ portalWidget.prototype = {
}
content+='</select>';
content+='</td><td valign="middle">';
content+='<table cellspacing="2" cellpadding="0"><tr><td><input class=formButton type=button name="add" value=" >> " onclick="moveItem(\'available_'+param_id+'\',\''+param_id+'\');" /></td></tr><tr><td><input class=formButton type=button name="delete" value=" << " onclick="moveItem(\''+param_id+'\',\'available_'+param_id+'\');" /></td></tr></table>';
content+='<table cellspacing="2" cellpadding="0"><tr><td><input type=button name="add" value=" >> " onclick="moveItem(\'available_'+param_id+'\',\''+param_id+'\');" /></td></tr><tr><td><input type=button name="delete" value=" << " onclick="moveItem(\''+param_id+'\',\'available_'+param_id+'\');" /></td></tr></table>';
content+='</td><td>';
content+='Selected:<br/><select multiple size="10" class="formSelect" id="'+param_id+'" name="'+param_id+'" >';
for (var k=0;k<param.value.length;k++) {
@@ -524,9 +523,9 @@ portalWidget.prototype = {
content+='</select>';
content+='</td><td valign="middle">';
content+='<table cellspacing="2" cellpadding="0"><tr><td>';
content+='<input class=formButton border=0 type=image src="/hicc/images/u.gif" name="up" value="up" onclick="moveUpList(\''+param_id+'\');return false;"></td></tr>';
content+='<input border=0 type=image src="/hicc/images/u.gif" name="up" value="up" onclick="moveUpList(\''+param_id+'\');return false;"></td></tr>';
content+='<tr><td>';
content+='<input class=formButton border=0 type=image src="/hicc/images/d.gif" name="down" value="down" onclick="moveDownList(\''+param_id+'\');return false;">';
content+='<input border=0 type=image src="/hicc/images/d.gif" name="down" value="down" onclick="moveDownList(\''+param_id+'\');return false;">';
content+='</td></tr>';
content+='</table>';
content+='</td></tr>';
@@ -567,7 +566,7 @@ portalWidget.prototype = {
content+='<tr><td>'+'Refresh (min)'+':<\/td><td>';
content+='<input type="text" id="'+this.pageid+'_'+this.boxIndex + '_refreshrate" value="' + this.block_obj.refresh + '" size="20" maxlength="255"\/><\/td><\/tr>'

content+='<tr><td colspan="2"><input class="formButton" type="button" onclick="saveParameters(\'' + this.pageid+'_'+this.boxIndex + '\');" value="'+'Apply'+'">&nbsp;<input class="formButton" type="button" onclick="resetParameters(\'' + this.pageid+'_'+this.boxIndex + '\');" value="'+'Reset'+'">&nbsp;<input class="formButton" type="button" onclick="closeEditBox(\'' + this.pageid+'_'+this.boxIndex + '\');" value="'+'Close'+'"><\/td><\/tr><\/table><\/form>';
content+='<tr><td colspan="2"><input type="button" onclick="saveParameters(\'' + this.pageid+'_'+this.boxIndex + '\');" value="'+'Apply'+'">&nbsp;<input type="button" onclick="resetParameters(\'' + this.pageid+'_'+this.boxIndex + '\');" value="'+'Reset'+'">&nbsp;<input type="button" onclick="closeEditBox(\'' + this.pageid+'_'+this.boxIndex + '\');" value="'+'Close'+'"><\/td><\/tr><\/table><\/form>';
content+='<\/td><\/tr><\/table>';
content+='<br/>';

@@ -2319,7 +2318,7 @@ function create_new_view() {
}

function clone_view(owner,vid) {
var viewName=prompt("Enter a new name for "+vid+" dashboard.");
var viewName=prompt("Enter a new name to clone "+vid+" dashboard.");
if(viewName==null) {
return false;
}
@@ -2340,7 +2339,7 @@ function clone_view(owner,vid) {
}

function rename_view(owner,vid) {
var viewName=prompt("Enter a new name for "+vid+" dashboard.");
var viewName=prompt("Enter a new name to rename "+vid+" dashboard.");
if(viewName==null) {
return false;
}
@@ -2410,9 +2409,9 @@ function update_views_list() {
var view="<tr>";
if(data[i].editable=="true") {
view=view+"<td>";
view=view+"<a href='#' class='glossy_icon' onclick='delete_view(\""+data[i].owner+"\",\""+data[i].name+"\")'><img src='images/close.png'></a>";
view=view+"<a href='#' class='glossy_icon' onclick='clone_view(\""+data[i].owner+"\",\""+data[i].name+"\")'><img src='images/clone.png'></a>";
view=view+"</td>";
view=view+"<a href='#' class='glossy_icon' onclick='delete_view(\""+data[i].owner+"\",\""+data[i].name+"\")'><img src='images/close.png'></a> ";
view=view+"<a href='#' class='glossy_icon' onclick='rename_view(\""+data[i].owner+"\",\""+data[i].name+"\")'><img src='images/application_edit.png'></a> ";
view=view+"<a href='#' class='glossy_icon' onclick='clone_view(\""+data[i].owner+"\",\""+data[i].name+"\")'><img src='images/clone.png'></a></td>";
view=view+"<td><input type='radio' name='permission."+data[i].name+"."+data[i].owner+"' value='public' ";
if(data[i].type=="public") {
view=view+"checked";
@@ -2424,7 +2423,7 @@ function update_views_list() {
}
view=view+" onclick='update_permission(\""+data[i].owner+"\",\""+data[i].name+"\",\"private\")'> Private</td>";
view=view+"<td>"+data[i].name;
view=view+"<a href='#' class='glossy_icon' onclick='rename_view(\""+data[i].owner+"\",\""+data[i].name+"\")'><img src='images/application_edit.png' align='right'></a></td>";
view=view+"</td>";
} else {
view=view+"<td>";
view=view+"<img src='images/bullet_white.png' width='16'>";
@@ -2561,19 +2560,19 @@ function onLabelClick(id) {
jQuery.getJSON('/hicc/v1/widget/wid/'+id,
function(node) {
var detail='';
detail+="<table class='configurationTableContent' width='95%'><tr><td valign='top' width='40%'><table class='configurationTableContent'>";
detail+="<tr><td><b>"+'Name'+":</b>&nbsp;</td><td>";
detail+="<table class='configurationTableContent' width='95%'><tr><td>";
detail+="<tr><td style='width: 100px;'>Name</td><td>";
detail+=node.title;
detail+="</td></tr>";
detail+="<tr><td><b>"+'Version'+":&nbsp;</b></td><td>";
detail+="<tr><td>Version</td><td>";
detail+=node.version;
detail+="</td></tr>";
detail+="<tr><td valign='top'><b>"+'Description'+":&nbsp;</b></td><td>";
detail+="<tr><td>Description</td><td>";
detail+=node.description;
detail+='</td></tr><tr><td><input class="formButton" type="button" name="addwidget" value="Add Widget" onClick="add_widget(\''+id+'\');"/>';
detail+="</td></tr>";
detail+="</table></td>";
detail+="<td width='55%'><div style='width:100%;height:280px;overflow:hidden;'>";
detail+='<tr><td><input type="button" name="addwidget" value="Add Widget" onClick="add_widget(\''+id+'\');"/></td></tr>';
detail+="<tr>";
detail+="<td colspan='2'><div style='width:100%;height:280px;overflow:hidden;'>";
detail+="<div id='_preview' class='dragableBoxContent' style='width:100%;height:280px;overflow:hidden;'><img src='/hicc/images/loading.gif'></div></div></td></tr></table>";

jQuery('#widget_detail').empty();
2 src/main/web/hicc/jsp/cluster_selector.jsp
View file
@@ -48,4 +48,4 @@ Cluster
}
} %>
</select>
<input type="button" onClick="save_cluster('<%= boxId %>');" name="Apply" value="Apply" class="formButton">
<input type="button" onClick="save_cluster('<%= boxId %>');" name="Apply" value="Apply">
4 src/main/web/hicc/jsp/event2_viewer.jsp
View file
@@ -28,8 +28,8 @@
}
%>
<div style="height:300px;overflow:auto;">
Filter: <input type="text" id="<%=XssFilter.filter(request.getParameter("boxId"))%>filter" name="<%=XssFilter.filter(request.getParameter("boxId"))%>filter" value="<%=filter%>" class="formInput">
<input type="button" name="apply_filter" value="Filter" onClick="filter_event_viewer('<%=XssFilter.filter(request.getParameter("boxId"))%>');" class="formButton">
Filter: <input type="text" id="<%=XssFilter.filter(request.getParameter("boxId"))%>filter" name="<%=XssFilter.filter(request.getParameter("boxId"))%>filter" value="<%=filter%>">
<input type="button" name="apply_filter" value="Filter" onClick="filter_event_viewer('<%=XssFilter.filter(request.getParameter("boxId"))%>');">
<table class="simple" width="100%">
<tr>
<th>Time</th>
2 src/main/web/hicc/jsp/host_selector_dropdown.jsp
View file
@@ -86,7 +86,7 @@
%>
</select></div>
<div class="row">
<input type="button" onClick="save_host('<%= boxId %>');" name="Apply" value="Apply" class="formButton">
<input type="button" onClick="save_host('<%= boxId %>');" name="Apply" value="Apply">
</div>
</fieldset>
</div>
2 src/main/web/hicc/jsp/host_selector_role.jsp
View file
@@ -87,4 +87,4 @@ HDFS Cluster<br>
Map Reduce Cluster<br>
<input type="checkbox" id="<%= boxId %>jobtracker" value="true" <%= roles.get("jobtracker") %>> Job Tracker<br>
<input type="checkbox" id="<%= boxId %>tasktracker" value="true" <%= roles.get("tasktracker") %>> Task Trackers<br><br>
<input type="button" onClick="save_host_role('<%= boxId %>');" name="Apply" value="Apply" class="formButton">
<input type="button" onClick="save_host_role('<%= boxId %>');" name="Apply" value="Apply">
2 src/main/web/hicc/jsp/host_selector_user.jsp
View file
@@ -32,4 +32,4 @@
}
}
%></textarea><br>
<input type="button" onClick="save_host_user('<%= boxId %>');" name="Apply" value="Apply" class="formButton">
<input type="button" onClick="save_host_user('<%= boxId %>');" name="Apply" value="Apply">
6 src/main/web/hicc/jsp/time_frame.jsp
View file
@@ -38,14 +38,14 @@
</td></tr>
<tr><td colspan="3" align="center">
<span>
<input type="text" name="<%= boxId %>start" value="<%= time.getStartDate("MMMMM dd, yyyy") %>" id="<%= boxId %>start" class="formInput" size="10"/>
<input type="text" name="<%= boxId %>start" value="<%= time.getStartDate("MMMMM dd, yyyy") %>" id="<%= boxId %>start" size="10"/>
&ndash;
<input type="text" name="<%= boxId %>end" value="<%= time.getEndDate("MMMMM dd, yyyy") %>" id="<%= boxId %>end" class="formInput" size="10"/>
<input type="text" name="<%= boxId %>end" value="<%= time.getEndDate("MMMMM dd, yyyy") %>" id="<%= boxId %>end" size="10"/>
</span>
</td></tr>
</table>
<div style="display:none"><a href="#" onclick="return false;" id="<%= boxId %>reset">Reset</a></a></div>
<input type="button" name="<%=boxId%>apply" value="Apply" class="formButton" onclick="save_timeframe('<%= boxId %>');">
<input type="button" name="<%=boxId%>apply" value="Apply" onclick="save_timeframe('<%= boxId %>');">
<script type="text/javascript">
new Timeframe('<%= boxId %>calendars', {
previousButton: "<%= boxId %>previous",
2 src/main/web/hicc/jsp/time_range.jsp
View file
@@ -102,7 +102,7 @@ Time Period
</fieldset>

</div>
<input type="button" name="<%= boxId %>apply" value="Apply" onclick="save_time_range('<%= boxId %>')" class="formButton">
<input type="button" name="<%= boxId %>apply" value="Apply" onclick="save_time_range('<%= boxId %>')">

<script type='text/javascript' src="/hicc/js/"></script>
<script>
2 src/main/web/hicc/jsp/time_slider_wrapper.jsp
View file
@@ -23,5 +23,5 @@
response.setHeader("boxId", xf.getParameter("boxId"));
%>
<IFRAME id="<%= xf.getParameter("boxId") %>iframe" src="/hicc/jsp/time_slider.jsp" width="100%" frameborder="0" height="80" scrolling="no"></IFRAME>
<input type=button id="time_slider_apply" name="time_slider_apply" value="Apply" onclick="save_time_slider(document.getElementById('<%= xf.getParameter("boxId") %>iframe').contentDocument.getElementById('hidden_start').innerHTML,document.getElementById('<%= xf.getParameter("boxId") %>iframe').contentDocument.getElementById('hidden_end').innerHTML);" class="formButton">
<input type=button id="time_slider_apply" name="time_slider_apply" value="Apply" onclick="save_time_slider(document.getElementById('<%= xf.getParameter("boxId") %>iframe').contentDocument.getElementById('hidden_start').innerHTML,document.getElementById('<%= xf.getParameter("boxId") %>iframe').contentDocument.getElementById('hidden_end').innerHTML);">

18 src/main/web/hicc/jsp/workspace/manage_view.jsp
View file
@@ -40,7 +40,7 @@
<div id="displayViewNameBlock${key}">
<a href="#" onClick="javascript:set_current_view('${key}');initScript('${key}');">${description}</a></div>
<div id="changeViewNameBlock${key}" style="display:none;">
<input type=text class=formInput name="changeViewNameField${key}" id="changeViewNameField${key}" value='${description}'/>
<input type=text name="changeViewNameField${key}" id="changeViewNameField${key}" value='${description}'/>
</div>
</td><td align='center'>${owner}</td>
<td align='center' width="270">
@@ -88,38 +88,38 @@
</tbody>
</table>
<br/>
<input type=button class=formButton name="addPermissionRowButton" value="Add More Permission" onClick="addPermissionRow('${key}','',false,false);"/>
<input type=button name="addPermissionRowButton" value="Add More Permission" onClick="addPermissionRow('${key}','',false,false);"/>
</div>
</div>
<!-- end permission -->
</td><td width="115">
<!-- begin operations -->
<!--c:if test="${permission.all.modify=='1'} || ${permission.user.modify=='1'}"-->
<div id="changeViewNameButtonBlock${key}" style="display:block;">
<input class="formButton" name="changeNameButton${key}" id="changeNameButton${key}" value="Change" type="button" onClick="changeViewName('${key}',false);"/>&nbsp;
<input name="changeNameButton${key}" id="changeNameButton${key}" value="Change" type="button" onClick="changeViewName('${key}',false);"/>&nbsp;
</div>
<div id="cancelChangeViewNameBlock${key}" style="display:none;">
<input class="formButton" name="saveNameButton${key}" id="saveNameButton${key}" value="Save" type="button" onClick="changeViewName('${key}',true);"/>&nbsp;
<input class="formButton" name="cancelChangeNameButton${key}" id="cancelChangeNameButton${key}" value="Cancel" type="button" onClick="changeViewName('${key}',false);"/>&nbsp;
<input name="saveNameButton${key}" id="saveNameButton${key}" value="Save" type="button" onClick="changeViewName('${key}',true);"/>&nbsp;
<input name="cancelChangeNameButton${key}" id="cancelChangeNameButton${key}" value="Cancel" type="button" onClick="changeViewName('${key}',false);"/>&nbsp;
</div>
<!--/c:if-->
</td>
<td nowrap width="60">
<input class="formButton" name="cloneview" value="Clone" type="button" onClick="cloneView('${key}');"/>&nbsp;
<input name="cloneview" value="Clone" type="button" onClick="cloneView('${key}');"/>&nbsp;
</td>
<td nowrap width="60">
<!--c:if test="${key=='default'}"-->
<!-- <input class="formButton" name="restoreview" value="Restore" type="button" onClick="if (confirm(Are you sure you want to restore the default workspace?)){ restoreView('${key}');}"/> -->
<!-- <input name="restoreview" value="Restore" type="button" onClick="if (confirm(Are you sure you want to restore the default workspace?)){ restoreView('${key}');}"/> -->
<!--/c:if-->

<!--c:if test="${permision.all.modify=='1'} || ${permission.user.modify=='1'} && ${key!='default'}"-->
<input class="formButton" name="delelete" value="Delete" type="button" onClick="if (confirm('Are you sure you want to delete the workspace?')){ deleteView('${key}');}"/>
<input name="delelete" value="Delete" type="button" onClick="if (confirm('Are you sure you want to delete the workspace?')){ deleteView('${key}');}"/>
<!--/c:if-->
</td>
<td nowrap width="60">
<c:choose>
<c:when test="${key!=default_view}">
<input class="formButton" name="setDefault" value="Set As Default" type="button" onClick="setDefaultView('${key}');"/>
<input name="setDefault" value="Set As Default" type="button" onClick="setDefaultView('${key}');"/>
</c:when>
<c:otherwise>
Default View
2 src/main/web/hicc/jsp/workspace/time_iphone.jsp
View file
@@ -107,7 +107,7 @@
</select>
</div>
<div class="row">
<input type="button" name="apply" value="Apply" onclick="save_time('<%= boxId %>');" class="formButton">
<input type="button" name="apply" value="Apply" onclick="save_time('<%= boxId %>');">
</div>
</fieldset>
</div>

0 comments on commit 8b6ba13

Please sign in to comment.