From 6e5f1b68ed5e421c5247cf75f0273bdb24c79dac Mon Sep 17 00:00:00 2001
From: Suzana Dirla <dirla.silvia.suzana@gmail.com>
Date: Thu, 17 Jan 2019 12:28:17 +0200
Subject: [PATCH] [ADF-3810] Viewer - rightmost position for more menu (#4137)

* [ADF-3810] Viewer - rightmost position for more menu

* [ADF-3810] small change
---
 .../file-view/file-view.component.html        | 25 +++++++++++++++++
 .../file-view/file-view.component.ts          |  5 ++++
 .../viewer/components/viewer.component.html   | 28 +++++++++----------
 3 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/demo-shell/src/app/components/file-view/file-view.component.html b/demo-shell/src/app/components/file-view/file-view.component.html
index d4ec8af7ca..ab4b953f9f 100644
--- a/demo-shell/src/app/components/file-view/file-view.component.html
+++ b/demo-shell/src/app/components/file-view/file-view.component.html
@@ -188,6 +188,16 @@
                     </mat-slide-toggle>
                 </p>
 
+                <p class="toggle">
+                    <mat-slide-toggle
+                        id="adf-switch-moreactionsmenu"
+                        [color]="'primary'"
+                        (change)="toggleMoreActionsMenu()"
+                        [checked]="moreActionsMenu">
+                        More Actions Menu
+                    </mat-slide-toggle>
+                </p>
+
                 <p class="toggle">
                     <mat-slide-toggle
                         id="adf-switch-download"
@@ -286,6 +296,21 @@
             </button>
         </adf-viewer-toolbar-actions>
 
+        <adf-viewer-more-actions *ngIf="moreActionsMenu">
+            <button mat-menu-item id="adf-viewer-more-menu-alarm">
+                <mat-icon>alarm</mat-icon>
+                <span>Alarm</span>
+            </button>
+            <button mat-menu-item id="adf-viewer-more-menu-backup">
+                <mat-icon>backup</mat-icon>
+                <span>Backup</span>
+            </button>
+            <button mat-menu-item id="adf-viewer-more-menu-bug">
+                <mat-icon>bug_report</mat-icon>
+                <span>Bug report</span>
+            </button>
+        </adf-viewer-more-actions>
+
         <ng-container *ngIf="openWith">
             <adf-viewer-open-with>
                 <button mat-menu-item>
diff --git a/demo-shell/src/app/components/file-view/file-view.component.ts b/demo-shell/src/app/components/file-view/file-view.component.ts
index 06982d7e6e..a63e539d97 100644
--- a/demo-shell/src/app/components/file-view/file-view.component.ts
+++ b/demo-shell/src/app/components/file-view/file-view.component.ts
@@ -46,6 +46,7 @@ export class FileViewComponent implements OnInit {
     allowRightSidebar = true;
     allowLeftSidebar = true;
     moreActions = true;
+    moreActionsMenu = false;
     customName = false;
     fileUrlSwitch = false;
     showLeftSidebar = null;
@@ -123,6 +124,10 @@ export class FileViewComponent implements OnInit {
         this.moreActions = !this.moreActions;
     }
 
+    toggleMoreActionsMenu() {
+        this.moreActionsMenu = !this.moreActionsMenu;
+    }
+
     toggleShowRightSidebar() {
         this.showRightSidebar = !this.showRightSidebar;
     }
diff --git a/lib/core/viewer/components/viewer.component.html b/lib/core/viewer/components/viewer.component.html
index eca17cdbfa..d919585579 100644
--- a/lib/core/viewer/components/viewer.component.html
+++ b/lib/core/viewer/components/viewer.component.html
@@ -100,20 +100,6 @@
                     <mat-icon>fullscreen</mat-icon>
                 </button>
 
-                <ng-container *ngIf="mnuMoreActions">
-                    <button
-                        id="adf-viewer-moreactions"
-                        mat-icon-button
-                        [matMenuTriggerFor]="mnuMoreActions"
-                        title="{{ 'ADF_VIEWER.ACTIONS.MORE_ACTIONS' | translate }}"
-                        data-automation-id="adf-toolbar-more-actions">
-                        <mat-icon>more_vert</mat-icon>
-                    </button>
-                    <mat-menu #mnuMoreActions="matMenu" [overlapTrigger]="false">
-                        <ng-content select="adf-viewer-more-actions"></ng-content>
-                    </mat-menu>
-                </ng-container>
-
                 <ng-container *ngIf="allowRightSidebar">
                     <adf-toolbar-divider></adf-toolbar-divider>
 
@@ -128,6 +114,20 @@
 
                 </ng-container>
 
+                <ng-container *ngIf="mnuMoreActions">
+                    <button
+                        id="adf-viewer-moreactions"
+                        mat-icon-button
+                        [matMenuTriggerFor]="mnuMoreActions"
+                        title="{{ 'ADF_VIEWER.ACTIONS.MORE_ACTIONS' | translate }}"
+                        data-automation-id="adf-toolbar-more-actions">
+                        <mat-icon>more_vert</mat-icon>
+                    </button>
+                    <mat-menu #mnuMoreActions="matMenu" [overlapTrigger]="false">
+                        <ng-content select="adf-viewer-more-actions"></ng-content>
+                    </mat-menu>
+                </ng-container>
+
             </adf-toolbar>
         </ng-container>