Browse Source

HUE-621 Fixed welcome screen

Enrico Berti 13 years ago
parent
commit
c0c464f3ee

+ 60 - 0
VERSION_DATA

@@ -0,0 +1,60 @@
+Project mootools-touch:
+  HEAD: 7bfbaf96254e8f6e2392a27d657e588978c4adb3
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project jframe:
+  HEAD: e70b0934398494f7260bfe9fa35ad2cc3d1631b0
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project art:
+  HEAD: c9d7967865b7ed7058f9cee692d046c9e4d283be
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project behavior:
+  HEAD: dbd0d332f5e62d297bc63391aa3f2f189d43372e
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project slick:
+  HEAD: d4bc6cf55ebba5eeecf5288513fd7c638c4ad982
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project mootools-core:
+  HEAD: 3e7459cb4756475a80921bfde5c19a7c7edb64df
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project clientcide:
+  HEAD: 735697be7f55be589bd1d11fc7cfbf5738a662cc
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project mootools-color:
+  HEAD: ff4df88a9a4c323363f4f16a3446cd6097d07695
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project more-behaviors:
+  HEAD: 1f5f90fa98371ade9722087809f377b1ced545e3
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project art-widgets:
+  HEAD: bb04ca24f72b4bcfc07b5cd2e97b281bad2e3f87
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Project mootools-more:
+  HEAD: 1ea36e18ccd7c6bc33ce67ef811fccd114fba39c
+  Symbolic: crepo
+  Your tracking branch and remote branches are up to date.
+
+Manifest repo:
+  HEAD: 8e047cc29bdb75c05aafea66c133355e4aa08b6d
+  Symbolic: hue2
+  Your tracking branch and remote branches are up to date.
+  Project hue has a dirty working directory (unstaged changes).

+ 2 - 0
apps/beeswax/conf/hue-beeswax.ini

@@ -14,10 +14,12 @@
 #
 # Hive home directory
 ## hive_home_dir=/usr/lib/hive
+hive_home_dir=/opt/hadoop/hive
 
 #
 # Hive configuration directory, where hive-site.xml is located
 ## hive_conf_dir=/etc/hive/conf
+hive_conf_dir=/opt/hadoop/hive/conf
 
 #
 # Timeout in seconds for thrift calls to beeswax service

+ 31 - 30
apps/beeswax/src/beeswax/templates/index.mako

@@ -20,37 +20,38 @@ from desktop.views import commonheader, commonfooter
 <%namespace name="layout" file="layout.mako" />
 ${commonheader("Beeswax", "beeswax", "100px")}
 ${layout.menubar(section='tables')}
-
-<div class="sidebar">
-	<div class="well">
-		<h4>Examples</h4>
-		<ul>
-			<li><a href="${ url('beeswax.views.install_examples') }">Install examples</a></li>
-		</ul>
-    	<h4>Tables</h4>
-		<ul>
-			<li><a href="${ url('beeswax.views.show_tables') }">Show tables</a></li>
-		    <li><a href="${ url('beeswax.create_table.create_table') }">Create Table</a></li>
-		</ul>
-		<h4>Queries</h4>
-		<ul>
-			<li><a href="${ url('beeswax.views.list_designs') }">Saved Queries</a></li>
-		    <li><a href="${ url('beeswax.views.execute_query') }">Execute Query</a></li>
-		    <li><a href="${ url('beeswax.views.edit_report') }">Report Generator</a></li>
-			<li><a href="${ url('beeswax.views.list_query_history') }">Query History</a></li>
-		</ul>
-		<h4>Configuration</h4>
-		<ul>
-			<li><a href="${ url('beeswax.views.configuration') }">Hive Configuration</a></li>
-		    <li><a href="${ url('beeswax.views.configuration') }?include_hadoop=1">Extended Configuration</a></li>
-		</ul>
+<div class="container-fluid">
+	<div class="sidebar">
+		<div class="well">
+			<h4>Examples</h4>
+			<ul>
+				<li><a href="${ url('beeswax.views.install_examples') }">Install examples</a></li>
+			</ul>
+	    	<h4>Tables</h4>
+			<ul>
+				<li><a href="${ url('beeswax.views.show_tables') }">Show tables</a></li>
+			    <li><a href="${ url('beeswax.create_table.create_table') }">Create Table</a></li>
+			</ul>
+			<h4>Queries</h4>
+			<ul>
+				<li><a href="${ url('beeswax.views.list_designs') }">Saved Queries</a></li>
+			    <li><a href="${ url('beeswax.views.execute_query') }">Execute Query</a></li>
+			    <li><a href="${ url('beeswax.views.edit_report') }">Report Generator</a></li>
+				<li><a href="${ url('beeswax.views.list_query_history') }">Query History</a></li>
+			</ul>
+			<h4>Configuration</h4>
+			<ul>
+				<li><a href="${ url('beeswax.views.configuration') }">Hive Configuration</a></li>
+			    <li><a href="${ url('beeswax.views.configuration') }?include_hadoop=1">Extended Configuration</a></li>
+			</ul>
+		</div>
 	</div>
