hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1325888 - in /hive/branches/branch-0.9: ./ hwi/web/ hwi/web/css/ hwi/web/img/
Date Fri, 13 Apr 2012 18:10:25 GMT
Author: hashutosh
Date: Fri Apr 13 18:10:24 2012
New Revision: 1325888

URL: http://svn.apache.org/viewvc?rev=1325888&view=rev
Log:
Merged in HIVE-2910

Added:
    hive/branches/branch-0.9/hwi/web/css/
      - copied from r1325492, hive/trunk/hwi/web/css/
    hive/branches/branch-0.9/hwi/web/css/bootstrap.min.css
      - copied unchanged from r1325492, hive/trunk/hwi/web/css/bootstrap.min.css
    hive/branches/branch-0.9/hwi/web/img/
      - copied from r1325492, hive/trunk/hwi/web/img/
    hive/branches/branch-0.9/hwi/web/img/glyphicons-halflings-white.png
      - copied unchanged from r1325492, hive/trunk/hwi/web/img/glyphicons-halflings-white.png
    hive/branches/branch-0.9/hwi/web/img/glyphicons-halflings.png
      - copied unchanged from r1325492, hive/trunk/hwi/web/img/glyphicons-halflings.png
    hive/branches/branch-0.9/hwi/web/navbar.jsp
      - copied unchanged from r1325492, hive/trunk/hwi/web/navbar.jsp
Modified:
    hive/branches/branch-0.9/   (props changed)
    hive/branches/branch-0.9/NOTICE
    hive/branches/branch-0.9/hwi/web/authorize.jsp
    hive/branches/branch-0.9/hwi/web/diagnostics.jsp
    hive/branches/branch-0.9/hwi/web/error_page.jsp
    hive/branches/branch-0.9/hwi/web/index.jsp
    hive/branches/branch-0.9/hwi/web/left_navigation.jsp
    hive/branches/branch-0.9/hwi/web/session_create.jsp
    hive/branches/branch-0.9/hwi/web/session_diagnostics.jsp
    hive/branches/branch-0.9/hwi/web/session_history.jsp
    hive/branches/branch-0.9/hwi/web/session_kill.jsp
    hive/branches/branch-0.9/hwi/web/session_list.jsp
    hive/branches/branch-0.9/hwi/web/session_manage.jsp
    hive/branches/branch-0.9/hwi/web/session_remove.jsp
    hive/branches/branch-0.9/hwi/web/session_result.jsp
    hive/branches/branch-0.9/hwi/web/show_database.jsp
    hive/branches/branch-0.9/hwi/web/show_databases.jsp
    hive/branches/branch-0.9/hwi/web/show_table.jsp
    hive/branches/branch-0.9/hwi/web/view_file.jsp

Propchange: hive/branches/branch-0.9/
------------------------------------------------------------------------------
  Merged /hive/trunk:r1325492

