Browse Source

HUE-1017 [oozie] Workflow and coordinator editor should have a consistent navigation bar

Improved usability of the nav bar
Enrico Berti 13 years ago
parent
commit
dc398c2b83

+ 3 - 19
apps/oozie/src/oozie/templates/editor/create_coordinator.mako

@@ -51,13 +51,9 @@ ${ layout.menubar(section='coordinators') }
   <div class="row-fluid">
     <div class="span2">
       <div class="well sidebar-nav">
-        <ul class="nav nav-list">
-          <li class="nav-header">${ _('Name') }</li>
-          <li id="coordinatorName">${ _('Please choose one') }</li>
-
-          <li class="nav-header">${ _('Workflow') }</li>
-          <li id="workflowName">${ _('Please choose one') }</li>
-
+        <ul class="nav nav-list" style="min-height: 150px">
+          <li class="nav-header">${ _('Properties') }</li>
+          <li class="active"><a href="#">${ _('Edit properties') }</a></li>
          </ul>
         </div>
     </div>
@@ -212,18 +208,6 @@ ${ layout.menubar(section='coordinators') }
       $(this).parents(".control-group").removeClass("error");
       $(this).parent().find(".help-inline").remove();
     });
-
-    $("#id_name").change(function () {
-      $("#coordinatorName").text($(this).val());
-    });
-
-    $("#id_workflow").change(function () {
-      if ($(this).val()) {
-        $("#workflowName").text($("#id_workflow option[value='" + $(this).val() + "']").text());
-      }
-    });
-
-    $("#id_workflow").change();
   });
 </script>
 

+ 7 - 11
apps/oozie/src/oozie/templates/editor/edit_coordinator.mako

@@ -57,12 +57,12 @@ ${ layout.menubar(section='coordinators') }
     <div class="span2">
       <div class="well sidebar-nav">
         <ul class="nav nav-list">
-          <li class="nav-header">${ _('Name') }</li>
-          <li><a id="coordinatorName" href="#steps">${ coordinator.name }</a></li>
+          <li class="nav-header">${ _('Properties') }</li>
+          <li class="active"><a href="#properties">${ _('Edit properties') }</a></li>
 
           % if coordinator.workflow:
             <li class="nav-header">${ _('Workflow') }</li>
-            <li id="workflowName"><a href="${ coordinator.workflow.get_absolute_url() }" target="_blank">${ coordinator.workflow }</a></li>
+            <li id="workflowName"><a href="${ coordinator.workflow.get_absolute_url() }" target="_blank"><i class="icon-share-alt"></i> ${ coordinator.workflow }</a></li>
           % endif
 
           <li class="nav-header">${ _('Datasets') }</li>
@@ -87,7 +87,7 @@ ${ layout.menubar(section='coordinators') }
     </div>
     <div class="span10">
       <form id="jobForm" class="form-horizontal" action="${ url('oozie:edit_coordinator', coordinator=coordinator.id) }" method="POST">
-      <div id="steps" class="section">
+      <div id="properties" class="section">
         <ul class="nav nav-pills">
           <li class="active"><a href="#step1" class="step">${ _('Step 1: General') }</a></li>
           <li><a href="#step2" class="step">${ _('Step 2: Frequency') }</a></li>
@@ -607,8 +607,8 @@ ${ layout.menubar(section='coordinators') }
             window.viewModel.isSaveVisible(true);
           }
         },
-        "steps":function () {
-          showSection("steps");
+        "properties":function () {
+          showSection("properties");
         },
         "createDataset":function () {
           window.viewModel.reset();
@@ -636,7 +636,7 @@ ${ layout.menubar(section='coordinators') }
       }
 
       function showStep(step) {
-        showSection("steps");
+        showSection("properties");
         currentStep = step;
         if (step != "step1") {
           $("#backBtn").removeClass("disabled");
@@ -695,10 +695,6 @@ ${ layout.menubar(section='coordinators') }
         $(this).parent().find(".help-inline").remove();
       });
 
-      $("#id_name").change(function () {
-        $("#coordinatorName").text($(this).val());
-      });
-
       $("#id_workflow").change(function () {
         $("#workflowName").text($("#id_workflow option[value='" + $(this).val() + "']").text());
       });

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

@@ -42,18 +42,15 @@ ${ layout.menubar(section='workflows') }
   <div class="span2">
     <div class="well sidebar-nav">
       <ul class="nav nav-list">
-        <li class="nav-header">${ _('Name') }</li>
-        <li><a href="#properties" data-bind="text: name()"></a></li>
-
-        <li class="nav-header">${ _('Description') }</li>
-        <li><a href="#properties" data-bind="text: description() || 'N/A'"></a></li>
+        <li class="nav-header">${ _('Properties') }</li>
+        <li><a href="#properties">${ _('Edit properties') }</a></li>
 
         <li class="nav-header">${ _('Editor') }</li>
         <li><a href="#editWorkflow">${ _('Edit workflow') }</a></li>
         <li><a href="javascript:void(0)" class="import-jobsub-node-link" title="${ _('Click to import a Job Designer action and add it to the end of the flow') }" rel="tooltip" data-placement="right">${ _('Import action') }</a></li>
         % if user_can_edit_job:
             <li>
-              <a data-bind="attr: {href: '/filebrowser/view' + deployment_dir() }" target="_blank" title="${ _('Upload additional files and libraries to the deployment directory') }" rel="tooltip" data-placement="right">${ _('Upload') }</a>
+              <a data-bind="attr: {href: '/filebrowser/view' + deployment_dir() }" target="_blank" title="${ _('Upload additional files and libraries to the deployment directory') }" rel="tooltip" data-placement="right"><i class="icon-share-alt"></i> ${ _('Upload') }</a>
             </li>
         % endif