From 773bcbfa923bd008711ff5344695d572862bf846 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Sat, 6 May 2017 18:59:19 +0200
Subject: [PATCH] 1) Links improved 2) Titles improved

---
 .../pages/users/users-page.component.html     |  2 +-
 .../assets/pages/assets-page.component.html   |  2 +-
 .../pages/content/content-page.component.html |  4 ++--
 .../contents/contents-page.component.html     |  4 ++--
 .../pages/schemas/schemas-page.component.html |  2 +-
 .../pages/dashboard-page.component.html       |  8 ++++----
 .../pages/dashboard-page.component.scss       |  2 +-
 .../pages/schema/schema-page.component.html   |  2 +-
 .../pages/schemas/schemas-page.component.html |  2 +-
 .../pages/clients/clients-page.component.html |  2 +-
 .../contributors-page.component.html          |  2 +-
 .../languages/languages-page.component.html   |  2 +-
 .../settings/settings-area.component.html     |  4 +++-
 .../settings/settings-area.component.ts       | 13 ++++++++++--
 .../angular/parent-link.directive.ts}         | 20 +++++++++----------
 src/Squidex/app/framework/declarations.ts     |  1 +
 src/Squidex/app/framework/module.ts           |  3 +++
 .../app/shared/components/help.component.html |  2 +-
 .../shared/components/history.component.html  |  2 +-
 src/Squidex/app/shared/declarations.ts        |  1 -
 src/Squidex/app/shared/module.ts              |  3 ---
 .../not-found/not-found-page.component.html   |  2 +-
 22 files changed, 47 insertions(+), 38 deletions(-)
 rename src/Squidex/app/{shared/components/dashboard-link.directive.ts => framework/angular/parent-link.directive.ts} (59%)

diff --git a/src/Squidex/app/features/administration/pages/users/users-page.component.html b/src/Squidex/app/features/administration/pages/users/users-page.component.html
index 5e766b695..1cf3240e4 100644
--- a/src/Squidex/app/features/administration/pages/users/users-page.component.html
+++ b/src/Squidex/app/features/administration/pages/users/users-page.component.html
@@ -18,7 +18,7 @@
             <h3 class="panel-title">Users</h3>
         </div>
 
-        <a class="panel-close" routerLink="../">
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/features/assets/pages/assets-page.component.html b/src/Squidex/app/features/assets/pages/assets-page.component.html
index 317d8d60b..f0e825dd3 100644
--- a/src/Squidex/app/features/assets/pages/assets-page.component.html
+++ b/src/Squidex/app/features/assets/pages/assets-page.component.html
@@ -18,7 +18,7 @@
             <h3 class="panel-title">Assets</h3>
         </div>
 
-        <a class="panel-close" routerLink="./../">
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/features/content/pages/content/content-page.component.html b/src/Squidex/app/features/content/pages/content/content-page.component.html
index 5613edcce..62b728f31 100644
--- a/src/Squidex/app/features/content/pages/content/content-page.component.html
+++ b/src/Squidex/app/features/content/pages/content/content-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Content" parameter1="app" value1="{{appName() | async}}"></sqx-title>
+<sqx-title message="{app} | {schema} | Content" parameter1="app" parameter2="schema" value1="{{appName() | async}}" value2="{{schema.name}}"></sqx-title>
 
 <form [formGroup]="contentForm" (ngSubmit)="saveAndPublish()">
     <sqx-panel panelWidth="53rem">
@@ -31,7 +31,7 @@
                 </h3>
             </div>
 
-            <a class="panel-close" routerLink="../">
+            <a class="panel-close" sqxParentLink>
                 <i class="icon-close"></i>
             </a>
         </div>
diff --git a/src/Squidex/app/features/content/pages/contents/contents-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-page.component.html
index 1fb6d0bf9..af09083be 100644
--- a/src/Squidex/app/features/content/pages/contents/contents-page.component.html
+++ b/src/Squidex/app/features/content/pages/contents/contents-page.component.html
@@ -1,4 +1,4 @@
-<sqx-title message="{app} | Contents" parameter1="app" value1="{{appName() | async}}"></sqx-title>
+<sqx-title message="{app} | {schema} | Contents" parameter1="app" parameter2="schema" value1="{{appName() | async}}" value2="{{schema.name}}"></sqx-title>
 
 <sqx-panel panelWidth="60rem">
     <div class="panel-header">
