Explorar o código

[core] Use titles instead of tooltips in the navigation bar

Romain Rigaux %!s(int64=12) %!d(string=hai) anos
pai
achega
6e15a89f58

+ 10 - 4
apps/about/src/about/templates/admin_wizard.mako

@@ -30,11 +30,12 @@ ${ header.menubar() }
         % if user.is_superuser:
           ${ _('Quick Start Wizard') } -
         % endif
-        Hue ${version}
+        Hue ${version} - The Hadoop UI
       </h2>
 
+     % if user.is_superuser:
+
       <div class="card-body">
-          % if user.is_superuser:
             <br/>
 
           <div class="row-fluid">
@@ -56,7 +57,7 @@ ${ header.menubar() }
               <div class="card-body">
                 <div id="check-config-section" style="margin-bottom:20px">
                   <!--[if !IE]><!--><i class="icon-spinner icon-spin" style="font-size: 60px; color: #DDD"></i><!--<![endif]-->
-                  <!--[if IE]><img src="/hbase/static/art/loader.gif" /><![endif]-->
+                  <!--[if IE]><img src="/static/art/spinner.gif" /><![endif]-->
                 </div>
               </div>
             </div>
@@ -193,13 +194,18 @@ ${ header.menubar() }
 
           </div>
           </div>
-          % endif
       </div>
 
       <div class="form-actions">
         <a id="backBtn" class="btn disabled">${ _('Back') }</a>
         <a id="nextBtn" class="btn btn-primary disable-feedback">${ _('Next') }</a>
       </div>
+      % else:
+        <p>
+        </br>
+        &nbsp;&nbsp;&nbsp;${ _('Learn more about Hue and Hadoop on') } <a href="http://gethue.com" target="_blank">http://gethue.com</a>
+        </p>
+      % endif
 
     </div>
   </div>

+ 5 - 5
apps/about/src/about/templates/header.mako

@@ -27,11 +27,11 @@ from django.utils.translation import ugettext as _
                 <a href="/${app_name}"><img src="/static/art/icon_hue_24.png" />
                 ${ _('About Hue') }</a>
                </li>
-              % if user.is_superuser:
-                <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>
-              % endif
+               % if user.is_superuser:
+                 <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>
+               % endif
             </ul>
           </div>
         </div>

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

@@ -143,7 +143,7 @@ from django.utils.translation import ugettext as _
 
       $("[rel='tooltip']").tooltip({
         delay: 0,
-        placement: "right"
+        placement: "bottom"
       });
 
       var JB_CHECK_INTERVAL_IN_MILLIS = 30000;
@@ -182,7 +182,7 @@ from django.utils.translation import ugettext as _
 
 % if conf.CUSTOM.BANNER_TOP_HTML.get():
   <div id="banner-top" class="banner">
-    ${conf.CUSTOM.BANNER_TOP_HTML.get()}
+    ${ conf.CUSTOM.BANNER_TOP_HTML.get() }
   </div>
 % endif
 
@@ -192,13 +192,13 @@ from django.utils.translation import ugettext as _
   <ul class="nav nav-pills">
     <li class="divider-vertical"></li>
     % if 'filebrowser' in apps:
-    <li><a href="/${apps['filebrowser'].display_name}"><i class="icon-file"></i>&nbsp;${_('File Browser')} &nbsp;</a></li>
+    <li><a title="${_('Manage HDFS')}" href="/${apps['filebrowser'].display_name}"><i class="icon-file"></i>&nbsp;${_('File Browser')} &nbsp;</a></li>
     % endif
     % if 'jobbrowser' in apps:
-    <li><a href="/${apps['jobbrowser'].display_name}"><i class="icon-list-alt"></i>&nbsp;${_('Job Browser')} &nbsp;<span id="jobBrowserCount" class="badge badge-warning hide" style="padding-top:0;padding-bottom: 0"></span></a></li>
+    <li><a title="${_('Manage jobs')}" href="/${apps['jobbrowser'].display_name}"><i class="icon-list-alt"></i>&nbsp;${_('Job Browser')} &nbsp;<span id="jobBrowserCount" class="badge badge-warning hide" style="padding-top:0;padding-bottom: 0"></span></a></li>
     % endif
     <li class="dropdown">
-      <a href="index.html#" data-toggle="dropdown" class="dropdown-toggle"><i class="icon-cogs"></i>&nbsp;&nbsp;<b class="caret"></b></a>
+      <a title="${ _('Administration') }" href="index.html#" data-toggle="dropdown" class="dropdown-toggle"><i class="icon-cogs"></i>&nbsp;&nbsp;<b class="caret"></b></a>
       <ul class="dropdown-menu">
         <li><a href="${ url('useradmin.views.edit_user', username=urllib.quote(user.username)) }"><i class="icon-key"></i>&nbsp;&nbsp;${_('Change Password')}</a></li>
         %if user.is_superuser:
@@ -206,17 +206,17 @@ from django.utils.translation import ugettext as _
         %endif
       </ul>
     </li>
-    <li><a title="${_('Sign out')}" rel="tooltip" data-placement="left" href="/accounts/logout/"><i class="icon-signout"></i>&nbsp;&nbsp;${user.username}</a></li>
-    <li><a href="/help"><i class="icon-question-sign"></i></a></li>
+    <li><a title="${_('Sign out')}" data-placement="left" href="/accounts/logout/"><i class="icon-signout"></i>&nbsp;&nbsp;${user.username}</a></li>
+    <li><a title="${_('Documentation')}" data-placement="left" href="/help"><i class="icon-question-sign"></i></a></li>
     <li id="jHueTourFlagPlaceholder"></li>
   </ul>
   % endif
   </div>
     <a class="brand nav-tooltip pull-left" title="${_('About Hue')}" href="/about"><img src="/static/art/hue-logo-mini-white.png" data-orig="/static/art/hue-logo-mini-white.png" data-hover="/static/art/hue-logo-mini-white-hover.png"/></a>
      <ul class="nav nav-pills pull-left">
