Explorar o código

HUE-1530 [oozie] Improve re-run dialogs

Better style for the popups
Re-styled jHueSelector
Enrico Berti %!s(int64=12) %!d(string=hai) anos
pai
achega
6449b8c67c

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

@@ -33,7 +33,7 @@ ${ layout.menubar(section='dashboard') }
 <div class="row-fluid">
   <div class="span2">
     <div class="sidebar-nav">
-      <ul class="nav nav-list">
+      <ul class="nav nav-list" style="border:none">
         <li class="nav-header">${ _('Bundle') }</li>
         % if bundle is not None:
         <li><a href="${ bundle.get_absolute_url() }">${ oozie_bundle.appName }</a></li>

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -33,7 +33,7 @@ ${ layout.menubar(section='dashboard') }
 <div class="row-fluid">
   <div class="span2">
     <div class="sidebar-nav">
-      <ul class="nav nav-list">
+      <ul class="nav nav-list" style="border:none">
         <li class="nav-header">${ _('Coordinator') }</li>
         % if coordinator is not None:
         <li><a href="${ coordinator.get_absolute_url() }">${ oozie_coordinator.appName }</a></li>

+ 1 - 4
apps/oozie/src/oozie/templates/dashboard/rerun_bundle_popup.mako

@@ -25,16 +25,13 @@
 <form action="${ action }" method="POST">
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
-    <h2>${ _('Rerun this job?') }</h2>
+    <h3>${ _('Select coordinators to rerun') }</h3>
   </div>
 
   <div class="modal-body">
     <fieldset>
       <div id="config-container">
         <div class="fieldWrapper">
-          <div class="row-fluid">
-            <h3>${ _('Select coordinators to rerun') }</h3>
-          </div>
           <div class="row-fluid">
             ${ utils.render_field(rerun_form['coordinators'], show_label=False) }
           </div>

+ 1 - 4
apps/oozie/src/oozie/templates/dashboard/rerun_coord_popup.mako

@@ -25,16 +25,13 @@
 <form action="${ action }" method="POST">
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
-    <h2>${ _('Rerun this job?') }</h2>
+    <h3>${ _('Select actions to rerun') }</h3>
   </div>
 
   <div class="modal-body">
     <fieldset>
       <div id="config-container">
         <div class="fieldWrapper">
-          <div class="row-fluid">
-            <h3>${ _('Select actions to rerun') }</h3>
-          </div>
           <div class="row-fluid">
             ${ utils.render_field(rerun_form['actions'], show_label=False) }
           </div>

+ 9 - 10
apps/oozie/src/oozie/templates/dashboard/rerun_job_popup.mako

@@ -26,23 +26,22 @@
 
   <div class="modal-header">
     <a href="#" class="close" data-dismiss="modal">&times;</a>
-    <h2>${ _('Rerun this job?') }</h2>
+    <h3>${ _('Select actions to rerun') }</h3>
   </div>
 
   <div class="modal-body">
     <fieldset>
       <div id="config-container">
-        <h3>${ _('Select actions to rerun') }</h3>
           <div class="fieldWrapper">
             <div class="row-fluid">
-              <div class="span6">
-                <input type="radio" name="rerun_form_choice" value="skip_nodes" id="skip_nodes" checked>
-                  ${ _('All or skip successful') }
+              <div class="span8">
+                <label class="radio" style="padding-left: 24px; margin-bottom: 10px"><input type="radio" name="rerun_form_choice" value="skip_nodes" id="skip_nodes" checked>
+                  ${ _('All or skip successful') }</label>
                   ${ utils.render_field(rerun_form['skip_nodes'], show_label=False) }
                 </div>
-              <div class="span6">
-                <input type="radio" name="rerun_form_choice" value="fail_nodes" id="fail_nodes">
-                ${ _('Only failed') }
+              <div class="span4">
+                <label class="radio"><input type="radio" name="rerun_form_choice" value="fail_nodes" id="fail_nodes">
+                ${ _('Only failed') }</label>
               </div>
             </div>
           </div>
@@ -91,8 +90,8 @@
             selectAllLabel: "${_('Select all')}",
             searchPlaceholder: "${_('Search')}",
             noChoicesFound: "${_('No successful actions found.')}",
-            width:250,
-            height:100
+            width:350,
+            height:150
         });
     });
 </script>

+ 6 - 4
desktop/core/static/css/hue3.css

@@ -900,14 +900,14 @@ div.box {
  */
 
 .jHueSelector {
-  border: 1px solid #CCC;
+  border: 1px solid #F1F1F1;
   padding: 0;
   margin: 0;
   width: 300px;
 }
 
 .jHueSelectorHeader {
-  background-color: #CCC;
+  background-color: #F1F1F1;
   padding: 4px;
 }
 
@@ -926,7 +926,8 @@ div.box {
   position: absolute;
   margin-left: 180px;
   width: 100px;
-  height: 11px;
+  height: 20px;
+  min-height: 20px;
   border: 1px solid #CCCCCC;
   border-radius: 10px;
   -webkit-border-radius: 10px;
@@ -952,8 +953,9 @@ div.box {
 }
 
 .jHueSelector li.selectorDivider {
-  background-color: #EEE;
+  border-bottom: 1px solid #E5E5E5;
   padding: 4px;
+  color: #338BB8;
 }
 
 .modal-body iframe {