@@ -26,7 +26,7 @@
             <h3 class="panel-title">Contents</h3>
         </div>
 
-        <a class="panel-close" routerLink="../">
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html
index 2274b91b3..5a6358b71 100644
--- a/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html
+++ b/src/Squidex/app/features/content/pages/schemas/schemas-page.component.html
@@ -6,7 +6,7 @@
             <h3 class="panel-title">Schemas</h3>
         </div>
 
-        <a class="panel-close" sqxDashboardLink>
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
 
diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html
index d2be98bb7..3b0a4e802 100644
--- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html
+++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html
@@ -12,7 +12,7 @@
     </div>
 
     <div class="clearfix">
-        <a class="card card-link" [routerLink]="['schemas', { showDialog: true }]">
+        <a class="card card-href" [routerLink]="['schemas', { showDialog: true }]">
             <div class="card-block">
                 <div class="card-image">
                     <img src="/images/dashboard-schema.png" />
@@ -23,7 +23,7 @@
             </div>
         </a>
 
-        <a class="card card-link" href="/api/content/{{appName() | async}}/docs" target="_blank">
+        <a class="card card-href" href="/api/content/{{appName() | async}}/docs" target="_blank">
             <div class="card-block">
                 <div class="card-image">
                     <img src="/images/dashboard-api.png" />
@@ -34,7 +34,7 @@
             </div>
         </a>
 
-        <a class="card card-link" (click)="showForum()">
+        <a class="card card-href" (click)="showForum()">
             <div class="card-block">
                 <div class="card-image">
                     <img src="/images/dashboard-feedback.png" />
@@ -45,7 +45,7 @@
             </div>
         </a>
 
-        <a class="card card-link" href="https://github.com/squidex/squidex" target="_blank">
+        <a class="card card-href" href="https://github.com/squidex/squidex" target="_blank">
             <div class="card-block">
                 <div class="card-image">
                     <img src="/images/dashboard-github.png" />
diff --git a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss
index 3483dadf4..a8fea444d 100644
--- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss
+++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss
@@ -62,7 +62,7 @@
         margin-top: .4rem;
     }
 
