Преглед на файлове

HUE-2352 [oozie] Manage buttons on the single coordinator page stack up weirdly on smaller screens

Added margin
Added empty datasets message
Enrico Berti преди 11 години
родител
ревизия
1720ade5da

+ 4 - 4
apps/oozie/src/oozie/templates/dashboard/list_oozie_bundle.mako

@@ -87,7 +87,7 @@ ${ layout.menubar(section='bundles', dashboard=True) }
               href="javascript:void(0)"
               data-url="${ url('oozie:manage_oozie_jobs', job_id=oozie_bundle.id, action='kill') }"
               data-message="${ _('The bundle was killed!') }"
-              data-confirmation-message="${ _('Are you sure you\'d like to kill this job?') }">
+              data-confirmation-message="${ _('Are you sure you\'d like to kill this job?') }" style="margin-bottom: 5px">
                 ${_('Kill')}
             </button>
             <button class="btn btn-small
@@ -97,7 +97,7 @@ ${ layout.menubar(section='bundles', dashboard=True) }
             "
               id="rerun-btn"
               data-rerun-url="${ url('oozie:rerun_oozie_bundle', job_id=oozie_bundle.id, app_path=oozie_bundle.bundleJobPath) }"
-            >
+            style="margin-bottom: 5px">
               ${ _('Rerun') }
             </button>
             <div id="rerun-coord-modal" class="modal hide"></div>
@@ -108,7 +108,7 @@ ${ layout.menubar(section='bundles', dashboard=True) }
                % if not oozie_bundle.is_running():
                  hide
                % endif
-               " rel="tooltip" data-placement="right">
+               " rel="tooltip" data-placement="right" style="margin-bottom: 5px">
               ${ _('Suspend') }
             </button>
             <button title="${ _('Resume the bundle') }" id="resume-btn"
@@ -118,7 +118,7 @@ ${ layout.menubar(section='bundles', dashboard=True) }
                % if oozie_bundle.is_running():
                  hide
                % endif
-               ">
+               " style="margin-bottom: 5px">
               ${ _('Resume') }
             </button>
           </li>

+ 7 - 4
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -73,6 +73,9 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
           % for dataset in coordinator.dataset_set.all():
             <li rel="tooltip" title="${ dataset.name } : ${ dataset.uri }" class="white"><i class="fa fa-eye"></i> <span class="dataset">${ dataset.name }</span></li>
           % endfor
+          % if not coordinator.dataset_set.all():
+            <li class="white">${ _('No available datasets') }</li>
+          % endif
         % endif
 
         % if has_job_edition_permission(oozie_coordinator, user):
@@ -89,7 +92,7 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
               href="javascript:void(0)"
               data-url="${ url('oozie:manage_oozie_jobs', job_id=oozie_coordinator.id, action='kill') }"
               data-message="${ _('The coordinator was killed!') }"
-              data-confirmation-message="${ _('Are you sure you\'d like to kill this job?') }">
+              data-confirmation-message="${ _('Are you sure you\'d like to kill this job?') }" style="margin-bottom: 5px">
                 ${_('Kill')}
             </button>
             <button class="btn btn-small
@@ -99,7 +102,7 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
             "
               id="rerun-btn"
               data-rerun-url="${ url('oozie:rerun_oozie_coord', job_id=oozie_coordinator.id, app_path=oozie_coordinator.coordJobPath) }"
-            >
+            style="margin-bottom: 5px">
               ${ _('Rerun') }
             </button>
             <div id="rerun-coord-modal" class="modal hide"></div>
@@ -110,7 +113,7 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
                % if not oozie_coordinator.is_running():
                  hide
                % endif
-               " rel="tooltip" data-placement="right">
+               " rel="tooltip" data-placement="right" style="margin-bottom: 5px">
               ${ _('Suspend') }
             </button>
             <button title="${ _('Resume the coordinator') }" id="resume-btn"
@@ -120,7 +123,7 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
                % if oozie_coordinator.is_running():
                  hide
                % endif
-               ">
+               " style="margin-bottom: 5px">
               ${ _('Resume') }
             </button>
           </li>

+ 4 - 4
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -94,7 +94,7 @@ ${ layout.menubar(section='workflows', dashboard=True) }
                    href="javascript:void(0)"
                    data-url="${ url('oozie:manage_oozie_jobs', job_id=oozie_workflow.id, action='kill') }"
                    data-message="${ _('The workflow was killed.') }"
-                   data-confirmation-message="${ _('Are you sure you\'d like to kill this job?') }">
+                   data-confirmation-message="${ _('Are you sure you\'d like to kill this job?') }" style="margin-bottom: 5px">
                 ${_('Kill')}
                 </button>
                 <button title="${ _('Suspend the workflow after finishing the current running actions') }" id="suspend-btn"
@@ -104,7 +104,7 @@ ${ layout.menubar(section='workflows', dashboard=True) }
                    % if not oozie_workflow.is_running():
                      hide
                    % endif
-                   " rel="tooltip" data-placement="right">
+                   " rel="tooltip" data-placement="right" style="margin-bottom: 5px">
                   ${ _('Suspend') }
                 </button>
                 <button title="${ _('Resume the workflow') }" id="resume-btn"
@@ -114,7 +114,7 @@ ${ layout.menubar(section='workflows', dashboard=True) }
                    % if oozie_workflow.is_running():
                      hide
                    % endif
-                   ">
+                   " style="margin-bottom: 5px">
                   ${ _('Resume') }
                 </button>
                 <button title="${ _('Rerun the same workflow') }" id="rerun-btn"
@@ -123,7 +123,7 @@ ${ layout.menubar(section='workflows', dashboard=True) }
                    % if oozie_workflow.is_running():
                      hide
                    % endif
-                   ">
+                   " style="margin-bottom: 5px">
                   ${ _('Rerun') }
                 </button>
                 <div id="rerun-wf-modal" class="modal hide"></div>