TTOOLS-489

- removed layout toolbar buttons - changed canvas/property panel width ratios - removed the editor views panel out of the view-editor-area
teiid · Oct 1, 2018 · bb627e3 · bb627e3
1 parent 9ea5504
commit bb627e3
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 47 deletions.
diff --git a/...p/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.css b/...p/src/app/dataservices/virtualization/view-editor/editor-views/editor-views.component.css
@@ -3,7 +3,9 @@
  */
 #editor-views-tabs .tab-content {
   border: 1px solid lightgray;
-  height: 75%;
+  height: 140px;
+  overflow-x: auto;
+  overflow-y: auto;
 }
 
 /*

diff --git a/ngapp/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.css b/ngapp/src/app/dataservices/virtualization/view-editor/view-canvas/view-canvas.component.css
@@ -5,7 +5,7 @@
   display: grid;
   grid-template-areas:
     "canvas-editor properties-editor";
-  grid-template-columns: 8fr 2fr;
+  grid-template-columns: 50fr 50fr;
   height: 100%;
 }
 
@@ -39,7 +39,7 @@
 
 .canvas-node-selected {
   stroke: red !important;
-  stroke-width: 2 !important;
+  stroke-width: 2px !important;
   stroke-dasharray: 5,5;
   fill: transparent !important;
 }
diff --git a/...taservices/virtualization/view-editor/view-canvas/visuals/graph/graph-visual.component.ts b/...taservices/virtualization/view-editor/view-canvas/visuals/graph/graph-visual.component.ts
@@ -107,8 +107,8 @@ export class GraphVisualComponent implements OnInit {
   // TODO: Need to discuss how all the layout sizes affect each other.
   public get options(): any {
     return this._options = {
-      width: window.innerWidth * .7,
-      height: window.innerHeight * .4
+      width: window.innerWidth * .5,
+      height: window.innerHeight * .45
     };
   }
 }
diff --git a/ngapp/src/app/dataservices/virtualization/view-editor/view-editor.component.css b/ngapp/src/app/dataservices/virtualization/view-editor/view-editor.component.css
@@ -14,7 +14,7 @@
 }
 
 /*
- * A view editor area (i.e., heading, canvas, properties, editor views).
+ * A view editor area (i.e., heading, toobar, canvas, properties).
  */
 .view-editor-area {
   background-color: #ededed;
@@ -58,10 +58,10 @@
     "dataservices-breadcrumb-bar"
     "header"
     "toolbar"
-    "canvas"
-    "editor-views";
+    "canvas";
   grid-template-columns: 1fr;
-  grid-template-rows: 1fr 10fr 3fr 60fr 26fr;
+  grid-template-rows: 5fr 10fr 5fr 80fr;
+  grid-row-gap: 10px;
 }
 
 /*
@@ -78,19 +78,6 @@
   margin: 0;
 }
 
-/*
- * A view editor showing only header, toolbar, and editor views areas (missing canvas and properties).
- */
-.view-editor-views-only {
-  grid-template-areas:
-    "dataservices-breadcrumb-bar"
-    "header"
-    "toolbar"
-    "editor-views";
-  grid-template-columns: 1fr;
-  grid-template-rows: 5fr 10fr 5fr 80fr;
-}
-
 /*
  * The view editor toolbar which is below the heading section.
  */
@@ -183,6 +170,4 @@
  * View editor bottom section containing live sample results, message log, and maybe others.
  */
 #view-editor-views-container {
-  grid-area: editor-views;
-  overflow-y: auto;
 }
diff --git a/ngapp/src/app/dataservices/virtualization/view-editor/view-editor.component.html b/ngapp/src/app/dataservices/virtualization/view-editor/view-editor.component.html
@@ -91,9 +91,9 @@
   <!-- ============================= -->
   <!-- ========== Results ========== -->
   <!-- ============================= -->
-  <div class="view-editor-area"
-       id="view-editor-views-container"
-       *ngIf="isShowingAdditionalViews">
+
+  <div id="view-editor-views-container"
+      *ngIf="isShowingAdditionalViews">
     <app-editor-views></app-editor-views>
   </div>
 

diff --git a/ngapp/src/app/dataservices/virtualization/view-editor/view-editor.component.ts b/ngapp/src/app/dataservices/virtualization/view-editor/view-editor.component.ts
@@ -153,26 +153,6 @@ export class ViewEditorComponent implements DoCheck, OnDestroy, OnInit {
     this.editorService.setEditorConfig( this.fullEditorCssType ); // this could be set via preference or last used config
     this.subscription = this.editorService.editorEvent.subscribe( ( event ) => this.handleEditorEvent( event ) );
 
-    this.toolbarConfig = {
-      views: [
-        {
-          id: this.fullEditorCssType,
-          iconStyleClass: "fa fa-file-text-o",
-          tooltip: ViewEditorI18n.showEditorCanvasAndViewsActionTooltip
-        },
-        {
-          id: this.canvasOnlyCssType,
-          iconStyleClass: "fa fa-file-image-o",
-          tooltip: ViewEditorI18n.showEditorCanvasOnlyActionTooltip
-        },
-        {
-          id: this.viewsOnlyCssType,
-          iconStyleClass: "fa fa-table",
-          tooltip: ViewEditorI18n.showEditorViewsOnlyActionTooltip
-        }
-      ]
-    } as ToolbarConfig;
-
     // Load the connections
     const self = this;
     this.connectionService