Эх сурвалжийг харах

[hive] Remove old Spark menu

Disable 'Query Editor' from being translated
Romain Rigaux 10 жил өмнө
parent
commit
192670d

+ 1 - 31
apps/beeswax/src/beeswax/templates/layout.mako

@@ -13,10 +13,7 @@
 ## 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.
-##
-##
-## no spaces in this method please; we're declaring a CSS class, and ART uses this value for stuff, and it splits on spaces, and
-## multiple spaces and line breaks cause issues
+
 <%!
 from django.utils.translation import ugettext as _
 
@@ -28,32 +25,6 @@ def is_selected(section, matcher):
 %>
 
 <%def name="menubar(section='')">
-  % if app_name == 'spark':
-  ## Duplication from spark common.mako!
-  <div class="navbar navbar-inverse navbar-fixed-top">
-    <div class="navbar-inner">
-      <div class="container-fluid">
-        <div class="nav-collapse">
-          <ul class="nav">
-            <li class="currentApp">
-              <a href="/spark">
-                <img src="/spark/static/art/icon_spark_48.png" class="app-icon" />
-                ${ _('Spark Igniter') }
-              </a>
-            </li>
-            <li class="${is_selected(section, 'query')}"><a href="${ url('spark:editor') }">${_('Editor')}</a></li>
-            ##<li class="${is_selected(section, 'my queries')}"><a href="${ url(app_name + ':my_queries') }">${_('My Queries')}</a></li>
-            <li class="${is_selected(section, 'saved queries')}"><a href="${ url('spark:list_designs') }">${_('Applications')}</a></li>
-            ##<li class="${is_selected(section, 'history')}"><a href="${ url('spark:list_query_history') }">${_('History')}</a></li>
-            <li class="${is_selected(section, 'jobs')}"><a href="${ url('spark:list_jobs') }">${_('Dashboard')}</a></li>
-            <li class="${is_selected(section, 'contexts')}"><a href="${ url('spark:list_contexts') }">${_('Contexts')}</a></li>
-            <li class="${is_selected(section, 'applications')}"><a href="${ url('spark:list_applications') }">${_('Uploads')}</a></li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  </div>
-  % else:
   <div class="navbar navbar-inverse navbar-fixed-top">
       <div class="navbar-inner">
         <div class="container-fluid">
@@ -82,7 +53,6 @@ def is_selected(section, matcher):
         </div>
       </div>
   </div>
-  % endif
 </%def>
 
 <%def name="metastore_menubar()">

+ 2 - 2
apps/beeswax/src/beeswax/tests.py

@@ -477,8 +477,8 @@ for x in sys.stdin:
       result_holder[i] = response
       lock.release()
       LOG.info("Finished: " + str(i))
-    except:
-      LOG.exception("Saw exception in child thread.")
+    except Exception, e:
+      LOG.exception("Saw exception in child thread: %s" % e)
 
   def test_multiple_statements_no_result_set(self):
     hql = """

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

@@ -360,7 +360,7 @@ from django.utils.translation import ugettext as _
        %>
        % if query_apps[1] > 1:
        <li class="dropdown">
-         <a title="${_('Query data')}" rel="navigator-tooltip" href="#" data-toggle="dropdown" class="dropdown-toggle">${_('Query Editors')} <b class="caret"></b></a>
+         <a title="${_('Query data')}" rel="navigator-tooltip" 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 }" class="app-icon"/> ${_('Hive')}</a></li>