-</div>
 
-<div class="content">
-	<h2>Welcome to Beeswax for Hive</h2>
-	<p>To get started with Beeswax you'll first need set up some data.</p>
-	<a href="${ url('beeswax.create_table.create_table') }" class='btn large'>Import Data</a>
-	<a href="${ url('beeswax.views.install_examples') }" class='btn large'>Install Samples</a>
+	<div class="content">
+		<h1>Welcome to Beeswax for Hive</h1>
+		To get started with Beeswax you'll first need set up some data.
+		<a href="${ url('beeswax.create_table.create_table') }" class='btn'>Import Data</a>
+		or <a href="${ url('beeswax.views.install_examples') }" class=''>Install Samples</a>.
+	</div>
 </div>
 ${commonfooter()}

+ 0 - 20
desktop/core/src/desktop/templates/commonfooter.html

@@ -1,20 +0,0 @@
-{% comment %}
-Licensed to Cloudera, Inc. under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  Cloudera, Inc. licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-{% endcomment %}
-
-	</body>
-</html>

+ 0 - 88
desktop/core/src/desktop/templates/commonheader.html

@@ -1,88 +0,0 @@
-{% comment %}
-Licensed to Cloudera, Inc. under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  Cloudera, Inc. licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-{% endcomment %}
-{% load is_selected %}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<meta name="viewport" content="width=device-width user-scalable=no initial-scale=1" />
-	<meta name="apple-mobile-web-app-capable" content="yes" />
-	<title>{{title}}</title>
-	<link rel="stylesheet" href="/static/ext/css/bootstrap.min.css" type="text/css" media="screen" title="no title" charset="utf-8" />
-	<link rel="stylesheet" href="/static/css/jhue.css" type="text/css" media="screen" title="no title" charset="utf-8" />
-	<link rel="stylesheet" href="/static/ext/css/fileuploader.css" type="text/css" media="screen" title="no title" charset="utf-8" />
-
-	<style type="text/css">
-      body {
-        padding-top: {{padding}};
-      }
-    </style>
-
-	<script src="/static/ext/js/jquery/jquery-1.7.min.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/js/Source/jHue/jquery.showusername.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/js/Source/jHue/jquery.filechooser.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/js/Source/jHue/jquery.contextmenu.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/js/Source/jHue/jquery.selector.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/jquery/plugins/jquery.simpleplaceholder.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/jquery/plugins/jquery.dataTables.1.8.2.min.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/bootstrap-tabs.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/bootstrap-dropdown.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/bootstrap-tabs.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/bootstrap-modal.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/bootstrap-twipsy.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/bootstrap-popover.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/fileuploader.js" type="text/javascript" charset="utf-8"></script>
-
-	<script type="text/javascript" charset="utf-8">
-		$(document).ready(function(){
-			$("#username").showUsername();
-			$("input:text[placeholder]").simplePlaceholder();
-			$(".submitter").keydown(function(e){
-				if (e.keyCode==13){
-					$(this).closest("form").submit();
-				}
-			}).change(function(){
-				$(this).closest("form").submit();
-			});
-		});
-	</script>
-
-</head>
-<body>
-	<div class="topbar">
-		<div class="topbar-inner">
-			<div class="container-fluid">
-				<a class="brand" href="#">jHue</a>
-				<ul class="nav">
-					<li {% is_selected section "beeswax" %}><a href="/beeswax">Beeswax</a></li>
-
-					<li {% is_selected section "filebrowser" %}><a href="/filebrowser/">File Browser</a></li>
-					<li {% is_selected section "jobsub" %}><a href="/jobsub/">Job Designer</a></li>
-					<li {% is_selected section "jobbrowser" %}><a href="/jobbrowser/jobs/">Job Browser</a></li>
-					<li {% is_selected section "useradmin" %}><a href="/useradmin/">User Admin</a></li>
-					<li {% is_selected section "shell" %}><a href="/shell/">Shell</a></li>
-					<li {% is_selected section "help" %}><a href="/help/">Help</a></li>
-					<li {% is_selected section "about" %}><a href="/about/">About</a></li>
-				</ul>
-				<p class="pull-right">Logged in as <strong><span id="username">xxx</span></strong> - <a href="/accounts/logout">Sign out</a></p>
-			</div>
-		</div>
-	</div>
-

