From 86a2ff6064c98b278bdca53c08e7ec977ddf0e4c Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 20 Dec 2016 23:47:26 +0100 Subject: [PATCH] A lot of small improvements --- src/Squidex/app/app.routes.ts | 3 - .../content/pages/content-page.component.html | 4 +- .../pages/dashboard-page.component.html | 4 +- .../app/features/media/declarations.ts | 8 -- src/Squidex/app/features/media/index.ts | 9 -- src/Squidex/app/features/media/module.ts | 34 -------- .../media/pages/media-page.component.html | 14 --- .../media/pages/media-page.component.scss | 7 -- .../media/pages/media-page.component.ts | 27 ------ src/Squidex/app/features/schemas/module.ts | 17 +++- .../pages/schema/schema-page.component.html | 85 +++++++++++-------- .../pages/schema/schema-page.component.scss | 4 + .../pages/schemas/schemas-page.component.html | 32 +++---- .../shared/components/history.component.ts | 13 ++- .../shell/pages/app/left-menu.component.html | 5 -- 15 files changed, 103 insertions(+), 163 deletions(-) delete mode 100644 src/Squidex/app/features/media/declarations.ts delete mode 100644 src/Squidex/app/features/media/index.ts delete mode 100644 src/Squidex/app/features/media/module.ts delete mode 100644 src/Squidex/app/features/media/pages/media-page.component.html delete mode 100644 src/Squidex/app/features/media/pages/media-page.component.scss delete mode 100644 src/Squidex/app/features/media/pages/media-page.component.ts diff --git a/src/Squidex/app/app.routes.ts b/src/Squidex/app/app.routes.ts index b8d5bbf3a..de15fc8f5 100644 --- a/src/Squidex/app/app.routes.ts +++ b/src/Squidex/app/app.routes.ts @@ -46,9 +46,6 @@ export const routes: Routes = [ }, { path: 'content', loadChildren: './features/content/module#SqxFeatureContentModule' - }, { - path: 'media', - loadChildren: './features/media/module#SqxFeatureMediaModule' }, { path: 'schemas', loadChildren: './features/schemas/module#SqxFeatureSchemasModule' diff --git a/src/Squidex/app/features/content/pages/content-page.component.html b/src/Squidex/app/features/content/pages/content-page.component.html index 56e978053..3c66e1605 100644 --- a/src/Squidex/app/features/content/pages/content-page.component.html +++ b/src/Squidex/app/features/content/pages/content-page.component.html @@ -9,6 +9,8 @@ -
+
+
+
\ No newline at end of file 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 0f3ddb664..26e2c9c7c 100644 --- a/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html +++ b/src/Squidex/app/features/dashboard/pages/dashboard-page.component.html @@ -5,6 +5,8 @@

Dashboard

-
+
+
+
\ No newline at end of file diff --git a/src/Squidex/app/features/media/declarations.ts b/src/Squidex/app/features/media/declarations.ts deleted file mode 100644 index 8ed25b17a..000000000 --- a/src/Squidex/app/features/media/declarations.ts +++ /dev/null @@ -1,8 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Sebastian Stehle. All rights reserved - */ - -export * from './pages/media-page.component'; \ No newline at end of file diff --git a/src/Squidex/app/features/media/index.ts b/src/Squidex/app/features/media/index.ts deleted file mode 100644 index da3622ff0..000000000 --- a/src/Squidex/app/features/media/index.ts +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Sebastian Stehle. All rights reserved - */ - -export * from './declarations'; -export * from './module'; \ No newline at end of file diff --git a/src/Squidex/app/features/media/module.ts b/src/Squidex/app/features/media/module.ts deleted file mode 100644 index 7a5eda2a5..000000000 --- a/src/Squidex/app/features/media/module.ts +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Sebastian Stehle. All rights reserved - */ - -import { NgModule } from '@angular/core'; -import { RouterModule, Routes } from '@angular/router'; - -import { SqxFrameworkModule, SqxSharedModule } from 'shared'; - -import { - MediaPageComponent -} from './declarations'; - -const routes: Routes = [ - { - path: '', - component: MediaPageComponent - } -]; - -@NgModule({ - imports: [ - SqxFrameworkModule, - SqxSharedModule, - RouterModule.forChild(routes) - ], - declarations: [ - MediaPageComponent - ] -}) -export class SqxFeatureMediaModule { } \ No newline at end of file diff --git a/src/Squidex/app/features/media/pages/media-page.component.html b/src/Squidex/app/features/media/pages/media-page.component.html deleted file mode 100644 index 2d0e936cf..000000000 --- a/src/Squidex/app/features/media/pages/media-page.component.html +++ /dev/null @@ -1,14 +0,0 @@ - - -
-
-

Media

- - - - -
- -
-
-
\ No newline at end of file diff --git a/src/Squidex/app/features/media/pages/media-page.component.scss b/src/Squidex/app/features/media/pages/media-page.component.scss deleted file mode 100644 index 83df9045e..000000000 --- a/src/Squidex/app/features/media/pages/media-page.component.scss +++ /dev/null @@ -1,7 +0,0 @@ -@import '_vars'; -@import '_mixins'; - -.panel { - min-width: 600px; - max-width: 600px; -} \ No newline at end of file diff --git a/src/Squidex/app/features/media/pages/media-page.component.ts b/src/Squidex/app/features/media/pages/media-page.component.ts deleted file mode 100644 index 59400de16..000000000 --- a/src/Squidex/app/features/media/pages/media-page.component.ts +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Squidex Headless CMS - * - * @license - * Copyright (c) Sebastian Stehle. All rights reserved - */ - -import { Component } from '@angular/core'; - -import { - AppComponentBase, - AppsStoreService, - NotificationService, - UsersProviderService - } from 'shared'; - -@Component({ - selector: 'sqx-media-page', - styleUrls: ['./media-page.component.scss'], - templateUrl: './media-page.component.html' -}) -export class MediaPageComponent extends AppComponentBase { - constructor(apps: AppsStoreService, notifications: NotificationService, users: UsersProviderService) { - super(apps, notifications, users); - } -} - diff --git a/src/Squidex/app/features/schemas/module.ts b/src/Squidex/app/features/schemas/module.ts index 807fee8f7..e39448d16 100644 --- a/src/Squidex/app/features/schemas/module.ts +++ b/src/Squidex/app/features/schemas/module.ts @@ -8,7 +8,11 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; -import { SqxFrameworkModule, SqxSharedModule } from 'shared'; +import { + HistoryComponent, + SqxFrameworkModule, + SqxSharedModule +} from 'shared'; import { FieldComponent, @@ -31,7 +35,16 @@ const routes: Routes = [ }, { path: ':schemaName', - component: SchemaPageComponent + component: SchemaPageComponent, + children: [ + { + path: 'history', + component: HistoryComponent, + data: { + channel: 'schemas.{schemaName}' + } + } + ] }] } ]; 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 7eb8a43b0..7cad0e4b3 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 @@ -11,44 +11,57 @@ -
-
- -
- -
-
-
- -
-
-
-
- - Name is required. - - - Name can not have more than 40 characters. - - - Name can contain lower case letters (a-z), numbers and dashes (not at the end). - -
+
+
+
+ +
+ +
+ +
+
+
+
+
+ + Name is required. + + + Name can not have more than 40 characters. + + + Name can contain lower case letters (a-z), numbers and dashes (not at the end). + +
+
- -
+ +
- - + + +
+
+
+
+
  • + + + +
    • +
    -
    \ No newline at end of file +
    + + \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss index ca6031c09..d7893c195 100644 --- a/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss +++ b/src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss @@ -4,4 +4,8 @@ .panel { min-width: 760px; max-width: 700px; +} + +.panel-content { + overflow-y: scroll; } \ No newline at end of file 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 f479538b3..6937a336c 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 @@ -22,21 +22,23 @@
    -
    -
    -
    -
    -
    -
    - {{schema.name}} -
    -
    - - {{userName(schema.lastModifiedBy, true) | async}} - -
    -
    - {{schema.lastModified.toLocal() | fromNow}} +
    +
    +
    +
    +
    +
    +
    + {{schema.name}} +
    +
    + + {{userName(schema.lastModifiedBy, true) | async}} + +
    +
    + {{schema.lastModified.toLocal() | fromNow}} +
    diff --git a/src/Squidex/app/shared/components/history.component.ts b/src/Squidex/app/shared/components/history.component.ts index 1538aff24..f8db8a210 100644 --- a/src/Squidex/app/shared/components/history.component.ts +++ b/src/Squidex/app/shared/components/history.component.ts @@ -26,7 +26,18 @@ const REPLACEMENT_TEMP = '$TEMP$'; }) export class HistoryComponent extends AppComponentBase { public get channel(): string { - return this.route.snapshot.data['channel']; + let result = this.route.snapshot.data['channel']; + let params = this.route.parent.snapshot.params; + + for (let key in params) { + if (params.hasOwnProperty(key)) { + const value = params[key]; + + result = result.replace('{' + key + '}', value); + } + } + + return result; } public events = diff --git a/src/Squidex/app/shell/pages/app/left-menu.component.html b/src/Squidex/app/shell/pages/app/left-menu.component.html index 36cab231a..8b7195677 100644 --- a/src/Squidex/app/shell/pages/app/left-menu.component.html +++ b/src/Squidex/app/shell/pages/app/left-menu.component.html @@ -10,11 +10,6 @@ Content -
  • - - Media - -
  • Settings