浏览代码

HUE-1260 [core] The control used to filter lists should have consistent label and info text

Fixed all the apps
Enrico Berti 12 年之前
父节点
当前提交
d40fd69
共有 23 个文件被更改,包括 66 次插入9 次删除
  1. 1 1
      apps/beeswax/src/beeswax/templates/configuration.mako
  2. 4 0
      apps/beeswax/src/beeswax/templates/list_designs.mako
  3. 4 0
      apps/beeswax/src/beeswax/templates/list_trashed_designs.mako
  4. 4 0
      apps/beeswax/src/beeswax/templates/my_queries.mako
  5. 1 1
      apps/jobbrowser/src/jobbrowser/templates/job.mako
  6. 4 0
      apps/jobsub/src/jobsub/templates/designs.mako
  7. 4 0
      apps/metastore/src/metastore/templates/databases.mako
  8. 4 0
      apps/metastore/src/metastore/templates/tables.mako
  9. 0 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_bundles.mako
  10. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako
  11. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_info.mako
  12. 1 1
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako
  13. 4 0
      apps/oozie/src/oozie/templates/editor/list_bundles.mako
  14. 4 0
      apps/oozie/src/oozie/templates/editor/list_coordinators.mako
  15. 1 1
      apps/oozie/src/oozie/templates/editor/list_history.mako
  16. 4 0
      apps/oozie/src/oozie/templates/editor/list_trashed_bundles.mako
  17. 4 0
      apps/oozie/src/oozie/templates/editor/list_trashed_coordinators.mako
  18. 4 0
      apps/oozie/src/oozie/templates/editor/list_trashed_workflows.mako
  19. 4 0
      apps/oozie/src/oozie/templates/editor/list_workflows.mako
  20. 3 0
      apps/useradmin/src/useradmin/templates/list_groups.mako
  21. 5 1
      apps/useradmin/src/useradmin/templates/list_permissions.mako
  22. 3 0
      apps/useradmin/src/useradmin/templates/list_users.mako
  23. 1 1
      desktop/core/src/desktop/templates/logs.mako

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

@@ -29,7 +29,7 @@ ${layout.menubar(section='configuration')}
 	<div class="well">
 	<div class="well">
 		<form class="form-search" method="POST">
 		<form class="form-search" method="POST">
 		    <span class="pull-left">
 		    <span class="pull-left">
-                ${_('Filter:')} <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for key, value, etc...')}">
+                <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${_('Search for key, value, etc...')}">
 		        <a href="#" id="clearFilterBtn" class="btn">${_('Clear')}</a>
 		        <a href="#" id="clearFilterBtn" class="btn">${_('Clear')}</a>
 		    </span>
 		    </span>
 		</form>
 		</form>

+ 4 - 0
apps/beeswax/src/beeswax/templates/list_designs.mako

@@ -32,6 +32,10 @@ ${layout.menubar(section='saved queries')}
   <h1>${_('Saved Queries')}</h1>
   <h1>${_('Saved Queries')}</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for query')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
       <button id="editBtn" class="btn toolbarBtn" title="${_('Edit the selected query')}" disabled="disabled"><i class="icon-edit"></i> ${_('Edit')}</button>
       <button id="editBtn" class="btn toolbarBtn" title="${_('Edit the selected query')}" disabled="disabled"><i class="icon-edit"></i> ${_('Edit')}</button>
       <button id="cloneBtn" class="btn toolbarBtn" title="${_('Copy the selected query')}" disabled="disabled"><i class="icon-retweet"></i> ${_('Copy')}</button>
       <button id="cloneBtn" class="btn toolbarBtn" title="${_('Copy the selected query')}" disabled="disabled"><i class="icon-retweet"></i> ${_('Copy')}</button>

+ 4 - 0
apps/beeswax/src/beeswax/templates/list_trashed_designs.mako

@@ -32,6 +32,10 @@ ${layout.menubar(section='saved queries')}
   <h1>${_('Trashed Queries')}</h1>
   <h1>${_('Trashed Queries')}</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for query')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
       <button id="deleteQueryBtn" class="btn toolbarBtn" title="${_('Delete forever')}" disabled="disabled">
       <button id="deleteQueryBtn" class="btn toolbarBtn" title="${_('Delete forever')}" disabled="disabled">
         <i class="icon-bolt"></i> ${_('Delete forever')}
         <i class="icon-bolt"></i> ${_('Delete forever')}

+ 4 - 0
apps/beeswax/src/beeswax/templates/my_queries.mako