Modified: hive/branches/branch-0.9/NOTICE
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/NOTICE?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/NOTICE (original)
+++ hive/branches/branch-0.9/NOTICE Fri Apr 13 18:10:24 2012
@@ -24,3 +24,9 @@ Copyright (c) 2002-2006, Marc Prud'homme
 
 This product includes/uses SLF4J (http://www.slf4j.org/),
 Copyright (c) 2004-2008 QOS.ch
+
+This product includes/uses Bootstrap (http://twitter.github.com/bootstrap/),
+Copyright (c) 2012 Twitter, Inc.
+
+This product includes/uses Glyphicons (http://glyphicons.com/),
+Copyright (c) 2010 - 2012 Jan Kovarík
\ No newline at end of file

Modified: hive/branches/branch-0.9/hwi/web/authorize.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/authorize.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/authorize.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/authorize.jsp Fri Apr 13 18:10:24 2012
@@ -14,63 +14,75 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@ page import="org.apache.hadoop.hive.hwi.*" %>
-<%@page errorPage="error_page.jsp" %>
-<% 
-  HWIAuth auth = (HWIAuth) session.getAttribute("auth"); 
-  if ( auth == null ){
-    auth = new HWIAuth();
-    auth.setUser("");
-    auth.setGroups( new String [] { "" });
-    session.setAttribute("auth", auth);
-  }
+<!DOCTYPE html>
+<%@ page import="org.apache.hadoop.hive.hwi.*"%>
+<%@page errorPage="error_page.jsp"%>
+<%
+	HWIAuth auth = (HWIAuth) session.getAttribute("auth");
+	if (auth == null) {
+		auth = new HWIAuth();
+		auth.setUser("");
+		auth.setGroups(new String[] { "" });
+		session.setAttribute("auth", auth);
+	}
 %>
 <%
-  String user = request.getParameter("user");
-  String groups = request.getParameter("groups");
-  if (user != null){
-    auth.setUser(user);
-    auth.setGroups( groups.split("\\s+") );
-    session.setAttribute("auth", auth);
-  }
+	String user = request.getParameter("user");
+	String groups = request.getParameter("groups");
+	if (user != null) {
+		auth.setUser(user);
+		auth.setGroups(groups.split("\\s+"));
+		session.setAttribute("auth", auth);
+	}
 %>
 <html>
-  <head>
-    <title>Authorize</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" width="100">
-	  <jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2>Change User Info</h2>
+<head>
+<title>Authorize</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div>
+			<div class="span8">
 
-	<% if (request.getParameter("user")!=null){ %>
-		<font color="red"><b>Authorization is complete.</b></font>
-	<% }  %>
-	  <form action="authorize.jsp">
-	    <table border="1">
-	      <tr>
-	        <td>User</td>
-		<td><input type="text" name="user" value="<%=auth.getUser()%>"></td>
-	      </tr>
-              <tr>
-		<td>Groups</td>
-		<td><input type="text" name="groups" value="<% 
-			for (String group:auth.getGroups() ){
-				out.print(group);
-			}
-		%>"></td>
-	      </tr>
-	      <tr>
-	        <td colSpan="2"><input type="submit"></td>
-              </tr>
-	    </table>
-	  </form>
+				<%
+					if (request.getParameter("user") != null) {
+				%>
+				<div class="alert alert-success">
+					<p>Authorization is complete.</p>
+				</div>
+				<%
+					}
+				%>
+				<form action="authorize.jsp" class="form-horizontal">
+					<fieldset>
+					    <legend>Change User Info</legend>
+						<div class="control-group">
+							<label class="control-label" for="flduser">User</label>
+							<div class="controls">
+								<input id="flduser" type="text" name="user"
+									value="<%=auth.getUser()%>">
+							</div>
+						</div>
 
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
\ No newline at end of file
+						<div class="control-group">
+							<label class="control-label" for="fldgroups">Groups</label>
+							<div class="controls">
+								<input id="fldgroups" type="text" name="groups"
+									value="<% for (String group : auth.getGroups()) { out.print(group); } %>">
+							</div>
+						</div>
+					</fieldset>
+					<div class="form-actions">
+						<button type="submit" class="btn btn-primary">Submit</button>
+					</div>
+				</form>
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
+</html>

Modified: hive/branches/branch-0.9/hwi/web/diagnostics.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/diagnostics.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/diagnostics.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/diagnostics.jsp Fri Apr 13 18:10:24 2012
@@ -15,57 +15,70 @@
    limitations under the License.
 --%>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@page errorPage="error_page.jsp" %>
-<%@page import="java.util.*" %>
+<%@page errorPage="error_page.jsp"%>
+<%@page import="java.util.*"%>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
 "http://www.w3.org/TR/html4/loose.dtd">
 
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Diagnostics</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" width="100"><jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          
-          <h2>System.getProperties()</h2>
-          <table border="1">
-            <tr>
-              <td>Name</td>
-              <td>Value</td>
-            </tr>
-            <%
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Diagnostics</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div>
+			<!-- span4 -->
+			<div class="span8">
+
+				<h2>System.getProperties()</h2>
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>Value</th>
+						</tr>
+					</thead>
+					<tbody>
+						<%
           Properties p = System.getProperties();
           for (Object o : p.keySet()) {%>
-            <tr>
-              <td><%=o%></td>
-              <td><%=p.getProperty(((String) o))%></td>
-            </tr>
-            <% }%>
-          </table>
-          
-               <h2>System.getenv()</h2>
-          <table border="1">
-            <tr>
-              <td>Name</td>
-              <td>Value</td>
-            </tr>
-            <%
+						<tr>
+							<td><%=o%></td>
+							<td><%=p.getProperty(((String) o))%></td>
+						</tr>
+						<% }%>
+					</tbody>
+				</table>
+
+				<h2>System.getenv()</h2>
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>Value</th>
+						</tr>
+					</thead>
+					<tbody>
+						<%
            Map<String,String> env =  System.getenv();
           for (String key : env.keySet() ) {%>
-            <tr>
-              <td><%=key%></td>
-              <td><%=env.get(key)%></td>
-            </tr>
-            <% }%>
-          </table>
-          
-          
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
\ No newline at end of file
+						<tr>
+							<td><%=key%></td>
+							<td><%=env.get(key)%></td>
+						</tr>
+						<% }%>
+					</tbody>
+				</table>
+
+
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
+</html>

Modified: hive/branches/branch-0.9/hwi/web/error_page.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/error_page.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/error_page.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/error_page.jsp Fri Apr 13 18:10:24 2012
@@ -14,31 +14,41 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@ page import="org.apache.hadoop.hive.hwi.*" %>
-<%@page isErrorPage="true" %>
+<%@ page import="org.apache.hadoop.hive.hwi.*"%>
+<%@page isErrorPage="true"%>
+<!DOCTYPE html>
 <html>
-  <head>
-    <title>Hive Web Interface</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" valign="top" width="100">
-	  <jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2>Hive Web Interface</h2>
-          <p>
-          <%= exception.getClass().getName() %>
-          <br>
-          <%=exception.getMessage() %>
-          <br>
+<head>
+<title>Hive Web Interface</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div>
+			<!-- span4 -->
+			<div class="span8">
+				<h2>Hive Web Interface</h2>
+				<div class="alert alert-error">
+					<h4 class="alert-heading"><%= exception.getClass().getName() %></h4>
+					<%=exception.getMessage() %>
+				</div>
+				<!-- alert -->
+				<h3>Stacktrace</h3>
+				<pre class="pre-scrollable">
           <% for (StackTraceElement e: exception.getStackTrace() ) { %>
           	File: <%= e.getFileName() %> Line:<%= e.getLineNumber() %> method: <%= e.getMethodName() %>
-          	class: <%=e.getClassName() %> <br>
+          	class: <%=e.getClassName() %>
           <% }  %>
-          </p>
-        </td>
-      </tr>
-    </table>
-  </body>
+          </pre>
+			</div>
+			<!-- span8 -->
+		</div>
+		<!-- row -->
+	</div>
+	<!-- container -->
+</body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/index.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/index.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/index.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/index.jsp Fri Apr 13 18:10:24 2012
@@ -14,28 +14,35 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@page errorPage="error_page.jsp" %>
-<%@ page import="org.apache.hadoop.hive.hwi.*" %>
+<!DOCTYPE html>
+<%@page errorPage="error_page.jsp"%>
+<%@ page import="org.apache.hadoop.hive.hwi.*"%>
 <% HWIAuth auth = (HWIAuth) session.getAttribute("auth"); %>
 <% if (auth==null) { %>
-	<jsp:forward page="/authorize.jsp" />
+<jsp:forward page="/authorize.jsp" />
 <% } %>
 <html>
-  <head>
-    <title>Hive Web Interface</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" valign="top" width="100">
-	  <jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2>Hive Web Interface</h2>
-          <p>The Hive Web Interface (HWI) offers an alternative to the command line interface (CLI). Once authenticated 
-          users can start HWIWebSessions. A HWIWebSession lives on the server users can submit queries and return later 
-          to view the status of the query and view any results it produced. </p>
-        </td>
-      </tr>
-    </table>
-  </body>
+<head>
+<title>Hive Web Interface</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<div class="hero-unit"><h2>Hive Web Interface</h2>
+				<p>The Hive Web Interface (HWI) offers an alternative to the
+					command line interface (CLI). Once authenticated users can start
+					HWIWebSessions. A HWIWebSession lives on the server users can
+					submit queries and return later to view the status of the query and
+					view any results it produced.</p>
+				</div><!-- hero-unit -->
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/left_navigation.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/left_navigation.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/left_navigation.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/left_navigation.jsp Fri Apr 13 18:10:24 2012
@@ -14,10 +14,18 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<h2>User</h2>
-<a href="authorize.jsp">Authorize</a><br>
-<a href="show_databases.jsp">Browse Schema</a><br>
-<a href="session_create.jsp">Create Session</a><br>
-<a href="diagnostics.jsp">Diagnostics</a><br>
-<a href="session_list.jsp">List Sessions</a><br>
-<br>
+<div class="well" style="padding: 8px 0;">
+<ul class="nav nav-list">
+  <li class="nav-header">User</li>
+  <li><a href="index.jsp"><i class="icon-home"></i> Home</a></li>
+  <li><a href="authorize.jsp"><i class="icon-lock"></i> Authorize</a></li>
+  <li class="nav-header">Database</li>
+  <li><a href="show_databases.jsp"><i class="icon-search"></i> Browse Schema</a></li>
+  <li class="nav-header">Sessions</li>
+  <li><a href="session_create.jsp"><i class="icon-user"></i> Create Session</a></li>
+  <li><a href="session_list.jsp"><i class="icon-search"></i> List Sessions</a></li>
+  <li class="divider"></li>
+  <li class="nav-header">Diagnostics</li>
+  <li><a href="diagnostics.jsp"><i class="icon-cog"></i> Diagnostics</a></li>
+</ul>
+</div><!-- well -->

Modified: hive/branches/branch-0.9/hwi/web/session_create.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/session_create.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/session_create.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/session_create.jsp Fri Apr 13 18:10:24 2012
@@ -14,11 +14,11 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@ page import="org.apache.hadoop.hive.hwi.*" %>
-<%@ page errorPage="error_page.jsp" %>
+<%@ page import="org.apache.hadoop.hive.hwi.*"%>
+<%@ page errorPage="error_page.jsp"%>
 <% HWIAuth auth = (HWIAuth) session.getAttribute("auth"); %>
 <% if (auth==null) { %>
-	<jsp:forward page="/authorize.jsp" />
+<jsp:forward page="/authorize.jsp" />
 <% } %>
 
 <% HWISessionManager hs = (HWISessionManager) application.getAttribute("hs"); %>
@@ -46,31 +46,39 @@
 		sessionName="";
 	}
 %>