-       <li><a href="/home"><i class="icon-home"></i></a></li>
+       <li><a title="${_('My documents')}" href="/home"><i class="icon-home"></i></a></li>
        <li class="dropdown">
-         <a href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Query Editors')} <b class="caret"></b></a>
+         <a title="${_('Query data')}" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Query Editors')} <b class="caret"></b></a>
          <ul role="menu" class="dropdown-menu">
            % if 'beeswax' in apps:
            <li><a href="/${apps['beeswax'].display_name}"><img src="${ apps['beeswax'].icon_path }"/> ${_('Hive')}</a></li>
@@ -233,7 +233,7 @@ from django.utils.translation import ugettext as _
          </ul>
        </li>
        <li class="dropdown">
-         <a href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Data Browsers')} <b class="caret"></b></a>
+         <a title="${_('Manage data')}" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Data Browsers')} <b class="caret"></b></a>
          <ul role="menu" class="dropdown-menu">
            % if 'metastore' in apps:
            <li><a href="/${apps['metastore'].display_name}"><img src="${ apps['metastore'].icon_path }"/> ${_('Metastore Tables')}</a></li>
@@ -245,13 +245,13 @@ from django.utils.translation import ugettext as _
            <li><a href="/${apps['sqoop'].display_name}"><img src="${ apps['sqoop'].icon_path }"/> ${_('Sqoop Transfer')}</a></li>
            % endif
            % if 'zookeeper' in apps:
-           <li><a href="/${apps['zookeeper'].display_name}"><img src="${ apps['zookeeper'].icon_path }"/> ${_('Zookeeper')}</a></li>
+           <li><a href="/${apps['zookeeper'].display_name}"><img src="${ apps['zookeeper'].icon_path }"/> ${_('ZooKeeper')}</a></li>
            % endif
          </ul>
        </li>
        % if 'oozie' in apps:
        <li class="dropdown">
-         <a title="${_('Oozie')}" rel="tooltip" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Workflows')} <b class="caret"></b></a>
+         <a title="${_('Schedule with Oozie')}" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Workflows')} <b class="caret"></b></a>
          <ul role="menu" class="dropdown-menu">
            <li><a href="${ url('oozie:index') }"><img src="${ apps['oozie'].icon_path }"/> ${_('Dashboard')}</a></li>
            <li><a href="${ url('oozie:list_workflows') }"><img src="${ apps['oozie'].icon_path }"/> ${_('Editor')}</a></li>
@@ -260,12 +260,12 @@ from django.utils.translation import ugettext as _
        % endif
        % if 'search' in apps:
        <li>
-         <a title="${_('Solr Search')}" rel="tooltip" href="${ url('search:index') }">${_('Search')}</a>
+         <a title="${_('Solr Search')}" href="${ url('search:index') }">${_('Search')}</a>
        </li>
        % endif
-       % if len(other_apps) > 0:
+       % if other_apps:
        <li class="dropdown">
-         <a title="${_('Other apps')}" rel="tooltip" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Other apps')} <b class="caret"></b></a>
+         <a title="${_('Other apps')}" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Other apps')} <b class="caret"></b></a>
          <ul role="menu" class="dropdown-menu">
            % for other in other_apps:
              <li><a href="/${ other.display_name }"><img src="${ other.icon_path }"/> ${ other.nice_name }</a></li>

+ 8 - 5
desktop/core/static/help/index.html

@@ -16,11 +16,14 @@
 
 	<div class="body conbody">
 
-		<p class="p"> <a href="http://gethue.com" target="_blank">Hue</a> is a set of web applications that enable you to interact with a CDH
-			cluster. Hue applications let you browse HDFS, manage a Hive metastore, and run Hive and
-			Cloudera Impala queries, HBase and Sqoop commands, Pig scripts, MapReduce jobs, and
-			Oozie workflows. </p>
-
+		<p class="p"> <a href="http://gethue.com" target="_blank">Hue</a> is a Web applications that enables you to easily interact with an Hadoop
+			cluster. Hue applications let you browse HDFS, Jobs, run Hive, Pig and
+			Cloudera Impala queries, manage the Hive Metastore, HBase, Sqoop, ZooKeeper, MapReduce jobs, and
+			create and schedule worklows with Oozie.</p>
+
+    </br>
+    <p class="p alert"> Checkout the latest updates and tutorials on <a href="http://gethue.com" target="_blank">http://gethue.com</a>!</p>
+    </br>
 
 	</div>
 

+ 1 - 1
desktop/core/static/js/jquery.tour.js

@@ -120,7 +120,7 @@
   Plugin.prototype.initQuestionMark = function () {
     var _this = this;
     $("#jHueTourFlag").remove();
-    var _questionMark = $("<a>").attr("id", "jHueTourFlag").html('<i class="icon-flag-checkered" style=""></i>');
+    var _questionMark = $("<a>").attr("id", "jHueTourFlag").html('<i title="Demo tutorials" class="icon-flag-checkered" style=""></i>');
     if ($.totalStorage("jHueTourExtras") != null) {
       var _newTours = [];
       $.each(_this.options.tours, function (cnt, tour) {