-    &-link {
+    &-href {
         & {
             cursor: pointer;
         }
diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
index 77110ebeb..ab6e3664d 100644
--- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
+++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
@@ -30,7 +30,7 @@
             </h3>
         </div>
 
-        <a class="panel-close" routerLink="../">
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
index 8070474e1..d597f4996 100644
--- a/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
+++ b/src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
@@ -6,7 +6,7 @@
             <h3 class="panel-title">Schemas</h3>
         </div>
 
-        <a class="panel-close" sqxDashboardLink>
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
 
diff --git a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
index 1e85110c7..69351fd9c 100644
--- a/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
+++ b/src/Squidex/app/features/settings/pages/clients/clients-page.component.html
@@ -6,7 +6,7 @@
             <h3 class="panel-title">Clients</h3>
         </div>
 
-        <a class="panel-close" routerLink="../">
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
index 6407a4d3a..f5bba22c7 100644
--- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
+++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
@@ -6,7 +6,7 @@
             <h3 class="panel-title">Contributors</h3>
         </div>
 
-        <a class="panel-close" routerLink="../">
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html
index 699063901..657067bc1 100644
--- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.html
+++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.html
@@ -6,7 +6,7 @@
             <h3 class="panel-title">Languages</h3>
         </div>
 
-        <a class="panel-close" routerLink="../">
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/features/settings/settings-area.component.html b/src/Squidex/app/features/settings/settings-area.component.html
index 3947075f2..8675c0256 100644
--- a/src/Squidex/app/features/settings/settings-area.component.html
+++ b/src/Squidex/app/features/settings/settings-area.component.html
@@ -1,10 +1,12 @@
+<sqx-title message="{app} | Settings" parameter1="app" value1="{{appName() | async}}"></sqx-title>
+
 <sqx-panel theme="dark" panelWidth="16rem">
     <div class="panel-header">
         <div class="panel-title-row">
             <h3 class="panel-title">Settings</h3>
         </div>
 
-        <a class="panel-close" sqxDashboardLink>
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/features/settings/settings-area.component.ts b/src/Squidex/app/features/settings/settings-area.component.ts
index 2005951f2..6e332b9a2 100644
--- a/src/Squidex/app/features/settings/settings-area.component.ts
+++ b/src/Squidex/app/features/settings/settings-area.component.ts
@@ -7,11 +7,20 @@
 
 import { Component } from '@angular/core';
 
+import {
+    AppComponentBase,
+    AppsStoreService,
+    NotificationService
+} from 'shared';
+
 @Component({
     selector: 'sqx-settings-area',
     styleUrls: ['./settings-area.component.scss'],
     templateUrl: './settings-area.component.html'
 })
-export class SettingsAreaComponent {
-
+export class SettingsAreaComponent extends AppComponentBase {
+    constructor(apps: AppsStoreService, notifications: NotificationService
+    ) {
+        super(notifications, apps);
+    }
 }
\ No newline at end of file
diff --git a/src/Squidex/app/shared/components/dashboard-link.directive.ts b/src/Squidex/app/framework/angular/parent-link.directive.ts
similarity index 59%
rename from src/Squidex/app/shared/components/dashboard-link.directive.ts
rename to src/Squidex/app/framework/angular/parent-link.directive.ts
index e9b97be4d..f09a398d9 100644
--- a/src/Squidex/app/shared/components/dashboard-link.directive.ts
+++ b/src/Squidex/app/framework/angular/parent-link.directive.ts
@@ -6,34 +6,32 @@
  */
 
 import { Directive, ElementRef, HostListener, OnDestroy, OnInit, Renderer } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { Subscription } from 'rxjs';
 
-import { AppsStoreService } from './../declarations-base';
-
 @Directive({
-    selector: '[sqxDashboardLink]'
+    selector: '[sqxParentLink]'
 })
-export class DashboardLinkDirective implements OnInit, OnDestroy {
-    private appSubscription: Subscription;
+export class ParentLinkDirective implements OnInit, OnDestroy {
+    private urlSubscription: Subscription;
     private url: string;
 
     constructor(
-        private readonly appsStore: AppsStoreService,
         private readonly router: Router,
+        private readonly route: ActivatedRoute,
         private readonly element: ElementRef,
         private readonly renderer: Renderer
     ) {
     }
 
     public ngOnDestroy() {
-        this.appSubscription.unsubscribe();
+        this.urlSubscription.unsubscribe();
     }
 
     public ngOnInit() {
-        this.appSubscription =
-            this.appsStore.selectedApp.subscribe(app => {
-                this.url = this.router.createUrlTree(['app', app!.name]).toString();
+        this.urlSubscription =
+            this.route.url.subscribe(() => {
+                this.url = this.router.createUrlTree(['.'], { relativeTo: this.route.parent.parent }).toString();
 
                 this.renderer.setElementAttribute(this.element.nativeElement, 'href', this.url);
             });
diff --git a/src/Squidex/app/framework/declarations.ts b/src/Squidex/app/framework/declarations.ts
index d2893cea4..bed8a4530 100644
--- a/src/Squidex/app/framework/declarations.ts
+++ b/src/Squidex/app/framework/declarations.ts
@@ -28,6 +28,7 @@ export * from './angular/money.pipe';
 export * from './angular/name.pipe';
 export * from './angular/panel.component';
 export * from './angular/panel-container.directive';
+export * from './angular/parent-link.directive';
 export * from './angular/progress-bar.component';
 export * from './angular/rich-editor.component';
 export * from './angular/scroll-active.directive';
diff --git a/src/Squidex/app/framework/module.ts b/src/Squidex/app/framework/module.ts
index e3ed7e04a..fd0b700f4 100644
--- a/src/Squidex/app/framework/module.ts
+++ b/src/Squidex/app/framework/module.ts
@@ -42,6 +42,7 @@ import {
     PanelContainerDirective,
     PanelComponent,
     PanelService,
+    ParentLinkDirective,
     ProgressBarComponent,
     ResourceLoaderService,
     RichEditorComponent,
@@ -92,6 +93,7 @@ import {
         MonthPipe,
         PanelContainerDirective,
         PanelComponent,
+        ParentLinkDirective,
         ProgressBarComponent,
         RichEditorComponent,
         ScrollActiveDirective,
@@ -130,6 +132,7 @@ import {
         MonthPipe,
         PanelContainerDirective,
         PanelComponent,
+        ParentLinkDirective,
         ProgressBarComponent,
         RichEditorComponent,
         ScrollActiveDirective,
diff --git a/src/Squidex/app/shared/components/help.component.html b/src/Squidex/app/shared/components/help.component.html
index 3c3da9f8e..7ff0156d1 100644
--- a/src/Squidex/app/shared/components/help.component.html
+++ b/src/Squidex/app/shared/components/help.component.html
@@ -4,7 +4,7 @@
             <h3 class="panel-title">Help</h3>
         </div>
 
-        <a class="panel-close" routerLink="../">
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/shared/components/history.component.html b/src/Squidex/app/shared/components/history.component.html
index 3765d5feb..300d715e7 100644
--- a/src/Squidex/app/shared/components/history.component.html
+++ b/src/Squidex/app/shared/components/history.component.html
@@ -4,7 +4,7 @@
             <h3 class="panel-title">Activity</h3>
         </div>
 
-        <a class="panel-close" routerLink="../">
+        <a class="panel-close" sqxParentLink>
             <i class="icon-close"></i>
         </a>
     </div>
diff --git a/src/Squidex/app/shared/declarations.ts b/src/Squidex/app/shared/declarations.ts
index c25316b54..b1cb1dba5 100644
--- a/src/Squidex/app/shared/declarations.ts
+++ b/src/Squidex/app/shared/declarations.ts
@@ -10,7 +10,6 @@ export * from './components/app-form.component';
 export * from './components/asset.component';
 export * from './components/assets-editor.component';
 export * from './components/component-base';
-export * from './components/dashboard-link.directive';
 export * from './components/help.component';
 export * from './components/history.component';
 export * from './components/language-selector.component';
diff --git a/src/Squidex/app/shared/module.ts b/src/Squidex/app/shared/module.ts
index feceeadae..ebf8c8044 100644
--- a/src/Squidex/app/shared/module.ts
+++ b/src/Squidex/app/shared/module.ts
@@ -25,7 +25,6 @@ import {
     AssetsService,
     AuthService,
     ContentsService,
-    DashboardLinkDirective,
     EventConsumersService,
     HelpComponent,
     HelpService,
@@ -62,7 +61,6 @@ import {
         AppFormComponent,
         AssetComponent,
         AssetsEditorComponent,
-        DashboardLinkDirective,
         HelpComponent,
         HistoryComponent,
         LanguageSelectorComponent,
@@ -77,7 +75,6 @@ import {
         AppFormComponent,
         AssetComponent,
         AssetsEditorComponent,
-        DashboardLinkDirective,
         HelpComponent,
         HistoryComponent,
         LanguageSelectorComponent,
diff --git a/src/Squidex/app/shell/pages/not-found/not-found-page.component.html b/src/Squidex/app/shell/pages/not-found/not-found-page.component.html
index 7f7e6ae8d..a17098c68 100644
--- a/src/Squidex/app/shell/pages/not-found/not-found-page.component.html
+++ b/src/Squidex/app/shell/pages/not-found/not-found-page.component.html
@@ -7,5 +7,5 @@
 
     <p>Sorry, the page you are looking for does not exist</p>
 
-    <a routerLink="../">Back to Homepage</a>
+    <a sqxParentLink>Back to Homepage</a>
 </div>
\ No newline at end of file