Browse Source

HUE-897 Oozie ported to Hue 3

Enrico Berti 12 năm trước cách đây
mục cha
commit
3df4c7c
49 tập tin đã thay đổi với 554 bổ sung488 xóa
  1. 1 1
      apps/beeswax/src/beeswax/templates/choose_file.mako
  2. 1 1
      apps/beeswax/src/beeswax/templates/create_database.mako
  3. 1 1
      apps/beeswax/src/beeswax/templates/create_table_manually.mako
  4. 1 1
      apps/beeswax/src/beeswax/templates/execute.mako
  5. 0 6
      apps/beeswax/src/beeswax/templates/list_history.mako
  6. 1 1
      apps/beeswax/src/beeswax/templates/my_queries.mako
  7. 1 1
      apps/beeswax/src/beeswax/templates/watch_results.mako
  8. 1 1
      apps/metastore/src/metastore/templates/describe_table.mako
  9. 1 1
      apps/metastore/src/metastore/templates/popups/load_data.mako
  10. 15 22
      apps/oozie/src/oozie/templates/dashboard/list_oozie_bundle.mako
  11. 23 24
      apps/oozie/src/oozie/templates/dashboard/list_oozie_bundles.mako
  12. 22 28
      apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako
  13. 23 24
      apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako
  14. 64 86
      apps/oozie/src/oozie/templates/dashboard/list_oozie_info.mako
  15. 31 36
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako
  16. 16 17
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow_action.mako
  17. 24 24
      apps/oozie/src/oozie/templates/dashboard/list_oozie_workflows.mako
  18. 1 1
      apps/oozie/src/oozie/templates/editor/coordinator_properties.mako
  19. 19 23
      apps/oozie/src/oozie/templates/editor/create_bundle.mako
  20. 5 8
      apps/oozie/src/oozie/templates/editor/create_coordinator.mako
  21. 1 1
      apps/oozie/src/oozie/templates/editor/create_coordinator_data.mako
  22. 49 46
      apps/oozie/src/oozie/templates/editor/create_workflow.mako
  23. 4 6
      apps/oozie/src/oozie/templates/editor/edit_bundle.mako
  24. 4 6
      apps/oozie/src/oozie/templates/editor/edit_coordinator.mako
  25. 66 45
      apps/oozie/src/oozie/templates/editor/edit_workflow.mako
  26. 1 1
      apps/oozie/src/oozie/templates/editor/gen/workflow-graph-status.xml.mako
  27. 1 1
      apps/oozie/src/oozie/templates/editor/gen/workflow-graph.xml.mako
  28. 1 1
      apps/oozie/src/oozie/templates/editor/job_action_properties.mako
  29. 4 2
      apps/oozie/src/oozie/templates/editor/list_bundles.mako
  30. 4 2
      apps/oozie/src/oozie/templates/editor/list_coordinators.mako
  31. 4 2
      apps/oozie/src/oozie/templates/editor/list_trashed_bundles.mako
  32. 4 2
      apps/oozie/src/oozie/templates/editor/list_trashed_coordinators.mako
  33. 4 2
      apps/oozie/src/oozie/templates/editor/list_trashed_workflows.mako
  34. 4 2
      apps/oozie/src/oozie/templates/editor/list_workflows.mako
  35. 15 8
      apps/oozie/src/oozie/templates/navigation-bar.mako
  36. 1 1
      apps/oozie/src/oozie/templates/utils.inc.mako
  37. 2 5
      apps/oozie/static/css/workflow.css
  38. 1 1
      apps/oozie/static/js/workflow.utils.js
  39. 1 1
      apps/pig/src/pig/templates/app.mako
  40. 18 0
      apps/search/static/css/bootstrap-select.css
  41. 26 7
      apps/search/static/css/freshereditor.css
  42. 18 0
      apps/search/static/css/search.css
  43. 18 0
      apps/sqoop/static/css/sqoop.css
  44. 1 1
      desktop/core/src/desktop/templates/logs.mako
  45. 17 0
      desktop/core/static/css/hue3.css
  46. 0 2
      desktop/core/static/ext/css/bootplus-responsive.css
  47. 30 32
      desktop/core/static/ext/css/bootplus.css
  48. 1 1
      desktop/core/static/jasmine/jHueTableExtenderFixture.html
  49. 3 3
      tools/bootplus/less/bootplus/forms.less

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

@@ -119,7 +119,7 @@ ${ commonheader(_('Create table from file'), 'metastore', user) | n,unicode }
 </div>
 
 
-<style>
+<style type="text/css">
     #filechooser {
         min-height: 100px;
         overflow-y: scroll;

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

@@ -135,7 +135,7 @@ ${ commonheader(_("Create database"), 'metastore', user) | n,unicode }
     </div>
 </div>
 
-<style>
+<style type="text/css">
   #filechooser {
     min-height: 100px;
     overflow-y: scroll;

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

@@ -400,7 +400,7 @@ ${ commonheader(_("Create table manually"), 'metastore', user) | n,unicode }
     </div>
 </div>
 
-<style>
+<style type="text/css">
   #filechooser {
     min-height: 100px;
     overflow-y: scroll;

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

@@ -383,7 +383,7 @@ ${layout.menubar(section='query')}
 <link href="/static/ext/css/bootstrap-editable.css" rel="stylesheet">
 <script src="/static/ext/js/bootstrap-editable.min.js"></script>
 
-<style>
+<style type="text/css">
   h1 {
     margin-bottom: 5px;
   }

+ 0 - 6
apps/beeswax/src/beeswax/templates/list_history.mako

@@ -49,12 +49,6 @@ ${ layout.menubar(section='history') }
   % endif
 </%def>
 
-<style type="text/css">
-  .sidebar-nav {
-    padding: 9px 0;
-  }
-</style>
-
 <div class="container-fluid">
     <div class="row-fluid">
         <div class="span2">

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

@@ -29,7 +29,7 @@ from beeswax.views import collapse_whitespace
 ${ commonheader(_('My Queries'), app_name, user, '100px') | n,unicode }
 ${layout.menubar(section='my queries')}
 
-<style>
+<style type="text/css">
     .tab-content {
         overflow:visible!important;
     }

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

@@ -27,7 +27,7 @@ from django.utils.translation import ugettext as _
 ${ commonheader(_('Query Results'), app_name, user, '100px') | n,unicode }
 ${layout.menubar(section='query')}
 
-<style>
+<style type="text/css">
   #collapse {
     float: right;
     cursor: pointer;

+ 1 - 1
apps/metastore/src/metastore/templates/describe_table.mako

