瀏覽代碼

HUE-1220 [core] Case in multi-word field labels and buttons should be consistent

Fixed all the buttons and labels across Hue
Enrico Berti 12 年之前
父節點
當前提交
85e5a16174

+ 2 - 2
apps/about/src/about/templates/admin_wizard.mako

@@ -18,14 +18,14 @@ from desktop.views import commonheader, commonfooter
 from django.utils.translation import ugettext as _
 %>
 
-${ commonheader(_('About Hue'), "quick_start", user, "100px") | n,unicode }
+${ commonheader(_('Quick Start'), "quick_start", user, "100px") | n,unicode }
 
 % if user.is_superuser:
   <div class="row-fluid">
     <div class="subnav subnav-fixed">
       <div class="container-fluid">
         <ul class="nav nav-pills">
-          <li class="active"><a href="${url("about:admin_wizard")}">${_('Quick start')}</a></li>
+          <li class="active"><a href="${url("about:admin_wizard")}">${_('Quick Start')}</a></li>
           <li><a href="${url("desktop.views.dump_config")}">${_('Configuration')}</a></li>
           <li><a href="${url("desktop.views.log_view")}">${_('Server Logs')}</a></li>
         </ul>

+ 1 - 0
apps/beeswax/src/beeswax/templates/configuration.mako

@@ -50,6 +50,7 @@ ${layout.menubar(section='configuration')}
 	    % endfor
 		</tbody>
 	</table>
+  <br/>
 </div>
 
 <script type="text/javascript" charset="utf-8">

+ 2 - 2
apps/beeswax/src/beeswax/templates/list_designs.mako

@@ -43,14 +43,14 @@ ${layout.menubar(section='saved queries')}
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" style="top: auto">
-          <li><a href="#" id="trashQueryBtn" title="${_('Move to Trash')}"><i class="icon-trash"></i> ${_('Move to Trash')}</a></li>
+          <li><a href="#" id="trashQueryBtn" title="${_('Move to trash')}"><i class="icon-trash"></i> ${_('Move to trash')}</a></li>
           <li><a href="#" id="deleteQueryBtn" title="${_('Delete forever')}"><i class="icon-bolt"></i> ${_('Delete forever')}</a></li>
         </ul>
       </div>
     </%def>
 
     <%def name="creation()">
-      <a class="btn" href="${ url(app_name + ':execute_query') }" title="${_('Create new query')}"><i class="icon-plus-sign"></i> ${_('New Query')}</a>
+      <a class="btn" href="${ url(app_name + ':execute_query') }" title="${_('Create new query')}"><i class="icon-plus-sign"></i> ${_('New query')}</a>
       <a class="btn" href="${ url(app_name + ':list_trashed_designs') }" title="${_('Go to the trash')}"><i class="icon-trash"></i> ${_('Trash')}</a>
     </%def>
   </%actionbar:render>

+ 9 - 4
apps/beeswax/src/beeswax/templates/list_history.mako

@@ -48,10 +48,15 @@ ${ layout.menubar(section='history') }
   % endif
 </%def>
 
+<style type="text/css">
+  .sidebar-nav {
+    padding: 9px 0;
+  }
+</style>
+
 <div class="container-fluid">
-    <h1>${_('History')}</h1>
     <div class="row-fluid">
-        <div class="span3">
+        <div class="span2">
             <div class="well sidebar-nav">
                 <ul class="nav nav-list">
                     <li class="nav-header">${_('Actions')}</li>
@@ -87,8 +92,8 @@ ${ layout.menubar(section='history') }
                 </ul>
             </div>
         </div>
-        <div class="span9">
-
+        <div class="span10">
+        <h1>${_('History')}</h1>
         <table class="table table-striped table-condensed datatables">
             <thead>
               <tr>

+ 1 - 1
apps/beeswax/src/beeswax/templates/my_queries.mako

