From 49a74a931cf6319b568e2ea32583948b000771f0 Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Fri, 12 Jul 2019 12:33:59 +0200 Subject: [PATCH] Added button to show or hide map. --- .../contents-filters-page.component.html | 2 +- .../contents-filters-page.component.scss | 4 +++ .../shared/field-editor.component.html | 2 +- .../geolocation-editor.component.html | 32 ++++++++++++------- .../geolocation-editor.component.scss | 10 ++++-- .../geolocation-editor.component.ts | 21 ++++++++++-- 6 files changed, 53 insertions(+), 18 deletions(-) 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 600764d90..e06a9bcea 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 @@ -14,7 +14,7 @@

Status Queries

- {{query.name}} diff --git a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.scss b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.scss index 684ee4478..fed91c194 100644 --- a/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.scss +++ b/src/Squidex/app/features/content/pages/contents/contents-filters-page.component.scss @@ -4,3 +4,7 @@ .text-muted { pointer-events: none; } + +.status { + @include truncate; +} \ No newline at end of file diff --git a/src/Squidex/app/features/content/shared/field-editor.component.html b/src/Squidex/app/features/content/shared/field-editor.component.html index 59a50036f..8bbb536f0 100644 --- a/src/Squidex/app/features/content/shared/field-editor.component.html +++ b/src/Squidex/app/features/content/shared/field-editor.component.html @@ -47,7 +47,7 @@ - + diff --git a/src/Squidex/app/shared/components/geolocation-editor.component.html b/src/Squidex/app/shared/components/geolocation-editor.component.html index 6372c12ed..7d835fb28 100644 --- a/src/Squidex/app/shared/components/geolocation-editor.component.html +++ b/src/Squidex/app/shared/components/geolocation-editor.component.html @@ -1,31 +1,41 @@ -
-
+
+
+ -
-
-
- + +
+ +
+
-
+
-
- +
+
-
+
-
+
+
+ + +
\ No newline at end of file diff --git a/src/Squidex/app/shared/components/geolocation-editor.component.scss b/src/Squidex/app/shared/components/geolocation-editor.component.scss index 87fd5f1b7..1e55176c4 100644 --- a/src/Squidex/app/shared/components/geolocation-editor.component.scss +++ b/src/Squidex/app/shared/components/geolocation-editor.component.scss @@ -15,6 +15,12 @@ width: 40%; } -.form-inline { - margin-top: .5rem; +.compact { + .form-group { + max-width: 40%; + } + + .form-control { + max-width: 100%; + } } \ No newline at end of file diff --git a/src/Squidex/app/shared/components/geolocation-editor.component.ts b/src/Squidex/app/shared/components/geolocation-editor.component.ts index 0a83b2a4e..6ee573110 100644 --- a/src/Squidex/app/shared/components/geolocation-editor.component.ts +++ b/src/Squidex/app/shared/components/geolocation-editor.component.ts @@ -5,10 +5,11 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, ViewChild } from '@angular/core'; +import { AfterViewInit, ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, forwardRef, Input, ViewChild } from '@angular/core'; import { FormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms'; import { + LocalStoreService, ResourceLoaderService, StatefulControlComponent, Types, @@ -28,6 +29,10 @@ interface Geolocation { longitude: number; } +interface Snapshot { + isMapHidden?: boolean; +} + @Component({ selector: 'sqx-geolocation-editor', styleUrls: ['./geolocation-editor.component.scss'], @@ -35,7 +40,7 @@ interface Geolocation { providers: [SQX_GEOLOCATION_EDITOR_CONTROL_VALUE_ACCESSOR], changeDetection: ChangeDetectionStrategy.OnPush }) -export class GeolocationEditorComponent extends StatefulControlComponent implements AfterViewInit { +export class GeolocationEditorComponent extends StatefulControlComponent implements AfterViewInit { private readonly isGoogleMaps: boolean; private marker: any; private map: any; @@ -61,6 +66,9 @@ export class GeolocationEditorComponent extends StatefulControlComponent; @@ -68,15 +76,22 @@ export class GeolocationEditorComponent extends StatefulControlComponent; constructor(changeDetector: ChangeDetectorRef, + private readonly localStore: LocalStoreService, private readonly resourceLoader: ResourceLoaderService, private readonly formBuilder: FormBuilder, private readonly uiOptions: UIOptions ) { - super(changeDetector, undefined); + super(changeDetector, { isMapHidden: localStore.getBoolean('hideMap') }); this.isGoogleMaps = uiOptions.get('map.type') !== 'OSM'; } + public hideMap(isMapHidden: boolean) { + this.next({ isMapHidden }); + + this.localStore.setBoolean('hideMap', isMapHidden); + } + public writeValue(obj: any) { if (Types.isObject(obj) && Types.isNumber(obj.latitude) && Types.isNumber(obj.longitude)) { this.value = obj;