-
+<!DOCTYPE html>
 <html>
-  <head>
-    <title>Hive Web Interface-Create a Hive Session</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" valign="top" width="100">
-	  <jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2>Create a Hive Session</h2>
-          <form action="session_create.jsp">
-            <table border="1">
-            <tr>
-              <td>Session Name</td>
-              <td><input type="text" name="sessionName" value="<%=sessionName%>" ></td>
-            </tr>
-            <tr>
-            	<td colSpan="2"><input type="submit"></td>
-            </tr>
-            </table>
-          </form>
-        </td>
-      </tr>
-    </table>
-  </body>
-</html>
\ No newline at end of file
+<head>
+<title>Hive Web Interface-Create a Hive Session</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<form action="session_create.jsp" class="form-horizontal">
+					<fieldset>
+						<legend>Create a Hive Session</legend>
+						<div class="control-group">
+							<label class="control-label" for="fldsession">Sesion Name</label>
+							<div class="controls">
+								<input id="fldsession" type="text" name="sessionName"
+									value="<%=sessionName%>">
+							</div>
+						</div>
+					</fieldset>
+
+					<div class="form-actions">
+						<button type="submit" class="btn btn-primary">Submit</button>
+					</div>
+				</form>
+
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
+</html>

Modified: hive/branches/branch-0.9/hwi/web/session_diagnostics.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/session_diagnostics.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/session_diagnostics.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/session_diagnostics.jsp Fri Apr 13 18:10:24 2012
@@ -14,54 +14,64 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@page contentType="text/html" pageEncoding="UTF-8" %>
-<%@page errorPage="error_page.jsp" %>
-<%@page import="org.apache.hadoop.hive.hwi.*" %>
-<%@page import="org.apache.hadoop.hive.conf.*" %>
-<%@page import="java.util.*" %>
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@page errorPage="error_page.jsp"%>
+<%@page import="org.apache.hadoop.hive.hwi.*"%>
+<%@page import="org.apache.hadoop.hive.conf.*"%>
+<%@page import="java.util.*"%>
 
 <% HWISessionManager hs = (HWISessionManager) application.getAttribute("hs"); %>
 <% if (hs == null) { %>
-  <jsp:forward page="error.jsp">
-    <jsp:param name="message" value="Hive Session Manager Not Found" />
-  </jsp:forward>
+<jsp:forward page="error.jsp">
+	<jsp:param name="message" value="Hive Session Manager Not Found" />
+</jsp:forward>
 <% } %>
 
 <% HWIAuth auth = (HWIAuth) session.getAttribute("auth"); %>
 <% if (auth==null) { %>
-	<jsp:forward page="/authorize.jsp" />
+<jsp:forward page="/authorize.jsp" />
 <% } %>
 <% String sessionName = request.getParameter("sessionName"); %>
 <% HWISessionItem si = hs.findSessionItemByName(auth,sessionName); %>
+<!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Session Diagnostics</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top"><jsp:include page="left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2>Session Diagnostics</h2>
-          
-          <% if (si!=null) { %>
-            <table border="1">
-              <tr>
-                <td>Var Name</td>
-                <td>Var Value</td>
-              </tr>
-            <% for (HiveConf.ConfVars var : HiveConf.ConfVars.values() ){ %>
-              <tr>
-                <td><%=var.name()%></td>
-                <td><%=si.getHiveConfVar(var)%></td>
-              </tr>
-            <%  } %>
-            </table>
-          <% } %>
-          
-        </td>
-      </tr>
-    </table>
-  </body>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Session Diagnostics</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<h2>Session Diagnostics</h2>
+
+				<% if (si!=null) { %>
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Var Name</th>
+							<th>Var Value</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% for (HiveConf.ConfVars var : HiveConf.ConfVars.values() ){ %>
+						<tr>
+							<td><%=var.name()%></td>
+							<td><%=si.getHiveConfVar(var)%></td>
+						</tr>
+						<%  } %>
+					
+					<tbody>
+				</table>
+				<% } %>
+
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/session_history.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/session_history.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/session_history.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/session_history.jsp Fri Apr 13 18:10:24 2012
@@ -22,57 +22,104 @@
 <%@page import="org.apache.hadoop.hive.ql.history.HiveHistory.*"%>
 <%@page import="java.util.*"%>
 
-<% HWISessionManager hs = (HWISessionManager) application.getAttribute("hs"); %>
-<% if (hs == null) { %>
-  <jsp:forward page="error.jsp">
+<%
+	HWISessionManager hs = (HWISessionManager) application
+			.getAttribute("hs");
+%>
+<%
+	if (hs == null) {
+%>
+<jsp:forward page="error.jsp">
 	<jsp:param name="message" value="Hive Session Manager Not Found" />
-  </jsp:forward>
-<% } %>
+</jsp:forward>
+<%
+	}
+%>
 
