Permalink
Browse files

[core] Using Hue blue logo on about and login page

Also rename Oozie Editor to Oozie Manager
  • Loading branch information...
romainr committed Dec 20, 2012
1 parent 27c912a commit 0178560d92117ecbd4f2f88598c3d8d7c5051ed4
@@ -30,10 +30,8 @@ ${commonheader(_('About Hue'), "about", user, "100px")}
</div>
<div class="container-fluid">
-
- <img src="/static/art/help/logo.png" />
+ <img src="/static/art/hue-login-logo.png" />
<p>Hue ${version}</p>
-
</div>
${commonfooter(messages)}
@@ -48,7 +48,7 @@ ${ layout.menubar(section='coordinators') }
<div class="container-fluid">
- <h1>${ _('Coordinator') } ${ coordinator.name }</h1>
+ <h1>${ _('Coordinator Editor : ') } ${ coordinator.name }</h1>
<div class="row-fluid">
<div class="span2">
@@ -34,7 +34,7 @@ ${ layout.menubar(section='workflows') }
<div class="ribbon">${ _('Unsaved') }</div>
</div>
- <h1 data-bind="text: '${ _('Workflow') } ' + name()"></h1>
+ <h1 data-bind="text: '${ _('Workflow Editor : ') } ' + name()"></h1>
<div class="well">
<span data-bind="text: '${ _('Description') }: ' + description() || 'N/A'"></span>
@@ -28,7 +28,7 @@ ${ layout.menubar(section='coordinators') }
<div class="container-fluid">
- <h1>${ _('Coordinator Editor') }</h1>
+ <h1>${ _('Coordinator Manager') }</h1>
<div class="well hueWell">
<div class="btn-group pull-right">
@@ -28,7 +28,7 @@ ${ layout.menubar(section='workflows') }
<div class="container-fluid">
- <h1>${ _('Workflow Editor') }</h1>
+ <h1>${ _('Workflow Manager') }</h1>
<div class="well hueWell">
<div class="btn-group pull-right">
@@ -18,45 +18,43 @@ from desktop.lib.conf import BoundConfig
from desktop.views import commonheader, commonfooter
from django.utils.translation import ugettext as _
%>
+
<%namespace name="layout" file="about_layout.mako" />
${commonheader(_('About'), "about", user, "100px")}
-${layout.menubar(section='check_config')}
-
- <div class="container-fluid">
- ${_('Configuration files located in')} <code>${conf_dir}</code>
- <br/><br/>
- % if error_list:
- <h2>${_('Potential misconfiguration detected. Fix and restart Hue.')}</h2>
- <br/>
- <table class="table table-striped">
- % for confvar, error in error_list:
- <tr>
- <td width="5%">
- <code>
- % if isinstance(confvar, str):
- ${confvar | n}
- % else:
- ${confvar.get_fully_qualifying_key()}
- % endif
- </code>
- </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}
- </td>
- </tr>
- % endfor
- </table>
- % else:
- <h2>${_('All OK. Configuration check passed.')}</h2>
- % endif
-
- </div>
+${layout.menubar(section='check_config')}
+<div class="container-fluid">
+ ${_('Configuration files located in')} <code>${conf_dir}</code>
+ <br/><br/>
+ % if error_list:
+ <h2>${_('Potential misconfiguration detected. Fix and restart Hue.')}</h2>
+ <br/>
+ <table class="table table-striped">
+ % for confvar, error in error_list:
+ <tr>
+ <td width="5%">
+ <code>
+ % if isinstance(confvar, str):
+ ${confvar | n}
+ % else:
+ ${confvar.get_fully_qualifying_key()}
+ % endif
+ </code>
+ </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}
+ </td>
+ </tr>
+ % endfor
+ </table>
+ % else:
+ <h2>${_('All OK. Configuration check passed.')}</h2>
+ % endif
+</div>
${commonfooter(messages)}
-
@@ -1,12 +1,12 @@
## Licensed to Cloudera, Inc. under one
-## or more contributor license agreements. See the NOTICE file
+## 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
+## 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,
@@ -20,82 +20,86 @@ from django.utils.translation import ugettext as _
<!DOCTYPE html>
<html lang="en">
<head>
- <meta charset="utf-8">
- <title>Hue Login</title>
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <meta name="description" content="">
- <meta name="author" content="">
+ <meta charset="utf-8">
+ <title>Hue Login</title>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="description" content="">
+ <meta name="author" content="">
- <link href="/static/ext/css/bootstrap.min.css" rel="stylesheet">
- <link href="/static/css/hue2.css" rel="stylesheet">
+ <link href="/static/ext/css/bootstrap.min.css" rel="stylesheet">
+ <link href="/static/css/hue2.css" rel="stylesheet">
- <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
- <!--[if lt IE 9]>
- <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
- <![endif]-->
+ <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
+ <!--[if lt IE 9]>
+ <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ <![endif]-->
- <style type="text/css">
- body {
- padding-top: 100px;
- }
- </style>
+ <style type="text/css">
+ body {
+ padding-top: 100px;
+ }
+ </style>
</head>
<body>
- <div class="navbar navbar-fixed-top">
- % if conf.CUSTOM.BANNER_TOP_HTML.get():
- <div id="banner-top" class="banner">
- ${conf.CUSTOM.BANNER_TOP_HTML.get()}
- </div>
- % endif
- <div class="navbar-inner">
- <div class="container-fluid">
- <a class="brand" href="#">Hue</a>
- </div>
- </div>
- </div>
+ <div class="navbar navbar-fixed-top">
+ % if conf.CUSTOM.BANNER_TOP_HTML.get():
+ <div id="banner-top" class="banner">
+ ${conf.CUSTOM.BANNER_TOP_HTML.get()}
+ </div>
+ % endif
+ <div class="navbar-inner">
+ <div class="container-fluid">
+ <a class="brand" href="#">Hue</a>
+ </div>
+ </div>
+ </div>
- <div class="container">
- <div class="row">
- <div class="span4 offset4">
- <form method="POST" action="${action}" class="well">
- <label>${_('Username')}
- ${ form['username'] }
- ${ form['username'].errors }
- </label>
- <label>${_('Password')}
- ${ form['password'] }
- ${ form['password'].errors }
- </label>
+ <div class="container">
+ <div class="row">
+ <img src="/static/art/hue-login-logo.png" style="display: block; margin-left: auto; margin-right: auto"/>
+ </br>
+ </div>
+ <div class="row">
+ <div class="span4 offset4">
+ <form method="POST" action="${action}" class="well">
+ <label>${_('Username')}
+ ${ form['username'] }
+ ${ form['username'].errors }
+ </label>
+ <label>${_('Password')}
+ ${ form['password'] }
+ ${ form['password'].errors }
+ </label>
- %if first_login_ever==True:
- <input type="submit" class="btn btn-primary" value="${_('Sign up')}" />
- %else:
- <input type="submit" class="btn btn-primary" value="${_('Sign in')}" />
- %endif
- <input type="hidden" name="next" value="${next}" />
+ %if first_login_ever==True:
+ <input type="submit" class="btn btn-primary" value="${_('Sign up')}" />
+ %else:
+ <input type="submit" class="btn btn-primary" value="${_('Sign in')}" />
+ %endif
+ <input type="hidden" name="next" value="${next}" />
- %if login_errors==True:
- <br/>
- <br/>
- <div class="alert alert-error">
- <p><strong>${_('Error!')}</strong> ${_('Invalid username or password.')}</p>
- </div>
- %endif
- </form>
- </div>
- </div>
+ %if login_errors==True:
+ <br/>
+ <br/>
+ <div class="alert alert-error">
+ <p><strong>${_('Error!')}</strong> ${_('Invalid username or password.')}</p>
+ </div>
+ %endif
+ </form>
+ </div>
+ </div>
- %if first_login_ever==True:
- <div class="row">
- <div class="span6 offset3">
- <div class="alert alert-block">
- <p>${_('Since this is your first time logging in, pick any username and password. Be sure to remember these, as')}
- <strong>${_('they will become your Hue superuser credentials.')}</strong>.</p>
- </div>
- </div>
- </div>
- %endif
- </div>
+ %if first_login_ever==True:
+ <div class="row">
+ <div class="span6 offset3">
+ <div class="alert alert-block">
+ <p>${_('Since this is your first time logging in, pick any username and password. Be sure to remember these, as')}
+ <strong>${_('they will become your Hue superuser credentials.')}</strong>.</p>
+ </div>
+ </div>
+ </div>
+ %endif
+ </div>
</body>
</html>

0 comments on commit 0178560

Please sign in to comment.