From e2adc8911f7b475959ded01f639a26046840e6e7 Mon Sep 17 00:00:00 2001 From: Sean Engelhardt Date: Fri, 12 Jul 2019 13:09:07 +0200 Subject: [PATCH] Add NGrid UI for MediaFiles --- .../media-upload/media-upload.component.html | 2 +- .../media-upload/media-upload.component.ts | 9 +- .../mediafile-list.component.html | 229 ++++++++++-------- .../mediafile-list.component.scss | 67 +++++ .../mediafile-list.component.scss-theme.scss | 13 + .../mediafile-list.component.ts | 73 ++++-- .../mediafiles/mediafiles-routing.module.ts | 5 + .../site/mediafiles/models/view-mediafile.ts | 4 + .../motion-list/motion-list.component.scss | 6 - client/src/styles.scss | 8 + 10 files changed, 282 insertions(+), 134 deletions(-) create mode 100644 client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.scss-theme.scss diff --git a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.html b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.html index 7bc586305..06a7a6566 100644 --- a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.html +++ b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.html @@ -1,4 +1,4 @@ - +

Upload files

diff --git a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.ts b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.ts index d0499a273..1ad22b941 100644 --- a/client/src/app/site/mediafiles/components/media-upload/media-upload.component.ts +++ b/client/src/app/site/mediafiles/components/media-upload/media-upload.component.ts @@ -1,11 +1,12 @@ import { Component, OnInit } from '@angular/core'; -import { Title } from '@angular/platform-browser'; +import { Location } from '@angular/common'; import { MatSnackBar } from '@angular/material/snack-bar'; +import { Title } from '@angular/platform-browser'; import { TranslateService } from '@ngx-translate/core'; import { BaseViewComponent } from 'app/site/base/base-view'; -import { Router, ActivatedRoute } from '@angular/router'; +import { ActivatedRoute } from '@angular/router'; import { MediafileRepositoryService } from 'app/core/repositories/mediafiles/mediafile-repository.service'; /** @@ -38,7 +39,7 @@ export class MediaUploadComponent extends BaseViewComponent implements OnInit { titleService: Title, translate: TranslateService, matSnackBar: MatSnackBar, - private router: Router, + private location: Location, private route: ActivatedRoute, private repo: MediafileRepositoryService ) { @@ -55,7 +56,7 @@ export class MediaUploadComponent extends BaseViewComponent implements OnInit { * Handler for successful uploads */ public uploadSuccess(): void { - this.router.navigate(['../'], { relativeTo: this.route }); + this.location.back(); } /** diff --git a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html index 32323405e..cef343094 100644 --- a/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html +++ b/client/src/app/site/mediafiles/components/mediafile-list/mediafile-list.component.html @@ -21,102 +21,108 @@ -->
- - +
- - - chevron_right - - - - - -
- -
- Visibility of this directory: - No one - - {{ directory.inherited_access_groups }} - -
- - - - - - - - - - - - {{ mediafile.getIcon() }} - - - - - - - {{ mediafile.title }} - - - {{ mediafile.title }} - - - - - - - {{ mediafile.size }} - {{ mediafile.access_groups }} - - - - - -
- text_fields - insert_photo + +
+ chevron_right
- - - - - - - + +
+ + Visibility of this directory: + No one + + {{ directory.inherited_access_groups }} + + +
+ + - -
+ + + +
+ + + {{ mediafile.getIcon() }} +
+ + +
+ + +
+
+ {{ mediafile.title }} +
+
+ {{ getDateFromTimestamp(mediafile.timestamp) }} ยท {{ mediafile.size }} +
+
+
+ + +
+ + + {{ mediafile.access_groups }} + + +
+ + +
+
+ text_fields + insert_photo +
+
+ + +
+ +
+
@@ -127,20 +133,28 @@
- +
- +
- +