-<% HWIAuth auth = (HWIAuth) session.getAttribute("auth"); %>
-<% if (auth==null) { %>
-  <jsp:forward page="/authorize.jsp" />
-<% } %>
-<% String sessionName = request.getParameter("sessionName"); %>
-<% HWISessionItem si = hs.findSessionItemByName(auth,sessionName); %>
-<% HiveHistoryViewer hv = si.getHistoryViewer(); %>
+<%
+	HWIAuth auth = (HWIAuth) session.getAttribute("auth");
+%>
+<%
+	if (auth == null) {
+%>
+<jsp:forward page="/authorize.jsp" />
+<%
+	}
+%>
+<%
+	String sessionName = request.getParameter("sessionName");
+%>
+<%
+	HWISessionItem si = hs.findSessionItemByName(auth, sessionName);
+%>
+<%
+	HiveHistoryViewer hv = si.getHistoryViewer();
+%>
+<!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>Session History</title>
-  </head>
-  <body>
-    <table>
-	  <tr>
-		<td valign="top"><jsp:include page="left_navigation.jsp" /></td>
-		<td valign="top">
-		<h2>Hive History</h2>
-		SessionID: <%= hv.getSessionId() %><br>
-		<% for (String jobKey: hv.getJobInfoMap().keySet() ){ %> <%=jobKey%><br>
-		<ul>
-			<% QueryInfo qi = hv.getJobInfoMap().get(jobKey); %>
-			<% for (String qiKey: qi.hm.keySet() ){ %>
-			<li><%=qiKey%> <%=qi.hm.get(qiKey) %></li>
-			<% } %>
-		</ul>
-		<% } %>
-		<br>
-		<br>
-		<% for (String taskKey: hv.getTaskInfoMap().keySet() ){ %> <%=taskKey%><br>
-		<ul>
-			<% TaskInfo ti = hv.getTaskInfoMap().get(taskKey); %>
-			<% for (String tiKey: ti.hm.keySet() ) { %>
-				<li><%=tiKey%> <%=ti.hm.get(tiKey)%>
-					<% if (tiKey.equalsIgnoreCase("TASK_HADOOP_ID") ){ %>
-						<a href="http://<%=si.getJobTrackerURL(ti.hm.get(tiKey))%>"><%=ti.hm.get(tiKey)%></a>	 
-					<% } %>		
-				<% } %>
-				</li>          
-			<% } %>
-		</ul>
-		
-		</td>
-	  </tr>
-    </table>
-  </body>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Session History</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<h2>Hive History</h2>
+				SessionID:
+				<%=hv.getSessionId()%><br>
+				<%
+					for (String jobKey : hv.getJobInfoMap().keySet()) {
+				%>
+				<%=jobKey%><br>
+				<ul>
+					<%
+						QueryInfo qi = hv.getJobInfoMap().get(jobKey);
+					%>
+					<%
+						for (String qiKey : qi.hm.keySet()) {
+					%>
+					<li><%=qiKey%> <%=qi.hm.get(qiKey)%></li>
+					<%
+						}
+					%>
+				</ul>
+				<%
+					}
+				%>
+				<br> <br>
+				<%
+					for (String taskKey : hv.getTaskInfoMap().keySet()) {
+				%>
+				<%=taskKey%><br>
+				<ul>
+					<%
+						TaskInfo ti = hv.getTaskInfoMap().get(taskKey);
+					%>
+					<%
+						for (String tiKey : ti.hm.keySet()) {
+					%>
+					<li><%=tiKey%> <%=ti.hm.get(tiKey)%> <%
+ 	if (tiKey.equalsIgnoreCase("TASK_HADOOP_ID")) {
+ %>
+						<a href="http://<%=si.getJobTrackerURL(ti.hm.get(tiKey))%>"><%=ti.hm.get(tiKey)%></a>
+						<%
+							}
+						%> <%
+ 	}
+ %></li>
+					<%
+						}
+					%>
+				</ul>
+
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/session_kill.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/session_kill.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/session_kill.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/session_kill.jsp Fri Apr 13 18:10:24 2012
@@ -14,11 +14,11 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@ page import="org.apache.hadoop.hive.hwi.*" %>
-<%@ page errorPage="error_page.jsp" %>
+<%@ page import="org.apache.hadoop.hive.hwi.*"%>
+<%@ page errorPage="error_page.jsp"%>
 <% HWIAuth auth = (HWIAuth) session.getAttribute("auth"); %>
 <% if (auth==null) { %>
-	<jsp:forward page="/authorize.jsp" />
+<jsp:forward page="/authorize.jsp" />
 <% } %>
 <% HWISessionManager hs = (HWISessionManager) application.getAttribute("hs"); %>
 <% String sessionName=request.getParameter("sessionName"); %>
@@ -30,26 +30,36 @@
 	message="Query will be killed";
   }
 %>
+<!DOCTYPE html>
 <html>
-  <head>
-    <title>Hive Web Interface</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" valign="top" width="100">
-	  <jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2>Hive Web Interface</h2>
-          <% if (message!=null){ %><font color="red"><%=message%></font><% } %>
-          <br>
-          <form action="session_kill.jsp">
-          	<input type="hidden" name="sessionName" value="<%=sessionName%>">
-          	Are you sure you want to kill this session?
-          	<input type="submit" name="confirm" value="yes">
-          </form>
-        </td>
-      </tr>
-    </table>
-  </body>
+<head>
+<title>Hive Web Interface</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<% if (message!=null){ %><font color="red"><%=message%></font>
+				<% } %>
+				<br>
+				<form action="session_kill.jsp">
+					<fieldset>
+					<legend>Killing session <%=sessionName%></legend>
+					<input type="hidden" name="sessionName" value="<%=sessionName%>">
+					Are you sure you want to kill this session? <input type="submit"
+						name="confirm" value="yes">
+					</fieldset>
+				</form>
+			</div>
+			<!-- span8 -->
+		</div>
+		<!-- row -->
+	</div>
+	<!-- container -->
+</body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/session_list.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/session_list.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/session_list.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/session_list.jsp Fri Apr 13 18:10:24 2012
@@ -14,51 +14,60 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 --%>
-<%@ page import="org.apache.hadoop.hive.hwi.*" %>
-<%@page errorPage="error_page.jsp" %>
+<%@ page import="org.apache.hadoop.hive.hwi.*"%>
+<%@page errorPage="error_page.jsp"%>
 <% HWISessionManager hs = (HWISessionManager) application.getAttribute("hs"); %>
 <% if (hs == null) { %>
-  <jsp:forward page="error.jsp">
-    <jsp:param name="message" value="Hive Session Manager Not Found" />
-  </jsp:forward>
+<jsp:forward page="error.jsp">
+	<jsp:param name="message" value="Hive Session Manager Not Found" />
+</jsp:forward>
 <% } %>
 
 <% HWIAuth auth = (HWIAuth) session.getAttribute("auth"); %>
 <% if (auth==null) { %>
-	<jsp:forward page="/authorize.jsp" />
+<jsp:forward page="/authorize.jsp" />
 <% } %>
