瀏覽代碼

HUE-1861 [oozie] Forks can't be created anymore in a workflow

CSS class misplaced
Fixed new action drag cursor
Enrico Berti 12 年之前
父節點
當前提交
045a046
共有 2 個文件被更改,包括 32 次插入14 次删除
  1. 6 6
      apps/oozie/src/oozie/templates/editor/edit_workflow.mako
  2. 26 8
      apps/oozie/static/css/workflow.css

+ 6 - 6
apps/oozie/src/oozie/templates/editor/edit_workflow.mako

@@ -452,7 +452,7 @@ ${ controls.decision_form(node_form, link_form, default_link_form, 'decision', T
 <script type="text/html" id="emptyTemplate"></script>
 
 <script type="text/html" id="disabledNodeTemplate">
-  <div class="node node-control action row-fluid">
+  <div class="node node-control row-fluid editor-action">
     <!-- ko if: node_type() == 'start' -->
       <ul class="nav nav-tabs" style="margin-bottom:0">
         <li class="active"><a data-toggle="tab" style="line-height:10px;background-color: #F9F9F9;"><i style="color:#DDD" class="fa fa-thumbs-up"></i> &nbsp;
@@ -460,12 +460,12 @@ ${ controls.decision_form(node_form, link_form, default_link_form, 'decision', T
         </li>
       </ul>
       <div class="row-fluid">
-        <div class="span12 gradient" style="border:0"></div>
+        <div class="span12 action gradient" style="border:0"></div>
       </div>
     <!-- /ko -->
     <!-- ko if: node_type() == 'end' -->
       <div class="row-fluid">
-        <div class="span12 inverse_gradient" style="border:0"></div>
+        <div class="span12 action inverse_gradient" style="border:0"></div>
       </div>
       <div class="tabbable tabs-below">
         <ul class="nav nav-tabs" style="margin-bottom:0">
@@ -482,7 +482,7 @@ ${ controls.decision_form(node_form, link_form, default_link_form, 'decision', T
 </script>
 
 <script type="text/html" id="nodeTemplate">
-  <div class="node node-action row-fluid action">
+  <div class="node node-action row-fluid editor-action">
     <ul class="nav nav-tabs" style="margin-bottom:0">
       <li class="active"><a data-toggle="tab" style="line-height:10px;background-color: #F9F9F9;"><i style="color:#DDD" class="fa fa-cogs"></i> &nbsp;
         <strong style="color:#999" data-bind="text: node_type"></strong>
@@ -493,7 +493,7 @@ ${ controls.decision_form(node_form, link_form, default_link_form, 'decision', T
       </li>
     </ul>
     <div class="row-fluid">
-      <div class="span12" style="text-align:left; padding:10px;border:1px solid #DDD; border-top:0">
+      <div class="span12 action editor-action-body">
         <div class="pull-right" style="font-size: 30px; margin-top:14px; cursor:pointer"><a class="edit-node-link" title="${ _('Edit') }" relz="tooltip" data-bind="attr: { 'data-node-type': node_type() }"><i class="fa fa-pencil"></i></a></div>
         <h4 data-bind="text: (name()) ? name() : node_type() + '-' + id()"></h4>
         <div class="node-description muted" data-bind="text: description()"></div>
@@ -725,7 +725,7 @@ workflow.el.on('mousedown', '.new-node-link', function(e) {
 
   // Trigger fake mousedown event to start dragging node.
   var is_dirty = workflow.is_dirty();
-  el.offset({ top: e.pageY - el.height()/10, left: e.pageX - el.width()/10 });
+  el.offset({ top: e.pageY - el.height()/2, left: e.pageX - el.width()/10 });
   el.trigger($.Event("mousedown", {pageX: e.pageX, pageY: e.pageY, target: el[0], which: 1}));
 
   var cancel_edit = function(e) {

+ 26 - 8
apps/oozie/static/css/workflow.css

@@ -41,15 +41,12 @@ ul {
     margin-left: 0;
 }
 
-.action {
+.action, .editor-action {
   border: 0!important;
   padding: 0;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
 }
 
-.action h4 {
+.action h4, .editor-action h4 {
   margin-bottom: 1px;
 }
 
@@ -159,18 +156,32 @@ ul {
   cursor: pointer;
 }
 
-.action > .nav-tabs > li, .action > .nav-pills > li, .action > .tabs-below > .nav-tabs > li, .action > .tabs-below > .nav-pills > li {
+.action > .nav-tabs > li,
+.action > .nav-pills > li,
+.action > .tabs-below > .nav-tabs > li,
+.action > .tabs-below > .nav-pills > li,
+.editor-action > .nav-tabs > li,
+.editor-action > .nav-pills > li,
+.editor-action > .tabs-below > .nav-tabs > li,
+.editor-action > .tabs-below > .nav-pills > li {
     float:none;
     display:inline-block;
     *display:inline; /* ie7 fix */
      zoom:1; /* hasLayout ie7 trigger */
 }
 
-.action > .nav-tabs, .action > .nav-pills, .action > .tabs-below > .nav-tabs, .action > .tabs-below > .nav-pills {
+.action > .nav-tabs,
+.action > .nav-pills,
+.action > .tabs-below > .nav-tabs,
+.action > .tabs-below > .nav-pills,
+.editor-action > .nav-tabs,
+.editor-action > .nav-pills,
+.editor-action > .tabs-below > .nav-tabs,
+.editor-action > .tabs-below > .nav-pills {
     text-align:center;
 }
 
-.action .btn-mini i {
+.action .btn-mini i, .editor-action .btn-mini i {
   line-height: 18px!important;
 }
 
@@ -198,4 +209,11 @@ ul {
   background: -ms-linear-gradient(top,  #ffffff 0%,#f9f9f9 100%); /* IE10+ */
   background: linear-gradient(to bottom,  #ffffff 0%,#f9f9f9 100%); /* W3C */
   filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#f9f9f9',GradientType=0 ); /* IE6-8 */
+}
+
+.editor-action-body {
+  text-align:left;
+  padding:10px;
+  border:1px solid #DDD!important;
+  border-top:0!important;
 }