diff --git a/src/Squidex/app/features/content/pages/content/content-history.component.html b/src/Squidex/app/features/content/pages/content/content-history.component.html index 4a83a942b..cfd678f5e 100644 --- a/src/Squidex/app/features/content/pages/content/content-history.component.html +++ b/src/Squidex/app/features/content/pages/content/content-history.component.html @@ -4,11 +4,11 @@ -
-
+
+
-
+
{{event.actor | sqxUserNameRef:null}}
diff --git a/src/Squidex/app/features/content/pages/content/content-history.component.scss b/src/Squidex/app/features/content/pages/content/content-history.component.scss index 9fa38efc6..3a034e941 100644 --- a/src/Squidex/app/features/content/pages/content/content-history.component.scss +++ b/src/Squidex/app/features/content/pages/content/content-history.component.scss @@ -1,14 +1,30 @@ @import '_vars'; @import '_mixins'; +:host /deep/ { + .user-ref { + color: $color-title; + } + + .marker-ref { + color: $color-title; + } +} + +.user-picture { + margin-top: .25rem; +} + .event { & { - @include flex-box; - margin-bottom: 1rem; + color: $color-text-decent; + font-size: .9rem; + font-weight: normal; + margin-bottom: 1.5rem; } - &-main { - @include flex-grow(1); + &-created { + font-size: .75rem; } &-load { @@ -24,16 +40,4 @@ text-decoration: underline !important; } } - - &-left { - min-width: 2.8rem; - max-width: 2.8rem; - margin-top: .25rem; - } - - &-created { - font-size: .65rem; - font-weight: normal; - color: $color-text-decent; - } } \ No newline at end of file diff --git a/src/Squidex/app/features/schemas/module.ts b/src/Squidex/app/features/schemas/module.ts index 53583eab9..a6ede84cb 100644 --- a/src/Squidex/app/features/schemas/module.ts +++ b/src/Squidex/app/features/schemas/module.ts @@ -10,6 +10,7 @@ import { RouterModule, Routes } from '@angular/router'; import { DndModule } from 'ng2-dnd'; import { + HelpComponent, SchemaMustExistGuard, SqxFrameworkModule, SqxSharedModule @@ -54,7 +55,16 @@ const routes: Routes = [ { path: ':schemaName', component: SchemaPageComponent, - canActivate: [SchemaMustExistGuard] + canActivate: [SchemaMustExistGuard], + children: [ + { + path: 'help', + component: HelpComponent, + data: { + helpPage: '05-integrated/schemas' + } + } + ] }] } ]; 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 eda9217a0..91802f822 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 @@ -1,6 +1,6 @@ - + {{schema.displayName}} @@ -69,8 +69,16 @@
+ + + + + + + + diff --git a/src/Squidex/app/features/settings/module.ts b/src/Squidex/app/features/settings/module.ts index 5abe1d47b..5672f29ac 100644 --- a/src/Squidex/app/features/settings/module.ts +++ b/src/Squidex/app/features/settings/module.ts @@ -10,6 +10,8 @@ import { RouterModule, Routes } from '@angular/router'; import { DndModule } from 'ng2-dnd'; import { + HelpComponent, + HistoryComponent, SqxFrameworkModule, SqxSharedModule } from '@app/shared'; @@ -38,33 +40,115 @@ const routes: Routes = [ { path: '' }, - { - path: 'plans', - component: PlansPageComponent - }, { path: 'more', component: MorePageComponent }, { path: 'backups', - component: BackupsPageComponent + component: BackupsPageComponent, + children: [ + { + path: 'help', + component: HelpComponent, + data: { + helpPage: '05-integrated/backups' + } + } + ] + }, + { + path: 'plans', + component: PlansPageComponent, + children: [ + { + path: 'history', + component: HistoryComponent, + data: { + channel: 'settings.plans' + } + } + ] + }, + { + path: 'patterns', + component: PatternsPageComponent, + children: [ + { + path: 'history', + component: HistoryComponent, + data: { + channel: 'settings.patterns' + } + }, + { + path: 'help', + component: HelpComponent, + data: { + helpPage: '05-integrated/patterns' + } + } + ] }, { path: 'clients', - component: ClientsPageComponent + component: ClientsPageComponent, + children: [ + { + path: 'history', + component: HistoryComponent, + data: { + channel: 'settings.clients' + } + }, + { + path: 'help', + component: HelpComponent, + data: { + helpPage: '05-integrated/clients' + } + } + ] }, { path: 'contributors', - component: ContributorsPageComponent + component: ContributorsPageComponent, + children: [ + { + path: 'history', + component: HistoryComponent, + data: { + channel: 'settings.contributors' + } + }, + { + path: 'help', + component: HelpComponent, + data: { + helpPage: '05-integrated/contributors' + } + } + ] }, { path: 'languages', - component: LanguagesPageComponent - }, - { - path: 'patterns', - component: PatternsPageComponent + component: LanguagesPageComponent, + children: [ + { + path: 'history', + component: HistoryComponent, + data: { + channel: 'settings.languages' + } + }, + { + path: 'help', + component: HelpComponent, + data: { + helpPage: '05-integrated/languages' + } + } + ] } ] } diff --git a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html index 9aa9650ac..9e302bf28 100644 --- a/src/Squidex/app/features/settings/pages/backups/backups-page.component.html +++ b/src/Squidex/app/features/settings/pages/backups/backups-page.component.html @@ -1,6 +1,6 @@ - + Backups @@ -91,4 +91,12 @@ - \ No newline at end of file + + + + + + + + + \ No newline at end of file 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 3a9e17b94..d33e5fd2a 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 @@ -1,6 +1,6 @@ - + Clients @@ -40,4 +40,15 @@
- \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file 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 69f714378..ae284ed0e 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 @@ -1,6 +1,6 @@ - + Contributors @@ -71,4 +71,15 @@ - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file 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 047300c98..4bdb95d8a 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 @@ -1,6 +1,6 @@ - + Languages @@ -41,4 +41,15 @@ - \ No newline at end of file + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html index 0eb0893fa..b1c2c482c 100644 --- a/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html +++ b/src/Squidex/app/features/settings/pages/patterns/patterns-page.component.html @@ -1,6 +1,6 @@  - + Patterns @@ -23,6 +23,15 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html index 1bea97060..84f11db59 100644 --- a/src/Squidex/app/features/settings/pages/plans/plans-page.component.html +++ b/src/Squidex/app/features/settings/pages/plans/plans-page.component.html @@ -1,6 +1,6 @@ - + Update Plan @@ -77,4 +77,12 @@ - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/src/Squidex/app/shared/components/history-list.component.scss b/src/Squidex/app/shared/components/history-list.component.scss index da8768e17..177a8de84 100644 --- a/src/Squidex/app/shared/components/history-list.component.scss +++ b/src/Squidex/app/shared/components/history-list.component.scss @@ -23,6 +23,10 @@ margin-bottom: 1.5rem; } + &-message { + margin-bottom: .35rem; + } + &-created { font-size: .75rem; } diff --git a/src/Squidex/app/theme/_common.scss b/src/Squidex/app/theme/_common.scss index fff7ea050..a271702fb 100644 --- a/src/Squidex/app/theme/_common.scss +++ b/src/Squidex/app/theme/_common.scss @@ -15,16 +15,6 @@ body { } } -// User ref for history panel. Must be placed here, because element is created dynamically. -.user-ref { - color: $color-theme-blue-dark; -} - -// Marker ref for history panel. Must be placed here, because element is created dynamically. -.marker-ref { - font-weight: bolder; -} - // Common style for user email. .user-email { font-style: italic;