-
+<!DOCTYPE html>
 <html>
-  <head>
-    <title>Session List</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" valign="top" width="100">
-	  <jsp:include page="left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2>Session List</h2>
-         
-			<table border="1">
-			  <tr>
-			    <td>Name</td>
-			    <td>Status</td>
-			    <td>Action</td>
-			  </tr>
-			   <% if ( hs.findAllSessionsForUser(auth)!=null){ %>
-				  <% for (HWISessionItem item: hs.findAllSessionsForUser(auth) ){ %>
-				  	<tr>
-				  	  <td><%=item.getSessionName()%></td>
-				  	  <td><%=item.getStatus()%></td>
-				  	  <td><a href="/hwi/session_manage.jsp?sessionName=<%=item.getSessionName()%>">Manager</a></td>
-				  	</tr>
-				  <% } %>
-			  <% } %>
-			</table>          
-        </td>
-      </tr>
-    </table>
-  </body>
+<head>
+<title>Session List</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+
+				<h2>Session List</h2>
+
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>Status</th>
+							<th>Action</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% if ( hs.findAllSessionsForUser(auth)!=null){ %>
+						<% for (HWISessionItem item: hs.findAllSessionsForUser(auth) ){ %>
+						<tr>
+							<td><%=item.getSessionName()%></td>
+							<td><%=item.getStatus()%></td>
+							<td><a
+								href="/hwi/session_manage.jsp?sessionName=<%=item.getSessionName()%>">Manager</a></td>
+						</tr>
+						<% } %>
+						<% } %>
+					</tbody>
+				</table>
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>
 

Modified: hive/branches/branch-0.9/hwi/web/session_manage.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/session_manage.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/session_manage.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/session_manage.jsp Fri Apr 13 18:10:24 2012
@@ -61,67 +61,82 @@
       }
   } 
 %>
-
+<!DOCTYPE html>
 <html>
-  <head>
-    <title>Manage Session <%=sessionName%></title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" valign="top" width="100">
-	  		<jsp:include page="/left_navigation.jsp"/>
-	  	</td>
-        <td valign="top">
-          <h2>Manage Session <%=sessionName%></h2>
-          
-          <% if (message != null) {  %> <font color="red"><%=message %></font> <% } %>
-          <br>
-          <% if (sess.getStatus()==HWISessionItem.WebSessionItemStatus.QUERY_RUNNING) { %>
-          	<font color="RED">Session is in QUERY_RUNNING state. Changes are not possible!</font>
-          <% } %>
-          <br>  
-          
-          <% if (sess.getStatus()==HWISessionItem.WebSessionItemStatus.QUERY_RUNNING){ %>
-          	<%-- 
+<head>
+<title>Manage Session <%=sessionName%></title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<h2>
+					Manage Session
+					<%=sessionName%></h2>
+
+				<% if (message != null) {  %>
+				<div class="alert alert-info"><%=message %></div>
+				<% } %>
+
+				<% if (sess.getStatus()==HWISessionItem.WebSessionItemStatus.QUERY_RUNNING) { %>
+				<div class="alert alert-warning">Session is in QUERY_RUNNING
+					state. Changes are not possible!</div>
+				<% } %>
+
+				<% if (sess.getStatus()==HWISessionItem.WebSessionItemStatus.QUERY_RUNNING){ %>
+				<%-- 
           	View JobTracker: <a href="<%= sess.getJobTrackerURI() %>">View Job</a><br>
           	Kill Command: <%= sess.getKillCommand() %>
           	 Session Kill: <a href="/hwi/session_kill.jsp?sessionName=<%=sessionName%>"><%=sessionName%></a><br>
           	--%>
-          <% } %>
-          
-          Session History:  <a href="/hwi/session_history.jsp?sessionName=<%=sessionName%>"><%=sessionName%></a><br> 
-          Session Diagnostics: <a href="/hwi/session_diagnostics.jsp?sessionName=<%=sessionName%>"><%=sessionName%></a><br>
-          Session Remove: <a href="/hwi/session_remove.jsp?sessionName=<%=sessionName%>"><%=sessionName%></a><br> 
-          Session Result Bucket: <a href="/hwi/session_result.jsp?sessionName=<%=sessionName%>"><%=sessionName%></a><br>
-	<br>
-          
-			<form action="session_manage.jsp">
-				<input type="hidden" name="sessionName" value="<%=sessionName %>">
-			<table>
-				<tr>
-				<td>Result File</td>
-				<td>
-				<input type="text" name="resultFile" value="<% 
-				if (sess.getResultFile()==null) { out.print(""); } else { out.print(sess.getResultFile()); }
-				%>"><br>
-				<% if (sess.getResultFile()!=null) { %>
-					<a href="/hwi/view_file.jsp?sessionName=<%=sessionName%>">View File</a>
 				<% } %>
-				</td>
-				</tr>
-				
-				<tr>
-				<td>Error File</td>
-				<td>
-				<input type="text" name="errorFile" value="<% 
-				if (sess.getErrorFile()==null) { out.print(""); } else { out.print(sess.getErrorFile()); }
-				%>"></td>
-				</tr>
-				
-				<tr>
-					<td>Query</td>
-					<td><textarea name="query" rows="8" cols="70"><% 
+
+				<div class="btn-group">
+					<a class="btn" href="/hwi/session_history.jsp?sessionName=<%=sessionName%>"><i class="icon-book"></i> History</a>
+					<a class="btn" href="/hwi/session_diagnostics.jsp?sessionName=<%=sessionName%>"><i class="icon-cog"></i> Diagnostics</a>
+					<a class="btn"href="/hwi/session_remove.jsp?sessionName=<%=sessionName%>"><i class="icon-remove"></i> Remove</a>
+					<a class="btn"href="/hwi/session_result.jsp?sessionName=<%=sessionName%>"><i class=" icon-download-alt"></i> Result Bucket</a>
+				</div>
+
+				<form action="session_manage.jsp" class="form-horizontal">
+					<input type="hidden" name="sessionName" value="<%=sessionName %>">
+
+					<fieldset>
+						<legend>Session Details	</legend>
+						<div class="control-group">
+							<label class="control-label" for="fldresfile">Result File</label>
+							<div class="controls">
+								<input id="fldresfile" type="text" name="resultFile"
+									value="<%
+                    if (sess.getResultFile()==null) { out.print(""); } else { out.print(sess.getResultFile()); }
+                 %>">
+								<% if (sess.getResultFile()!=null) { %>
+								<a href="/hwi/view_file.jsp?sessionName=<%=sessionName%>">View
+									File</a>
+								<% } %>
+							</div>
+						</div>
+
+						<div class="control-group">
+							<label class="control-label" for="flderrfile">Error File</label>
+							<div class="controls">
+								<input id="flderrfile" type="text" name="errorFile"
+									value="<%
+                    if (sess.getErrorFile()==null) { out.print(""); } else { out.print(sess.getErrorFile()); }
+                 %>">
+							</div>
+						</div>
+
+						<div class="control-group">
+							<label class="control-label" for="fldquery">Query</label>
+							<div class="controls">
+								<textarea id="fldquery" name="query" rows="8" cols="70">
+									<% 
 				if (sess.getQueries()==null) { 
 				  out.print(""); 
 				} else { 
@@ -129,51 +144,54 @@
 				    out.print(qu); out.print(" ; ");
 				  }	
 				}
