- < zurück zur Übersicht
-
- Auszeichnungen von {{user.username}}
-
+
+
+ Auszeichnungen von {{user.username}}
+
+
@@ -23,31 +27,31 @@
-
- |
- Bezeichnung |
- Begründung |
- Verliehen am |
-
+
+ |
+ Bezeichnung |
+ Begründung |
+ Verliehen am |
+
-
-
-
- |
-
-
- |
-
- {{award.decorationId.name}}
- |
-
- {{award.reason}}
- |
-
- {{award.date | date: 'dd.MM.yyyy'}}
- |
-
+
+
+
+ |
+
+
+ |
+
+ {{award.decorationId.name}}
+ |
+
+ {{award.reason}}
+ |
+
+ {{award.date | date: 'dd.MM.yyyy'}}
+ |
+
diff --git a/static/src/app/pub/trace-overview/trace-overview.component.css b/static/src/app/pub/trace-overview/trace-overview.component.css
index 6061a78..e8b564f 100644
--- a/static/src/app/pub/trace-overview/trace-overview.component.css
+++ b/static/src/app/pub/trace-overview/trace-overview.component.css
@@ -7,6 +7,12 @@
min-height: calc(100vh - 95px);
}
+.return-button {
+ display: block;
+ width: auto;
+ float: left;
+}
+
.show-panel {
display: inline-block;
margin: inherit;
diff --git a/static/src/app/pub/trace-overview/trace-overview.component.html b/static/src/app/pub/trace-overview/trace-overview.component.html
index 9ae31f3..9fb4195 100644
--- a/static/src/app/pub/trace-overview/trace-overview.component.html
+++ b/static/src/app/pub/trace-overview/trace-overview.component.html
@@ -1,6 +1,12 @@
Alle aktiven Teilnehmer mit {{isRank ? 'Rang' : 'Auszeichnung'}}
+
+
+
+
diff --git a/static/src/app/pub/trace-overview/trace-overview.component.ts b/static/src/app/pub/trace-overview/trace-overview.component.ts
index 7a94b87..049eb28 100644
--- a/static/src/app/pub/trace-overview/trace-overview.component.ts
+++ b/static/src/app/pub/trace-overview/trace-overview.component.ts
@@ -1,6 +1,6 @@
import {Component, Inject, OnDestroy, OnInit} from '@angular/core';
import {ActivatedRoute, Router} from '@angular/router';
-import {DOCUMENT} from '@angular/common';
+import {DOCUMENT, Location} from '@angular/common';
import {Fraction} from '../../utils/fraction.enum';
import {CSSHelpers} from '../../utils/global.helpers';
import {RouteConfig} from '../../app.config';
@@ -29,6 +29,7 @@ export class TraceOverviewComponent implements OnInit, OnDestroy {
constructor(private router: Router,
private route: ActivatedRoute,
+ private location: Location,
private userService: UserService,
private rankService: RankService,
private decorationService: DecorationService,
@@ -67,6 +68,10 @@ export class TraceOverviewComponent implements OnInit, OnDestroy {
this.router.navigate(['overview', {outlets: {'right': ['member', user._id]}}]);
}
+ navigateBack() {
+ this.location.back();
+ }
+
ngOnDestroy() {
if (!this.router.url.includes(RouteConfig.overviewPath)) {
this.document.getElementById('right').setAttribute('style', '');
diff --git a/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.html b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.html
index 51fb3e7..0d579ca 100644
--- a/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.html
+++ b/static/src/app/statistic/campaign/campaign-player-detail/campaign-player-detail.component.html
@@ -2,7 +2,9 @@
Kampagnendetails - {{campaignPlayer.name}}
{{campaignPlayer.campaign.title}} Kampagne
- < Zurück
+
diff --git a/static/src/app/statistic/war/scoreboard/scoreboard.component.css b/static/src/app/statistic/war/scoreboard/scoreboard.component.css
index 423e99b..419eae2 100644
--- a/static/src/app/statistic/war/scoreboard/scoreboard.component.css
+++ b/static/src/app/statistic/war/scoreboard/scoreboard.component.css
@@ -1,10 +1,9 @@
.scoreboard-table {
- height: 68vh;
+ height: 60vh;
width:fit-content;
border: 1px solid #dadada;
overflow-x: auto;
- margin: auto;
- margin-top: 56px;
+ margin: 56px auto auto;
}
:host /deep/ table.mat-table > thead {
diff --git a/static/src/app/statistic/war/war-list/war-list.component.css b/static/src/app/statistic/war/war-list/war-list.component.css
index 0c21524..c881da2 100644
--- a/static/src/app/statistic/war/war-list/war-list.component.css
+++ b/static/src/app/statistic/war/war-list/war-list.component.css
@@ -1,3 +1,7 @@
+.select-list {
+ min-height: calc(100vh - 50px);
+}
+
.war-list-header {
margin: auto;
}