You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/07/18 20:07:39 UTC

[incubator-streampipes] 02/05: [STREAMPIPES-145] Improve layout of editor module

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch STREAMPIPES-145
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit db90e071230fa05f6d28f653869f8d44f8192490
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Sat Jul 18 15:23:29 2020 +0200

    [STREAMPIPES-145] Improve layout of editor module
---
 .../pipeline-element-icon-stand.component.html     | 93 +++++++++++-----------
 .../pipeline-element-icon-stand.component.scss     | 12 +++
 ui/src/app/editor-v2/editor.component.html         |  2 +-
 ui/src/app/editor-v2/editor.component.scss         |  8 ++
 ui/src/scss/sp/main.scss                           | 10 ---
 5 files changed, 68 insertions(+), 57 deletions(-)

diff --git a/ui/src/app/editor-v2/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.html b/ui/src/app/editor-v2/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.html
index 74ca991..848ac02 100644
--- a/ui/src/app/editor-v2/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.html
+++ b/ui/src/app/editor-v2/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.html
@@ -15,57 +15,58 @@
   ~ limitations under the License.
   ~
   -->
+<div fxFlex="100" fxLayout="column" class="border">
+    <div class="editorIconStandOptions" style="padding:0px;">
+        <div fxFlex="100" fxLayout="row" fxLayoutAlign="start start" style="padding-top:2px;padding-left:10px;">
 
-<div class="editorIconStandOptions" style="padding:0px;">
-    <div fxFlex="100" fxLayout="row" fxLayoutAlign="start start" style="padding-top:2px;padding-left:10px;">
-
-        <div fxLayoutAlign="start center" fxLayout="row">
-            <div fxLayout="row" style="margin-right: 5px">
-                <i class="material-icons">search</i>
-                <input type="text" (keyup)="applyFilter()" [(ngModel)]="elementFilter" placeholder="Find Element"
-                       style="background-color:#f6f6f6;border: none;border-bottom: solid 2px rgb(27, 20, 100);">&nbsp;
-            </div>
-            <div fxLayout="row">
-                <button mat-button [matMenuTriggerFor]="menu"><div class="menu-text-color"><i class="material-icons">list</i>&nbsp;Filter by category</div></button>
-                <mat-menu #menu="matMenu">
-                    <button mat-menu-item (click)="selectAllOptions()">
-                        <div class="menu-text-color"><i class="material-icons">done</i>&nbsp;Select all</div>
-                    </button>
-                    <button mat-menu-item (click)="deselectAllOptions()">
-                        <div class="menu-text-color"><i class="material-icons">clear</i>&nbsp;Deselect all</div>
-                    </button>
-                    <mat-divider></mat-divider>
-                    <button (click)="toggleOption(option)" mat-menu-item *ngFor="let option of currentCategories">
-                        <div class="menu-text-color" *ngIf="optionSelected(option)">
-                            <i class="material-icons">visibility</i>&nbsp;{{option.label}}
-                        </div>
-                        <div  class="menu-text-color" *ngIf="!optionSelected(option)">
-                            <i class="material-icons">visibility_off</i>&nbsp;{{option.label}}
-                        </div>
-                    </button>
-                </mat-menu>
+            <div fxLayoutAlign="start center" fxLayout="row">
+                <div fxLayout="row" style="margin-right: 5px">
+                    <i class="material-icons">search</i>
+                    <input type="text" (keyup)="applyFilter()" [(ngModel)]="elementFilter" placeholder="Find Element"
+                           style="background-color:#f6f6f6;border: none;border-bottom: solid 2px rgb(27, 20, 100);">&nbsp;
+                </div>
+                <div fxLayout="row">
+                    <button mat-button [matMenuTriggerFor]="menu"><div class="menu-text-color"><i class="material-icons">list</i>&nbsp;Filter by category</div></button>
+                    <mat-menu #menu="matMenu">
+                        <button mat-menu-item (click)="selectAllOptions()">
+                            <div class="menu-text-color"><i class="material-icons">done</i>&nbsp;Select all</div>
+                        </button>
+                        <button mat-menu-item (click)="deselectAllOptions()">
+                            <div class="menu-text-color"><i class="material-icons">clear</i>&nbsp;Deselect all</div>
+                        </button>
+                        <mat-divider></mat-divider>
+                        <button (click)="toggleOption(option)" mat-menu-item *ngFor="let option of currentCategories">
+                            <div class="menu-text-color" *ngIf="optionSelected(option)">
+                                <i class="material-icons">visibility</i>&nbsp;{{option.label}}
+                            </div>
+                            <div  class="menu-text-color" *ngIf="!optionSelected(option)">
+                                <i class="material-icons">visibility_off</i>&nbsp;{{option.label}}
+                            </div>
+                        </button>
+                    </mat-menu>
+                </div>
             </div>
         </div>
     </div>
