Browse Source

HUE-618 fixed Check configuration page

Enrico Berti 13 years ago
parent
commit
bcc21e2412
1 changed files with 14 additions and 76 deletions
  1. 14 76
      desktop/core/src/desktop/templates/check_config.mako

+ 14 - 76
desktop/core/src/desktop/templates/check_config.mako

@@ -13,75 +13,12 @@
 ## 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.
-
 <%!
 from desktop.lib.conf import BoundConfig
+from desktop.views import commonheader, commonfooter
 %>
-<!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 Configuration Check</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>
+${commonheader("About", "about", "100px")}
 
-	<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">
@@ -93,8 +30,8 @@ from desktop.lib.conf import BoundConfig
 			</div>
 		</div>
 	</div>
-	
-	
+
+
 	<div class="container-fluid">
 
 		Configuration files located in <code>${conf_dir}</code>
@@ -102,9 +39,10 @@ from desktop.lib.conf import BoundConfig
 		% if error_list:
 	      <h2>Potential misconfiguration detected. Please fix and restart HUE.</h2>
 		  <br/>
+			<table>
 	      % for confvar, error in error_list:
-			<div class="row">
-				<div class="span3">
+			<tr>
+				<td width="5%">
 					<code>
 		            % if isinstance(confvar, str):
 		              ${confvar | n}
@@ -112,23 +50,23 @@ from desktop.lib.conf import BoundConfig
 		              ${confvar.get_fully_qualifying_key()}
 		            % endif
 		          </code>
-		        </div>
-				<div class="span13">
+		        </td>
+				<td>
 		          ## Doesn't make sense to print the value of a BoundContainer
 		          % if type(confvar) is BoundConfig:
 		            Current value: <code>${confvar.get()}</code><br/>
 		          % endif
 		          ${error | n}
-	        	</div>
-			</div>
+	        	</td>
+			</tr>
 	      % endfor
+		</table>
 	    % else:
 	      <h2>All ok. Configuration check passed!</h2>
 	    % endif
-		
+
 	</div>
-</body>
 
-</html>
 
+${commonfooter()}