瀏覽代碼

HUE-1176 [jb] Shortened breadcrumbs

Enrico Berti 8 年之前
父節點
當前提交
98d3d1f

+ 27 - 7
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -95,6 +95,10 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
     color: #CCC;
     padding-right: 12px;
   }
+
+  #jobbrowserComponents .app-icon {
+    vertical-align: text-top;
+  }
 </style>
 
 <div class="navbar navbar-inverse navbar-fixed-top">
@@ -244,9 +248,26 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
 </div>
 
 
+<script type="text/html" id="breadcrumbs-icons">
+<!-- ko switch: type -->
+  <!-- ko case: 'workflow' -->
+    <img src="${ static('oozie/art/icon_oozie_workflow_48.png') }" class="app-icon"/>
+  <!-- /ko -->
+  <!-- ko case: 'workflow-action' -->
+    <i class="fa fa-fw fa-code-fork"></i>
+  <!-- /ko -->
+  <!-- ko case: 'schedule' -->
+    <img src="${ static('oozie/art/icon_oozie_coordinator_48.png') }" class="app-icon"/>
+  <!-- /ko -->
+  <!-- ko case: 'bundle' -->
+    <img src="${ static('oozie/art/icon_oozie_bundle_48.png') }" class="app-icon"/>
+  <!-- /ko -->
+<!-- /ko -->
+</script>
+
 <script type="text/html" id="breadcrumbs">
   <h3>
-    <ul class="nav nav-pills hueBreadcrumbBar" data-bind="foreach: breadcrumbs">
+    <ul class="inline hueBreadcrumbBar" data-bind="foreach: breadcrumbs">
       <li>
       <!-- ko if: $index() > 0 -->
         <span class="divider">&gt;</span>
@@ -257,14 +278,13 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
       <!-- /ko -->
       <!-- ko if: $index() != 0 -->
         <!-- ko if: $index() != $parent.breadcrumbs().length - 1 -->
-          <a href="javascript:void(0)" data-bind="text: type, click: function() { $parent.breadcrumbs.splice($index()); $root.job().id(id); $root.job().fetchJob(); }"></a>
-          :
-          <a href="javascript:void(0)" data-bind="text: id, click: function() { $parent.breadcrumbs.splice($index()); $root.job().id(id); $root.job().fetchJob(); }"></a>
+          <a href="javascript:void(0)" data-bind="click: function() { $parent.breadcrumbs.splice($index()); $root.job().id(id); $root.job().fetchJob(); }">
+          <span data-bind="template: 'breadcrumbs-icons'"></span>
+          <span data-bind="text: id"></span></a>
         <!-- /ko -->
         <!-- ko if: $index() == $parent.breadcrumbs().length - 1 -->
-          <span data-bind="text: type"></span>
-          :
-          <span data-bind="text: id"></span>
+          <span data-bind="template: 'breadcrumbs-icons'"></span>
+          <span data-bind="text: id, attr: {title: id}"></span>
         <!-- /ko -->
       <!-- /ko -->
       </li>

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

@@ -143,6 +143,7 @@ if USE_NEW_EDITOR.get():
   <script src="${ static('desktop/ext/js/knockout.min.js') }"></script>
   <script src="${ static('desktop/ext/js/knockout-mapping.min.js') }"></script>
   <script src="${ static('desktop/ext/js/knockout.validation.min.js') }"></script>
+  <script src="${ static('desktop/js/ko.switch-case.js') }"></script>
   <script src="${ static('desktop/js/ko.hue-bindings.js') }"></script>
 
   ${ koComponents.all() }

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

@@ -27,7 +27,6 @@
   <script src="${ static('desktop/js/apiHelper.js') }"></script>
   <script src="${ static('desktop/ext/js/knockout-sortable.min.js') }"></script>
   <script src="${ static('desktop/js/ko.editable.js') }"></script>
-  <script src="${ static('desktop/js/ko.switch-case.js') }"></script>
   <script src="${ static('desktop/js/jquery.huedatatable.js') }"></script>
   <script src="${ static('desktop/ext/js/jquery/plugins/jquery.mousewheel.min.js') }"></script>
   <script src="${ static('desktop/ext/js/jquery.mCustomScrollbar.concat.min.js') }"></script>

+ 0 - 1
desktop/libs/notebook/src/notebook/templates/editor_components.mako

@@ -60,7 +60,6 @@ from notebook.conf import ENABLE_QUERY_BUILDER, ENABLE_QUERY_SCHEDULING, ENABLE_
 % endif
 
 <script src="${ static('desktop/js/ko.selectize.js') }"></script>
-<script src="${ static('desktop/js/ko.switch-case.js') }"></script>
 <script src="${ static('desktop/js/sqlFunctions.js') }"></script>
 <script src="${ static('desktop/js/autocomplete/sql.js') }"></script>
 <script src="${ static('desktop/js/sqlAutocompleter.js') }"></script>