@@ -50,7 +50,7 @@ ${layout.menubar(section='my queries')}
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" style="top: auto">
-          <li><a href="#" id="trashQueryBtn" title="${_('Move to Trash')}"><i class="icon-trash"></i> ${_('Move to Trash')}</a></li>
+          <li><a href="#" id="trashQueryBtn" title="${_('Move to trash')}"><i class="icon-trash"></i> ${_('Move to trash')}</a></li>
           <li><a href="#" id="deleteQueryBtn" title="${_('Delete forever')}"><i class="icon-bolt"></i> ${_('Delete forever')}</a></li>
         </ul>
       </div>

+ 7 - 7
apps/filebrowser/src/filebrowser/templates/display.mako

@@ -45,19 +45,19 @@ ${ commonheader(_('%(filename)s - File Viewer') % dict(filename=truncate(filenam
         <ul class="nav nav-list">
           <li class="nav-header">${_('Actions')}</li>
           % if view['mode'] == "binary":
-            <li><a href="${base_url}?offset=${view['offset']}&length=${view['length']}&mode=text&compression=${view['compression']}">${_('View As Text')}</a></li>
+            <li><a href="${base_url}?offset=${view['offset']}&length=${view['length']}&mode=text&compression=${view['compression']}">${_('View as text')}</a></li>
           % endif
 
           % if view['mode'] == "text":
-            <li><a href="${base_url}?offset=${view['offset']}&length=${view['length']}&mode=binary&compression=${view['compression']}">${_('View As Binary')}</a></li>
+            <li><a href="${base_url}?offset=${view['offset']}&length=${view['length']}&mode=binary&compression=${view['compression']}">${_('View as binary')}</a></li>
           % endif
 
           % if view['compression'] != "gzip" and path.endswith('.gz'):
-            <li><a href="${base_url}?offset=0&length=2000&mode=${view['mode']}&compression=gzip">${_('Preview As Gzip')}</a></li>
+            <li><a href="${base_url}?offset=0&length=2000&mode=${view['mode']}&compression=gzip">${_('Preview as Gzip')}</a></li>
           % endif
 
           % if view['compression'] != "avro" and view['compression'] != "snappy_avro" and path.endswith('.avro'):
-            <li><a href="${base_url}?offset=0&length=2000&mode=${view['mode']}&compression=avro">${_('Preview As Avro')}</a></li>
+            <li><a href="${base_url}?offset=0&length=2000&mode=${view['mode']}&compression=avro">${_('Preview as Avro')}</a></li>
           % endif
 
           % if view['compression'] and view['compression'] != "none":
@@ -65,16 +65,16 @@ ${ commonheader(_('%(filename)s - File Viewer') % dict(filename=truncate(filenam
           % endif
 
           % if editable and view['compression'] == "none":
-            <li><a href="${url('filebrowser.views.edit', path=path_enc)}">${_('Edit File')}</a></li>
+            <li><a href="${url('filebrowser.views.edit', path=path_enc)}">${_('Edit file')}</a></li>
           % endif
 
            <li><a href="${url('filebrowser.views.download', path=path_enc)}">${_('Download')}</a></li>
-           <li><a href="${url('filebrowser.views.view', path=dirname_enc)}">${_('View File Location')}</a></li>
+           <li><a href="${url('filebrowser.views.view', path=dirname_enc)}">${_('View file location')}</a></li>
            <li><a id="refreshBtn">${_('Refresh')}</a></li>
           <li class="nav-header">${_('Info')}</li>
           <li>
             <dl>
-              <dt>${_('Last Modified')}</dt>
+              <dt>${_('Last modified')}</dt>
               <dd>${date(datetime.datetime.fromtimestamp(stats['mtime']))} ${time(datetime.datetime.fromtimestamp(stats['mtime']))}</dd>
               <dt>${_('User')}</dt>
               <dd>${stats['user']}</dd>

+ 3 - 3
apps/filebrowser/src/filebrowser/templates/edit.mako

@@ -38,7 +38,7 @@ ${ commonheader(_('%(filename)s - File Viewer') % dict(filename=truncate(filenam
 <div class="well" >
     <form class="form-stacked" method="post" action="${url('filebrowser.views.save_file')}">
     <div class="toolbar">
-		<a class="btn" href="${url('filebrowser.views.view', path=dirname_enc)}">${_('View Location')}</a>
+		<a class="btn" href="${url('filebrowser.views.view', path=dirname_enc)}">${_('Browse location')}</a>
 	</div>
 	<br/>
 
@@ -57,7 +57,7 @@ ${ commonheader(_('%(filename)s - File Viewer') % dict(filename=truncate(filenam
         <div style="width: 100%; height: 100%;">${edit.render_field(form["contents"], tag="textarea", notitle=True, attrs=dict(
           style="width:100%; height:400px;")) | n}</div>
         <input class="btn btn-primary" type="submit" name="save" value="${_('Save')}">
-        <a id="saveAsBtn" class="btn">${_('Save As')}</a>
+        <a id="saveAsBtn" class="btn">${_('Save as')}</a>
     </form>
 </div>
 
@@ -66,7 +66,7 @@ ${ commonheader(_('%(filename)s - File Viewer') % dict(filename=truncate(filenam
     <form id="saveAsForm" action="${url('filebrowser.views.save_file')}" method="POST" class="form-stacked form-padding-fix">
     <div class="modal-header">
         <a href="#" class="close" data-dismiss="modal">&times;</a>
-        <h3>${_('Save As')}</h3>
+        <h3>${_('Save as')}</h3>
     </div>
     <div class="modal-body">
 		${edit.render_field(form["path"], notitle=True, klass="xlarge")}

+ 3 - 3
apps/filebrowser/src/filebrowser/templates/listdir.mako

@@ -39,9 +39,9 @@ ${ commonheader(_('File Browser'), 'filebrowser', user) | n,unicode }
             <button class="btn fileToolbarBtn" title="${_('Move')}" data-bind="click: move, enable: selectedFiles().length > 0"><i class="icon-random"></i> ${_('Move')}</button>
             <button class="btn fileToolbarBtn" title="${_('Copy')}" data-bind="click: copy, enable: selectedFiles().length > 0"><i class="icon-retweet"></i> ${_('Copy')}</button>
             %if is_fs_superuser:
-                <button class="btn fileToolbarBtn" title="${_('Change Owner / Group')}" data-bind="visible: !inTrash(), click: changeOwner, enable: selectedFiles().length > 0"><i class="icon-user"></i> ${_('Change Owner / Group')}</button>
+                <button class="btn fileToolbarBtn" title="${_('Change owner / group')}" data-bind="visible: !inTrash(), click: changeOwner, enable: selectedFiles().length > 0"><i class="icon-user"></i> ${_('Change owner / group')}</button>
             %endif
-            <button class="btn fileToolbarBtn" title="${_('Change Permissions')}" data-bind="visible: !inTrash(), click: changePermissions, enable: selectedFiles().length > 0"><i class="icon-list-alt"></i> ${_('Change Permissions')}</button>
+            <button class="btn fileToolbarBtn" title="${_('Change permissions')}" data-bind="visible: !inTrash(), click: changePermissions, enable: selectedFiles().length > 0"><i class="icon-list-alt"></i> ${_('Change permissions')}</button>
             <button class="btn fileToolbarBtn" title="${_('Download')}" data-bind="visible: !inTrash(), click: downloadFile, enable: selectedFiles().length == 1 && selectedFile().type == 'file'"><i class="icon-download-alt"></i> ${_('Download')}</button>
             &nbsp;&nbsp;
             <button class="btn fileToolbarBtn" title="${_('Empty trash')}" data-bind="visible: inTrash(), click: purgeTrash"><i class="icon-fire"></i> ${_('Empty')}</button>
@@ -53,7 +53,7 @@ ${ commonheader(_('File Browser'), 'filebrowser', user) | n,unicode }
                 <span class="caret"></span>
               </button>
               <ul class="dropdown-menu" style="top: auto">
-                <li data-bind="visible: trashEnabled"><a href="#" class="delete-link" title="${_('Move to Trash')}" data-bind="enable: selectedFiles().length > 0, click: trashSelected"><i class="icon-trash"></i> ${_('Move to Trash')}</a></li>
+                <li data-bind="visible: trashEnabled"><a href="#" class="delete-link" title="${_('Move to trash')}" data-bind="enable: selectedFiles().length > 0, click: trashSelected"><i class="icon-trash"></i> ${_('Move to trash')}</a></li>
                 <li><a href="#" class="delete-link" title="${_('Delete forever')}" data-bind="enable: selectedFiles().length > 0, click: deleteSelected"><i class="icon-bolt"></i> ${_('Delete forever')}</a></li>
               </ul>
             </div>

+ 23 - 23
apps/jobsub/src/jobsub/templates/designs.mako

@@ -56,7 +56,7 @@ ${ commonheader(_('Job Designer'), "jobsub", user, "60px") | n,unicode }
             <span class="caret"></span>
           </button>
           <ul class="dropdown-menu" style="top: auto">
-            <li><a href="javascript:void(0);" id="trash-designs" title="${_('Move to Trash')}"><i class="icon-trash"></i> ${_('Move to Trash')}</a></li>
+            <li><a href="javascript:void(0);" id="trash-designs" title="${_('Move to trash')}"><i class="icon-trash"></i> ${_('Move to trash')}</a></li>
             <li><a href="javascript:void(0);" id="destroy-designs" title="${_('Delete forever')}"><i class="icon-bolt"></i> ${_('Delete forever')}</a></li>
           </ul>
         </div>
@@ -70,43 +70,43 @@ ${ commonheader(_('Job Designer'), "jobsub", user, "60px") | n,unicode }
     <%def name="creation()">
       <!-- ko ifnot: inTrash -->
         <div id="new-action-dropdown" class="btn-group" style="display: inline">
-          <a href="#" class="btn new-action-link dropdown-toggle" title="${_('New Action')}" data-toggle="dropdown">
-            <i class="icon-plus-sign"></i> ${_('New Action')}
+          <a href="#" class="btn new-action-link dropdown-toggle" title="${_('New action')}" data-toggle="dropdown">
+            <i class="icon-plus-sign"></i> ${_('New action')}
             <span class="caret"></span>
           </a>
           <ul class="dropdown-menu" style="top: auto">
             <li>
-              <a href="#new-design/mapreduce" class="new-node-link" title="${_('Create MapReduce Design')}" rel="tooltip"><i class="icon-plus-sign"></i> MapReduce</a>
+              <a href="#new-design/mapreduce" class="new-node-link" title="${_('Create MapReduce design')}" rel="tooltip"><i class="icon-plus-sign"></i> MapReduce</a>
             </li>
             <li>
-              <a href="#new-design/java" class="new-node-link" title="${_('Create Java Design')}" rel="tooltip"><i class="icon-plus-sign"></i> Java</a>
+              <a href="#new-design/java" class="new-node-link" title="${_('Create Java design')}" rel="tooltip"><i class="icon-plus-sign"></i> Java</a>
             </li>
             <li>
-              <a href="#new-design/streaming" class="new-node-link" title="${_('Create Streaming Design')}" rel="tooltip"><i class="icon-plus-sign"></i> Streaming</a>
+              <a href="#new-design/streaming" class="new-node-link" title="${_('Create Streaming design')}" rel="tooltip"><i class="icon-plus-sign"></i> Streaming</a>
             </li>
             <li>
-              <a href="#new-design/hive" class="new-node-link" title="${_('Create Hive Design')}" rel="tooltip"><i class="icon-plus-sign"></i> Hive</a>
+              <a href="#new-design/hive" class="new-node-link" title="${_('Create Hive design')}" rel="tooltip"><i class="icon-plus-sign"></i> Hive</a>
             </li>
             <li>
-              <a href="#new-design/pig" class="new-node-link" title="${_('Create Pig Design')}" rel="tooltip"><i class="icon-plus-sign"></i> Pig</a>
+              <a href="#new-design/pig" class="new-node-link" title="${_('Create Pig design')}" rel="tooltip"><i class="icon-plus-sign"></i> Pig</a>
             </li>
             <li>
-              <a href="#new-design/sqoop" class="new-node-link" title="${_('Create Sqoop Design')}" rel="tooltip"><i class="icon-plus-sign"></i> Sqoop</a>
+              <a href="#new-design/sqoop" class="new-node-link" title="${_('Create Sqoop design')}" rel="tooltip"><i class="icon-plus-sign"></i> Sqoop</a>
             </li>
             <li>
-              <a href="#new-design/fs" class="new-node-link" title="${_('Create Fs Design')}" rel="tooltip"><i class="icon-plus-sign"></i> Fs</a>
+              <a href="#new-design/fs" class="new-node-link" title="${_('Create Fs design')}" rel="tooltip"><i class="icon-plus-sign"></i> Fs</a>
             </li>
             <li>
-              <a href="#new-design/ssh" class="new-node-link" title="${_('Create Ssh Design')}" rel="tooltip"><i class="icon-plus-sign"></i> Ssh</a>
+              <a href="#new-design/ssh" class="new-node-link" title="${_('Create Ssh design')}" rel="tooltip"><i class="icon-plus-sign"></i> Ssh</a>
             </li>
             <li>
-              <a href="#new-design/shell" class="new-node-link" title="${_('Create Shell Design')}" rel="tooltip"><i class="icon-plus-sign"></i> Shell</a>
+              <a href="#new-design/shell" class="new-node-link" title="${_('Create Shell design')}" rel="tooltip"><i class="icon-plus-sign"></i> Shell</a>
             </li>
             <li>
-              <a href="#new-design/email" class="new-node-link" title="${_('Create Email Design')}" rel="tooltip"><i class="icon-plus-sign"></i> Email</a>
+              <a href="#new-design/email" class="new-node-link" title="${_('Create Email design')}" rel="tooltip"><i class="icon-plus-sign"></i> Email</a>
             </li>
             <li>
-              <a href="#new-design/distcp" class="new-node-link" title="${_('Create DistCp Design')}" rel="tooltip"><i class="icon-plus-sign"></i> DistCp</a>
+              <a href="#new-design/distcp" class="new-node-link" title="${_('Create DistCp design')}" rel="tooltip"><i class="icon-plus-sign"></i> DistCp</a>
             </li>
           </ul>
         </div>
@@ -433,7 +433,7 @@ $(document).ready(function() {
       popover: "${ _('Body') }"
     },
     job_properties: {
-      title: "${ _('Job Properties') }",
+      title: "${ _('Job properties') }",
       name: "${ _('Property name') }",
       value: "${ _('Value') }",
       'delete': {
@@ -441,7 +441,7 @@ $(document).ready(function() {
         func: 'function(data, event) { $parent.removeProperty.call($parent, data, event) }'
       },
       add: {
-        name: "${ _('Add Property') }",
+        name: "${ _('Add property') }",
         func: 'addProperty'
       },
       ko: {
@@ -499,7 +499,7 @@ $(document).ready(function() {
         func: 'function(data, event) { $parent.removeFile.call($parent, data, event) }'
       },
       add: {
-        name: "${ _('Add File') }",
+        name: "${ _('Add file') }",
         func: 'addFile'
       },
       ko: {
@@ -515,7 +515,7 @@ $(document).ready(function() {
         func: 'function(data, event) { $parent.removeArchive.call($parent, data, event) }'
       },
       add: {
-        name: "${ _('Add Archive') }",
+        name: "${ _('Add archive') }",
         func: 'addArchive'
       },
       ko: {
@@ -597,7 +597,7 @@ $(document).ready(function() {
           func: 'function(data, event) { $parent.removeDelete.call($parent, data, event) }'
         },
         add: {
-          name: "${ _('Add Path') }",
+          name: "${ _('Add path') }",
           func: 'addDelete'
         },
         ko: {
@@ -613,7 +613,7 @@ $(document).ready(function() {
           func: 'function(data, event) { $parent.removeMkdir.call($parent, data, event) }'
         },
         add: {
-          name: "${ _('Add Path') }",
+          name: "${ _('Add path') }",
           func: 'addMkdir'
         },
         ko: {
@@ -629,7 +629,7 @@ $(document).ready(function() {
           func: 'function(data, event) { $parent.removeTouchz.call($parent, data, event) }'
         },
         add: {
-          name: "${ _('Add Path') }",
+          name: "${ _('Add path') }",
           func: 'addTouchz'
         },
         ko: {
@@ -706,7 +706,7 @@ $(document).ready(function() {
           name: "${ _('Add argument') }",
           func: 'addArgument'
         },{
-          name: "${ _('Add Env-Var') }",
+          name: "${ _('Add env-var') }",
           func: 'addEnvVar'
         }],
         ko: {
@@ -730,7 +730,7 @@ $(document).ready(function() {
           func: 'function(data, event) { $parent.removeParam.call($parent, data, event) }'
         },
         add: [{
-          name: "${ _('Add Argument') }",
+          name: "${ _('Add argument') }",
           func: 'addArgument'
         }],
         ko: {

+ 11 - 11
apps/oozie/src/oozie/templates/editor/action_utils.mako

@@ -176,8 +176,8 @@
               params_field(action_form['params'], {
                 'name': 'params',
                 'add': [
-                  {'label': _('Add Param'), 'method': 'addParam'},
-                  {'label': _('Add Argument'), 'method': 'addArgument'},
+                  {'label': _('Add param'), 'method': 'addParam'},
+                  {'label': _('Add argument'), 'method': 'addArgument'},
                 ],
                 'remove': '$parent.removeParam.bind($parent)'
               })
@@ -189,8 +189,8 @@
               params_field(action_form['params'], {
                 'name': 'params',
                 'add': [
-                  {'label': _('Add Argument'), 'method': 'addArgument'},
-                  {'label': _('Add Env-Var'), 'method': 'addEnvVar'},
+                  {'label': _('Add argument'), 'method': 'addArgument'},
+                  {'label': _('Add env-var'), 'method': 'addEnvVar'},
                 ],
                 'remove': '$parent.removeParam.bind($parent)'
               })
@@ -202,7 +202,7 @@
               params_field(action_form['params'], {
                 'name': 'params',
                 'add': [
-                  {'label': _('Add Param'), 'method': 'addParam'},
+                  {'label': _('Add param'), 'method': 'addParam'},
                 ],
                 'remove': '$parent.removeParam.bind($parent)'
               })
@@ -214,7 +214,7 @@
               params_field(action_form['params'], {
                 'name': 'params',
                 'add': [
-                  {'label': _('Add Argument'), 'method': 'addArgument'},
+                  {'label': _('Add argument'), 'method': 'addArgument'},
                 ],
                 'remove': '$parent.removeParam.bind($parent)'
               })
@@ -226,7 +226,7 @@
               params_field(action_form['params'], {
                 'name': 'params',
                 'add': [
-                  {'label': _('Add Arg'), 'method': 'addArg'},
+                  {'label': _('Add arg'), 'method': 'addArg'},
                 ],
                 'remove': '$parent.removeParam.bind($parent)'
               })
@@ -354,7 +354,7 @@
       </table>
 
       % if 'add' in javascript_attrs:
-        <button class="btn" data-bind="disable: $root.context().read_only, click: ${ javascript_attrs['add'] }">${ _('Add Path') }</button>
+        <button class="btn" data-bind="disable: $root.context().read_only, click: ${ javascript_attrs['add'] }">${ _('Add path') }</button>
       % endif
     % endif
   </div>
@@ -382,7 +382,7 @@
       </table>
 
       % if 'add' in javascript_attrs:
-        <button class="btn" data-bind="disable: $root.context().read_only, click: ${ javascript_attrs['add'] }">${ _('Add Archive') }</button>
+        <button class="btn" data-bind="disable: $root.context().read_only, click: ${ javascript_attrs['add'] }">${ _('Add archive') }</button>
       % endif
     % endif
   </div>
@@ -391,7 +391,7 @@
 
 <%def name="job_properties_field(field, javascript_attrs={})">
 <div class="control-group" rel="popover" data-original-title="${ field.label }" data-content="${ field.help_text }">
-  <label class="control-label">${ _('Job Properties') }</label>
+  <label class="control-label">${ _('Job properties') }</label>
   <div class="controls">
     % if 'name' in javascript_attrs:
       <table class="table-condensed designTable" data-bind="visible: ${ javascript_attrs['name'] }().length > 0">
@@ -416,7 +416,7 @@
       </table>
 
       % if 'add' in javascript_attrs:
-        <button class="btn" data-bind="disable: $root.context().read_only, click: ${ javascript_attrs['add'] }">${ _('Add Property') }</button>
+        <button class="btn" data-bind="disable: $root.context().read_only, click: ${ javascript_attrs['add'] }">${ _('Add property') }</button>
       % endif
     % endif
   </div>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_bundles.mako

@@ -41,7 +41,7 @@ ${ layout.menubar(section='bundles') }
             <span class="caret"></span>
           </button>
           <ul class="dropdown-menu" style="top: auto">
-            <li><a href="javascript:void(0);" id="trash-btn" title="${_('Move to Trash')}"><i class="icon-trash"></i> ${_('Move to Trash')}</a></li>
+            <li><a href="javascript:void(0);" id="trash-btn" title="${_('Move to trash')}"><i class="icon-trash"></i> ${_('Move to trash')}</a></li>
             <li><a href="javascript:void(0);" id="destroy-btn" title="${_('Delete forever')}"><i class="icon-bolt"></i> ${_('Delete forever')}</a></li>
           </ul>
         </div>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_coordinators.mako

@@ -40,7 +40,7 @@ ${ layout.menubar(section='coordinators') }
             <span class="caret"></span>
           </button>
           <ul class="dropdown-menu" style="top: auto">
-            <li><a href="javascript:void(0);" id="trash-btn" title="${_('Move to Trash')}"><i class="icon-trash"></i> ${_('Move to Trash')}</a></li>
+            <li><a href="javascript:void(0);" id="trash-btn" title="${_('Move to trash')}"><i class="icon-trash"></i> ${_('Move to trash')}</a></li>
             <li><a href="javascript:void(0);" id="destroy-btn" title="${_('Delete forever')}"><i class="icon-bolt"></i> ${_('Delete forever')}</a></li>
           </ul>
         </div>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/list_workflows.mako

@@ -41,7 +41,7 @@ ${ layout.menubar(section='workflows') }
           <span class="caret"></span>
         </button>
         <ul class="dropdown-menu" style="top: auto">
-          <li><a href="javascript:void(0);" id="trash-btn" title="${_('Move to Trash')}"><i class="icon-trash"></i> ${_('Move to Trash')}</a></li>
+          <li><a href="javascript:void(0);" id="trash-btn" title="${_('Move to trash')}"><i class="icon-trash"></i> ${_('Move to trash')}</a></li>
           <li><a href="javascript:void(0);" id="destroy-btn" title="${_('Delete forever')}"><i class="icon-bolt"></i> ${_('Delete forever')}</a></li>
         </ul>
       </div>

+ 1 - 1
desktop/core/src/desktop/templates/common_header.mako

@@ -24,7 +24,7 @@ from django.utils.translation import ugettext as _
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>${smart_unicode(title)}</title>
+  <title>Hue - ${smart_unicode(title)}</title>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="">
   <meta name="author" content="">

+ 59 - 20
desktop/core/src/desktop/templates/dump_config.mako

@@ -23,32 +23,75 @@ from django.utils.translation import ugettext as _
 
 <%namespace name="layout" file="about_layout.mako" />
 
-${ commonheader(_('About'), "about", user, "100px") | n,unicode }
+${ commonheader(_('Configuration'), "about", user, "100px") | n,unicode }
 ${layout.menubar(section='dump_config')}
 
+<style type="text/css">
+  #installedApps {
+    margin: 0;
+    padding: 0;
+    list-style-type: none;
+  }
+
+  #installedApps li {
+    display: inline;
+  }
+
+  .widget-content {
+    padding: 10px;
+  }
+</style>
+
     <div class="container-fluid">
+      <div class="row-fluid">
 
         ${_('Configuration files located in')} <code>${conf_dir}</code>
         <br/><br/>
 
-        <h2>${_('Installed applications')}</h2>
-        <ul>
-        % for app in apps:
-            <li>${app.name}</li>
-        % endfor
-        </ul>
-
-        <h2>${_('Configuration Sections and Variables')}</h2>
+        <div class="widget-box">
+          <div class="widget-title">
+            <span class="icon">
+              <i class="icon-th-list"></i>
+            </span>
+            <h5>${_('Installed Applications')}</h5>
+          </div>
+          <div class="widget-content">
+            <ul id="installedAppsz" class="nav nav-pills">
+            % for app in apps:
+                <li><a href="/${app.display_name}">${app.name}</a></li>
+            % endfor
+            </ul>
+          </div>
+        </div>
 
-        <ul class="nav nav-tabs">
-            % for obj in top_level:
+        <div class="widget-box" style="margin-top: 40px">
+          <div class="widget-title">
+            <span class="icon">
+              <i class="icon-th-list"></i>
+            </span>
+            <h5>${_('Configuration Sections and Variables')}</h5>
+          </div>
+          <div class="widget-content">
+            <ul class="nav nav-tabs">
+              % for obj in top_level:
                 <li
-                    % if loop.first:
-                        class="active"
-                    % endif
+                  % if loop.first:
+                      class="active"
+                  % endif
                 ><a href="#${obj.config.key}Conf" data-toggle="tab">${obj.config.key}</a></li>
-            % endfor
-        </ul>
+              % endfor
+            </ul>
+
+            ${showTopLevel(top_level)}
+
+              <br/>
+              <br/>
+              <br/>
+          </div>
+        </div>
+
+      </div>
+
 
         <%def name="showTopLevel(config_obj, depth=0)">
             <div class="tab-content">
@@ -107,11 +150,7 @@ ${layout.menubar(section='dump_config')}
             </table>
         </%def>
 
-        ${showTopLevel(top_level)}
 
-        <br/>
-        <br/>
-        <br/>
 
     </div>
 

+ 6 - 1
desktop/core/src/desktop/templates/login.mako

@@ -21,7 +21,12 @@ from django.utils.translation import ugettext as _
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>${_('Hue Login')}</title>
+  %if first_login_ever:
+    <title>${_('Hue - Sign up')}</title>
+  %else:
+    <title>${_('Hue - Sign in')}</title>
+  %endif
+
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="description" content="">
   <meta name="author" content="">

+ 3 - 3
desktop/core/src/desktop/templates/logs.mako

@@ -24,7 +24,7 @@ import re
 <%namespace name="actionbar" file="actionbar.mako" />
 <%namespace name="layout" file="about_layout.mako" />
 
-${ commonheader(_('About'), "about", user, "100px") | n,unicode }
+${ commonheader(_('Server Logs'), "about", user, "100px") | n,unicode }
 ${layout.menubar(section='log_view')}
 
 <style>
@@ -56,8 +56,6 @@ ${layout.menubar(section='log_view')}
 </style>
 
 <div class="container-fluid">
-  <h1>${_('Log entries (most recent first)')}</h1>
-
   <%actionbar:render>
     <%def name="search()">
         <input type="text" class="input-xxlarge search-query" placeholder="${_('Search...')}" value="${query}">
@@ -77,6 +75,8 @@ ${layout.menubar(section='log_view')}
       % endfor
   </div>
 
+  <br/>
+
 </div>
 
 <script>