From d05aac9843af3d41ee6e4382ce7f3bdcffb6bc5a Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Sun, 14 Jul 2019 20:55:14 +0200 Subject: [PATCH] X-Languages fix and modal fixes. --- .../Contents/ContextExtensions.cs | 2 +- .../pages/content/content-page.component.html | 8 +-- .../shared/content-item.component.html | 4 +- .../schemas/pages/schema/field.component.html | 4 +- .../angular/modals/modal.directive.ts | 21 ++++++-- .../components/asset-uploader.component.html | 54 ++++++++++--------- .../pages/internal/apps-menu.component.scss | 19 ++++--- .../internal/profile-menu.component.scss | 3 +- 8 files changed, 67 insertions(+), 48 deletions(-) diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContextExtensions.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContextExtensions.cs index 78f208424..c88b4fae9 100644 --- a/src/Squidex.Domain.Apps.Entities/Contents/ContextExtensions.cs +++ b/src/Squidex.Domain.Apps.Entities/Contents/ContextExtensions.cs @@ -104,7 +104,7 @@ namespace Squidex.Domain.Apps.Entities.Contents public static IEnumerable Languages(this Context context) { - if (context.Headers.TryGetValue(HeaderResolveAssetUrls, out var value)) + if (context.Headers.TryGetValue(HeaderLanguages, out var value)) { var languages = new HashSet(); 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 cc47f0d29..21a0c6170 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 @@ -33,7 +33,7 @@ -
+
Change to {{info.status}} diff --git a/src/Squidex/app/features/schemas/pages/schema/field.component.html b/src/Squidex/app/features/schemas/pages/schema/field.component.html index 03fdd2a4d..2abde3801 100644 --- a/src/Squidex/app/features/schemas/pages/schema/field.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/field.component.html @@ -25,12 +25,12 @@
- -
+
Enable in UI diff --git a/src/Squidex/app/framework/angular/modals/modal.directive.ts b/src/Squidex/app/framework/angular/modals/modal.directive.ts index c33912b28..6dbc36bc1 100644 --- a/src/Squidex/app/framework/angular/modals/modal.directive.ts +++ b/src/Squidex/app/framework/angular/modals/modal.directive.ts @@ -5,7 +5,8 @@ * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. */ -import { ChangeDetectorRef, Directive, EmbeddedViewRef, Input, OnDestroy, Renderer2, TemplateRef } from '@angular/core'; +import { ChangeDetectorRef, Directive, EmbeddedViewRef, Input, OnDestroy, Renderer2, TemplateRef, ViewContainerRef } from '@angular/core'; +import { timer } from 'rxjs'; import { DialogModel, @@ -40,6 +41,9 @@ export class ModalDirective implements OnDestroy { } } + @Input('sqxModalOnRoot') + public placeOnRoot = true; + @Input('sqxModalCloseAuto') public closeAuto = true; @@ -50,7 +54,8 @@ export class ModalDirective implements OnDestroy { private readonly changeDetector: ChangeDetectorRef, private readonly renderer: Renderer2, private readonly rootView: RootViewComponent, - private readonly templateRef: TemplateRef + private readonly templateRef: TemplateRef, + private readonly viewContainer: ViewContainerRef ) { } @@ -70,7 +75,7 @@ export class ModalDirective implements OnDestroy { if (isOpen) { if (!this.renderedView) { - this.renderedView = this.rootView.viewContainer.createEmbeddedView(this.templateRef); + this.renderedView = this.getContainer().createEmbeddedView(this.templateRef); this.renderRoots = this.renderedView.rootNodes.filter(x => !!x.style); this.setupStyles(); @@ -91,6 +96,10 @@ export class ModalDirective implements OnDestroy { this.isOpen = isOpen; } + private getContainer() { + return this.placeOnRoot ? this.rootView.viewContainer : this.viewContainer; + } + private setupStyles() { if (this.renderRoots) { for (let node of this.renderRoots) { @@ -134,8 +143,12 @@ export class ModalDirective implements OnDestroy { } private documentClickListener = (event: MouseEvent) => { + const model = this.currentModel; + if (!this.isClickedInside(event)) { - hideModal(this.currentModel); + this.eventsView.own(timer(0, 100).subscribe(() => { + hideModal(model); + })); } } diff --git a/src/Squidex/app/shared/components/asset-uploader.component.html b/src/Squidex/app/shared/components/asset-uploader.component.html index 3f9a43764..769d19969 100644 --- a/src/Squidex/app/shared/components/asset-uploader.component.html +++ b/src/Squidex/app/shared/components/asset-uploader.component.html @@ -8,38 +8,40 @@ {{uploads.length}} -
-
- - No upload in progress, drop files here. - - -
-
-
- + +
+
+ + No upload in progress, drop files here. + + +
+
+
+ +
+
+ +
+
+ +
-
- +
+
{{upload.name}}
-
- +
+ +
+
+
-
-
-
{{upload.name}}
-
-
- -
-
-
-
+ diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.scss b/src/Squidex/app/shell/pages/internal/apps-menu.component.scss index a39731cae..d9b954623 100644 --- a/src/Squidex/app/shell/pages/internal/apps-menu.component.scss +++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.scss @@ -37,16 +37,19 @@ $color-apps-border: #65a6ff; } } -.dropdown-button { - padding: 1rem 1.5rem; -} +.dropdown { + &-button { + padding: 1rem 1.5rem; + } -.dropdown-menu { - @include absolute(2.65rem, auto, auto, auto); -} + &-menu { + @include absolute($size-navbar-height, auto, auto, 9rem); + margin: 0; + } -.dropdown-item { - @include border-radius(0); + &-item { + @include border-radius(0); + } } .btn-block { diff --git a/src/Squidex/app/shell/pages/internal/profile-menu.component.scss b/src/Squidex/app/shell/pages/internal/profile-menu.component.scss index 546145346..02372e6e5 100644 --- a/src/Squidex/app/shell/pages/internal/profile-menu.component.scss +++ b/src/Squidex/app/shell/pages/internal/profile-menu.component.scss @@ -21,7 +21,8 @@ .dropdown { &-menu { - @include absolute(2.6rem, 0, auto, auto); + @include absolute($size-navbar-height, .25rem, auto, auto); + margin: 0; } &-item {