Merge pull request apache#198 from NFLabs/update/quickaccesstoggle

Bringing code show/hide button back outside of dropdown for quickaccess
lelou6666 · Nov 11, 2014 · 2e1f1a3 · 2e1f1a3
2 parents f02beed + b68eeb5
commit 2e1f1a3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 13 deletions.
diff --git a/zeppelin-web/app/scripts/controllers/paragraph.js b/zeppelin-web/app/scripts/controllers/paragraph.js
@@ -268,6 +268,14 @@ angular.module('zeppelinWebApp')
     commitParagraph($scope.paragraph.title, $scope.paragraph.text, newConfig, newParams);
   };
 
+  $scope.toggleEditor = function() {
+    if ($scope.paragraph.config.editorHide) {
+      $scope.openEditor();
+    } else {
+      $scope.closeEditor();
+    }
+  };
+
   $scope.closeEditor = function() {
     console.log('close the note');
 

diff --git a/zeppelin-web/app/views/paragraph.html b/zeppelin-web/app/views/paragraph.html
@@ -296,7 +296,10 @@
     <span class="icon-control-pause" style="cursor:pointer;color:#CD5C5C" tooltip-placement="top" tooltip="Cancel"
           ng-click="cancelParagraph()"
           ng-show="paragraph.status=='RUNNING' || paragraph.status=='PENDING'"></span>
-  <span class="{{paragraph.config.tableHide ? 'icon-notebook' : 'icon-book-open'}}" tooltip-placement="top" tooltip="{{(paragraph.config.tableHide ? 'Show' : 'Hide') + ' output'}}"
+
+    <span class="{{paragraph.config.editorHide ? 'icon-size-fullscreen' : 'icon-size-actual'}}" tooltip-placement="top" tooltip="{{(paragraph.config.editorHide ? 'Show' : 'Hide') + ' editor'}}"
+	  ng-click="toggleEditor()"></span>
+    <span class="{{paragraph.config.tableHide ? 'icon-notebook' : 'icon-book-open'}}" tooltip-placement="top" tooltip="{{(paragraph.config.tableHide ? 'Show' : 'Hide') + ' output'}}"
 	  ng-click="toggleOutput()"></span>
 
     <span class="dropdown navbar-right">
@@ -337,18 +340,6 @@
                 ng-show="!paragraph.config.title"> Show title</a>
         </li>
 
-        <li>
-          <!-- Editor handler -->
-          <a style="cursor:pointer"
-                class="fa fa-code"
-                ng-click="closeEditor()"
-                ng-show="!paragraph.config.editorHide && !paragraph.config.hide"> Hide code editor</a>
-          <a style="cursor:pointer"
-                class="fa fa-code"
-                ng-click="openEditor()"
-                ng-show="paragraph.config.editorHide && !paragraph.config.hide"> Show code editor</a>
-        </li>
-
         <li>
           <!-- paragraph handler -->
           <a class="fa fa-compress" style="cursor:pointer"