Browse Source

[oozie] Reorganized CSS

Enrico Berti 11 years ago
parent
commit
ac835d5

+ 5 - 8
apps/oozie/src/oozie/templates/editor/workflow_editor.mako

@@ -482,10 +482,11 @@ ${ commonheader(_("Workflow Editor"), "Oozie", user, "40px") | n,unicode }
 <script type="text/html" id="kill-widget">
 <script type="text/html" id="kill-widget">
   <!-- ko if: $root.workflow.getNodeById(id()) -->
   <!-- ko if: $root.workflow.getNodeById(id()) -->
   <div class="row-fluid" data-bind="with: $root.workflow.getNodeById(id())" style="min-height: 40px">
   <div class="row-fluid" data-bind="with: $root.workflow.getNodeById(id())" style="min-height: 40px">
-    <div class="big-icon" data-bind="visible: id() == '17c9c895-5a16-7443-bb81-f34b30b21548'"><i class="fa fa-thumbs-o-down"></i></div>
+    <div class="big-icon" data-bind="visible: id() == '17c9c895-5a16-7443-bb81-f34b30b21548'"><i class="fa fa-stop"></i></div>
 
 
-    <div>
-      <input type="text" class="input-xxlarge" data-bind="value: properties.message" />
+    <div data-bind="visible: $root.isEditing()" style="padding: 10px">
+      <h6 class="field-title">${ _('Message') }</h6>
+      <textarea class="span12" data-bind="value: properties.message" />
     </div>
     </div>
   </div>
   </div>
   <!-- /ko -->
   <!-- /ko -->
@@ -623,9 +624,7 @@ ${ commonheader(_("Workflow Editor"), "Oozie", user, "40px") | n,unicode }
 
 
 
 
 <script type="text/html" id="common-action-sla">
 <script type="text/html" id="common-action-sla">
-  <div class="control-group">
-    <label class="control-label">${ _('SLA Configuration') }</label>
-    <div class="controls" data-bind="with: properties">
+    <div data-bind="with: properties">
       ${ utils.slaForm() }
       ${ utils.slaForm() }
     </div>
     </div>
   </div>
   </div>
@@ -942,8 +941,6 @@ ${ commonheader(_("Workflow Editor"), "Oozie", user, "40px") | n,unicode }
   <div class="row-fluid" data-bind="with: $root.workflow.getNodeById(id())" style="padding: 10px">
   <div class="row-fluid" data-bind="with: $root.workflow.getNodeById(id())" style="padding: 10px">
     <div data-bind="visible: $root.isEditing" style="margin-bottom: 20px">
     <div data-bind="visible: $root.isEditing" style="margin-bottom: 20px">
       <div data-bind="visible: ! $parent.oozieExpanded()">
       <div data-bind="visible: ! $parent.oozieExpanded()">
-        <span data-bind="text: $root.workflow_properties.workflow.label"></span>
-        <input type="text" data-bind="value: properties.workflow" />
         <select data-bind="options: $root.addActionWorkflows, optionsText: 'name', value: properties.selectedSubWorkflow"></select>
         <select data-bind="options: $root.addActionWorkflows, optionsText: 'name', value: properties.selectedSubWorkflow"></select>
       </div>
       </div>
     </div>
     </div>

+ 33 - 17
apps/oozie/static/css/workflow-editor.css

@@ -292,7 +292,7 @@ em {
 }
 }
 
 
 #emptyDashboard {
 #emptyDashboard {
-  right: 70px!important;
+  right: 70px !important;
 }
 }
 
 
 .drop-target {
 .drop-target {
@@ -332,14 +332,13 @@ em {
 }
 }
 
 
 .readonly .card-widget {
 .readonly .card-widget {
-  border: 1px solid #d8d8d8!important;
+  border: 1px solid #d8d8d8 !important;
 }
 }
 
 
 .row-fluid [class*="span"] {
 .row-fluid [class*="span"] {
   margin-left: 0.5%;
   margin-left: 0.5%;
 }
 }
 
 
-
 .row-fluid .span10 {
 .row-fluid .span10 {
   width: 90%;
   width: 90%;
 }
 }
@@ -349,19 +348,19 @@ em {
 }
 }
 
 
 .card-widget {
 .card-widget {
-  position:relative;
+  position: relative;
 }
 }
 
 
 #exposeOverlay {
 #exposeOverlay {
-  background-color:#000;
+  background-color: #000;
   opacity: 0.3;
   opacity: 0.3;
-  display:none;
-  width:100%;
-  height:100%;
-  position:fixed;
-  top:0;
-  left:0;
-  z-index:1031;
+  display: none;
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 1031;
 }
 }
 
 
 .card-column-disabled {
 .card-column-disabled {
@@ -396,6 +395,11 @@ em {
   color: #338bb8;
   color: #338bb8;
 }
 }
 
 
+.card-widget h6.field-title {
+  margin-bottom: 0;
+  padding-left: 4px;
+}
+
 .widget-main-section {
 .widget-main-section {
   overflow-y: auto;
   overflow-y: auto;
   overflow-x: hidden;
   overflow-x: hidden;
@@ -407,11 +411,11 @@ em {
 }
 }
 
 
 .row-container.is-editing {
 .row-container.is-editing {
-  border: none!important;
+  border: none !important;
 }
 }
 
 
 .card-widget {
 .card-widget {
-  border: 1px solid #d8d8d8!important;
+  border: 1px solid #d8d8d8 !important;
 }
 }
 
 
 .row-fluid .span4 {
 .row-fluid .span4 {
@@ -438,11 +442,11 @@ body {
 }
 }
 
 
 .ui-sortable {
 .ui-sortable {
- min-height: 10px!important;
+  min-height: 10px !important;
 }
 }
 
 
 .row-container {
 .row-container {
- min-height: 10px!important;;
+  min-height: 10px !important;;
 }
 }
 
 
 input[type="text"].filechooser-input {
 input[type="text"].filechooser-input {
@@ -460,4 +464,16 @@ input[type="text"].filechooser-input {
 
 
 #settingsModal ul.unstyled li {
 #settingsModal ul.unstyled li {
   margin-bottom: 4px;
   margin-bottom: 4px;
-}
+}
+
+.readonly .card {
+  margin-bottom: 15px;
+}
+
+textarea {
+  resize: none;
+}
+
+.span4.readonly {
+  margin-left: 1px;
+}