浏览代码

HUE-5853 [oozie] Make info page embeddable

Enrico Berti 8 年之前
父节点
当前提交
8044d83

+ 6 - 7
apps/oozie/src/oozie/templates/dashboard/list_oozie_info.mako

@@ -22,7 +22,9 @@
 <%namespace name="layout" file="../navigation-bar.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />
 
+%if not is_embeddable:
 ${ commonheader(_("Oozie Information"), "oozie", user, request) | n,unicode }
+%endif
 ${ layout.menubar(section='oozie', dashboard=True) }
 
 
@@ -30,7 +32,6 @@ ${ layout.menubar(section='oozie', dashboard=True) }
 
   <div class="card card-small">
   <div class="card-body">
-  <p>
 
   <h1 class="card-heading card-heading-noborder simple pull-right" style="margin-top: -4px;">
   ${ _('Oozie status') }
@@ -77,12 +78,8 @@ ${ layout.menubar(section='oozie', dashboard=True) }
             " id="${ category }">
 
               % for index, group in enumerate(instrumentation[category]):
-                <p class="nav-header">${ group['group'] }</p>
+              <div class="nav-header">${ group['group'] }</div>
               <table id="intrumentationTable-${ category }-${ index }" class="table table-striped table-condensed">
-                <thead>
-                <th></th>
-                <th></th>
-                </thead>
               <tbody>
                 % for item in group['data']:
                 <tr>
@@ -214,10 +211,10 @@ ${ layout.menubar(section='oozie', dashboard=True) }
       <a href="${ url('oozie:list_oozie_bundles') }" class="btn">${ _('Back') }</a>
     </div>
 
-    </p>
     </div>
     </div>
   </div>
+</div>
 
 <script>
   $(document).ready(function(){
@@ -307,4 +304,6 @@ ${ layout.menubar(section='oozie', dashboard=True) }
   });
 </script>
 
+%if not is_embeddable:
 ${ commonfooter(request, messages) | n,unicode }
+%endif

+ 1 - 0
apps/oozie/src/oozie/views/dashboard.py

@@ -614,6 +614,7 @@ def list_oozie_info(request):
     'metrics': metrics,
     'configuration': configuration,
     'oozie_status': oozie_status,
+    'is_embeddable': request.GET.get('is_embeddable', False),
   })
 
 

+ 6 - 0
desktop/core/src/desktop/templates/hue.mako

@@ -270,6 +270,7 @@ ${ hueIcons.symbols() }
       <div id="embeddable_oozie_workflow" class="embeddable"></div>
       <div id="embeddable_oozie_coordinator" class="embeddable"></div>
       <div id="embeddable_oozie_bundle" class="embeddable"></div>
+      <div id="embeddable_oozie_info" class="embeddable"></div>
       <div id="embeddable_jobbrowser" class="embeddable"></div>
       <div id="embeddable_filebrowser" class="embeddable"></div>
       <div id="embeddable_home" class="embeddable"></div>
@@ -470,6 +471,7 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
         oozie_workflow: '/oozie/editor/workflow/*',
         oozie_coordinator: '/oozie/editor/coordinator/*',
         oozie_bundle: '/oozie/editor/bundle/*',
+        oozie_info: '/oozie/list_oozie_info',
         jobbrowser: '/jobbrowser/apps',
         filebrowser: '/filebrowser/view=*',
         home: '/home*',
@@ -792,6 +794,10 @@ ${ smart_unicode(login_modal(request).content) | n,unicode }
             page('/home?type=oozie-workflow');
           }},
           { url: '/oozie/editor/workflow/*', app: 'oozie_workflow' },
+          { url: '/oozie/list_oozie_info', app: 'oozie_info' },
+          { url: '/oozie/list_oozie_sla', app: function() {
+            page.redirect('/jobbrowser/#!slas');
+          }},
           { url: '/pig', app: function () {
             self.loadApp('editor');
             self.changeEditorType('pig');