@@ -39,6 +39,10 @@ ${layout.menubar(section='my queries')}
   <h1>${_('My Queries')}</h1>
   <h1>${_('My Queries')}</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for query')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
       <button id="viewBtn" class="btn toolbarBtn" title="${_('View the result of the selected')}" disabled="disabled"><i class="icon-eye-open"></i> ${_('View result')}</button>
       <button id="viewBtn" class="btn toolbarBtn" title="${_('View the result of the selected')}" disabled="disabled"><i class="icon-eye-open"></i> ${_('View result')}</button>
       <button id="editBtn" class="btn toolbarBtn" title="${_('Edit the selected query')}" disabled="disabled"><i class="icon-edit"></i> ${_('Edit')}</button>
       <button id="editBtn" class="btn toolbarBtn" title="${_('Edit the selected query')}" disabled="disabled"><i class="icon-edit"></i> ${_('Edit')}</button>

+ 1 - 1
apps/jobbrowser/src/jobbrowser/templates/job.mako

@@ -222,7 +222,7 @@ ${ commonheader(_('Job: %(jobId)s') % dict(jobId=job.jobId_short), "jobbrowser",
                 <div id="metadata" class="tab-pane">
                 <div id="metadata" class="tab-pane">
                     <div class="well hueWell">
                     <div class="well hueWell">
                         <form class="form-search">
                         <form class="form-search">
-                            ${_('Filter: ')}<input type="text" id="metadataFilter" class="input-xlarge search-query" placeholder="${_('Text Filter')}">
+                            <input type="text" id="metadataFilter" class="input-xlarge search-query" placeholder="${_('Text Filter')}">
                         </form>
                         </form>
                     </div>
                     </div>
                     <table id="metadataTable" class="table table-striped table-condensed">
                     <table id="metadataTable" class="table table-striped table-condensed">

+ 4 - 0
apps/jobsub/src/jobsub/templates/designs.mako

@@ -43,6 +43,10 @@ ${ commonheader(None, "jobsub", user, "60px") | n,unicode }
   <h1>${_('Job Designs')}</h1>
   <h1>${_('Job Designs')}</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for design name')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
       <div class="btn-toolbar" style="display: inline; vertical-align: middle">
       <div class="btn-toolbar" style="display: inline; vertical-align: middle">
         <button id="home" class="btn" title="${_('Home')}"><i class="icon-share"></i> ${_('Home')}</button>
         <button id="home" class="btn" title="${_('Home')}"><i class="icon-share"></i> ${_('Home')}</button>

+ 4 - 0
apps/metastore/src/metastore/templates/databases.mako

@@ -36,6 +36,10 @@ ${ commonheader(_('Databases'), 'metastore', user) | n,unicode }
         </div>
         </div>
         <div class="span9">
         <div class="span9">
           <%actionbar:render>
           <%actionbar:render>
+            <%def name="search()">
+              <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for database name')}">
+            </%def>
+
             <%def name="actions()">
             <%def name="actions()">
                 <button id="dropBtn" class="btn toolbarBtn" title="${_('Drop the selected databases')}" disabled="disabled"><i class="icon-trash"></i>  ${_('Drop')}</button>
                 <button id="dropBtn" class="btn toolbarBtn" title="${_('Drop the selected databases')}" disabled="disabled"><i class="icon-trash"></i>  ${_('Drop')}</button>
             </%def>
             </%def>

+ 4 - 0
apps/metastore/src/metastore/templates/tables.mako

@@ -45,6 +45,10 @@ ${ commonheader(_('Tables'), 'metastore', user) | n,unicode }
         </div>
         </div>
         <div class="span9">
         <div class="span9">
           <%actionbar:render>
           <%actionbar:render>
+            <%def name="search()">
+              <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for table name')}">
+            </%def>
+
             <%def name="actions()">
             <%def name="actions()">
                 <button id="viewBtn" class="btn toolbarBtn" title="${_('Browse the selected table')}" disabled="disabled"><i class="icon-eye-open"></i> ${_('View')}</button>
                 <button id="viewBtn" class="btn toolbarBtn" title="${_('Browse the selected table')}" disabled="disabled"><i class="icon-eye-open"></i> ${_('View')}</button>
                 <button id="browseBtn" class="btn toolbarBtn" title="${_('Browse the selected table')}" disabled="disabled"><i class="icon-list"></i> ${_('Browse Data')}</button>
                 <button id="browseBtn" class="btn toolbarBtn" title="${_('Browse the selected table')}" disabled="disabled"><i class="icon-list"></i> ${_('Browse Data')}</button>

+ 0 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundles.mako

@@ -32,7 +32,6 @@ ${layout.menubar(section='dashboard')}
 
 
   <div class="well hueWell">
   <div class="well hueWell">
     <form>
     <form>
-      ${ _('Filter:') }
       <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
       <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
 
 
       <span class="pull-right">
       <span class="pull-right">

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako

@@ -32,7 +32,7 @@ ${layout.menubar(section='dashboard')}
 
 
   <div class="well hueWell">
   <div class="well hueWell">
     <form>
     <form>
-      ${ _('Filter:') } <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+      <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
 
 
       <span class="pull-right">
       <span class="pull-right">
         <span style="padding-right:10px;float:left;margin-top:3px">
         <span style="padding-right:10px;float:left;margin-top:3px">

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_info.mako

@@ -55,7 +55,7 @@ ${ layout.menubar(section='dashboard') }
       <div class="tab-pane active" id="instrumentation">
       <div class="tab-pane active" id="instrumentation">
         <div class="well hueWell">
         <div class="well hueWell">
             <form class="form-search">
             <form class="form-search">
-                ${_('Filter: ')}<input type="text" class="searchFilter input-xlarge search-query" placeholder="${_('Text Filter')}">
+                <input type="text" class="searchFilter input-xlarge search-query" placeholder="${_('Text Filter')}">
             </form>
             </form>
         </div>
         </div>
        <div class="tabbable">
        <div class="tabbable">

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako

@@ -33,7 +33,7 @@ ${ layout.menubar(section='dashboard') }
 
 
   <div class="well hueWell">
   <div class="well hueWell">
     <form>
     <form>
-      ${ _('Filter:') } <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+      <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
 
 
       <span class="pull-right">
       <span class="pull-right">
         <span style="padding-right:10px;float:left;margin-top:3px">
         <span style="padding-right:10px;float:left;margin-top:3px">

+ 4 - 0
apps/oozie/src/oozie/templates/editor/list_bundles.mako

@@ -37,6 +37,10 @@ ${ layout.menubar(section='bundles') }
   <h1>${ _('Bundle Manager') }</h1>
   <h1>${ _('Bundle Manager') }</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for name, description, etc...')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
       <div class="btn-toolbar" style="display: inline; vertical-align: middle">
       <div class="btn-toolbar" style="display: inline; vertical-align: middle">
         <button class="btn toolbarBtn" id="submit-btn" disabled="disabled"><i class="icon-play"></i> ${ _('Submit') }</button>
         <button class="btn toolbarBtn" id="submit-btn" disabled="disabled"><i class="icon-play"></i> ${ _('Submit') }</button>

+ 4 - 0
apps/oozie/src/oozie/templates/editor/list_coordinators.mako

@@ -36,6 +36,10 @@ ${ layout.menubar(section='coordinators') }
   <h1>${ _('Coordinator Manager') }</h1>
   <h1>${ _('Coordinator Manager') }</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for name, description, etc...')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
       <div class="btn-toolbar" style="display: inline; vertical-align: middle">
       <div class="btn-toolbar" style="display: inline; vertical-align: middle">
         <button class="btn toolbarBtn" id="submit-btn" disabled="disabled"><i class="icon-play"></i> ${ _('Submit') }</button>
         <button class="btn toolbarBtn" id="submit-btn" disabled="disabled"><i class="icon-play"></i> ${ _('Submit') }</button>

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

@@ -32,7 +32,7 @@ ${ layout.menubar(section='history') }
   <h1>${ _('Submission History') }</h1>
   <h1>${ _('Submission History') }</h1>
   <div class="well hueWell">
   <div class="well hueWell">
     <form class="form-search">
     <form class="form-search">
-      ${ _('Filter:') } <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+      <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
     </form>
     </form>
   </div>
   </div>
 
 

+ 4 - 0
apps/oozie/src/oozie/templates/editor/list_trashed_bundles.mako

@@ -32,6 +32,10 @@ ${ layout.menubar(section='bundles') }
   <h1>${ _('Bundle Trash') }</h1>
   <h1>${ _('Bundle Trash') }</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for name, description, etc...')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
       <a href="${ url('oozie:list_bundles') }" id="home-btn" class="btn" title="${ _('Got to bundle manager') }"><i class="icon-home"></i> ${ _('Bundles') }</a>
       <a href="${ url('oozie:list_bundles') }" id="home-btn" class="btn" title="${ _('Got to bundle manager') }"><i class="icon-home"></i> ${ _('Bundles') }</a>
       &nbsp;&nbsp;
       &nbsp;&nbsp;

+ 4 - 0
apps/oozie/src/oozie/templates/editor/list_trashed_coordinators.mako

@@ -31,6 +31,10 @@ ${ layout.menubar(section='coordinators') }
   <h1>${ _('Coordinator Trash') }</h1>
   <h1>${ _('Coordinator Trash') }</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for name, description, etc...')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
         <a href="${ url('oozie:list_coordinators') }" id="home-btn" class="btn" title="${ _('Got to coordinator manager') }">
         <a href="${ url('oozie:list_coordinators') }" id="home-btn" class="btn" title="${ _('Got to coordinator manager') }">
           <i class="icon-home"></i> ${ _('Coordinators') }
           <i class="icon-home"></i> ${ _('Coordinators') }

+ 4 - 0
apps/oozie/src/oozie/templates/editor/list_trashed_workflows.mako

@@ -31,6 +31,10 @@ ${ layout.menubar(section='workflows') }
   <h1>${ _('Workflow Trash') }</h1>
   <h1>${ _('Workflow Trash') }</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for name, description, etc...')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
       <a href="${ url('oozie:list_workflows') }" id="home-btn" class="btn" title="${ _('Got to workflow manager') }">
       <a href="${ url('oozie:list_workflows') }" id="home-btn" class="btn" title="${ _('Got to workflow manager') }">
         <i class="icon-home"></i> ${ _('Workflows') }
         <i class="icon-home"></i> ${ _('Workflows') }

+ 4 - 0
apps/oozie/src/oozie/templates/editor/list_workflows.mako

@@ -36,6 +36,10 @@ ${ layout.menubar(section='workflows') }
   <h1>${ _('Workflow Manager') }</h1>
   <h1>${ _('Workflow Manager') }</h1>
 
 
   <%actionbar:render>
   <%actionbar:render>
+    <%def name="search()">
+      <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for name, description, etc...')}">
+    </%def>
+
     <%def name="actions()">
     <%def name="actions()">
       <div class="btn-toolbar" style="display: inline; vertical-align: middle">
       <div class="btn-toolbar" style="display: inline; vertical-align: middle">
         <button class="btn toolbarBtn" id="submit-btn" disabled="disabled"><i class="icon-play"></i> ${ _('Submit') }</button>
         <button class="btn toolbarBtn" id="submit-btn" disabled="disabled"><i class="icon-play"></i> ${ _('Submit') }</button>

+ 3 - 0
apps/useradmin/src/useradmin/templates/list_groups.mako

@@ -29,6 +29,9 @@ ${layout.menubar(section='groups', _=_)}
     <h1>${_('Hue Groups')}</h1>
     <h1>${_('Hue Groups')}</h1>
 
 
     <%actionbar:render>
     <%actionbar:render>
+        <%def name="search()">
+          <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for name, members, etc...')}">
+        </%def>
         <%def name="actions()">
         <%def name="actions()">
             %if user.is_superuser:
             %if user.is_superuser:
                 <button id="deleteGroupBtn" class="btn confirmationModal" title="${_('Delete')}" disabled="disabled"><i class="icon-trash"></i> ${_('Delete')}</button>
                 <button id="deleteGroupBtn" class="btn confirmationModal" title="${_('Delete')}" disabled="disabled"><i class="icon-trash"></i> ${_('Delete')}</button>

+ 5 - 1
apps/useradmin/src/useradmin/templates/list_permissions.mako

@@ -28,7 +28,11 @@ ${layout.menubar(section='permissions', _=_)}
 
 
 <div class="container-fluid">
 <div class="container-fluid">
     <h1>${_('Hue Permissions')}</h1>
     <h1>${_('Hue Permissions')}</h1>
-    <%actionbar:render />
+    <%actionbar:render>
+      <%def name="search()">
+        <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for application, group, etc...')}">
+      </%def>
+    </%actionbar:render>
 
 
     <table class="table table-striped table-condensed datatables">
     <table class="table table-striped table-condensed datatables">
         <thead>
         <thead>

+ 3 - 0
apps/useradmin/src/useradmin/templates/list_users.mako

@@ -29,6 +29,9 @@ ${layout.menubar(section='users', _=_)}
     <h1>${_('Hue Users')}</h1>
     <h1>${_('Hue Users')}</h1>
 
 
     <%actionbar:render>
     <%actionbar:render>
+        <%def name="search()">
+          <input id="filterInput" type="text" class="input-xlarge search-query" placeholder="${_('Search for name, group, etc...')}">
+        </%def>
         <%def name="actions()">
         <%def name="actions()">
             %if user.is_superuser:
             %if user.is_superuser:
                 <button id="deleteUserBtn" class="btn" title="${_('Delete')}" disabled="disabled"><i class="icon-trash"></i> ${_('Delete')}</button>
                 <button id="deleteUserBtn" class="btn" title="${_('Delete')}" disabled="disabled"><i class="icon-trash"></i> ${_('Delete')}</button>

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

@@ -58,7 +58,7 @@ ${layout.menubar(section='log_view')}
 <div class="container-fluid">
 <div class="container-fluid">
   <%actionbar:render>
   <%actionbar:render>
     <%def name="search()">
     <%def name="search()">
-        <input type="text" class="input-xxlarge search-query" placeholder="${_('Search...')}" value="${query}">
+        <input type="text" class="input-xxlarge search-query" placeholder="${_('Search in the logs')}" value="${query}">
     </%def>
     </%def>
     <%def name="creation()">
     <%def name="creation()">
         <span class="btn-group">
         <span class="btn-group">