浏览代码

HUE-6077 [frontend] Improve importer styling

Johan Ahlen 8 年之前
父节点
当前提交
a676a23

+ 4 - 0
desktop/core/src/desktop/static/desktop/css/wizard.css

@@ -24,6 +24,10 @@
   padding-top: 10px;
 }
 
+.step-indicator-fixed ol {
+  margin: 0;
+}
+
 .vertical-spacer {
   height: 80px;
 }

+ 33 - 39
desktop/core/src/desktop/static/desktop/js/ko.hue-bindings.js

@@ -2950,64 +2950,60 @@
 
   ko.bindingHandlers.filechooser = {
     init: function (element, valueAccessor, allBindingsAccessor, vm) {
-      var self = $(element);
+      var $element = $(element);
       var options = ko.unwrap(allBindingsAccessor());
-      self.attr("autocomplete", "off");
+      $element.attr("autocomplete", "off");
       if (typeof valueAccessor() == "function" || typeof valueAccessor().value == "function") {
-        self.val(valueAccessor().value ? valueAccessor().value(): valueAccessor()());
-        self.data("fullPath", self.val());
-        self.attr("data-original-title", self.val());
+        $element.val(valueAccessor().value ? valueAccessor().value(): valueAccessor()());
+        $element.data("fullPath", $element.val());
+        $element.attr("data-original-title", $element.val());
         if (valueAccessor().displayJustLastBit){
-          var _val = self.val();
-          self.val(_val.split("/")[_val.split("/").length - 1]);
+          var _val = $element.val();
+          $element.val(_val.split("/")[_val.split("/").length - 1]);
         }
-        self.on("blur", function () {
+        $element.on("blur", function () {
           if (valueAccessor().value){
             if (valueAccessor().displayJustLastBit){
-              var _val = self.data("fullPath");
-              valueAccessor().value(_val.substr(0, _val.lastIndexOf("/")) + "/" + self.val());
-            }
-            else {
-              valueAccessor().value(self.val());
+              var _val = $element.data("fullPath");
+              valueAccessor().value(_val.substr(0, _val.lastIndexOf("/")) + "/" + $element.val());
+            } else {
+              valueAccessor().value($element.val());
             }
-            self.data("fullPath", valueAccessor().value());
-          }
-          else {
-            valueAccessor()(self.val());
-            self.data("fullPath", valueAccessor()());
+            $element.data("fullPath", valueAccessor().value());
+          } else {
+            valueAccessor()($element.val());
+            $element.data("fullPath", valueAccessor()());
           }
-          self.attr("data-original-title", self.data("fullPath"));
+          $element.attr("data-original-title", $element.data("fullPath"));
         });
 
         if (options.valueUpdate && options.valueUpdate === 'afterkeydown') {
-          self.on('keyup', function () {
+          $element.on('keyup', function () {
             if (valueAccessor().value){
-              valueAccessor().value(self.val());
-            }
-            else {
-              valueAccessor()(self.val());
+              valueAccessor().value($element.val());
+            } else {
+              valueAccessor()($element.val());
             }
           });
         }
-      }
-      else {
-        self.val(valueAccessor());
-        self.on("blur", function () {
-          valueAccessor(self.val());
+      } else {
+        $element.val(valueAccessor());
+        $element.on("blur", function () {
+          valueAccessor($element.val());
         });
         if (options.valueUpdate && options.valueUpdate === 'afterkeydown') {
-          self.on('keyup', function () {
-            valueAccessor(self.val());
+          $element.on('keyup', function () {
+            valueAccessor($element.val());
           });
         }
       }
 
-      self.after(getFileBrowseButton(self, true, valueAccessor, true, allBindingsAccessor, valueAccessor().isAddon, valueAccessor().isNestedModal, allBindingsAccessor && allBindingsAccessor().filechooserOptions && allBindingsAccessor().filechooserOptions.linkMarkup));
+      $element.after(getFileBrowseButton($element, true, valueAccessor, true, allBindingsAccessor, valueAccessor().isAddon, valueAccessor().isNestedModal, allBindingsAccessor && allBindingsAccessor().filechooserOptions && allBindingsAccessor().filechooserOptions.linkMarkup));
 
       if (allBindingsAccessor && allBindingsAccessor().filechooserOptions && allBindingsAccessor().filechooserOptions.openOnFocus) {
-        self.on('focus', function () {
-          if (self.val() === '') {
-            self.siblings('.filechooser-clickable').click();
+        $element.on('focus', function () {
+          if ($element.val() === '') {
+            $element.siblings('.filechooser-clickable').click();
           }
         });
       }
@@ -3019,11 +3015,9 @@
     var _btn;
     if (isAddon) {
       _btn = $("<span>").addClass("add-on muted pointer filechooser-clickable").text("..");
-    }
-    else if (linkMarkup) {
+    } else if (linkMarkup) {
       _btn = $("<a>").addClass("btn").addClass("fileChooserBtn filechooser-clickable").text("..");
-    }
-    else {
+    } else {
       _btn = $("<button>").addClass("btn").addClass("fileChooserBtn filechooser-clickable").text("..");
     }
     _btn.click(function (e) {

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

@@ -46,6 +46,7 @@ ${layout.menubar(section='log_view')}
   #logs {
     overflow: auto;
     background-color: #F5F5F5;
+    width: 100%;
   }
 
   #logs pre:first-child {

+ 1 - 5
desktop/libs/indexer/src/indexer/templates/importer.mako

@@ -227,10 +227,6 @@ ${ assist.assistPanel() }
     margin-bottom: 100px;
   }
 
-  .fileChooserBtn {
-    height: 29px;
-  }
-
   .form-control.path {
     vertical-align: top;
   }
@@ -402,7 +398,7 @@ ${ assist.assistPanel() }
             <label for="sourceType" class="control-label">${ _('No source is needed for creating a database.') }</label>
           </div>
 
-          <div class="control-group" data-bind="visible: createWizard.source.inputFormat() == 'file'">
+          <div class="control-group input-append" data-bind="visible: createWizard.source.inputFormat() == 'file'">
             <label for="path" class="control-label"><div>${ _('Path') }</div>
               <input type="text" class="form-control path input-xxlarge" data-bind="value: createWizard.source.path, filechooser: createWizard.source.path, filechooserOptions: { linkMarkup: true, skipInitialPathIfEmpty: true, openOnFocus: true, selectFolder: false }" placeholder="${ _('Click or drag from the assist') }">
             </label>