+ 0 - 111
desktop/core/src/desktop/templates/logs.html

@@ -1,111 +0,0 @@
-{% comment %}
-Licensed to Cloudera, Inc. under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  Cloudera, Inc. licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-{% endcomment %}
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<meta name="viewport" content="width=device-width user-scalable=no initial-scale=1" />
-	<meta name="apple-mobile-web-app-capable" content="yes" />
-	<title>About :: Hue Logs</title>
-	<link rel="stylesheet" href="/static/ext/css/bootstrap.min.css" type="text/css" media="screen" title="no title" charset="utf-8" />
-	<link rel="stylesheet" href="/static/css/jhue.css" type="text/css" media="screen" title="no title" charset="utf-8" />
-	<link rel="stylesheet" href="/static/ext/css/fileuploader.css" type="text/css" media="screen" title="no title" charset="utf-8" />
-	
-	<style type="text/css">
-      body {
-        padding-top: 100px;
-      }
-    </style>
-	<script src="/static/ext/js/jquery/jquery-1.7.min.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/js/Source/jHue/jquery.showusername.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/js/Source/jHue/jquery.filechooser.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/js/Source/jHue/jquery.contextmenu.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/jquery/plugins/jquery.simpleplaceholder.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/jquery/plugins/jquery.dataTables.1.8.2.min.js" type="text/javascript" charset="utf-8"></script>
-	<script src="/static/ext/js/bootstrap-dropdown.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="/static/ext/js/bootstrap-tabs.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="/static/ext/js/bootstrap-modal.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="/static/ext/js/bootstrap-twipsy.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="/static/ext/js/bootstrap-popover.js" type="text/javascript" charset="utf-8"></script>	
-	<script src="/static/ext/js/fileuploader.js" type="text/javascript" charset="utf-8"></script>
-
-	<script type="text/javascript" charset="utf-8">
-		$(document).ready(function(){
-			$("#username").showUsername();
-			$("input:text[placeholder]").simplePlaceholder();
-			$(".submitter").keydown(function(e){
-				if (e.keyCode==13){
-					$(this).closest("form").submit();
-				}
-			}).change(function(){
-				$(this).closest("form").submit();
-			});
-		});
-	</script>
-	
-</head>
-<body>
-	<div class="topbar">
-		<div class="topbar-inner">
-			<div class="container-fluid">
-				<a class="brand" href="#">jHue</a>
-				<ul class="nav">
-					<li><a href="/beeswax">Beeswax</a></li>
-					<li><a href="/filebrowser/">File Browser</a></li>
-					<li><a href="/jobsub/">Job Designer</a></li>
-					<li><a href="/jobbrowser/jobs/">Job Browser</a></li>
-					<li><a href="/useradmin/">User Admin</a></li>
-					<li><a href="/shell/">Shell</a></li>
-					<li><a href="/help/">Help</a></li>
-					<li class="active"><a href="/about/">About</a></li>
-				</ul>
-				<p class="pull-right">Logged in as <a id="username" href="/accounts/logout">xxx</a></p>
-			</div>
-		</div>
-	</div>
-	<div class="menubar">
-		<div class="menubar-inner">
-			<div class="container-fluid">
-				<ul class="nav">
-					<li><a href="{% url desktop.views.dump_config %}">Configuration</a></li>
-					<li><a href="{% url desktop.views.check_config %}">Check for misconfiguration</a></li>
-					<li><a href="{% url desktop.views.log_view %}" class="selected">Server Logs</a></li>
-				</ul>
-			</div>
-		</div>
-	</div>
-	
-	
-	<div class="container-fluid">
-		<h1>Log entries (most recent first)</h1>
-		
-		<a href="/download_logs">Download entire log as zip</a>
-		<hr/>
-		
-		<pre>{% for l in log reversed %}
-{{l}}{% endfor %}</pre>
-		
-	</div>
-
-	
-</body>
-
-</html>