-</div>
-<div flex id="editor-icon-stand" class="icon-stand" *ngIf="currentlyFilteredElements">
-    <span matTooltip="{{element.name}}" [matTooltipPosition]="'above'" [matTooltipClass]="tooltip" id="{{ element.appId }}" (mouseenter)="updateMouseOver(element.name)"
-          (mouseleave)="updateMouseOver('')"
-          *ngFor="let element of currentlyFilteredElements"
-          class="draggable-icon tt"
-          [attr.data-pe]="element.elementId"
-          [ngClass]="activeCssClass">
-        <span id="container" style="position:relative;display:block;width:80px;height:80px;">
-        <pipeline-element id="pe-icon-stand-{{ element.appId }}" style="margin-left:-3%" [iconStandSize]="true" [pipelineElement]="element"
-                          [preview]="false"></pipeline-element>
-            <span style="display:block;width:100%;height:100%;position:absolute; top:0; left:0;"
-                  *ngIf="currentElementName===element.name">
-                <span class="help-button-icon-stand" style="z-index:10"><md-button
-                        (click)="openHelpDialog(element)"
-                        class="md-icon-button"
-                        style="margin:0px;font-size:20px;">?</md-button>
+    <div flex id="editor-icon-stand" class="icon-stand" *ngIf="currentlyFilteredElements">
+        <span matTooltip="{{element.name}}" [matTooltipPosition]="'above'" [matTooltipClass]="tooltip" id="{{ element.appId }}" (mouseenter)="updateMouseOver(element.name)"
+              (mouseleave)="updateMouseOver('')"
+              *ngFor="let element of currentlyFilteredElements"
+              class="draggable-icon tt"
+              [attr.data-pe]="element.elementId"
+              [ngClass]="activeCssClass">
+            <span id="container" style="position:relative;display:block;width:80px;height:80px;">
+            <pipeline-element id="pe-icon-stand-{{ element.appId }}" style="margin-left:-3%" [iconStandSize]="true" [pipelineElement]="element"
+                              [preview]="false"></pipeline-element>
+                <span style="display:block;width:100%;height:100%;position:absolute; top:0; left:0;"
+                      *ngIf="currentElementName===element.name">
+                    <span class="help-button-icon-stand" style="z-index:10"><md-button
+                            (click)="openHelpDialog(element)"
+                            class="md-icon-button"
+                            style="margin:0px;font-size:20px;">?</md-button>
+                    </span>
                 </span>
             </span>
         </span>
-    </span>
+    </div>
 </div>
\ No newline at end of file
diff --git a/ui/src/app/editor-v2/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.scss b/ui/src/app/editor-v2/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.scss
index ebb0e93..7b72065 100644
--- a/ui/src/app/editor-v2/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.scss
+++ b/ui/src/app/editor-v2/components/pipeline-element-icon-stand/pipeline-element-icon-stand.component.scss
@@ -27,4 +27,16 @@
 ::ng-deep.mat-tooltip.tooltip {
     background-color: darkblue;
     font-size: 12px;
+}
+
+.icon-stand {
+    max-height: 200px;
+    padding-bottom: 1%;
+    overflow-y: auto;
+    border-top: 0px;
+}
+
+.border {
+    border: 1px solid #cccccc;
+    border-top: 0;
 }
\ No newline at end of file
diff --git a/ui/src/app/editor-v2/editor.component.html b/ui/src/app/editor-v2/editor.component.html
index 49a449b..9653198 100644
--- a/ui/src/app/editor-v2/editor.component.html
+++ b/ui/src/app/editor-v2/editor.component.html
@@ -17,7 +17,7 @@
   -->
 
 <div fxLayout="column" class="page-container">
-    <div fxLayout="row" style="padding:0px;background-color:#f6f6f6;">
+    <div fxLayout="row" class="border" style="padding:0px;background-color:#f6f6f6;">
         <div fxFlex="100" style="line-height:24px;border-bottom:1px solid #ccc">
             <div fxFlex="100" fxLayout="row">
                 <div fxFlex fxLayoutAlign="start center" [attr.id]="'peType'">
diff --git a/ui/src/app/editor-v2/editor.component.scss b/ui/src/app/editor-v2/editor.component.scss
index 48a7f25..6c14207 100644
--- a/ui/src/app/editor-v2/editor.component.scss
+++ b/ui/src/app/editor-v2/editor.component.scss
@@ -20,4 +20,12 @@
 
 .text-color {
   color: $sp-color-accent;
+}
+
+.page-container {
+  border: 0;
+}
+
+.border {
+  border: 1px solid #cccccc;
 }
\ No newline at end of file
diff --git a/ui/src/scss/sp/main.scss b/ui/src/scss/sp/main.scss
index d5e87ff..d828549 100644
--- a/ui/src/scss/sp/main.scss
+++ b/ui/src/scss/sp/main.scss
@@ -886,16 +886,6 @@ md-select.md-default-theme .md-select-value.md-select-placeholder, md-select .md
   /* 	margin-top: 1%;  */
 }
 
-.icon-stand {
-  max-height: 200px;
-  margin-bottom: 1%;
-  padding-bottom: 1%;
-  overflow-y: auto;
-  /* 	border: 2px solid rgb(63,81,181); */
-  border-top: 0px;
-
-}
-
 .outerAssembly {
   position: relative;
   left: 0px;