-				%></textarea></td>
-				</tr>
-				
-				<tr>
-				<td>Silent Mode ?</td>
-				<td><select name="silent">
-					<option value="YES" 
-					<% if (sess.getSSIsSilent()==true) { out.print("SELECTED=\"TRUE\""); } %>
-					>YES</option>
-					<option value="NO"
-					<% if (sess.getSSIsSilent()==false) { out.print("SELECTED=\"TRUE\""); } %>
-					>NO</option>
-					</select>
-				</td>
-				</tr>
-				
-				<tr>
-					<td>Start Query?</td>
-					<td><select name="start">
-						<option value="NO" SELECTED="TRUE">NO</option>
-						<option value="YES" >YES</option>
-						</select>
-					</td>
-				</tr>
-					
-				<tr>
-					<td>Query Return Codes</td>
-					<td> <% for (int i=0; i< sess.getQueryRet().size();++i ){ %>
-						<%=i%> : <%=sess.getQueryRet().get(i)%><br>
-					     <% } %>
-					</td>
-				</tr>
-				<tr>
-					<td colSpan="2">
-					  <% if (sess.getStatus()==HWISessionItem.WebSessionItemStatus.QUERY_RUNNING) { %>
-			          		<font color="RED">Session is in QUERY_RUNNING state. Changes are not possible!</font>
-			          <% } else { %>
-			          	<input type="submit">
-			          <% } %>
-					</td>
-				</tr>
-				</table>	
-			</form>
-        </td>
-      </tr>
-    </table>
-  </body>
+				%>
+								</textarea>
+							</div>
+						</div>
+
+
+						<div class="control-group">
+							<label class="control-label" for="fldsilent">Silent Mode</label>
+							<div class="controls">
+								<select id="fldsilent" name="silent">
+									<option value="YES"
+										<% if (sess.getSSIsSilent()==true) { out.print("SELECTED=\"TRUE\""); } %>>YES</option>
+									<option value="NO"
+										<% if (sess.getSSIsSilent()==false) { out.print("SELECTED=\"TRUE\""); } %>>NO</option>
+								</select>
+							</div>
+						</div>
+
+						<div class="control-group">
+							<label class="control-label" for="fldstart">Start Query</label>
+							<div class="controls">
+								<select id="fldstart" name="start">
+									<option value="NO" SELECTED="TRUE">NO</option>
+									<option value="YES">YES</option>
+								</select>
+							</div>
+						</div>
+
+					</fieldset>
+
+					<h3>Query Return Codes</h3>
+					<p>
+						<% for (int i=0; i< sess.getQueryRet().size();++i ){ %>
+						<%=i%>
+						:
+						<%=sess.getQueryRet().get(i)%><br>
+						<% } %>
+					</p>
+
+					<% if (sess.getStatus()!=HWISessionItem.WebSessionItemStatus.QUERY_RUNNING) { %>
+					<div class="form-actions">
+						<button type="submit" class="btn btn-primary">Submit</button>
+					</div>
+
+					<% } %>
+				</form>
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/session_remove.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/session_remove.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/session_remove.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/session_remove.jsp Fri Apr 13 18:10:24 2012
@@ -37,26 +37,31 @@
     }
   }
 %>
+<!DOCTYPE html>
 <html>
-  <head>
-    <title>Hive Web Interface</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" valign="top" width="100">
-	  <jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2>Hive Web Interface</h2>
-          <% if (message!=null){ %><font color="red"><%=message%></font><% } %>
-          <br>
-          <form action="session_remove.jsp">
-          	<input type="hidden" name="sessionName" value="<%=sessionName%>">
-          	Are you sure you want to remove this session?
-          	<input type="submit" name="confirm" value="yes">
-          </form>
-        </td>
-      </tr>
-    </table>
-  </body>
+<head>
+<title>Hive Web Interface</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<h2>Hive Web Interface</h2>
+				<% if (message!=null){ %><font color="red"><%=message%></font>
+				<% } %>
+				<br>
+				<form action="session_remove.jsp">
+					<input type="hidden" name="sessionName" value="<%=sessionName%>">
+					Are you sure you want to remove this session? <input type="submit"
+						name="confirm" value="yes">
+				</form>
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/session_result.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/session_result.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/session_result.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/session_result.jsp Fri Apr 13 18:10:24 2012
@@ -36,30 +36,37 @@
 <% } %>
 <% String sessionName = request.getParameter("sessionName"); %>
 <% HWISessionItem si = hs.findSessionItemByName(auth,sessionName); %>
+<!DOCTYPE html>
 <html>
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
     <title>Session Result Bucket</title>
+    <link href="css/bootstrap.min.css" rel="stylesheet">
   </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top"><jsp:include page="left_navigation.jsp"/></td>
-        <td valign="top">
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+<div class="container">
+	<div class="row">
+		<div class="span4">
+			<jsp:include page="/left_navigation.jsp"/>
+		</div><!- span4 -->
+		<div class="span8">
           <h2>Session Result Bucket</h2>
           
           <% if (si!=null) { %>
-            <table border=1">
+            <table class="table table-striped">
+              <tbody>
               <% for (List<String> rows : si.getResultBucket() ) { %>
 	        <% for (String row : rows ) { %>  
 		  <tr><td><%=row%></td></tr>
 	      	<% } %>
             <% } %>
+              </tbody>
 	    	</table>	
           <% } %>
           
