Răsfoiți Sursa

HUE-897 Ported Sqoop2 app to Hue 3

Enrico Berti 12 ani în urmă
părinte
comite
73fbe8d

+ 14 - 6
apps/sqoop/src/sqoop/templates/app.mako

@@ -91,16 +91,18 @@ ${ commonheader(None, "sqoop", user, "40px") | n,unicode }
           </li>
           <!-- /ko -->
         </ul>
-
-        <div class="span10 offset1 center" data-bind="if: filteredJobs().length == 0">
-          <i class="icon-plus-sign waiting"></i>
-          <h1 class="emptyMessage">${ _('There are currently no jobs.') }<br/>${ _('Please click on New Job to add one.') }</h1>
+        <div class="card" data-bind="visible: filteredJobs().length == 0">
+          <div class="span10 offset1 center nojobs">
+            <i class="icon-plus-sign waiting"></i>
+            <h1 class="emptyMessage">${ _('There are currently no jobs.') }<br/><a href="#job/new">${ _('Click here to add one.') }</a></h1>
+          </div>
+          <div class="clearfix"></div>
         </div>
       </div>
     </div>
 
     <div id="job-editor" class="row-fluid section hide" data-bind="with: job">
-      <div class="well sidebar-nav span2" data-bind="visible: $root.job().persisted">
+      <div class="sidebar-nav span2" data-bind="visible: $root.job().persisted">
         <form id="advanced-settings" method="POST" class="form form-horizontal noPadding">
           <ul class="nav nav-list">
             <li class="nav-header" data-bind="visible: $root.job().persisted">${_('Actions')}</li>
@@ -141,7 +143,7 @@ ${ commonheader(None, "sqoop", user, "40px") | n,unicode }
                 ${_('Logs')}
               </a>
             </li>
-            <li class="nav-header" data-bind="visible: $root.job().persisted">${_('Last status')}</li>
+            <li class="nav-header" data-bind="visible: $root.job().persisted && $.inArray(submission().status(), ['BOOTING', 'RUNNING', 'UNKNOWN', 'SUCCEEDED', 'FAILURE_ON_SUBMIT', 'FAILED']) > -1">${_('Last status')}</li>
             <li data-bind="visible: $root.job().persisted">
               <span class="label label-success" data-bind="visible: submission().status() == 'SUCCEEDED'">
                 <span data-bind="text:  submission().createdFormatted()"></span>
@@ -163,6 +165,7 @@ ${ commonheader(None, "sqoop", user, "40px") | n,unicode }
       </div>
 
       <div id="job-forms" data-bind="css: {span10: $root.job().persisted, span12: !$root.job().persisted}">
+        <div class="card">
         <!-- ko if: $root.jobWizard.page -->
           <!-- ko with: $root.jobWizard -->
           <ul class="nav nav-pills" data-bind="foreach: pages">
@@ -193,6 +196,7 @@ ${ commonheader(None, "sqoop", user, "40px") | n,unicode }
           </form>
           <!-- /ko -->
         <!-- /ko -->
+          </div>
       </div>
     </div>
 
@@ -1083,6 +1087,10 @@ $(document).ready(function () {
     }
   });
 
+  $(".nojobs").on("click", function(){
+    routie("job/new");
+  });
+
   $("*[rel=tooltip]").tooltip({
     placement: 'right'
   });

+ 6 - 1
apps/sqoop/static/css/sqoop.css

@@ -32,6 +32,7 @@ ul.major-list li {
   border: 1px solid #E3E3E3;
   height: 60px;
   margin-bottom: 10px;
+  background-color: #FFFFFF;
 }
 
 ul.major-list li div.main {
@@ -78,6 +79,7 @@ h1.emptyMessage {
   padding: 10px 20px;
   text-align: left;
   height: 30px;
+  margin-top: 10px;
 }
 
 .top-bar h4 {
@@ -96,7 +98,6 @@ h1.emptyMessage {
 }
 
 .job-form {
-  margin-bottom: 80px;
   min-height: 300px;
 }
 
@@ -127,4 +128,8 @@ h1.emptyMessage {
 
 .big-btn i{
   font-size: 40px;
+}
+
+.nojobs {
+  cursor: pointer;
 }

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

@@ -18,6 +18,6 @@ from django.utils.translation import ugettext as _
 %>
 % if error_list:
   <a href="${url('about:index')}" title="${_('Misconfiguration detected')}" alt="${_('Misconfiguration detected')}">
-    <i class="icon-warning-sign" style="color:#3189C1"></i>
+    <i class="icon-warning-sign" style="color:#B94A48"></i>
   </a>
 % endif