diff --git a/src/Squidex/app/features/assets/pages/assets-filters-page.component.html b/src/Squidex/app/features/assets/pages/assets-filters-page.component.html index 99919b491..f3782afbe 100644 --- a/src/Squidex/app/features/assets/pages/assets-filters-page.component.html +++ b/src/Squidex/app/features/assets/pages/assets-filters-page.component.html @@ -30,7 +30,8 @@ + [queryUsed]="isQueryUsed" + (search)="search($event.query)"> \ No newline at end of file diff --git a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html index 78da01c95..3cf873ff7 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html +++ b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.html @@ -25,7 +25,8 @@ + [queryUsed]="isQueryUsed" + (search)="search($event.query)"> \ 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 e61b3ff27..eaee544c2 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 @@ -28,6 +28,39 @@ + +
+ + Just enter the email address to invite someone with no account to the app. + + +
+
+
+ + + + + + {{user.displayName}} + + + +
+
+ +
+
+
+
+ +
+ + Big team? Add many contributors at once + +
+ + @@ -56,7 +89,7 @@
- + @@ -64,37 +97,6 @@ No contributors found. - - -
- - Just enter the email address to invite someone with no account to the app. - - -
-
-
- - - - - - {{user.displayName}} - - - -
-
- -
-
-
-
- - - Big team? Add many contributors at once - - diff --git a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss index e42bfaa5c..56afd85b9 100644 --- a/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss +++ b/src/Squidex/app/features/settings/pages/contributors/contributors-page.component.scss @@ -9,4 +9,14 @@ &-name { margin-left: .25rem; } +} + +.import-hint { + margin-bottom: 1rem; + font-weight: normal; + font-size: 90%; +} + +.table-items-header { + margin: 0; } \ No newline at end of file diff --git a/src/Squidex/app/framework/angular/forms/form-alert.component.ts b/src/Squidex/app/framework/angular/forms/form-alert.component.ts index 052fca509..d9161242b 100644 --- a/src/Squidex/app/framework/angular/forms/form-alert.component.ts +++ b/src/Squidex/app/framework/angular/forms/form-alert.component.ts @@ -16,12 +16,12 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; max-width: 100%; } - .white { - background: #fff; + .light { + background: #fcfeff; } `], template: ` -
+
`, changeDetection: ChangeDetectionStrategy.OnPush @@ -37,5 +37,5 @@ export class FormAlertComponent { public marginBottom = 4; @Input() - public white = false; + public light = false; } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/saved-queries.component.ts b/src/Squidex/app/shared/components/saved-queries.component.ts index f5cce5ecf..d9d09a296 100644 --- a/src/Squidex/app/shared/components/saved-queries.component.ts +++ b/src/Squidex/app/shared/components/saved-queries.component.ts @@ -16,14 +16,14 @@ import { SavedQuery } from '../state/queries';

Shared queries

- - - + + {{saved.name}} - + @@ -42,9 +42,9 @@ import { SavedQuery } from '../state/queries';

My queries

- - - + + {{saved.name}} @@ -66,13 +66,13 @@ import { SavedQuery } from '../state/queries'; }) export class SavedQueriesComponent { @Input() - public queries: Queries; + public queryUsed: (saved: SavedQuery) => boolean; @Input() - public types: string; + public queries: Queries; @Input() - public queryUsed: (saved: SavedQuery) => boolean; + public types: string; @Output() public search = new EventEmitter(); diff --git a/src/Squidex/app/shared/components/search-form.component.ts b/src/Squidex/app/shared/components/search-form.component.ts index 5baa77436..5089dce47 100644 --- a/src/Squidex/app/shared/components/search-form.component.ts +++ b/src/Squidex/app/shared/components/search-form.component.ts @@ -93,7 +93,7 @@ export class SearchFormComponent implements OnChanges { if (value) { if (this.queries && this.query) { - this.queries.add(value.name, this.query); + this.queries.add(value.name, this.query, value.user); } this.saveQueryForm.submitCompleted(); diff --git a/src/Squidex/app/shared/state/queries.ts b/src/Squidex/app/shared/state/queries.ts index 66b8208ab..0f280cccc 100644 --- a/src/Squidex/app/shared/state/queries.ts +++ b/src/Squidex/app/shared/state/queries.ts @@ -69,6 +69,10 @@ export class Queries { this.uiState.removeUser(this.getPath(saved.name)); } + public remove(saved: SavedQuery) { + this.uiState.remove(this.getPath(saved.name)); + } + private getPath(key: string): string { return `${this.prefix}.queries.${key}`; }