-        </td>
-      </tr>
-    </table>
+		</div><!- span8 -->
+	</div><!-- row -->
+ </div><!-- container -->
   </body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/show_database.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/show_database.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/show_database.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/show_database.jsp Fri Apr 13 18:10:24 2012
@@ -23,8 +23,6 @@ java.util.*,
 org.apache.hadoop.hive.ql.*,
 org.apache.hadoop.hive.cli.*" %>
 <%@page contentType="text/html" pageEncoding="UTF-8"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-   "http://www.w3.org/TR/html4/loose.dtd">
 <%
   HiveConf hiveConf = new HiveConf(SessionState.class); 
   HiveMetaStoreClient client = new HiveMetaStoreClient(hiveConf);
@@ -33,28 +31,41 @@ org.apache.hadoop.hive.cli.*" %>
   List<String> tables = client.getAllTables(db);
   client.close();
 %>
+<!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>HWI Hive Web Interface</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top"><jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2><%= db%> Table List </h2>
-          Name: <%=  db2.getName()%><br>
-          Description: <%=  db2.getDescription()%><br> 
-          
-          <table border="1">
-          <% for (String table : tables){ %>
-          <tr><td><a href="/hwi/show_table.jsp?db=<%=db%>&table=<%=table%>"><%=table%></a></td></tr>
-          <% } %>
-          </table>
-          
-        </td>
-      </tr>
-    </table>
-  </body>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HWI Hive Web Interface</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<h2><%= db%>
+					Table List
+				</h2>
+				Name:
+				<%=  db2.getName()%><br> Description:
+				<%=  db2.getDescription()%><br>
+
+				<table class="table table-striped">
+					<tbody>
+						<% for (String table : tables){ %>
+						<tr>
+							<td><a
+								href="/hwi/show_table.jsp?db=<%=db%>&table=<%=table%>"><%=table%></a></td>
+						</tr>
+						<% } %>
+					</tbody>
+				</table>
+
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/show_databases.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/show_databases.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/show_databases.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/show_databases.jsp Fri Apr 13 18:10:24 2012
@@ -22,34 +22,41 @@ java.util.*,
 org.apache.hadoop.hive.ql.*,
 org.apache.hadoop.hive.cli.*" %>
 <%@page errorPage="error_page.jsp" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
 <% 
   HiveConf hiveConf = new HiveConf(SessionState.class); 
   HiveMetaStoreClient client = new HiveMetaStoreClient(hiveConf);
   List <String> dbs = client.getAllDatabases();
   client.close();
 %>
+<!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>HWI Hive Web Interface-Schema Browser</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top"><jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          
-          <h2>Database List</h2>
-          <table border="1">
-          <% for (String db : dbs) { %>
-          <tr><td><a href="/hwi/show_database.jsp?db=<%=db%>"><%=db%></a>
-          </td></tr>
-          <% } %>
-          </table>
-        </td>
-      </tr>
-    </table>
-  </body>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HWI Hive Web Interface-Schema Browser</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+
+				<h2>Database List</h2>
+				<table class="table table-striped">
+					<tbody>
+						<% for (String db : dbs) { %>
+						<tr>
+							<td><a href="/hwi/show_database.jsp?db=<%=db%>"><%=db%></a>
+							</td>
+						</tr>
+						<% } %>
+					</tbody>
+				</table>
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>

Modified: hive/branches/branch-0.9/hwi/web/show_table.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/show_table.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/show_table.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/show_table.jsp Fri Apr 13 18:10:24 2012
@@ -25,8 +25,6 @@ org.apache.hadoop.hive.ql.session.Sessio
 java.util.*,
 org.apache.hadoop.hive.ql.*,
 org.apache.hadoop.hive.cli.*" %>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
 <% 
   String db= request.getParameter("db");
   String table= request.getParameter("table");
@@ -40,109 +38,147 @@ org.apache.hadoop.hive.cli.*" %>
   List<Order> ord = sd.getSortCols();
   Partition p = null;//How do we get this info?
 %>