@@ -163,7 +163,7 @@ ${ commonheader(_("%s : %s") % (view_or_table_noun, table.name), app_name, user)
 <div id="import-data-modal" class="modal hide fade"></div>
 </div>
 
-<style>
+<style type="text/css">
   .sampleTable td, .sampleTable th {
     white-space: nowrap;
   }

+ 1 - 1
apps/metastore/src/metastore/templates/popups/load_data.mako

@@ -63,7 +63,7 @@ from django.utils.translation import ugettext as _
 </form>
 
 
-<style>
+<style type="text/css">
    #filechooser {
      display: none;
      min-height: 100px;

+ 15 - 22
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundle.mako

@@ -30,45 +30,40 @@ ${ layout.menubar(section='dashboard') }
 <div class="container-fluid">
   ${ layout.dashboard_sub_menubar(section='bundles') }
 
-  <h1>${ _('Bundle') } ${ oozie_bundle.appName }</h1>
-
-
 <div class="row-fluid">
   <div class="span2">
-    <div class="well sidebar-nav">
+    <div class="sidebar-nav">
       <ul class="nav nav-list">
         <li class="nav-header">${ _('Bundle') }</li>
-        <li>
-            % if bundle is not None:
-              <a href="${ bundle.get_absolute_url() }">${ oozie_bundle.appName }</a>
-            % else:
-              ${ oozie_bundle.appName }
-            % endif
-        </li>
+        % if bundle is not None:
+        <li><a href="${ bundle.get_absolute_url() }">${ oozie_bundle.appName }</a></li>
+        % else:
+        <li class="white">${ oozie_bundle.appName }</li>
+        % endif
 
         <li class="nav-header">${ _('Submitter') }</li>
-        <li>${ oozie_bundle.user }</li>
+        <li class="white">${ oozie_bundle.user }</li>
 
         <li class="nav-header">${ _('Status') }</li>
-        <li id="status"><span class="label ${ utils.get_status(oozie_bundle.status) }">${ oozie_bundle.status }</span></li>
+        <li class="white" id="status"><span class="label ${ utils.get_status(oozie_bundle.status) }">${ oozie_bundle.status }</span></li>
 
         <li class="nav-header">${ _('Progress') }</li>
-        <li id="progress">
+        <li class="white" id="progress">
           <div class="progress">
             <div class="bar" style="width: 0">${ oozie_bundle.get_progress() }%</div>
           </div>
         </li>
 
         <li class="nav-header">${ _('Kick off time') }</li>
-        <li>${ oozie_bundle.kickoffTime }</li>
+        <li class="white">${ oozie_bundle.kickoffTime }</li>
 
         <li class="nav-header">${ _('Id') }</li>
-        <li>${ oozie_bundle.id }</li>
+        <li class="white">${ oozie_bundle.id }</li>
 
         % if bundle:
             <li class="nav-header">${ _('Coordinators') }</li>
           % for bundled in bundle.coordinators.all():
-            <li rel="tooltip" title="${ bundled.coordinator.name }">
+            <li rel="tooltip" title="${ bundled.coordinator.name }" class="white">
               <i class="icon-eye-open"></i> <span class="dataset">${ bundled.coordinator.name }</span>
             </li>
           % endfor
@@ -76,7 +71,7 @@ ${ layout.menubar(section='dashboard') }
 
         % if has_job_edition_permission(oozie_bundle, user):
           <li class="nav-header">${ _('Manage') }</li>
-          <li>
+          <li class="white">
             <button title="${_('Kill %(bundle)s') % dict(bundle=oozie_bundle.id)}"
               id="kill-btn"
               class="btn btn-small confirmationModal
@@ -128,6 +123,7 @@ ${ layout.menubar(section='dashboard') }
     </div>
   </div>
   <div class="span10">
+    <h1 class="card-heading simple card-heading-nopadding card-heading-noborder card-heading-blue" style="margin-bottom: 10px">${ _('Bundle') } ${ oozie_bundle.appName }</h1>
     <ul class="nav nav-tabs">
       <li class="active"><a href="#calendar" data-toggle="tab">${ _('Coordinators') }</a></li>
       <li><a href="#actions" data-toggle="tab">${ _('Actions') }</a></li>
@@ -296,13 +292,10 @@ ${ layout.menubar(section='dashboard') }
 <link rel="stylesheet" href="/static/ext/css/codemirror.css">
 <script src="/static/ext/js/codemirror-xml.js"></script>
 
-<style>
+<style type="text/css">
   .CodeMirror.cm-s-default {
     height:500px;
   }
-  .sidebar-nav {
-    padding: 9px 0;
-  }
 </style>
 
 <script>

+ 23 - 24
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundles.mako

@@ -30,32 +30,30 @@ ${layout.menubar(section='dashboard')}
 <div class="container-fluid">
   ${ layout.dashboard_sub_menubar(section='bundles') }
 
-  <div class="well hueWell">
-    <form>
-      <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
-
-      <span class="pull-right">
-        <span style="padding-right:10px;float:left;margin-top:3px">
-        ${ _('Show only') }
-        </span>
-        <span class="btn-group" style="float:left">
-          <a class="btn btn-date btn-info" data-value="1">${ _('1') }</a>
-          <a class="btn btn-date btn-info" data-value="7">${ _('7') }</a>
-          <a class="btn btn-date btn-info" data-value="15">${ _('15') }</a>
-          <a class="btn btn-date btn-info" data-value="30">${ _('30') }</a>
-        </span>
-        <span style="float:left;padding-left:10px;padding-right:10px;margin-top:3px">${ _('days with status') }</span>
-        <span class="btn-group" style="float:left;">
-          <a class="btn btn-status btn-success" data-value='SUCCEEDED'>${ _('Succeeded') }</a>
-          <a class="btn btn-status btn-warning" data-value='RUNNING'>${ _('Running') }</a>
-          <a class="btn btn-status btn-danger disable-feedback" data-value='KILLED'>${ _('Killed') }</a>
-        </span>
+  <form>
+    <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+
+    <span class="pull-right">
+      <span style="padding-right:10px;float:left;margin-top:3px">
+      ${ _('Show only') }
       </span>
-   </form>
-  </div>
+      <span class="btn-group" style="float:left">
+        <a class="btn btn-date btn-info" data-value="1">${ _('1') }</a>
+        <a class="btn btn-date btn-info" data-value="7">${ _('7') }</a>
+        <a class="btn btn-date btn-info" data-value="15">${ _('15') }</a>
+        <a class="btn btn-date btn-info" data-value="30">${ _('30') }</a>
+      </span>
+      <span style="float:left;padding-left:10px;padding-right:10px;margin-top:3px">${ _('days with status') }</span>
+      <span class="btn-group" style="float:left;">
+        <a class="btn btn-status btn-success" data-value='SUCCEEDED'>${ _('Succeeded') }</a>
+        <a class="btn btn-status btn-warning" data-value='RUNNING'>${ _('Running') }</a>
+        <a class="btn btn-status btn-danger disable-feedback" data-value='KILLED'>${ _('Killed') }</a>
+      </span>
+    </span>
+  </form>
 
   <div style="min-height:200px">
-    <h1>${ _('Running') }</h1>
+    <h1 class="card-heading simple">${ _('Running') }</h1>
     <table class="table table-condensed" id="running-table">
       <thead>
         <tr>
@@ -76,7 +74,7 @@ ${layout.menubar(section='dashboard')}
   </div>
 
   <div>
-    <h1>${ _('Completed') }</h1>
+    <h1 class="card-heading simple">${ _('Completed') }</h1>
     <table class="table table-condensed" id="completed-table" data-tablescroller-disable="true">
       <thead>
         <tr>
@@ -93,6 +91,7 @@ ${layout.menubar(section='dashboard')}
       </tbody>
      </table>
    </div>
+  ${ layout.dashboard_end_sub_menubar() }
 </div>
 
 

+ 22 - 28
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -30,59 +30,49 @@ ${ layout.menubar(section='dashboard') }
 <div class="container-fluid">
   ${ layout.dashboard_sub_menubar(section='coordinators') }
 
-  <h1>
-    % if oozie_bundle:
-      ${ _('Bundle') } <a href="${ oozie_bundle.get_absolute_url() }">${ oozie_bundle.appName }</a> :
-    % endif
-    ${ _('Coordinator') } ${ oozie_coordinator.appName }
-  </h1>
-
-
 <div class="row-fluid">
   <div class="span2">
-    <div class="well sidebar-nav">
+    <div class="sidebar-nav">
       <ul class="nav nav-list">
         <li class="nav-header">${ _('Coordinator') }</li>
-        <li>
-            % if coordinator is not None:
-              <a href="${ coordinator.get_absolute_url() }">${ oozie_coordinator.appName }</a>
-            % else:
-              ${ oozie_coordinator.appName }
-            % endif
-        </li>
+        % if coordinator is not None:
+        <li><a href="${ coordinator.get_absolute_url() }">${ oozie_coordinator.appName }</a></li>
+        % else:
+        <li class="white">${ oozie_coordinator.appName }</li>
+        % endif
 
         <li class="nav-header">${ _('Submitter') }</li>
-        <li>${ oozie_coordinator.user }</li>
+        <li class="white">${ oozie_coordinator.user }</li>
 
         <li class="nav-header">${ _('Status') }</li>
-        <li id="status"><span class="label ${ utils.get_status(oozie_coordinator.status) }">${ oozie_coordinator.status }</span></li>
+        <li class="white" id="status"><span class="label ${ utils.get_status(oozie_coordinator.status) }">${ oozie_coordinator.status }</span></li>
 
         <li class="nav-header">${ _('Progress') }</li>
-        <li id="progress">
+        <li class="white" id="progress">
           <div class="progress">
             <div class="bar" style="width: 0">${ oozie_coordinator.get_progress() }%</div>
           </div>
         </li>
 
         <li class="nav-header">${ _('Frequency') }</li>
-        <li>${ oozie_coordinator.frequency } ${ oozie_coordinator.timeUnit }</li>
+        <li class="white">${ oozie_coordinator.frequency } ${ oozie_coordinator.timeUnit }</li>
 
         <li class="nav-header">${ _('Next Materialized Time') }</li>
-        <li id="nextTime">${ utils.format_time(oozie_coordinator.nextMaterializedTime) }</li>
+        <li class="white" id="nextTime">${ utils.format_time(oozie_coordinator.nextMaterializedTime) }</li>
 
         <li class="nav-header">${ _('Id') }</li>
-        <li>${ oozie_coordinator.id }</li>
+        <li class="white">${ oozie_coordinator.id }</li>
 
         % if coordinator:
             <li class="nav-header">${ _('Datasets') }</li>
           % for dataset in coordinator.dataset_set.all():
-            <li rel="tooltip" title="${ dataset.name } : ${ dataset.uri }"><i class="icon-eye-open"></i> <span class="dataset">${ dataset.name }</span></li>
+            <li rel="tooltip" title="${ dataset.name } : ${ dataset.uri }" class="white"><i class="icon-eye-open"></i> <span class="dataset">${ dataset.name }</span></li>
           % endfor
         % endif
 
         % if has_job_edition_permission(oozie_coordinator, user):
           <li class="nav-header">${ _('Manage') }</li>
-          <li>
+          <li class="white">
             <button title="${_('Kill %(coordinator)s') % dict(coordinator=oozie_coordinator.id)}"
               id="kill-btn"
               class="btn btn-small confirmationModal
@@ -134,6 +124,13 @@ ${ layout.menubar(section='dashboard') }
     </div>
   </div>
   <div class="span10">
+    <h1 class="card-heading simple card-heading-nopadding card-heading-noborder card-heading-blue" style="margin-bottom: 10px">
+      % if oozie_bundle:
+        ${ _('Bundle') } <a href="${ oozie_bundle.get_absolute_url() }">${ oozie_bundle.appName }</a> :
+      % endif
+      ${ _('Coordinator') } ${ oozie_coordinator.appName }
+    </h1>
+
     <ul class="nav nav-tabs">
       <li class="active"><a href="#calendar" data-toggle="tab">${ _('Calendar') }</a></li>
       <li><a href="#actions" data-toggle="tab">${ _('Actions') }</a></li>
@@ -304,13 +301,10 @@ ${ layout.menubar(section='dashboard') }
 <link rel="stylesheet" href="/static/ext/css/codemirror.css">
 <script src="/static/ext/js/codemirror-xml.js"></script>
 
-<style>
+<style type="text/css">
   .CodeMirror.cm-s-default {
     height:500px;
   }
-  .sidebar-nav {
-    padding: 9px 0;
-  }
 </style>
 
 <script>

+ 23 - 24
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinators.mako

@@ -30,32 +30,30 @@ ${layout.menubar(section='dashboard')}
 <div class="container-fluid">
   ${ layout.dashboard_sub_menubar(section='coordinators') }
 
-  <div class="well hueWell">
-    <form>
-      <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
-
-      <span class="pull-right">
-        <span style="padding-right:10px;float:left;margin-top:3px">
-        ${ _('Show only') }
-        </span>
-        <span class="btn-group" style="float:left">
-          <a class="btn btn-date btn-info" data-value="1">${ _('1') }</a>
-          <a class="btn btn-date btn-info" data-value="7">${ _('7') }</a>
-          <a class="btn btn-date btn-info" data-value="15">${ _('15') }</a>
-          <a class="btn btn-date btn-info" data-value="30">${ _('30') }</a>
-        </span>
-        <span style="float:left;padding-left:10px;padding-right:10px;margin-top:3px">${ _('days with status') }</span>
-        <span class="btn-group" style="float:left;">
-          <a class="btn btn-status btn-success" data-value='SUCCEEDED'>${ _('Succeeded') }</a>
-          <a class="btn btn-status btn-warning" data-value='RUNNING'>${ _('Running') }</a>
-          <a class="btn btn-status btn-danger disable-feedback" data-value='KILLED'>${ _('Killed') }</a>
-        </span>
+  <form>
+    <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+
+    <span class="pull-right">
+      <span style="padding-right:10px;float:left;margin-top:3px">
+      ${ _('Show only') }
       </span>
-   </form>
-  </div>
+      <span class="btn-group" style="float:left">
+        <a class="btn btn-date btn-info" data-value="1">${ _('1') }</a>
+        <a class="btn btn-date btn-info" data-value="7">${ _('7') }</a>
+        <a class="btn btn-date btn-info" data-value="15">${ _('15') }</a>
+        <a class="btn btn-date btn-info" data-value="30">${ _('30') }</a>
+      </span>
+      <span style="float:left;padding-left:10px;padding-right:10px;margin-top:3px">${ _('days with status') }</span>
+      <span class="btn-group" style="float:left;">
+        <a class="btn btn-status btn-success" data-value='SUCCEEDED'>${ _('Succeeded') }</a>
+        <a class="btn btn-status btn-warning" data-value='RUNNING'>${ _('Running') }</a>
+        <a class="btn btn-status btn-danger disable-feedback" data-value='KILLED'>${ _('Killed') }</a>
+      </span>
+    </span>
+  </form>
 
   <div style="min-height:200px">
-    <h1>${ _('Running') }</h1>
+    <h1 class="card-heading simple">${ _('Running') }</h1>
     <table class="table table-condensed" id="running-table">
       <thead>
         <tr>
@@ -78,7 +76,7 @@ ${layout.menubar(section='dashboard')}
   </div>
 
   <div>
-    <h1>${ _('Completed') }</h1>
+    <h1 class="card-heading simple">${ _('Completed') }</h1>
     <table class="table table-condensed" id="completed-table" data-tablescroller-disable="true">
       <thead>
         <tr>
@@ -98,6 +96,7 @@ ${layout.menubar(section='dashboard')}
       </tbody>
      </table>
    </div>
+  ${ layout.dashboard_end_sub_menubar() }
 </div>
 
 

+ 64 - 86
apps/oozie/src/oozie/templates/dashboard/list_oozie_info.mako

@@ -29,37 +29,25 @@ ${ layout.menubar(section='dashboard') }
 <div class="container-fluid">
   ${ layout.dashboard_sub_menubar(section='oozie') }
 
-  <h1>Oozie</h1>
-
-
-<div class="row-fluid">
-  <div class="span2">
-    <div class="well sidebar-nav">
-      <ul class="nav nav-list">
-        <li class="nav-header">${ _('Status') }</li>
-        <li>
-          <span class="label ${ utils.get_status(oozie_status['systemMode']) }">
-            ${ oozie_status['systemMode'] }
-          </span>
-        </li>
-      </ul>
-    </div>
+  <h1 class="card-heading card-heading-noborder simple pull-right" style="margin-top: -4px;">
+  ${ _('Oozie status') }
+  <div class="label ${ utils.get_status(oozie_status['systemMode']) }" style="line-height: 20px; vertical-align: middle">
+    ${ oozie_status['systemMode'] }
   </div>
-  <div class="span10">
-    <ul class="nav nav-tabs">
-      <li class="active"><a href="#instrumentation" data-toggle="tab">${ _('Instrumentation') }</a></li>
-      <li><a href="#configuration" data-toggle="tab">${ _('Configuration') }</a></li>
-    </ul>
-
-    <div class="tab-content" style="padding-bottom:200px">
-      <div class="tab-pane active" id="instrumentation">
-        <div class="well hueWell">
-            <form class="form-search">
-                <input type="text" class="searchFilter input-xlarge search-query" placeholder="${_('Text Filter')}">
-            </form>
-        </div>
-       <div class="tabbable">
-          <ul class="nav nav-pills">
+  </h1>
+
+  <ul class="nav nav-tabs">
+    <li class="active"><a href="#instrumentation" data-toggle="tab">${ _('Instrumentation') }</a></li>
+    <li><a href="#configuration" data-toggle="tab">${ _('Configuration') }</a></li>
+  </ul>
+
+  <div class="tab-content" style="padding-bottom:200px">
+    <div class="tab-pane active" id="instrumentation">
+      <form class="form-search">
+        <input type="text" class="searchFilter input-xlarge search-query" placeholder="${_('Text Filter')}">
+      </form>
+      <div class="tabbable">
+        <ul class="nav nav-pills">
             % for category in instrumentation.iterkeys():
             <li
             % if loop.first:
@@ -69,82 +57,72 @@ ${ layout.menubar(section='dashboard') }
               <a href="#${ category }" data-toggle="tab">${ category }</a>
             </li>
             % endfor
-          </ul>
+        </ul>
 
-         <div class="tab-content">
-          % for category in instrumentation.iterkeys():
+        <div class="tab-content">
+            % for category in instrumentation.iterkeys():
             <div class="tab-pane
               % if loop.first:
-                active
+              active
               % endif
             " id="${ category }">
 
               % for index, group in enumerate(instrumentation[category]):
-                  <p class="nav-header">${ group['group'] }</p>
-                    <table id="intrumentationTable-${ category }-${ index }" class="table table-striped table-condensed">
-                        <thead>
-                            <th> </th>
-                            <th> </th>
-                        </thead>
-                        <tbody>
-                          % for item in group['data']:
-                            <tr>
-                              <% name = item.pop('name') %>
-                              <td>${ name }</td>
-                              % if category == 'timers':
-                                <td>
-                                  % for label, timer in zip(['ownMinTime', 'ownTimeStdVar', 'totalTimeStdVar', 'ownTimeAvg', 'ticks', 'name', 'ownMaxTime', 'totalMinTime', 'totalMaxTime', 'totalTimeAvg'], item.values()):
-                                  ${ label } :
-                                  % if label == 'name':
-                                    ${ name } -
-                                  % endif
-                                  ${ timer }
-                                  % if not loop.last:
-                                    </br>
-                                  % endif
-                                  % endfor
-                                </td>
-                              % else:
-                                <td>${ ', '.join(map(str, item.values())) }</td>
-                              % endif
-                            </tr>
-                          % endfor
-                        </tbody>
-                    </table>
+                <p class="nav-header">${ group['group'] }</p>
+              <table id="intrumentationTable-${ category }-${ index }" class="table table-striped table-condensed">
+                <thead>
+                <th></th>
+                <th></th>
+                </thead>
+              <tbody>
+                % for item in group['data']:
+                <tr>
+                <% name = item.pop('name') %>
+                  <td>${ name }</td>
+                % if category == 'timers':
+                  <td>
+                    % for label, timer in zip(['ownMinTime', 'ownTimeStdVar', 'totalTimeStdVar', 'ownTimeAvg', 'ticks', 'name', 'ownMaxTime', 'totalMinTime', 'totalMaxTime', 'totalTimeAvg'], item.values()):
+                    ${ label } :
+                    % if label == 'name':
+                      ${ name } -
+                    % endif
+                    ${ timer }
+                    % if not loop.last:
+                        </br>
+                    % endif
+                    % endfor
+                  </td>
+                % else:
+                    <td>${ ', '.join(map(str, item.values())) }</td>
+                % endif
+                </tr>
+                % endfor
+              </tbody>
+              </table>
               % endfor
             </div>
-          % endfor
-         </div>
-       </div>
-
-      </div>
-
-      <div class="tab-pane" id="configuration">
-        <div class="well hueWell">
-            <form class="form-search">
-                ${_('Filter: ')}<input type="text" class="searchFilter input-xlarge search-query" placeholder="${_('Text Filter')}">
-            </form>
+            % endfor
         </div>
-        ${ utils.display_conf(configuration, "configurationTable") }
       </div>
 
+    </div>
+
+    <div class="tab-pane" id="configuration">
+      <form class="form-search">
+        <input type="text" class="searchFilter input-xlarge search-query" placeholder="${_('Text Filter')}">
+      </form>
+      ${ utils.display_conf(configuration, "configurationTable") }
+    </div>
+
 
     <div style="margin-bottom: 16px">
       <a href="${ url('oozie:list_oozie_bundles') }" class="btn">${ _('Back') }</a>
     </div>
 
   </div>
-</div>
-
-
 
-</div>
+  ${ layout.dashboard_end_sub_menubar() }
 
-<style>
-  .sidebar-nav {
-    padding: 9px 0;
-  }
-</style>
 
 <script>
   $(document).ready(function(){

+ 31 - 36
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -32,61 +32,49 @@ ${ layout.menubar(section='dashboard') }
 
   ${ layout.dashboard_sub_menubar(section='workflows') }
 
-  <h1>
-    % if oozie_bundle:
-      ${ _('Bundle') } <a href="${ oozie_bundle.get_absolute_url() }">${ oozie_bundle.appName }</a> :
-    % endif
-    % if oozie_coordinator:
-      ${ _('Coordinator') } <a href="${ oozie_coordinator.get_absolute_url(oozie_bundle) }">${ oozie_coordinator.appName }</a> :
-    % endif
-
-    ${ _('Workflow') } ${ oozie_workflow.appName }
-  </h1>
-
   <div class="row-fluid">
     <div class="span2">
-      <div class="well sidebar-nav">
-        <ul class="nav nav-list">
+      <div class="sidebar-nav">
+        <ul class="nav nav-list" style="border:none">
           <li class="nav-header">${ _('Workflow') }</li>
-          <li>
-              % if hue_workflow is not None:
-                <a title="${ _('Edit workflow') }" href="${ hue_workflow.get_absolute_url() }">${ hue_workflow }</a>
-              % else:
-              ${ oozie_workflow.appName }
-              % endif
-          </li>
+          % if hue_workflow is not None:
+          <li><a title="${ _('Edit workflow') }" href="${ hue_workflow.get_absolute_url() }">${ hue_workflow }</a></li>
+          % else:
+          <li class="white">${ oozie_workflow.appName }</li>
+          % endif
 
           % if hue_coord:
-              <li class="nav-header">${ _('Coordinator') }</li>
-              <li><a href="${ hue_coord.get_absolute_url() }">${ hue_coord.name }</a></li>
+          <li class="nav-header">${ _('Coordinator') }</li>
+          <li><a href="${ hue_coord.get_absolute_url() }">${ hue_coord.name }</a></li>
           % endif
 
           <li class="nav-header">${ _('Submitter') }</li>
-          <li>${ oozie_workflow.user }</li>
+          <li class="white">${ oozie_workflow.user }</li>
 
           <li class="nav-header">${ _('Status') }</li>
-          <li id="status"><span class="label ${ utils.get_status(oozie_workflow.status) }">${ oozie_workflow.status }</span></li>
+          <li class="white" id="status"><span class="label ${ utils.get_status(oozie_workflow.status) }">${ oozie_workflow.status }</span></li>
 
           <li class="nav-header">${ _('Progress') }</li>
-          <li id="progress">
+          <li class="white" id="progress">
             <div class="progress">
               <div class="bar" style="width: 0">${ oozie_workflow.get_progress() }%</div>
             </div>
           </li>
 
           <li class="nav-header">${ _('Id') }</li>
-          <li>${  oozie_workflow.id }</li>
+          <li class="white">${  oozie_workflow.id }</li>
 
           % if parameters and len(parameters) < 10:
               <li class="nav-header">${ _('Variables') }</li>
               % for var, value in parameters.iteritems():
                 % if var not in ParameterForm.NON_PARAMETERS and var != 'oozie.use.system.libpath':
+                  % if utils.is_linkable(var, str(value)):
                   <li rel="tooltip" title="${ var } : ${ str(value) }">
-                    % if utils.is_linkable(var, str(value)):
-                      <a href="${ utils.hdfs_link_js(str(value)) }"><i class="icon-eye-open"></i> <span class="variable hide">${ var }</span></a>
-                    % else:
+                    <a href="${ utils.hdfs_link_js(str(value)) }"><i class="icon-eye-open"></i> <span class="variable hide">${ var }</span></a>
+                  % else:
+                  <li rel="tooltip" title="${ var } : ${ str(value) }" class="white">
                     <i class="icon-eye-open"></i> <span class="variable">${ var }</span>
-                    % endif
+                  % endif
                   </li>
                 % endif
               % endfor
@@ -94,7 +82,7 @@ ${ layout.menubar(section='dashboard') }
 
           % if has_job_edition_permission(oozie_workflow, user):
               <li class="nav-header">${ _('Manage') }</li>
-              <li>
+              <li class="white">
                 <button title="${_('Kill %(workflow)s') % dict(workflow=oozie_workflow.id)}"
                    id="kill-btn"
                    class="btn btn-small confirmationModal
@@ -145,7 +133,17 @@ ${ layout.menubar(section='dashboard') }
       </div>
     </div>
 
-    <div class="span9">
+    <div class="span10">
+      <h1 class="card-heading simple card-heading-nopadding card-heading-noborder card-heading-blue" style="margin-bottom: 10px">
+        % if oozie_bundle:
+          ${ _('Bundle') } <a href="${ oozie_bundle.get_absolute_url() }">${ oozie_bundle.appName }</a> :
+        % endif
+        % if oozie_coordinator:
+          ${ _('Coordinator') } <a href="${ oozie_coordinator.get_absolute_url(oozie_bundle) }">${ oozie_coordinator.appName }</a> :
+        % endif
+
+        ${ _('Workflow') } ${ oozie_workflow.appName }
+      </h1>
       <ul class="nav nav-tabs">
         % if workflow_graph:
             <li class="active"><a href="#graph" data-toggle="tab">${ _('Graph') }</a></li>
@@ -314,13 +312,10 @@ ${ layout.menubar(section='dashboard') }
 <link rel="stylesheet" href="/static/ext/css/codemirror.css">
 <script src="/static/ext/js/codemirror-xml.js"></script>
 
-<style>
+<style type="text/css">
 .CodeMirror.cm-s-default {
    height:500px;
 }
-.sidebar-nav {
-  padding: 9px 0;
-}
 </style>
 
 <script type="text/javascript">

+ 16 - 17
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow_action.mako

@@ -30,28 +30,17 @@ ${ layout.menubar(section='running') }
 <div class="container-fluid">
   ${ layout.dashboard_sub_menubar(section='workflows') }
 
-  <h1>
-    % if oozie_bundle:
-      ${ _('Bundle') } <a href="${ oozie_bundle.get_absolute_url() }">${ oozie_bundle.appName }</a> :
-    % endif
-    % if oozie_coordinator:
-      ${ _('Coordinator') } <a href="${ oozie_coordinator.get_absolute_url() }">${ oozie_coordinator.appName }</a> :
-    % endif
-    ${ _('Workflow') } <a href="${ workflow.get_absolute_url() }">${ workflow.appName }</a> :
-    ${ _('Action') } ${ action.name }
-  </h1>
-
  <div class="row-fluid">
     <div class="span2">
-      <div class="well sidebar-nav">
-        <ul class="nav nav-list">
+      <div class="sidebar-nav">
+        <ul class="nav nav-list" style="border:none">
           <li class="nav-header">${ _('Workflow') }</li>
           <li>
             <a title="${ _('Edit workflow') }" href="${ workflow.get_absolute_url() }">${ workflow.appName }</a>
           </li>
 
           <li class="nav-header">${ _('Name') }</li>
-          <li>${ action.name }</li>
+          <li class="white">${ action.name }</li>
 
           % if action.externalId:
             <li class="nav-header">${ _('External Id') }</li>
@@ -64,15 +53,25 @@ ${ layout.menubar(section='running') }
           % endif
 
           <li class="nav-header">${ _('Type') }</li>
-          <li>${ action.type }</li>
+          <li class="white">${ action.type }</li>
 
           <li class="nav-header">${ _('Status') }</li>
-          <li id="status"><span class="label ${ utils.get_status(action.status) }">${ action.status }</span></li>
+          <li class="white" id="status"><span class="label ${ utils.get_status(action.status) }">${ action.status }</span></li>
         </ul>
       </div>
     </div>
 
-    <div class="span9">
+    <div class="span10">
+       <h1 class="card-heading simple card-heading-nopadding card-heading-noborder card-heading-blue" style="margin-bottom: 10px">
+        % if oozie_bundle:
+          ${ _('Bundle') } <a href="${ oozie_bundle.get_absolute_url() }">${ oozie_bundle.appName }</a> :
+        % endif
+        % if oozie_coordinator:
+          ${ _('Coordinator') } <a href="${ oozie_coordinator.get_absolute_url() }">${ oozie_coordinator.appName }</a> :
+        % endif
+        ${ _('Workflow') } <a href="${ workflow.get_absolute_url() }">${ workflow.appName }</a> :
+        ${ _('Action') } ${ action.name }
+      </h1>
       <ul class="nav nav-tabs">
         <li class="active"><a href="#details" data-toggle="tab">${ _('Details') }</a></li>
         <li><a href="#configuration" data-toggle="tab">${ _('Configuration') }</a></li>

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

@@ -31,32 +31,30 @@ ${ layout.menubar(section='dashboard') }
 <div class="container-fluid">
   ${ layout.dashboard_sub_menubar(section='workflows') }
 
-  <div class="well hueWell">
-    <form>
-      <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
-
-      <span class="pull-right">
-        <span style="padding-right:10px;float:left;margin-top:3px">
-        ${ _('Show only') }
-        </span>
-        <span class="btn-group" style="float:left">
-          <a class="btn btn-date btn-info" data-value="1">${ _('1') }</a>
-          <a class="btn btn-date btn-info" data-value="7">${ _('7') }</a>
-          <a class="btn btn-date btn-info" data-value="15">${ _('15') }</a>
-          <a class="btn btn-date btn-info" data-value="30">${ _('30') }</a>
-        </span>
-        <span style="float:left;padding-left:10px;padding-right:10px;margin-top:3px">${ _('days with status') }</span>
-        <span class="btn-group" style="float:left;">
-          <a class="btn btn-status btn-success" data-value='SUCCEEDED'>${ _('Succeeded') }</a>
-          <a class="btn btn-status btn-warning" data-value='RUNNING'>${ _('Running') }</a>
-          <a class="btn btn-status btn-danger disable-feedback" data-value='KILLED'>${ _('Killed') }</a>
-        </span>
+  <form>
+    <input type="text" id="filterInput" class="input-xlarge search-query" placeholder="${ _('Search for username, name, etc...') }">
+
+    <span class="pull-right">
+      <span style="padding-right:10px;float:left;margin-top:3px">
+      ${ _('Show only') }
       </span>
-   </form>
-  </div>
+      <span class="btn-group" style="float:left">
+        <a class="btn btn-date btn-info" data-value="1">${ _('1') }</a>
+        <a class="btn btn-date btn-info" data-value="7">${ _('7') }</a>
+        <a class="btn btn-date btn-info" data-value="15">${ _('15') }</a>
+        <a class="btn btn-date btn-info" data-value="30">${ _('30') }</a>
+      </span>
+      <span style="float:left;padding-left:10px;padding-right:10px;margin-top:3px">${ _('days with status') }</span>
+      <span class="btn-group" style="float:left;">
+        <a class="btn btn-status btn-success" data-value='SUCCEEDED'>${ _('Succeeded') }</a>
+        <a class="btn btn-status btn-warning" data-value='RUNNING'>${ _('Running') }</a>
+        <a class="btn btn-status btn-danger disable-feedback" data-value='KILLED'>${ _('Killed') }</a>
+      </span>
+    </span>
+ </form>
 
   <div style="min-height:200px">
-    <h1>${ _('Running') }</h1>
+    <h1 class="card-heading simple">${ _('Running') }</h1>
     <table class="table table-condensed" id="running-table">
       <thead>
         <tr>
@@ -80,7 +78,7 @@ ${ layout.menubar(section='dashboard') }
   </div>
 
   <div>
-    <h1>${ _('Completed') }</h1>
+    <h1 class="card-heading simple">${ _('Completed') }</h1>
     <table class="table table-condensed" id="completed-table" data-tablescroller-disable="true">
       <thead>
         <tr>
@@ -100,6 +98,8 @@ ${ layout.menubar(section='dashboard') }
       </tbody>
      </table>
    </div>
+
+  ${ layout.dashboard_end_sub_menubar() }
 </div>
 
 

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

@@ -54,7 +54,7 @@
     </div>
   </div>
 
-  <style>
+  <style type="text/css">
     .designTable th {
       text-align:left;
     }

+ 19 - 23
apps/oozie/src/oozie/templates/editor/create_bundle.mako

@@ -28,21 +28,20 @@ ${ layout.menubar(section='bundles') }
 
 
 <div class="container-fluid">
-  <h1>${ _('Create Bundle') }</h1>
-
-    <div class="well">
-      <br/>
-    </div>
-
-    <div style="min-height:300px">
-      <form class="form-horizontal" id="bundleForm" action="${ url('oozie:create_bundle') }" method="POST">
-
-      <div class="row-fluid">
-        <div class="span2">
+  <form class="form-horizontal" id="bundleForm" action="${ url('oozie:create_bundle') }" method="POST">
+    <div class="row-fluid">
+      <div class="span2">
+        <div class="sidebar-nav">
+          <ul class="nav nav-list">
+            <li class="nav-header">${ _('Properties') }</li>
+            <li class="active"><a href="#properties"><i class="icon-reorder"></i> ${ _('Edit properties') }</a></li>
+          </ul>
         </div>
-        <div class="span8">
-          <h2>${ _('Properties') }</h2>
-          <br/>
+      </div>
+      <div class="span10">
+        <div class="card" style="margin-top: 0">
+          <h1 class="card-heading simple">${ _('Create Bundle') }</h1>
+          <div class="alert alert-info"><h3>${ _('Bundle data') }</h3></div>
           <fieldset>
             ${ utils.render_field(bundle_form['name']) }
             ${ utils.render_field(bundle_form['description']) }
@@ -51,18 +50,15 @@ ${ layout.menubar(section='bundles') }
 
             ${ bundle_form['schema_version'] | n,unicode }
             ${ bundle_form['parameters'] | n,unicode }
-         </fieldset>
-
-        <div class="span2"></div>
+          </fieldset>
+          <div class="form-actions">
+            <input class="btn btn-primary" type="submit" value="${ _('Save') }" />
+            <a class="btn" onclick="history.back()">${ _('Back') }</a>
+          </div>
         </div>
       </div>
-
-      <div class="form-actions center">
-        <input class="btn btn-primary" type="submit" value="${ _('Save') }" />
-        <a class="btn" onclick="history.back()">${ _('Back') }</a>
-      </div>
-      </form>
     </div>
+  </form>
 </div>
 
 ${ utils.decorate_datetime_fields() }

+ 5 - 8
apps/oozie/src/oozie/templates/editor/create_coordinator.mako

@@ -1,4 +1,4 @@
-s## Licensed to Cloudera, Inc. under one
+## Licensed to Cloudera, Inc. under one
 ## or more contributor license agreements.  See the NOTICE file
 ## distributed with this work for additional information
 ## regarding copyright ownership.  Cloudera, Inc. licenses this file
@@ -36,21 +36,15 @@ ${ layout.menubar(section='coordinators') }
   .help-block {
     color: #999999;
   }
-  .sidebar-nav {
-    padding: 9px 0;
-  }
-
 </style>
 
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/routie-0.3.0.min.js" type="text/javascript" charset="utf-8"></script>
 
 <div class="container-fluid">
-  <h1>${ _('Coordinator Editor') } ${ coordinator.name }</h1>
-
   <div class="row-fluid">
     <div class="span2">
-      <div class="well sidebar-nav">
+      <div class="sidebar-nav">
         <ul class="nav nav-list" style="min-height: 150px">
           <li class="nav-header">${ _('Properties') }</li>
           <li class="active"><a href="#">${ _('Edit properties') }</a></li>
@@ -58,6 +52,8 @@ ${ layout.menubar(section='coordinators') }
         </div>
     </div>
     <div class="span10">
+      <div class="card" style="margin-top:0">
+        <h1 class="card-heading simple">${ _('Coordinator Editor') } ${ coordinator.name }</h1>
       <ul class="nav nav-pills">
         <li class="active"><a href="#step1" class="step">${ _('Step 1: Details') }</a></li>
         <li><a href="#step2" class="step">${ _('Step 2: Frequency') }</a></li>
@@ -119,6 +115,7 @@ ${ layout.menubar(section='coordinators') }
 
       </form>
     </div>
+    </div>
 
   </div>
 </div>

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

@@ -58,7 +58,7 @@ from django.utils.safestring import mark_safe
 
   </div>
 
-  <style>
+  <style type="text/css">
     .dataTable th {
       text-align:left;
     }

+ 49 - 46
apps/oozie/src/oozie/templates/editor/create_workflow.mako

@@ -27,61 +27,64 @@ ${ layout.menubar(section='workflows') }
 
 
 <div class="container-fluid">
-  <h1>${ _('Create Workflow') }</h1>
 
-    <div class="well">
-      <br/>
-    </div>
-
-    <div style="min-height:300px">
-      <form class="form-horizontal" id="workflowForm" action="${ url('oozie:create_workflow') }" method="POST">
-
-      <div class="row-fluid">
-        <div class="span2">
-        </div>
-        <div class="span8">
-          <h2>${ _('Properties') }</h2>
-          <br/>
-          <fieldset>
-          ${ utils.render_field(workflow_form['name']) }
-          ${ utils.render_field(workflow_form['description']) }
-          ${ utils.render_field(workflow_form['is_shared']) }
 
-          <div class="control-group ">
-            <label class="control-label">
-              <a href="#" id="advanced-btn" onclick="$('#advanced-container').toggle('hide')">
-                <i class="icon-share-alt"></i> ${ _('advanced') }
-              </a>
-            </label>
-            <div class="controls"></div>
+  <div class="row-fluid">
+    <div class="span2">
+      <div id="workflowControls" class="sidebar-nav">
+        <ul class="nav nav-list">
+          <li class="nav-header">${ _('New workflow') }</li>
+          <li class="active"><a href="#properties"><i class="icon-reorder"></i> ${ _('Properties') }</a></li>
+        </ul>
+      </div>
+    </div>
+    <div class="span10">
+      <div class="card" style="padding-top:0;margin-top: 0">
+        <div class="alert alert-info"><h3>${ _('Properties') }</h3></div>
+          <div class="card-body">
+            <p>
+              <form class="form-horizontal" id="workflowForm" action="${ url('oozie:create_workflow') }" method="POST">
+              <fieldset>
+              ${ utils.render_field(workflow_form['name']) }
+              ${ utils.render_field(workflow_form['description']) }
+              ${ utils.render_field(workflow_form['is_shared']) }
+
+              <div class="control-group ">
+                <label class="control-label">
+                  <a href="#" id="advanced-btn" onclick="$('#advanced-container').toggle('hide')">
+                    <i class="icon-share-alt"></i> ${ _('advanced') }
+                  </a>
+                </label>
+                <div class="controls"></div>
+              </div>
+
+                <div id="advanced-container" class="hide">
+                  ${ utils.render_field(workflow_form['deployment_dir']) }
+                  ${ utils.render_field(workflow_form['job_xml']) }
+               </div>
+
+               <div class="hide">
+                 ${ workflow_form['schema_version'] | n,unicode }
+                 ${ workflow_form['job_properties'] | n,unicode }
+                 ${ workflow_form['parameters'] | n,unicode }
+             </div>
+             </fieldset>
+              <div class="form-actions center">
+                <input class="btn btn-primary" type="submit" value="${ _('Save') }" />
+                <a class="btn" onclick="history.back()">${ _('Back') }</a>
+              </div>
+            </form>
+            </p>
           </div>
-
-            <div id="advanced-container" class="hide">
-              ${ utils.render_field(workflow_form['deployment_dir']) }
-              ${ utils.render_field(workflow_form['job_xml']) }
-           </div>
-
-           <div class="hide">
-             ${ workflow_form['schema_version'] | n,unicode }
-             ${ workflow_form['job_properties'] | n,unicode }
-             ${ workflow_form['parameters'] | n,unicode }
-         </div>
-         </fieldset>
-
-        <div class="span2"></div>
         </div>
       </div>
-
-      <div class="form-actions center">
-        <input class="btn btn-primary" type="submit" value="${ _('Save') }" />
-        <a class="btn" onclick="history.back()">${ _('Back') }</a>
-      </div>
-      </form>
     </div>
-</div>
+  </div>
 
 ${ utils.path_chooser_libs(True, True) }
 
+<link rel="stylesheet" href="/oozie/static/css/workflow.css">
+
 <script>
   $(document).ready(function(){
     $("input[name='deployment_dir']").after(getFileBrowseButton($("input[name='deployment_dir']"), true));

+ 4 - 6
apps/oozie/src/oozie/templates/editor/edit_bundle.mako

@@ -41,9 +41,6 @@ ${ layout.menubar(section='bundles') }
   .help-block {
     color: #999999;
   }
-  .sidebar-nav {
-    padding: 9px 0;
-  }
 </style>
 
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
@@ -51,11 +48,10 @@ ${ layout.menubar(section='bundles') }
 
 
 <div class="container-fluid">
-  <h1>${ _('Bundle Editor : ') } ${ bundle.name }</h1>
 
   <div class="row-fluid">
     <div class="span2">
-      <div class="well sidebar-nav">
+      <div class="sidebar-nav">
         <ul class="nav nav-list">
           <li class="nav-header">${ _('Properties') }</li>
           <li class="active"><a href="#properties"><i class="icon-reorder"></i> ${ _('Edit properties') }</a></li>
@@ -90,6 +86,8 @@ ${ layout.menubar(section='bundles') }
     </div>
 
     <div class="span10">
+      <div class="card" style="margin-top:0">
+      <h1 class="card-heading simple">${ _('Bundle Editor : ') } ${ bundle.name }</h1>
       <form id="jobForm" class="form-horizontal" action="${ url('oozie:edit_bundle', bundle=bundle.id) }" method="POST">
 
       <div id="properties" class="section">
@@ -249,7 +247,7 @@ ${ layout.menubar(section='bundles') }
         </div>
 
     </div>
-
+      </div>
   </div>
   </form>
 

+ 4 - 6
apps/oozie/src/oozie/templates/editor/edit_coordinator.mako

@@ -41,9 +41,6 @@ ${ layout.menubar(section='coordinators') }
   .help-block {
     color: #999999;
   }
-  .sidebar-nav {
-    padding: 9px 0;
-  }
 </style>
 
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
@@ -51,11 +48,9 @@ ${ layout.menubar(section='coordinators') }
 
 
 <div class="container-fluid">
-  <h1>${ _('Coordinator Editor : ') } ${ coordinator.name }</h1>
-
   <div class="row-fluid">
     <div class="span2">
-      <div class="well sidebar-nav">
+      <div class="sidebar-nav">
         <ul class="nav nav-list">
           <li class="nav-header">${ _('Properties') }</li>
           <li class="active"><a href="#properties"><i class="icon-reorder"></i> ${ _('Edit properties') }</a></li>
@@ -86,6 +81,8 @@ ${ layout.menubar(section='coordinators') }
       </div>
     </div>
     <div class="span10">
+      <div class="card" style="margin-top: 0">
+        <h1 class="card-heading simple">${ _('Coordinator Editor : ') } ${ coordinator.name }</h1>
       <form id="jobForm" class="form-horizontal" action="${ url('oozie:edit_coordinator', coordinator=coordinator.id) }" method="POST">
       <div id="properties" class="section">
         <ul class="nav nav-pills">
@@ -411,6 +408,7 @@ ${ layout.menubar(section='coordinators') }
       </form>
 
     </div>
+    </div>
 
   </div>
 

+ 66 - 45
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -35,11 +35,9 @@ ${ layout.menubar(section='workflows') }
     <div class="ribbon">${ _('Unsaved') }</div>
   </div>
 
-  <h1 data-bind="text: '${ _('Workflow Editor : ') } ' + name()"></h1>
-
   <div class="row-fluid">
   <div class="span2">
-    <div id="workflowControls" class="well sidebar-nav">
+    <div id="workflowControls" class="sidebar-nav">
       <ul class="nav nav-list">
         <li class="nav-header">${ _('Editor') }</li>
         <li><a href="#editWorkflow"><i class="icon-code-fork"></i> ${ _('Workflow') }</a></li>
@@ -79,8 +77,11 @@ ${ layout.menubar(section='workflows') }
   </div>
   <div class="span10">
     <div id="properties" class="section hide">
-      <div class="alert alert-info"><h3>${ _('Properties') }</h3></div>
-      <fieldset>
+    <div class="card" style="padding-top:0;margin-top: 0">
+      <div class="alert alert-info"><h3 data-bind="text: name()"></h3></div>
+      <div class="card-body">
+        <p>
+            <fieldset>
         ${ utils.render_field(workflow_form['name'], extra_attrs={'data-bind': 'value: %s' % workflow_form['name'].name}) }
         ${ utils.render_field(workflow_form['description'], extra_attrs={'data-bind': 'value: %s' % workflow_form['description'].name}) }
         ${ utils.render_field(workflow_form['is_shared'], extra_attrs={'data-bind': 'checked: %s' % workflow_form['is_shared'].name}) }
@@ -118,30 +119,39 @@ ${ layout.menubar(section='workflows') }
       </div>
 
       </fieldset>
+        </p>
+      </div>
+        </div>
     </div>
 
     <div id="editKill" class="section hide">
+      <div class="card" style="padding-top:0; margin-top:0">
       <div class="alert alert-info">
         <h3>${ _('Kill node') }</h3>
         <p>${_('If the "to" field has content, then the workflow editor assumes that the defined email action is to be placed before the kill action.')}</p>
       </div>
-      <fieldset data-bind="with: context().node">
-        <p >&nbsp;${_('Action enabled: ')} <i class="icon-check" data-bind="visible: to().length > 0"></i><i class="icon-check-empty" data-bind="visible: to().length == 0"></i></p>
-
-        % for form_info in action_forms:
-          % if form_info[0] == 'email':
-            ${ actions.action_form_fields(action_form=form_info[1], node_type=form_info[0], show_primary=False) }
-          % endif
-        % endfor
-      </fieldset>
+      <div class="card-body">
+        <p>
+          <fieldset data-bind="with: context().node">
+            <p>&nbsp;${_('Action enabled: ')} <i class="icon-check" data-bind="visible: to().length > 0"></i><i class="icon-check-empty" data-bind="visible: to().length == 0"></i></p>
+
+            % for form_info in action_forms:
+              % if form_info[0] == 'email':
+                ${ actions.action_form_fields(action_form=form_info[1], node_type=form_info[0], show_primary=False) }
+              % endif
+            % endfor
+          </fieldset>
+        </p>
+      </div>
+      </div>
     </div>
 
     <div id="importAction" class="section hide">
-      <ul class="nav nav-tabs">
+      <ul class="nav nav-tabs" style="margin-bottom: 0">
         <li class="active"><a href="#importJobsub" data-toggle="tab">${ _('Job Designer') }</a></li>
         <li><a href="#importOozie" data-toggle="tab">${ _('Oozie') }</a></li>
       </ul>
-
+      <div class="card" style="margin-top: 0">
       <div class="tab-content">
         <div class="tab-pane active" id="importJobsub" data-bind="with: jobsub">
           <div class="alert alert-info">
@@ -196,6 +206,7 @@ ${ layout.menubar(section='workflows') }
           </table>
         </div>
       </div>
+      </div>
     </div>
 
     <div id="importOozieAction" class="section hide" data-bind="if: selected_workflow()">
@@ -227,10 +238,11 @@ ${ layout.menubar(section='workflows') }
     </div>
 
     <div id="editWorkflow" class="section hide">
-
-      <div class="alert alert-info"><h3>${ _('Editor') }</h3></div>
-
-      <div id="actionToolbar" class="well">
+      <div class="card" style="padding-top:0; margin-top:0">
+      <div class="alert alert-info"><h3 data-bind="text: name()"></h3></div>
+      <div class="card-body">
+        <p>
+      <div id="actionToolbar">
         <div class="draggable-button">
           <a data-node-type="mapreduce"
              title="${ _('Drag and drop this action on the workflow') }" class="btn new-node-link">
@@ -318,33 +330,42 @@ ${ layout.menubar(section='workflows') }
       <div id="graph" class="row-fluid" data-bind="template: { name: function(item) { return item.view_template() }, foreach: nodes }"></div>
       <div id="new-node" class="row-fluid" data-bind="template: { name: 'nodeTemplate', 'if': new_node, data: new_node }"></div>
 
+      </p>
+    </div>
+    </div>
     </div>
 
     <div id="listHistory" class="section hide">
-      <div class="alert alert-info"><h3>${ _('History') }</h3></div>
-      % if not history:
-        ${ _('N/A') }
-      % else:
-        <table class="table">
-          <thead>
-          <tr>
-            <th>${ _('Date') }</th>
-            <th>${ _('Id') }</th>
-          </tr>
-          </thead>
-          <tbody>
-          % for record in history:
-          <tr>
-            <td>
-              <a href="${ url('oozie:list_history_record', record_id=record.id) }" data-row-selector="true"></a>
-              ${ utils.format_date(record.submission_date) }
-            </td>
-            <td>${ record.oozie_job_id }</td>
-          </tr>
-          % endfor
-          </tbody>
-        </table>
-      % endif
+      <div class="card" style="padding-top:0; margin-top:0">
+        <div class="alert alert-info"><h3>${ _('History') }</h3></div>
+        <div class="card-body">
+          <p>
+            % if not history:
+              ${ _('N/A') }
+            % else:
+              <table class="table">
+                <thead>
+                <tr>
+                  <th>${ _('Date') }</th>
+                  <th>${ _('Id') }</th>
+                </tr>
+                </thead>
+                <tbody>
+                % for record in history:
+                <tr>
+                  <td>
+                    <a href="${ url('oozie:list_history_record', record_id=record.id) }" data-row-selector="true"></a>
+                    ${ utils.format_date(record.submission_date) }
+                  </td>
+                  <td>${ record.oozie_job_id }</td>
+                </tr>
+                % endfor
+                </tbody>
+              </table>
+            % endif
+          </p>
+        </div>
+      </div>
     </div>
 
 
@@ -884,7 +905,7 @@ window.onbeforeunload = function (e) {
 
 window.onresize = function () {
   if (modal) {
-    modal.recenter(280, 250);
+    modal.recenter(280, 0);
   }
 };
 

+ 1 - 1
apps/oozie/src/oozie/templates/editor/gen/workflow-graph-status.xml.mako

@@ -92,7 +92,7 @@
 
 ${ graph.display_graph(nodes, print_status_node) }
 
-<style>
+<style type="text/css">
   .node-text-failed {color:white; font-weight:bold;};
   .node-text-pass {color:black; font-weight:bold;};
 </style>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/gen/workflow-graph.xml.mako

@@ -49,7 +49,7 @@
     ${ print_graph(nodes, print_node) }
   </div>
 
-  <style>
+  <style type="text/css">
     .action2 {text-align: center;}
     .action {border-style:solid; border-width:1px; border-color:LightGrey; padding: 3px; margin:25px;}
     .action-link:hover {cursor: pointer;}

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

@@ -54,7 +54,7 @@
     </div>
   </div>
 
-  <style>
+  <style type="text/css">
     .designTable th {
       text-align:left;
     }

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

@@ -34,7 +34,8 @@ ${ layout.menubar(section='bundles') }
 </style>
 
 <div class="container-fluid">
-  <h1>${ _('Bundle Manager') }</h1>
+  <div class="card">
+  <h1 class="card-heading simple">${ _('Bundle Manager') }</h1>
 
   <%actionbar:render>
     <%def name="search()">
@@ -116,6 +117,7 @@ ${ layout.menubar(section='bundles') }
     </tbody>
   </table>
 </div>
+</div>
 
 
 <div id="submit-job-modal" class="modal hide"></div>
@@ -249,7 +251,7 @@ ${ layout.menubar(section='bundles') }
       "sPaginationType":"bootstrap",
       'iDisplayLength':50,
       "bLengthChange":false,
-      "sDom":"<'row'r>t<'row'<'span8'i><''p>>",
+      "sDom": "<'row'r>t<'row-fluid'<'dt-pages'p><'dt-records'i>>",
       "aoColumns":[
         { "bSortable":false },
         null,

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

@@ -33,7 +33,8 @@ ${ layout.menubar(section='coordinators') }
 </style>
 
 <div class="container-fluid">
-  <h1>${ _('Coordinator Manager') }</h1>
+  <div class="card">
+  <h1 class="card-heading simple">${ _('Coordinator Manager') }</h1>
 
   <%actionbar:render>
     <%def name="search()">
@@ -112,6 +113,7 @@ ${ layout.menubar(section='coordinators') }
     </tbody>
   </table>
 </div>
+</div>
 
 
 <div id="submit-job-modal" class="modal hide"></div>
@@ -253,7 +255,7 @@ ${ layout.menubar(section='coordinators') }
       "sPaginationType":"bootstrap",
       'iDisplayLength':50,
       "bLengthChange":false,
-      "sDom":"<'row'r>t<'row'<'span8'i><''p>>",
+      "sDom": "<'row'r>t<'row-fluid'<'dt-pages'p><'dt-records'i>>",
       "aoColumns":[
         { "bSortable":false },
         null,

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

@@ -29,7 +29,8 @@ ${ layout.menubar(section='bundles') }
 
 
 <div class="container-fluid">
-  <h1>${ _('Bundle Trash') }</h1>
+  <div class="card">
+  <h1 class="card-heading simple">${ _('Bundle Trash') }</h1>
 
   <%actionbar:render>
     <%def name="search()">
@@ -89,6 +90,7 @@ ${ layout.menubar(section='bundles') }
     </tbody>
   </table>
 </div>
+</div>
 
 
 <div id="purge-job" class="modal hide">
@@ -212,7 +214,7 @@ ${ layout.menubar(section='bundles') }
       "sPaginationType":"bootstrap",
       'iDisplayLength':50,
       "bLengthChange":false,
-      "sDom":"<'row'r>t<'row'<'span8'i><''p>>",
+      "sDom": "<'row'r>t<'row-fluid'<'dt-pages'p><'dt-records'i>>",
       "aoColumns":[
         { "bSortable":false },
         null,

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

@@ -28,7 +28,8 @@ ${ layout.menubar(section='coordinators') }
 
 
 <div class="container-fluid">
-  <h1>${ _('Coordinator Trash') }</h1>
+  <div class="card">
+  <h1 class="card-heading simple">${ _('Coordinator Trash') }</h1>
 
   <%actionbar:render>
     <%def name="search()">
@@ -89,6 +90,7 @@ ${ layout.menubar(section='coordinators') }
     </tbody>
   </table>
 </div>
+</div>
 
 
 <div id="purge-job" class="modal hide">
@@ -214,7 +216,7 @@ ${ layout.menubar(section='coordinators') }
       "sPaginationType":"bootstrap",
       'iDisplayLength':50,
       "bLengthChange":false,
-      "sDom":"<'row'r>t<'row'<'span8'i><''p>>",
+      "sDom": "<'row'r>t<'row-fluid'<'dt-pages'p><'dt-records'i>>",
       "aoColumns":[
         { "bSortable":false },
         null,

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

@@ -28,7 +28,8 @@ ${ layout.menubar(section='workflows') }
 
 
 <div class="container-fluid">
-  <h1>${ _('Workflow Trash') }</h1>
+  <div class="card">
+  <h1 class="card-heading simple">${ _('Workflow Trash') }</h1>
 
   <%actionbar:render>
     <%def name="search()">
@@ -90,6 +91,7 @@ ${ layout.menubar(section='workflows') }
   </table>
 
 </div>
+</div>
 
 
 <div id="destroyWf" class="modal hide fade">
@@ -213,7 +215,7 @@ ${ layout.menubar(section='workflows') }
       "sPaginationType":"bootstrap",
       'iDisplayLength':50,
       "bLengthChange":false,
-      "sDom":"<'row'r>t<'row'<'span8'i><''p>>",
+      "sDom": "<'row'r>t<'row-fluid'<'dt-pages'p><'dt-records'i>>",
       "aoColumns":[
         { "bSortable":false },
         null,

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

@@ -33,7 +33,8 @@ ${ layout.menubar(section='workflows') }
 </style>
 
 <div class="container-fluid">
-  <h1>${ _('Workflow Manager') }</h1>
+  <div class="card">
+  <h1 class="card-heading simple">${ _('Workflow Manager') }</h1>
 
   <%actionbar:render>
     <%def name="search()">
@@ -112,6 +113,7 @@ ${ layout.menubar(section='workflows') }
     </tbody>
   </table>
 
+  </div>
 </div>
 
 
@@ -253,7 +255,7 @@ ${ layout.menubar(section='workflows') }
       "sPaginationType":"bootstrap",
       'iDisplayLength':50,
       "bLengthChange":false,
-      "sDom":"<'row'r>t<'row'<'span8'i><''p>>",
+      "sDom": "<'row'r>t<'row-fluid'<'dt-pages'p><'dt-records'i>>",
       "aoColumns":[
         { "bSortable":false },
         null,

+ 15 - 8
apps/oozie/src/oozie/templates/navigation-bar.mako

@@ -35,13 +35,20 @@
 </%def>
 
 <%def name="dashboard_sub_menubar(section='')">
-  <h1>${ _('Dashboard') }</h1>
-
-  <ul class="nav nav-tabs">
-    <li class="${utils.is_selected(section, 'workflows')}"><a href="${url('oozie:list_oozie_workflows')}">${ _('Workflows') }</a></li>
-    <li class="${utils.is_selected(section, 'coordinators')}"><a href="${url('oozie:list_oozie_coordinators')}">${ _('Coordinators') }</a></li>
-    <li class="${utils.is_selected(section, 'bundles')}"><a href="${url('oozie:list_oozie_bundles')}">${ _('Bundles') }</a></li>
-    <li class="${utils.is_selected(section, 'oozie')}"><a href="${url('oozie:list_oozie_info')}">${ _('Oozie') }</a></li>
-  </ul>
+  <div class="card" style="padding-top:1px;margin-top:1px">
+##    <h1 class="card-heading simple">${ _('Dashboard') }</h1>
+    <div class="card-body">
+      <p>
+        <ul class="nav nav-tabs">
+          <li class="${utils.is_selected(section, 'workflows')}"><a href="${url('oozie:list_oozie_workflows')}">${ _('Workflows') }</a></li>
+          <li class="${utils.is_selected(section, 'coordinators')}"><a href="${url('oozie:list_oozie_coordinators')}">${ _('Coordinators') }</a></li>
+          <li class="${utils.is_selected(section, 'bundles')}"><a href="${url('oozie:list_oozie_bundles')}">${ _('Bundles') }</a></li>
+          <li class="${utils.is_selected(section, 'oozie')}"><a href="${url('oozie:list_oozie_info')}">${ _('Oozie') }</a></li>
+        </ul>
 </%def>
 
+<%def name="dashboard_end_sub_menubar()">
+      </p>
+    </div>
+  </div>
+</%def>

+ 1 - 1
apps/oozie/src/oozie/templates/utils.inc.mako

@@ -366,7 +366,7 @@
   <link rel="stylesheet" href="/static/ext/css/bootstrap-datepicker.min.css" type="text/css" media="screen" title="no title" charset="utf-8" />
   <link rel="stylesheet" href="/static/ext/css/bootstrap-timepicker.min.css" type="text/css" media="screen" title="no title" charset="utf-8" />
 
-  <style>
+  <style type="text/css">
     .datepicker {
       z-index: 4999;
     }

+ 2 - 5
apps/oozie/static/css/workflow.css

@@ -121,10 +121,6 @@ ul {
   cursor: move;
 }
 
-.sidebar-nav {
-  padding: 9px 0;
-}
-
 #workflow {
   margin-bottom: 80px;
 }
@@ -156,6 +152,7 @@ ul {
   box-shadow: 0px -1px 3px rgba(50, 50, 50, 0.15);
   z-index: 1020;
   margin-left: -20px;
+  left:0;
 }
 
 .draggable-button {
@@ -174,4 +171,4 @@ ul {
 
 #importAction .action-row, #importOozieAction .action-row {
   cursor: pointer;
-}
+}

+ 1 - 1
apps/oozie/static/js/workflow.utils.js

@@ -60,7 +60,7 @@ function edit_node_modal(modal, workflow, node, save, cancel, template) {
     })
   };
   modal.show(context);
-  modal.recenter(280, 250);
+  modal.recenter(280, 0);
   modal.addDecorations();
 
   var cancel_edit = cancel || function() {

+ 1 - 1
apps/pig/src/pig/templates/app.mako

@@ -585,7 +585,7 @@ ${ commonheader(None, "pig", user, "100px") | n,unicode }
 <link rel="stylesheet" href="/static/ext/css/codemirror.css">
 <link rel="stylesheet" href="/static/ext/css/codemirror-show-hint.css">
 
-<style>
+<style type="text/css">
   .fileChooserBtn {
     border-radius: 0 3px 3px 0;
   }

+ 18 - 0
apps/search/static/css/bootstrap-select.css

@@ -1,3 +1,21 @@
+/*
+ Licensed to Cloudera, Inc. under one
+ 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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
+*/
+
 a.dropdown-toggle, a.dropdown-toggle:hover {
   text-decoration: none;
 }

+ 26 - 7
apps/search/static/css/freshereditor.css

@@ -1,13 +1,32 @@
-.fresheditor-toolbar 
-{
-	font-family:"Georgia", Serif;
-	line-height:1.67em;
-	font-size:1em;
+/*
+ Licensed to Cloudera, Inc. under one
+ 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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
+*/
+
+.fresheditor-toolbar {
+  font-family: "Georgia", Serif;
+  line-height: 1.67em;
+  font-size: 1em;
 }
+
 .toolbar-btn {
-	height: 20px;
+  height: 20px;
 }
+
 .colorpanel {
-	background-color: #333;
+  background-color: #333;
 }
 

+ 18 - 0
apps/search/static/css/search.css

@@ -1,3 +1,21 @@
+/*
+ Licensed to Cloudera, Inc. under one
+ 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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
+*/
+
 .container {
   margin-left: 20px!important;
 }

+ 18 - 0
apps/sqoop/static/css/sqoop.css

@@ -1,3 +1,21 @@
+/*
+ Licensed to Cloudera, Inc. under one
+ 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
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ 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.
+*/
+
 .row-selectable tr {
   cursor: pointer;
 }

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

@@ -27,7 +27,7 @@ import re
 ${ commonheader(_('Server Logs'), "about", user, "100px") | n,unicode }
 ${layout.menubar(section='log_view')}
 
-<style>
+<style type="text/css">
   pre {
     margin: 0;
     padding: 2px;

+ 17 - 0
desktop/core/static/css/hue3.css

@@ -1277,6 +1277,14 @@ a#advanced-btn:hover {
   color: #338BB8!important;
 }
 
+.card-heading-nopadding {
+  padding-left: 0!important;
+}
+
+.card-heading-noborder {
+  border-bottom: none!important;
+}
+
 .dt-records {
   margin-left: 10px;
 }
@@ -1301,4 +1309,13 @@ a#advanced-btn:hover {
   padding: 9px 18px;
   text-shadow: none;
   transition: border 0.218s ease 0s;
+}
+
+.input-append.date .add-on i, .input-prepend.date .add-on i {
+    line-height: 28px;
+}
+
+.modal {
+  padding: 25px 20px!important;
+  margin-left: -290px!important;
 }

+ 0 - 2
desktop/core/static/ext/css/bootplus-responsive.css

@@ -7,8 +7,6 @@
   * based on Twitter Bootstrap v2.3.2
 */
 
-/*darken(@btnPrimaryBackground, 5%);*/
-
 .clearfix {
   *zoom: 1;
 }

+ 30 - 32
desktop/core/static/ext/css/bootplus.css

@@ -7,8 +7,6 @@
  * based on Twitter Bootstrap v2.3.2
  */
 
-/*darken(@btnPrimaryBackground, 5%);*/
-
 .clearfix {
   *zoom: 1;
 }
@@ -5790,7 +5788,7 @@ input.search-query {
 .control-group.error .control-label,
 .control-group.error .help-block,
 .control-group.error .help-inline {
-  color: #f2dede;
+  color: #b94a48;
 }
 
 .control-group.error .checkbox,
@@ -5798,13 +5796,13 @@ input.search-query {
 .control-group.error input,
 .control-group.error select,
 .control-group.error textarea {
-  color: #f2dede;
+  color: #b94a48;
 }
 
 .control-group.error input,
 .control-group.error select,
 .control-group.error textarea {
-  border-color: #f2dede;
+  border-color: #b94a48;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
      -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -5813,23 +5811,23 @@ input.search-query {
 .control-group.error input:focus,
 .control-group.error select:focus,
 .control-group.error textarea:focus {
-  border-color: #e4b9b9;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
+  border-color: #953b39;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #d59392;
 }
 
 .control-group.error .input-prepend .add-on,
 .control-group.error .input-append .add-on {
-  color: #f2dede;
-  background-color: #f2dede;
-  border-color: #f2dede;
+  color: #b94a48;
+  background-color: #b94a48;
+  border-color: #b94a48;
 }
 
 .control-group.success .control-label,
 .control-group.success .help-block,
 .control-group.success .help-inline {
-  color: #dff0d8;
+  color: #468847;
 }
 
 .control-group.success .checkbox,
@@ -5837,13 +5835,13 @@ input.search-query {
 .control-group.success input,
 .control-group.success select,
 .control-group.success textarea {
-  color: #dff0d8;
+  color: #468847;
 }
 
 .control-group.success input,
 .control-group.success select,
 .control-group.success textarea {
-  border-color: #dff0d8;
+  border-color: #468847;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
      -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -5852,23 +5850,23 @@ input.search-query {
 .control-group.success input:focus,
 .control-group.success select:focus,
 .control-group.success textarea:focus {
-  border-color: #c1e2b3;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
+  border-color: #356635;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #7aba7b;
 }
 
 .control-group.success .input-prepend .add-on,
 .control-group.success .input-append .add-on {
-  color: #dff0d8;
-  background-color: #dff0d8;
-  border-color: #dff0d8;
+  color: #468847;
+  background-color: #468847;
+  border-color: #468847;
 }
 
 .control-group.info .control-label,
 .control-group.info .help-block,
 .control-group.info .help-inline {
-  color: #d9edf7;
+  color: #338bb8;
 }
 
 .control-group.info .checkbox,
@@ -5876,13 +5874,13 @@ input.search-query {
 .control-group.info input,
 .control-group.info select,
 .control-group.info textarea {
-  color: #d9edf7;
+  color: #338bb8;
 }
 
 .control-group.info input,
 .control-group.info select,
 .control-group.info textarea {
-  border-color: #d9edf7;
+  border-color: #338bb8;
   -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
      -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
           box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
@@ -5891,17 +5889,17 @@ input.search-query {
 .control-group.info input:focus,
 .control-group.info select:focus,
 .control-group.info textarea:focus {
-  border-color: #afd9ee;
-  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
-          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #ffffff;
+  border-color: #286d90;
+  -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #78b8d9;
+     -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #78b8d9;
+          box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 6px #78b8d9;
 }
 
 .control-group.info .input-prepend .add-on,
 .control-group.info .input-append .add-on {
-  color: #d9edf7;
-  background-color: #d9edf7;
-  border-color: #d9edf7;
+  color: #338bb8;
+  background-color: #338bb8;
+  border-color: #338bb8;
 }
 
 .form-actions {

+ 1 - 1
desktop/core/static/jasmine/jHueTableExtenderFixture.html

@@ -1,4 +1,4 @@
-<style>
+<style type="text/css">
   .resultTable td, .resultTable th {
     white-space: nowrap;
   }

+ 3 - 3
tools/bootplus/less/bootplus/forms.less

@@ -98,15 +98,15 @@ input.search-query {
 //}
 // Error
 .control-group.error {
-  .formFieldState(@errorBackground, @errorBackground, @errorBackground);
+  .formFieldState(@errorText, @errorText, @errorText);
 }
 // Success
 .control-group.success {
-  .formFieldState(@successBackground, @successBackground, @successBackground);
+  .formFieldState(@successText, @successText, @successText);
 }
 // Success
 .control-group.info {
-  .formFieldState(@infoBackground, @infoBackground, @infoBackground);
+  .formFieldState(@infoText, @infoText, @infoText);
 }