[ADF-1634] floating toolbar for PDF viewer (#2413)

* floating toolbar for PDF viewer * use routing settings to toggle app menu * remove dialog viewer * remove duplicate menu
2025-07-31 17:38:48 +00:00 · 2017-10-04 09:57:35 +01:00
parent d378d2702b
commit e3fbe21340
25 changed files with 138 additions and 1538 deletions
--- a/demo-shell-ng2/app/app.component.html
+++ b/demo-shell-ng2/app/app.component.html
@@ -1 +1,2 @@
+<adf-app-menu *ngIf="showAppMenu"></adf-app-menu>
 <router-outlet></router-outlet>
--- a/demo-shell-ng2/app/app.component.ts
+++ b/demo-shell-ng2/app/app.component.ts
@@ -16,6 +16,7 @@
 */

 import { Component, ViewEncapsulation } from '@angular/core';
+import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
 import { AlfrescoSettingsService, PageTitleService, StorageService } from 'ng2-alfresco-core';

@Component({
@@ -26,12 +27,34 @@ import { AlfrescoSettingsService, PageTitleService, StorageService } from 'ng2-a
 })
 export class AppComponent {
    searchTerm: string = '';
+    showAppMenu = true;

    constructor(private settingsService: AlfrescoSettingsService,
                private storage: StorageService,
-                pageTitleService: PageTitleService) {
+                pageTitleService: PageTitleService,
+                route: ActivatedRoute,
+                router: Router) {
        this.setProvider();
        pageTitleService.setTitle();
+
+        router.events
+            .filter(event => event instanceof NavigationEnd)
+            .subscribe(() => {
+                let currentRoute = route.root;
+
+                while (currentRoute.firstChild) {
+                    currentRoute = currentRoute.firstChild;
+                }
+
+                const snapshot: any = currentRoute.snapshot || {};
+                const data: any = snapshot.data || {};
+
+                if (data && data['showAppMenu'] !== undefined) {
+                    this.showAppMenu = data && data.showAppMenu;
+                } else {
+                    this.showAppMenu = true;
+                }
+            });
    }

    private setProvider() {
--- a/demo-shell-ng2/app/app.routes.ts
+++ b/demo-shell-ng2/app/app.routes.ts
@@ -44,7 +44,13 @@ import { CustomSourcesComponent } from './components/files/custom-sources.compon
 import { FormListDemoComponent } from './components/form/form-list-demo.component';

 export const appRoutes: Routes = [
-    { path: 'login', component: LoginDemoComponent },
+    {
+        path: 'login',
+        component: LoginDemoComponent,
+        data: {
+            showAppMenu: false
+        }
+    },
    {
        path: '',
        component: HomeComponent,
@@ -68,7 +74,10 @@ export const appRoutes: Routes = [
    {
        path: 'files/:nodeId/view',
        component: FileViewComponent,
-        canActivate: [ AuthGuardEcm ]
+        canActivate: [ AuthGuardEcm ],
+        data: {
+            showAppMenu: false
+        }
    },
    {
        path: 'dl-custom-sources',
--- a/demo-shell-ng2/app/components/about/about.component.html
+++ b/demo-shell-ng2/app/components/about/about.component.html
@@ -1,5 +1,3 @@
-<adf-app-menu></adf-app-menu>
-
 <div class="about-container">
    <h3>Server settings</h3>
    <md-list>
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.html
@@ -1,5 +1,3 @@
-<adf-app-menu></adf-app-menu>
-
 <md-tab-group [(selectedIndex)]="activeTab">
    <md-tab id="tasks-header" href="#tasks" label="{{'PS-TAB.TASKS-TAB' | translate}}">
        <div class="page-content">
--- a/demo-shell-ng2/app/components/activiti/apps.view.ts
+++ b/demo-shell-ng2/app/components/activiti/apps.view.ts
@@ -22,7 +22,6 @@ import { AppDefinitionRepresentationModel } from 'ng2-activiti-tasklist';
@Component({
    selector: 'activiti-apps-view',
    template: `
-        <adf-app-menu></adf-app-menu>
        <activiti-apps (appClick)="onAppClicked($event)"></activiti-apps>
    `
 })
--- a/demo-shell-ng2/app/components/datatable/datatable-demo.component.html
+++ b/demo-shell-ng2/app/components/datatable/datatable-demo.component.html
@@ -1,5 +1,3 @@
-<adf-app-menu></adf-app-menu>
-
 <div class="p-10">
    <alfresco-datatable
        [data]="data"
--- a/demo-shell-ng2/app/components/files/custom-sources.component.html
+++ b/demo-shell-ng2/app/components/files/custom-sources.component.html
@@ -1,4 +1,3 @@
-<adf-app-menu></adf-app-menu>
 <adf-toolbar>
    <adf-toolbar-title>
        <md-select [(ngModel)]="selectedSource">
--- a/demo-shell-ng2/app/components/files/files.component.html
+++ b/demo-shell-ng2/app/components/files/files.component.html
@@ -1,5 +1,3 @@
-<adf-app-menu></adf-app-menu>
-
 <div class="container">
    <div class="adf-demo-site-container-style" id="demo-container">
        <adf-sites-dropdown (change)="getSiteContent($event)">
--- a/demo-shell-ng2/app/components/form/form-demo.component.html
+++ b/demo-shell-ng2/app/components/form/form-demo.component.html
@@ -1,5 +1,3 @@
-<adf-app-menu></adf-app-menu>
-
 <div class="form-container">
    <adf-form [form]="form">
    </adf-form>
--- a/demo-shell-ng2/app/components/home/home.component.html
+++ b/demo-shell-ng2/app/components/home/home.component.html
@@ -1,5 +1,3 @@
-<adf-app-menu></adf-app-menu>
-
 <!-- DOCUMENT LIST-->
 <md-card class="adf-home-card">
        <md-card-title class="adf-home-card-title adf-primary-background-color"  routerLink="/files">
--- a/demo-shell-ng2/app/components/social/social.component.html
+++ b/demo-shell-ng2/app/components/social/social.component.html
@@ -1,5 +1,3 @@
-<adf-app-menu></adf-app-menu>
-
 <label for="nodeId"><b>Insert Node Id</b></label><br>
 <input id="nodeId" type="text" size="48" [(ngModel)]="nodeId"><br>
 <md-grid-list cols="2" rowHeight="100px">
--- a/demo-shell-ng2/app/components/tag/tag.component.html
+++ b/demo-shell-ng2/app/components/tag/tag.component.html
@@ -1,5 +1,3 @@
-<adf-app-menu></adf-app-menu>
-
 <label for="nodeId"><b>Insert Node Id</b></label><br>
 <input id="nodeId" type="text" size="48" [(ngModel)]="nodeId"><br>
 <div class="adf-tag-example-area">