+<!DOCTYPE html>
 <html>
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>HWI Hive Web Interface-Schema Browser</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top"><jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          
-          <h2><%=table%></h2>
-          ColsSize: <%= sd.getColsSize()%> <br>
-          Input Format: <%= sd.getInputFormat()   %><br>
-          Output Format: <%= sd.getOutputFormat()  %><br>
-          Is Compressed?: <%= sd.isCompressed()  %><br>
-          Location: <%= sd.getLocation()  %> <br>
-          Number Of Buckets: <%= sd.getNumBuckets() %><br>
-          
-           <h2>Field Schema</h2>
-          <table border="1">
-            <tr>
-              <td>Name</td>
-              <td>Type</td>
-              <td>Comment</td>
-            </tr>
-            <% for (FieldSchema fs: fsc ) {%>
-            <tr>
-              <td><%=fs.getName() %></td>
-              <td><%=fs.getType() %></td> 
-              <td><%=fs.getComment() %></td>
-            </tr>
-            <% } %>
-          </table>
-          
-          <table border="1">
-            <tr><td>Bucket Columns</td></tr>
-            <% for (String col: bcols ) {%>
-            <tr><td><%=col%></td></tr>
-            <% } %>
-          </table>
-          
-          <h2>Sort Columns</h2>
-          <table border="1">
-            <tr>
-              <td>Column</td>
-              <td>Order</td>
-            </tr>
-            <% for (Order  o: ord ) {%>
-            <tr>
-              <td><%= o.getCol()   %></td>
-              <td><%= o.getOrder()   %></td>
-            </tr>
-            <% } %>
-          </table>
-          <h2>Parameters</h2>
-          <table border="1">
-            <tr>
-              <td>Name</td>
-              <td>Value</td>
-            </tr>
-          <%  for ( String key: sd.getParameters().keySet() ){  %>
-            <tr>
-              <td><%=key%></td>
-              <td><%=sd.getParameters().get(key)%></td>
-            </tr>
-          <% } %>
-          </table>
-          
-          <h2>SerDe Info</h2>
-          <% SerDeInfo si = sd.getSerdeInfo(); %>
-          Name:<%= si.getName() %><br>
-          Lib: <%= si.getSerializationLib()  %><br>
-            <table border="1">
-              <tr>
-                <td>Name</td>
-                <td>value</td>
-              </tr>
-              <% for (String key: si.getParameters().keySet() ) { %>
-              <tr>
-                <td><%= key %></td>
-                <td><%= si.getParameters().get(key)  %></td>
-              </tr>
-              <% } %>
-            </table>
-            
-            <h2>Partition Information</h2>
-             <table border="1">
-              <tr>
-         		<td>Name</td>
-                <td>Type</td>
-                <td>Comment</td>
-              </tr>
-            <% for (FieldSchema fieldSchema: t.getPartitionKeys() ){ %>
-           	  <tr>
-            	<td><%= fieldSchema.getName() %></td>
-                <td><%= fieldSchema.getType() %></td>
-                <td><%= fieldSchema.getComment() %></td>
-              </tr>
-   			<% } %>
-        </td>
-      </tr>
-    </table>
-  </body>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>HWI Hive Web Interface-Schema Browser</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<h2><%=table%></h2>
+				ColsSize:
+				<%= sd.getColsSize()%>
+				<br> Input Format:
+				<%= sd.getInputFormat()   %><br> Output Format:
+				<%= sd.getOutputFormat()  %><br> Is Compressed?:
+				<%= sd.isCompressed()  %><br> Location:
+				<%= sd.getLocation()  %>
+				<br> Number Of Buckets:
+				<%= sd.getNumBuckets() %><br>
+
+				<h2>Field Schema</h2>
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>Type</th>
+							<th>Comment</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% for (FieldSchema fs: fsc ) {%>
+						<tr>
+							<td><%=fs.getName() %></td>
+							<td><%=fs.getType() %></td>
+							<td><%=fs.getComment() %></td>
+						</tr>
+						<% } %>
+					</tbody>
+				</table>
+
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Bucket Columns</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% for (String col: bcols ) {%>
+						<tr>
+							<td><%=col%></td>
+						</tr>
+						<% } %>
+					</tbody>
+				</table>
+
+				<h2>Sort Columns</h2>
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Column</th>
+							<th>Order</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% for (Order  o: ord ) {%>
+						<tr>
+							<td><%= o.getCol()   %></td>
+							<td><%= o.getOrder()   %></td>
+						</tr>
+						<% } %>
+					</tbody>
+				</table>
+
+				<h2>Parameters</h2>
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>Value</th>
+						</tr>
+					</thead>
+					<tbody>
+						<%  for ( String key: sd.getParameters().keySet() ){  %>
+						<tr>
+							<td><%=key%></td>
+							<td><%=sd.getParameters().get(key)%></td>
+						</tr>
+						<% } %>
+					</tbody>
+				</table>
+
+				<h2>SerDe Info</h2>
+				<% SerDeInfo si = sd.getSerdeInfo(); %>
+				Name:<%= si.getName() %><br> Lib:
+				<%= si.getSerializationLib()  %><br>
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>value</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% for (String key: si.getParameters().keySet() ) { %>
+						<tr>
+							<td><%= key %></td>
+							<td><%= si.getParameters().get(key)  %></td>
+						</tr>
+						<% } %>
+					</tbody>
+				</table>
+
+				<h2>Partition Information</h2>
+				<table class="table table-striped">
+					<thead>
+						<tr>
+							<th>Name</th>
+							<th>Type</th>
+							<th>Comment</th>
+						</tr>
+					</thead>
+					<tbody>
+						<% for (FieldSchema fieldSchema: t.getPartitionKeys() ){ %>
+						<tr>
+							<td><%= fieldSchema.getName() %></td>
+							<td><%= fieldSchema.getType() %></td>
+							<td><%= fieldSchema.getComment() %></td>
+						</tr>
+						<% } %>
+					</tbody>
+				</table>
+
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>
-<% client.close(); %>
\ No newline at end of file
+<% client.close(); %>

Modified: hive/branches/branch-0.9/hwi/web/view_file.jsp
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.9/hwi/web/view_file.jsp?rev=1325888&r1=1325887&r2=1325888&view=diff
==============================================================================
--- hive/branches/branch-0.9/hwi/web/view_file.jsp (original)
+++ hive/branches/branch-0.9/hwi/web/view_file.jsp Fri Apr 13 18:10:24 2012
@@ -33,20 +33,24 @@
      bsize = Integer.parseInt( request.getParameter("bsize") );
    }
 %>
-
+<!DOCTYPE html>
 <html>
-  <head>
-    <title>Hive Web Interface</title>
-  </head>
-  <body>
-    <table>
-      <tr>
-        <td valign="top" valign="top" width="100">
-	  <jsp:include page="/left_navigation.jsp"/></td>
-        <td valign="top">
-          <h2>Hive Web Interface</h2>
-          <p><%=sess.getResultFile() %></p>
-          <textarea rows="8" cols="40"><%   
+<head>
+<title>Hive Web Interface</title>
+<link href="css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body style="padding-top: 60px;">
+    <jsp:include page="/navbar.jsp"></jsp:include>
+	<div class="container">
+		<div class="row">
+			<div class="span4">
+				<jsp:include page="/left_navigation.jsp" />
+			</div><!-- span4 -->
+			<div class="span8">
+				<h2>Hive Web Interface</h2>
+				<p><%=sess.getResultFile() %></p>
+				<pre>
+					<%   
 			  File f = new File(   sess.getResultFile()  ); 
 			  BufferedReader br = new BufferedReader( new FileReader(f) );
 			  br.skip(start*bsize);
@@ -58,14 +62,18 @@
 			   out.println( c ); 
 			  }
 			  br.close();	  
-			%></textarea>
-          <br>
-          <% long numberOfBlocks = f.length()/ (long)bsize;%>
-          This file contains <%=numberOfBlocks%> of <%=bsize%> blocks.  
-        
-          <a href="/hwi/view_file.jsp?sessionName=<%=sessionName%>&start=<%=(start+1) %>&bsize=<%=bsize %>">Next Block</a>
-        </td>
-      </tr>
-    </table>
-  </body>
+			%>
+          </pre>
+				<% long numberOfBlocks = f.length()/ (long)bsize;%>
+				This file contains
+				<%=numberOfBlocks%>
+				of
+				<%=bsize%>
+				blocks. <a
+					href="/hwi/view_file.jsp?sessionName=<%=sessionName%>&start=<%=(start+1) %>&bsize=<%=bsize %>">Next
+					Block</a>
+			</div><!-- span8 -->
+		</div><!-- row -->
+	</div><!-- container -->
+</body>
 </html>



Mime
View raw message