瀏覽代碼

HUE-6530 [jb] Bring back the expand button in the JB mini

Enrico Berti 8 年之前
父節點
當前提交
4765a34

+ 13 - 1
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -2234,6 +2234,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
       huePubSub.subscribe('app.gained.focus', function (app) {
         if (app === 'jobbrowser') {
           huePubSub.publish('graph.draw.arrows');
+          loadHash();
         }
       }, 'jobbrowser');
 
@@ -2262,9 +2263,20 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
           jobBrowserViewModel.job().updateJob();
         }, 'jobbrowser');
       % else:
-        huePubSub.subscribe('mini.jb.navigate', function(interface){
+        huePubSub.subscribe('mini.jb.navigate', function (interface) {
+          $('#jobsPanel .nav-pills li').removeClass('active');
+          interface = jobBrowserViewModel.isValidInterface(interface);
+          $('#jobsPanel .nav-pills li[data-interface="' + interface + '"]').addClass('active');
           jobBrowserViewModel.selectInterface(interface);
         });
+        huePubSub.subscribe('mini.jb.expand', function () {
+          if (jobBrowserViewModel.job()) {
+            huePubSub.publish('open.link', '/jobbrowser/#!id=' + jobBrowserViewModel.job().id());
+          }
+          else {
+            huePubSub.publish('open.link', '/jobbrowser/#!' + jobBrowserViewModel.interface());
+          }
+        });
       % endif
 
       $(document).on('shown', '.jb-logs-link', function (e) {

+ 4 - 3
desktop/core/src/desktop/templates/hue.mako

@@ -277,10 +277,11 @@ ${ hueIcons.symbols() }
 
   <div id="jobsPanel" class="jobs-panel" style="display: none;">
     <a class="pointer inactive-action pull-right" onclick="huePubSub.publish('hide.jobs.panel')"><i class="fa fa-fw fa-times"></i></a>
+    <a class="pointer inactive-action pull-right" onclick="huePubSub.publish('mini.jb.expand'); huePubSub.publish('hide.jobs.panel')"><i class="fa fa-fw fa-expand" title="${ _('Open Job Browser') }"></i></a>
     <ul class="nav nav-pills" class="inline">
-      <li><a href="javascript:void(0)" onclick="huePubSub.publish('mini.jb.navigate', 'jobs')">${_('Jobs')}</a></li>
-      <li><a href="javascript:void(0)" onclick="huePubSub.publish('mini.jb.navigate', 'workflows')" data-bind="click: ">${_('Workflows')}</a></li>
-      <li><a href="javascript:void(0)" onclick="huePubSub.publish('mini.jb.navigate', 'schedules')" data-bind="click: ">${_('Schedules')}</a></li>
+      <li class="active" data-interface="jobs"><a href="javascript:void(0)" onclick="huePubSub.publish('mini.jb.navigate', 'jobs')">${_('Jobs')}</a></li>
+      <li data-interface="workflows"><a href="javascript:void(0)" onclick="huePubSub.publish('mini.jb.navigate', 'workflows')">${_('Workflows')}</a></li>
+      <li data-interface="schedules"><a href="javascript:void(0)" onclick="huePubSub.publish('mini.jb.navigate', 'schedules')">${_('Schedules')}</a></li>
     </ul>
     <div id="mini_jobbrowser"></div>
   </div>