From 436f6585c25da20c037b77d3f634d3e02ba18b67 Mon Sep 17 00:00:00 2001
From: Florian Hartwich <hardi@noarch.de>
Date: Sat, 7 Oct 2017 13:05:10 +0200
Subject: [PATCH 1/6] Fix army member click area & sort campaign all overview
 sorting

---
 static/src/app/army/army.component.css        |  1 -
 static/src/app/army/army.component.html       | 22 ++++++++++++-------
 .../overview/stats-overview.component.html    | 21 +++++++++---------
 .../overview/stats-overview.component.ts      | 17 +++++++++-----
 4 files changed, 36 insertions(+), 25 deletions(-)

diff --git a/static/src/app/army/army.component.css b/static/src/app/army/army.component.css
index 16ead7f..cbbe5fe 100644
--- a/static/src/app/army/army.component.css
+++ b/static/src/app/army/army.component.css
@@ -55,7 +55,6 @@ img {
 
 .member-link {
   cursor: pointer;
-  display: block;
   text-decoration: underline;
 }
 
diff --git a/static/src/app/army/army.component.html b/static/src/app/army/army.component.html
index 43a117b..243cd27 100644
--- a/static/src/app/army/army.component.html
+++ b/static/src/app/army/army.component.html
@@ -11,10 +11,13 @@
       </div>
       <div class="row middle-row">
         <div class="squad-cell name-cell">
-        <span class="member-link text-blufor"
-              *ngFor="let member of squad.members"
-              (click)="select(member._id)">
-          {{member.rank}} {{member.username}}
+        <span class="text-blufor"
+              style="display: block"
+              *ngFor="let member of squad.members">
+          <span class="member-link"
+                (click)="select(member._id)">
+            {{member.rank}} {{member.username}}
+          </span>
         </span>
         </div>
       </div>
@@ -37,10 +40,13 @@
       </div>
       <div class="row middle-row">
         <div class="squad-cell name-cell">
-        <span class="member-link text-opfor"
-              *ngFor="let member of squad.members"
-              (click)="select(member._id)">
-          {{member.rank}} {{member.username}}
+        <span class="text-opfor"
+              style="display: block"
+              *ngFor="let member of squad.members">
+          <span class="member-link"
+                (click)="select(member._id)">
+            {{member.rank}} {{member.username}}
+          </span>
         </span>
         </div>
       </div>
diff --git a/static/src/app/statistic/overview/stats-overview.component.html b/static/src/app/statistic/overview/stats-overview.component.html
index 9c9430f..2cea8db 100644
--- a/static/src/app/statistic/overview/stats-overview.component.html
+++ b/static/src/app/statistic/overview/stats-overview.component.html
@@ -1,15 +1,15 @@
 <div class="slide-chart-container" style="height: 150px;">
   <h2 style="margin-bottom: 20px">{{title}}</h2>
 
-    <div class="btn btn-default" [style.background]="isActiveSlide(0)"
-         (click)="goToSlide(0)" *ngIf="id != 'all'">Gesamtpunktzahl
-    </div>
-    <div class="btn btn-default" [style.background]="isActiveSlide(1)"
-         (click)="goToSlide(1)">Punkte je Schlacht
-    </div>
-    <div class="btn btn-default" [style.background]="isActiveSlide(2)"
-         (click)="goToSlide(2)">Spielerzahlen
-    </div>
+  <div class="btn btn-default" [style.background]="isActiveSlide(0)"
+       (click)="goToSlide(0)" *ngIf="id != 'all'">Gesamtpunktzahl
+  </div>
+  <div class="btn btn-default" [style.background]="isActiveSlide(1)"
+       (click)="goToSlide(1)">Punkte je Schlacht
+  </div>
+  <div class="btn btn-default" [style.background]="isActiveSlide(2)"
+       (click)="goToSlide(2)">Spielerzahlen
+  </div>
 </div>
 <div class="fade-in">
   <div class="slide-chart-container">
@@ -25,7 +25,8 @@
       [showYAxisLabel]="showYAxisLabel"
       [yAxisLabel]="yAxisLabel"
       [autoScale]="autoscale"
-      [timeline]="timeline">
+      [timeline]="timeline"
+      [roundDomains]="roundDomains">
     </ngx-charts-line-chart>
   </div>
 </div>
diff --git a/static/src/app/statistic/overview/stats-overview.component.ts b/static/src/app/statistic/overview/stats-overview.component.ts
index 12f7ec9..2e90f03 100644
--- a/static/src/app/statistic/overview/stats-overview.component.ts
+++ b/static/src/app/statistic/overview/stats-overview.component.ts
@@ -38,7 +38,6 @@ export class StatisticOverviewComponent {
   autoscale = true;
   timeline = false;
 
-
   constructor(private route: ActivatedRoute,
               private campaignService: CampaignService) {
   }
@@ -63,14 +62,20 @@ export class StatisticOverviewComponent {
     let itemsProcessed = 0;
     campaigns = campaigns.filter(campaign => this.id === 'all' || campaign._id === this.id);
     campaigns.forEach(campaign => {
-      if (this.id === 'all') {
-        this.title = "Gesamtübersicht";
-      } else {
-        this.title = campaign.title;
-      }
       wars = wars.concat(campaign.wars);
       itemsProcessed++;
       if (itemsProcessed === campaigns.length) {
+        if (this.id === 'all') {
+          this.title = "Gesamtübersicht";
+          wars.sort((a, b) => {
+              // sort by dates, because older campaign can contain newer war
+              if (a['date'] > (b['date'])) return -1;
+              if (a['date'] < (b['date'])) return 1;
+              return 0;
+          })
+        } else {
+          this.title = campaign.title;
+        }
         this.initChart(wars);
       }
     })

From 7ec7f3fb9ba11e8f9aea876d42a96dd639f6eecc Mon Sep 17 00:00:00 2001
From: Florian Hartwich <hardi@noarch.de>
Date: Sat, 7 Oct 2017 15:31:22 +0200
Subject: [PATCH 2/6] Fix load indicator position

---
 static/src/app/style/load-indicator.css | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/static/src/app/style/load-indicator.css b/static/src/app/style/load-indicator.css
index f224632..4fed87a 100644
--- a/static/src/app/style/load-indicator.css
+++ b/static/src/app/style/load-indicator.css
@@ -1,9 +1,7 @@
 .load-indicator {
   position: absolute;
   top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  width: 50%;
+  left: 48.5%;
   z-index: 1;
 }
 

From 7a6146f187d095aebcf3134caa6fcfebe0548973 Mon Sep 17 00:00:00 2001
From: Florian Hartwich <hardi@noarch.de>
Date: Sat, 7 Oct 2017 18:06:30 +0200
Subject: [PATCH 3/6] Fix army member alignment

---
 static/src/app/army/army-member.component.css  | 12 ++++++------
 static/src/app/army/army-member.component.html |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/static/src/app/army/army-member.component.css b/static/src/app/army/army-member.component.css
index 02e33f7..8c49849 100644
--- a/static/src/app/army/army-member.component.css
+++ b/static/src/app/army/army-member.component.css
@@ -1,14 +1,14 @@
-.overview {
-  height: 100vh;
+.army-member-view {
   width: 90%;
+  height: 100vh;
   padding: 5px;
   margin: auto;
-  position: relative;
-  left: -1%;
 }
 
-:host /deep/ #right {
-  padding-left: 0;
+.army-member-view-container {
+  width: 90%;
+  min-width: 870px;
+  margin:auto
 }
 
 .return-button {
diff --git a/static/src/app/army/army-member.component.html b/static/src/app/army/army-member.component.html
index ac0ae0c..b7b3488 100644
--- a/static/src/app/army/army-member.component.html
+++ b/static/src/app/army/army-member.component.html
@@ -1,5 +1,5 @@
-<div class="overview">
-  <div style="width: 90%; min-width: 870px; margin:auto">
+<div class="army-member-view">
+  <div class="army-member-view-container">
     <div class="return-button">
       <span class="btn btn-default" style="position:absolute;" (click)="backToOverview()">< zurück zur Übersicht</span>
       <h3 class="text-center" [ngClass]="user.squad?.fraction === 'BLUFOR' ? 'blufor' : 'opfor'">

From 840185d2e30233d152580a639957294a2c655d77 Mon Sep 17 00:00:00 2001
From: Florian Hartwich <hardi@noarch.de>
Date: Sat, 7 Oct 2017 19:32:16 +0200
Subject: [PATCH 4/6] Combine Overview css definition and fix layouts

---
 static/src/app/admin/admin.component.css      | 18 ++++++------
 static/src/app/admin/admin.component.html     |  3 +-
 static/src/app/admin/admin.component.ts       |  2 +-
 .../edit-decoration.component.ts              |  2 +-
 .../ranks/edit-rank/edit-rank.component.ts    |  2 +-
 .../app/request/award/req-award.component.css | 29 +++++++++----------
 .../request/award/req-award.component.html    |  4 +--
 .../app/request/award/req-award.component.ts  |  2 +-
 .../confirm-award/confirm-award.component.css | 24 +++++++--------
 .../confirm-award.component.html              |  3 +-
 .../confirm-award/confirm-award.component.ts  |  2 +-
 .../confirm-promotion.component.css           | 24 +++++++--------
 .../confirm-promotion.component.html          |  3 +-
 .../confirm-promotion.component.ts            |  2 +-
 .../promotion/req-promotion.component.css     | 26 ++++++++---------
 .../promotion/req-promotion.component.html    |  3 +-
 .../promotion/req-promotion.component.ts      |  2 +-
 .../squads/edit-squad/edit-squad.component.ts |  2 +-
 .../campaign-player-detail.component.css      | 10 -------
 .../campaign-player-detail.component.html     |  2 +-
 .../campaign-player-detail.component.ts       |  3 +-
 .../campaign-submit.component.css             |  8 -----
 .../campaign-submit.component.ts              |  2 +-
 .../overview/stats-overview.component.ts      |  2 +-
 .../war-submit/war-submit.component.css       |  8 -----
 .../war-submit/war-submit.component.ts        |  3 +-
 static/src/app/style/entry-form.css           | 18 +++++-------
 static/src/app/style/overview.css             |  9 ++++++
 .../users/award-user/award-user.component.css | 13 ---------
 .../users/award-user/award-user.component.ts  |  2 +-
 .../users/edit-user/edit-user.component.ts    |  2 +-
 31 files changed, 93 insertions(+), 142 deletions(-)
 create mode 100644 static/src/app/style/overview.css

diff --git a/static/src/app/admin/admin.component.css b/static/src/app/admin/admin.component.css
index 597fa90..2bd1a07 100644
--- a/static/src/app/admin/admin.component.css
+++ b/static/src/app/admin/admin.component.css
@@ -1,13 +1,5 @@
 .overview {
-  position: fixed;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  bottom: 20px;
-  width: 100%;
-  padding-left: 50px;
-  padding-top: 190px;
-  margin-left: 10px;
-  height: 100vh;
+  padding: 80px 0 0 10%!important;
 }
 
 .trash {
@@ -32,3 +24,11 @@
 .cell-outline {
   outline: 1px solid #D4D4D4;
 }
+
+.label {
+  display: block;
+  position: absolute;
+  font-size: 12px;
+  padding: 5px;
+  margin-left: 25%;
+}
diff --git a/static/src/app/admin/admin.component.html b/static/src/app/admin/admin.component.html
index 1538cdd..f6cc8cc 100644
--- a/static/src/app/admin/admin.component.html
+++ b/static/src/app/admin/admin.component.html
@@ -3,8 +3,7 @@
   <h2>Admin Panel</h2>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small"
-        style="margin-left: inherit">
+        class="label label-success label-small">
         Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/admin/admin.component.ts b/static/src/app/admin/admin.component.ts
index b8ce4b9..87674bf 100644
--- a/static/src/app/admin/admin.component.ts
+++ b/static/src/app/admin/admin.component.ts
@@ -8,7 +8,7 @@ import {SquadService} from "../services/squad-service/squad.service";
 @Component({
   selector: 'admin-panel',
   templateUrl: './admin.component.html',
-  styleUrls: ['./admin.component.css']
+  styleUrls: ['./admin.component.css', '../style/overview.css']
 })
 export class AdminComponent {
 
diff --git a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts
index ea4b617..a41c590 100644
--- a/static/src/app/decorations/edit-decoration/edit-decoration.component.ts
+++ b/static/src/app/decorations/edit-decoration/edit-decoration.component.ts
@@ -7,7 +7,7 @@ import {Subscription} from "rxjs/Subscription";
 
 @Component({
   templateUrl: './edit-decoration.component.html',
-  styleUrls: ['./edit-decoration.component.css', '../../style/entry-form.css']
+  styleUrls: ['./edit-decoration.component.css', '../../style/entry-form.css', '../../style/overview.css']
 })
 export class EditDecorationComponent {
 
diff --git a/static/src/app/ranks/edit-rank/edit-rank.component.ts b/static/src/app/ranks/edit-rank/edit-rank.component.ts
index 729488f..2aebc98 100644
--- a/static/src/app/ranks/edit-rank/edit-rank.component.ts
+++ b/static/src/app/ranks/edit-rank/edit-rank.component.ts
@@ -8,7 +8,7 @@ import {Subscription} from "rxjs/Subscription";
 
 @Component({
   templateUrl: './edit-rank.component.html',
-  styleUrls: ['./edit-rank.component.css', '../../style/entry-form.css']
+  styleUrls: ['./edit-rank.component.css', '../../style/entry-form.css', '../../style/overview.css']
 })
 export class EditRankComponent {
 
diff --git a/static/src/app/request/award/req-award.component.css b/static/src/app/request/award/req-award.component.css
index d9356a4..a6da309 100644
--- a/static/src/app/request/award/req-award.component.css
+++ b/static/src/app/request/award/req-award.component.css
@@ -1,3 +1,8 @@
+.overview {
+  width: 100%!important;
+  margin-left: 25px!important;
+}
+
 .decoration-preview {
   padding: 5px;
 }
@@ -14,30 +19,24 @@
 .table-container {
   margin-top: 40px;
   overflow-x: auto;
-  width: 65%;
-}
-
-/* enable scrolling for long list of awardings */
-.overview {
-  position: fixed;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  width: 100%;
-  border-left: thin solid lightgrey;
-  padding: 20px 0 0 50px;
-  margin-left: 10px;
-  height: 100vh;
-  bottom: 10px;
+  width: 75%;
+  min-width: 800px;
+  padding: 5px;
 }
 
 .form-group {
   width: 25%;
+  min-width: 300px;
 }
 
 h3 {
   margin: 80px 0 20px -20px;
 }
 
-label {
+.label {
   display: block;
+  position: absolute;
+  font-size: 12px;
+  padding: 5px;
+  margin-left: 25%;
 }
diff --git a/static/src/app/request/award/req-award.component.html b/static/src/app/request/award/req-award.component.html
index 3b4143d..a697b8b 100644
--- a/static/src/app/request/award/req-award.component.html
+++ b/static/src/app/request/award/req-award.component.html
@@ -17,7 +17,6 @@
     </select>
   </div>
 
-
   <div class="form-group">
     <label for="decoration">Auszeichnung</label>
     <select class="form-control"
@@ -64,8 +63,7 @@
   </button>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small"
-        style="margin-left: inherit">
+        class="label label-success label-small">
   Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/request/award/req-award.component.ts b/static/src/app/request/award/req-award.component.ts
index 9efc89a..befcdb0 100644
--- a/static/src/app/request/award/req-award.component.ts
+++ b/static/src/app/request/award/req-award.component.ts
@@ -10,7 +10,7 @@ import {LoginService} from "../../services/login-service/login-service";
 
 @Component({
   templateUrl: './req-award.component.html',
-  styleUrls: ['./req-award.component.css'],
+  styleUrls: ['./req-award.component.css', '../../style/overview.css'],
 })
 export class RequestAwardComponent {
 
diff --git a/static/src/app/request/confirm-award/confirm-award.component.css b/static/src/app/request/confirm-award/confirm-award.component.css
index ec81a52..9a8a3c4 100644
--- a/static/src/app/request/confirm-award/confirm-award.component.css
+++ b/static/src/app/request/confirm-award/confirm-award.component.css
@@ -1,3 +1,7 @@
+.overview {
+  margin-left: 25px!important;
+}
+
 .decoration-preview {
   padding: 5px;
 }
@@ -15,19 +19,7 @@
   margin-top: 40px;
   overflow-x: auto;
   width: 75%;
-}
-
-/* enable scrolling for long list of awardings */
-.overview {
-  position: fixed;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  width: 100%;
-  border-left: thin solid lightgrey;
-  padding: 20px 0 0 50px;
-  margin-left: 10px;
-  height: 100vh;
-  bottom: 10px;
+  padding: 5px;
 }
 
 .form-group {
@@ -38,6 +30,10 @@ h3 {
   margin: 80px 0 20px -20px;
 }
 
-label {
+.label {
   display: block;
+  position: absolute;
+  font-size: 12px;
+  padding: 5px;
+  margin-left: 25%;
 }
diff --git a/static/src/app/request/confirm-award/confirm-award.component.html b/static/src/app/request/confirm-award/confirm-award.component.html
index 0167564..b3c97de 100644
--- a/static/src/app/request/confirm-award/confirm-award.component.html
+++ b/static/src/app/request/confirm-award/confirm-award.component.html
@@ -2,8 +2,7 @@
   <h3>Offene Anträge - Auszeichnungen</h3>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small"
-        style="margin-left: inherit">
+        class="label label-success label-small">
   Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/request/confirm-award/confirm-award.component.ts b/static/src/app/request/confirm-award/confirm-award.component.ts
index a6ee3e6..4ce6898 100644
--- a/static/src/app/request/confirm-award/confirm-award.component.ts
+++ b/static/src/app/request/confirm-award/confirm-award.component.ts
@@ -6,7 +6,7 @@ import {LoginService} from "../../services/login-service/login-service";
 
 @Component({
   templateUrl: './confirm-award.component.html',
-  styleUrls: ['./confirm-award.component.css'],
+  styleUrls: ['./confirm-award.component.css', '../../style/overview.css'],
 })
 export class ConfirmAwardComponent {
 
diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.css b/static/src/app/request/confirm-promotion/confirm-promotion.component.css
index af8f5d3..24d723b 100644
--- a/static/src/app/request/confirm-promotion/confirm-promotion.component.css
+++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.css
@@ -1,3 +1,7 @@
+.overview {
+  margin-left: 25px!important;
+}
+
 .decoration-preview {
   padding: 5px;
 }
@@ -15,19 +19,7 @@
   margin-top: 40px;
   overflow-x: auto;
   width: 65%;
-}
-
-/* enable scrolling for long list of awardings */
-.overview {
-  position: fixed;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  width: 100%;
-  border-left: thin solid lightgrey;
-  padding: 20px 0 0 50px;
-  margin-left: 10px;
-  height: 100vh;
-  bottom: 10px;
+  padding: 5px;
 }
 
 .form-group {
@@ -38,6 +30,10 @@ h3 {
   margin: 80px 0 20px -20px;
 }
 
-label {
+.label {
   display: block;
+  position: absolute;
+  font-size: 12px;
+  padding: 5px;
+  margin-left: 25%;
 }
diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.html b/static/src/app/request/confirm-promotion/confirm-promotion.component.html
index a7824c7..3feac76 100644
--- a/static/src/app/request/confirm-promotion/confirm-promotion.component.html
+++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.html
@@ -2,8 +2,7 @@
   <h3>Offene Anträge - Beförderung</h3>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small"
-        style="margin-left: inherit">
+        class="label label-success label-small">
   Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts
index 05f9c15..d3c7d40 100644
--- a/static/src/app/request/confirm-promotion/confirm-promotion.component.ts
+++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.ts
@@ -7,7 +7,7 @@ import {LoginService} from "../../services/login-service/login-service";
 
 @Component({
   templateUrl: './confirm-promotion.component.html',
-  styleUrls: ['./confirm-promotion.component.css'],
+  styleUrls: ['./confirm-promotion.component.css', '../../style/overview.css'],
 })
 export class ConfirmPromotionComponent {
 
diff --git a/static/src/app/request/promotion/req-promotion.component.css b/static/src/app/request/promotion/req-promotion.component.css
index d9356a4..fcaba41 100644
--- a/static/src/app/request/promotion/req-promotion.component.css
+++ b/static/src/app/request/promotion/req-promotion.component.css
@@ -1,3 +1,7 @@
+.overview {
+  margin-left: 25px!important;
+}
+
 .decoration-preview {
   padding: 5px;
 }
@@ -15,29 +19,23 @@
   margin-top: 40px;
   overflow-x: auto;
   width: 65%;
-}
-
-/* enable scrolling for long list of awardings */
-.overview {
-  position: fixed;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  width: 100%;
-  border-left: thin solid lightgrey;
-  padding: 20px 0 0 50px;
-  margin-left: 10px;
-  height: 100vh;
-  bottom: 10px;
+  min-width: 800px;
+  padding: 5px;
 }
 
 .form-group {
   width: 25%;
+  min-width: 300px;
 }
 
 h3 {
   margin: 80px 0 20px -20px;
 }
 
-label {
+.label {
   display: block;
+  position: absolute;
+  font-size: 12px;
+  padding: 5px;
+  margin-left: 25%;
 }
diff --git a/static/src/app/request/promotion/req-promotion.component.html b/static/src/app/request/promotion/req-promotion.component.html
index e8a082b..c379568 100644
--- a/static/src/app/request/promotion/req-promotion.component.html
+++ b/static/src/app/request/promotion/req-promotion.component.html
@@ -58,8 +58,7 @@
   </button>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small"
-        style="margin-left: inherit">
+        class="label label-success label-small">
   Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/request/promotion/req-promotion.component.ts b/static/src/app/request/promotion/req-promotion.component.ts
index cf29d11..f542516 100644
--- a/static/src/app/request/promotion/req-promotion.component.ts
+++ b/static/src/app/request/promotion/req-promotion.component.ts
@@ -10,7 +10,7 @@ import {LoginService} from "../../services/login-service/login-service";
 
 @Component({
   templateUrl: './req-promotion.component.html',
-  styleUrls: ['./req-promotion.component.css'],
+  styleUrls: ['./req-promotion.component.css', '../../style/overview.css'],
 })
 export class RequestPromotionComponent {
 
diff --git a/static/src/app/squads/edit-squad/edit-squad.component.ts b/static/src/app/squads/edit-squad/edit-squad.component.ts
index 43d6e65..d4b46b7 100644
--- a/static/src/app/squads/edit-squad/edit-squad.component.ts
+++ b/static/src/app/squads/edit-squad/edit-squad.component.ts
@@ -8,7 +8,7 @@ import {Subscription} from "rxjs/Subscription";
 
 @Component({
   templateUrl: './edit-squad.component.html',
-  styleUrls: ['./edit-squad.component.css', '../../style/entry-form.css']
+  styleUrls: ['./edit-squad.component.css', '../../style/entry-form.css', '../../style/overview.css']
 })
 export class EditSquadComponent {
 
diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css
index ac2d807..a525771 100644
--- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css
+++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.css
@@ -1,13 +1,3 @@
-.overview {
-  position: fixed;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  border-left: thin solid lightgrey;
-  bottom: 20px;
-  padding: 70px 1% 0 1%;
-  height: 100vh;
-}
-
 h2 {
   padding: 10px;
 }
diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html
index c6dd3fb..8507339 100644
--- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html
+++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.html
@@ -1,4 +1,4 @@
-<div class="overview fade-in" xmlns="http://www.w3.org/1999/html">
+<div class="overview fade-in" style="padding: 70px 1% 0 1%;" xmlns="http://www.w3.org/1999/html">
   <h2 class="pull-left">Spielerstatistik - {{campaignPlayer.name}}</h2>
   <h2 class="pull-right">{{campaignPlayer.campaign.title}} Kampagne</h2>
 
diff --git a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
index c490c46..7f7b556 100644
--- a/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
+++ b/static/src/app/statistic/campaign-player-detail/campaign-player-detail.component.ts
@@ -9,7 +9,8 @@ import {Location} from '@angular/common';
 @Component({
   selector: 'campaign-player-detail',
   templateUrl: './campaign-player-detail.component.html',
-  styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css', '../../style/hide-scrollbar.css']
+  styleUrls: ['./campaign-player-detail.component.css', '../../style/list-entry.css',
+    '../../style/hide-scrollbar.css', '../../style/overview.css']
 })
 export class CampaignPlayerDetailComponent {
 
diff --git a/static/src/app/statistic/campaign-submit/campaign-submit.component.css b/static/src/app/statistic/campaign-submit/campaign-submit.component.css
index f0ba23d..e69de29 100644
--- a/static/src/app/statistic/campaign-submit/campaign-submit.component.css
+++ b/static/src/app/statistic/campaign-submit/campaign-submit.component.css
@@ -1,8 +0,0 @@
-.overview {
-  position: fixed;
-  width: 25%;
-  min-width: 300px;
-  padding-left: 50px;
-  padding-top: 70px;
-  margin-left: 10px;
-}
diff --git a/static/src/app/statistic/campaign-submit/campaign-submit.component.ts b/static/src/app/statistic/campaign-submit/campaign-submit.component.ts
index 469b968..8182d8e 100644
--- a/static/src/app/statistic/campaign-submit/campaign-submit.component.ts
+++ b/static/src/app/statistic/campaign-submit/campaign-submit.component.ts
@@ -8,7 +8,7 @@ import {CampaignService} from "../../services/campaign-service/campaign.service"
 @Component({
   selector: 'campaign-submit',
   templateUrl: './campaign-submit.component.html',
-  styleUrls: ['./campaign-submit.component.css']
+  styleUrls: ['./campaign-submit.component.css', '../../style/entry-form.css', '../../style/overview.css']
 })
 export class CampaignSubmitComponent {
 
diff --git a/static/src/app/statistic/overview/stats-overview.component.ts b/static/src/app/statistic/overview/stats-overview.component.ts
index 2e90f03..919a966 100644
--- a/static/src/app/statistic/overview/stats-overview.component.ts
+++ b/static/src/app/statistic/overview/stats-overview.component.ts
@@ -8,7 +8,7 @@ import {ChartUtils} from "../../utils/chart-utils";
 @Component({
   selector: 'stats-overview',
   templateUrl: './stats-overview.component.html',
-  styleUrls: ['./stats-overview.component.css', '../../style/list-entry.css'],
+  styleUrls: ['./stats-overview.component.css', '../../style/list-entry.css',  '../../style/overview.css'],
   inputs: ['campaigns'],
   providers: [{provide: CarouselConfig, useValue: {interval: false}}]
 })
diff --git a/static/src/app/statistic/war-submit/war-submit.component.css b/static/src/app/statistic/war-submit/war-submit.component.css
index f0ba23d..e69de29 100644
--- a/static/src/app/statistic/war-submit/war-submit.component.css
+++ b/static/src/app/statistic/war-submit/war-submit.component.css
@@ -1,8 +0,0 @@
-.overview {
-  position: fixed;
-  width: 25%;
-  min-width: 300px;
-  padding-left: 50px;
-  padding-top: 70px;
-  margin-left: 10px;
-}
diff --git a/static/src/app/statistic/war-submit/war-submit.component.ts b/static/src/app/statistic/war-submit/war-submit.component.ts
index ae96343..87c0b79 100644
--- a/static/src/app/statistic/war-submit/war-submit.component.ts
+++ b/static/src/app/statistic/war-submit/war-submit.component.ts
@@ -9,7 +9,8 @@ import {CampaignService} from "../../services/campaign-service/campaign.service"
 @Component({
   selector: 'war-submit',
   templateUrl: './war-submit.component.html',
-  styleUrls: ['./war-submit.component.css', '../../style/load-indicator.css']
+  styleUrls: ['./war-submit.component.css', '../../style/load-indicator.css',
+    '../../style/entry-form.css', '../../style/overview.css']
 })
 export class WarSubmitComponent {
 
diff --git a/static/src/app/style/entry-form.css b/static/src/app/style/entry-form.css
index 6fa2d36..7440bcf 100644
--- a/static/src/app/style/entry-form.css
+++ b/static/src/app/style/entry-form.css
@@ -1,3 +1,10 @@
+.overview {
+  overflow: hidden!important;
+  padding-top: 80px!important;
+  width: 20%;
+  min-width: 280px;
+}
+
 h3 {
   margin-left: -20px;
 }
@@ -10,17 +17,6 @@ label {
   border-color: red;
 }
 
-.overview {
-  position: fixed;
-  width: 25%;
-  min-width: 500px;
-  border-left: thin solid lightgrey;
-  padding-left: 50px;
-  padding-top: 20px;
-  margin-left: 10px;
-  height: 100vh;
-}
-
 .preview-image {
   margin: 10px;
 }
diff --git a/static/src/app/style/overview.css b/static/src/app/style/overview.css
new file mode 100644
index 0000000..df5f887
--- /dev/null
+++ b/static/src/app/style/overview.css
@@ -0,0 +1,9 @@
+.overview {
+  position: fixed;
+  overflow-y: scroll;
+  overflow-x: hidden;
+  border-left: thin solid lightgrey;
+  padding: 20px 0 0 50px;
+  height: 100vh;
+  bottom: 10px;
+}
diff --git a/static/src/app/users/award-user/award-user.component.css b/static/src/app/users/award-user/award-user.component.css
index dc5e592..63dbe91 100644
--- a/static/src/app/users/award-user/award-user.component.css
+++ b/static/src/app/users/award-user/award-user.component.css
@@ -18,19 +18,6 @@
   width: 50%;
 }
 
-/* enable scrolling for long list of awardings */
-.overview {
-  position: fixed;
-  overflow-y: scroll;
-  overflow-x: hidden;
-  width: 100%;
-  border-left: thin solid lightgrey;
-  padding: 20px 0 0 50px;
-  margin-left: 10px;
-  height: 100vh;
-  bottom: 10px;
-}
-
 .form-group {
   width: 25%;
 }
diff --git a/static/src/app/users/award-user/award-user.component.ts b/static/src/app/users/award-user/award-user.component.ts
index 0ab6e37..4ee5d92 100644
--- a/static/src/app/users/award-user/award-user.component.ts
+++ b/static/src/app/users/award-user/award-user.component.ts
@@ -8,7 +8,7 @@ import {DecorationService} from "../../services/decoration-service/decoration.se
 
 @Component({
   templateUrl: './award-user.component.html',
-  styleUrls: ['./award-user.component.css'],
+  styleUrls: ['./award-user.component.css', '../../style/overview.css', '../../style/hide-scrollbar.css'],
 })
 export class AwardUserComponent {
 
diff --git a/static/src/app/users/edit-user/edit-user.component.ts b/static/src/app/users/edit-user/edit-user.component.ts
index df115f3..8b495ce 100644
--- a/static/src/app/users/edit-user/edit-user.component.ts
+++ b/static/src/app/users/edit-user/edit-user.component.ts
@@ -10,7 +10,7 @@ import {NgForm} from "@angular/forms";
 
 @Component({
   templateUrl: './edit-user.component.html',
-  styleUrls: ['./edit-user.component.css', '../../style/entry-form.css'],
+  styleUrls: ['./edit-user.component.css', '../../style/entry-form.css', '../../style/overview.css'],
 })
 export class EditUserComponent {
 

From 2dfea01d68187ab57dbab927240a57a8a0a749d9 Mon Sep 17 00:00:00 2001
From: Florian Hartwich <hardi@noarch.de>
Date: Sat, 7 Oct 2017 19:40:00 +0200
Subject: [PATCH 5/6] Unite absolute label css

---
 static/src/app/admin/admin.component.css                 | 9 +--------
 static/src/app/admin/admin.component.html                | 2 +-
 static/src/app/request/award/req-award.component.css     | 8 --------
 static/src/app/request/award/req-award.component.html    | 2 +-
 .../request/confirm-award/confirm-award.component.css    | 8 --------
 .../request/confirm-award/confirm-award.component.html   | 2 +-
 .../confirm-promotion/confirm-promotion.component.css    | 8 --------
 .../confirm-promotion/confirm-promotion.component.html   | 2 +-
 .../app/request/promotion/req-promotion.component.css    | 8 --------
 .../app/request/promotion/req-promotion.component.html   | 2 +-
 static/src/app/style/overview.css                        | 8 ++++++++
 11 files changed, 14 insertions(+), 45 deletions(-)

diff --git a/static/src/app/admin/admin.component.css b/static/src/app/admin/admin.component.css
index 2bd1a07..c35dcd3 100644
--- a/static/src/app/admin/admin.component.css
+++ b/static/src/app/admin/admin.component.css
@@ -14,6 +14,7 @@
 .table-container {
   margin-top: 10px;
   overflow-x: auto;
+  padding: 5px;
 }
 
 .table-head {
@@ -24,11 +25,3 @@
 .cell-outline {
   outline: 1px solid #D4D4D4;
 }
-
-.label {
-  display: block;
-  position: absolute;
-  font-size: 12px;
-  padding: 5px;
-  margin-left: 25%;
-}
diff --git a/static/src/app/admin/admin.component.html b/static/src/app/admin/admin.component.html
index f6cc8cc..8f8db79 100644
--- a/static/src/app/admin/admin.component.html
+++ b/static/src/app/admin/admin.component.html
@@ -3,7 +3,7 @@
   <h2>Admin Panel</h2>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small">
+        class="absolute-label label label-success label-small">
         Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/request/award/req-award.component.css b/static/src/app/request/award/req-award.component.css
index a6da309..320c624 100644
--- a/static/src/app/request/award/req-award.component.css
+++ b/static/src/app/request/award/req-award.component.css
@@ -32,11 +32,3 @@
 h3 {
   margin: 80px 0 20px -20px;
 }
-
-.label {
-  display: block;
-  position: absolute;
-  font-size: 12px;
-  padding: 5px;
-  margin-left: 25%;
-}
diff --git a/static/src/app/request/award/req-award.component.html b/static/src/app/request/award/req-award.component.html
index a697b8b..8d4f33f 100644
--- a/static/src/app/request/award/req-award.component.html
+++ b/static/src/app/request/award/req-award.component.html
@@ -63,7 +63,7 @@
   </button>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small">
+        class="absolute-label label label-success label-small">
   Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/request/confirm-award/confirm-award.component.css b/static/src/app/request/confirm-award/confirm-award.component.css
index 9a8a3c4..68bab73 100644
--- a/static/src/app/request/confirm-award/confirm-award.component.css
+++ b/static/src/app/request/confirm-award/confirm-award.component.css
@@ -29,11 +29,3 @@
 h3 {
   margin: 80px 0 20px -20px;
 }
-
-.label {
-  display: block;
-  position: absolute;
-  font-size: 12px;
-  padding: 5px;
-  margin-left: 25%;
-}
diff --git a/static/src/app/request/confirm-award/confirm-award.component.html b/static/src/app/request/confirm-award/confirm-award.component.html
index b3c97de..6361bfb 100644
--- a/static/src/app/request/confirm-award/confirm-award.component.html
+++ b/static/src/app/request/confirm-award/confirm-award.component.html
@@ -2,7 +2,7 @@
   <h3>Offene Anträge - Auszeichnungen</h3>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small">
+        class="absolute-label label label-success label-small">
   Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.css b/static/src/app/request/confirm-promotion/confirm-promotion.component.css
index 24d723b..547e1a8 100644
--- a/static/src/app/request/confirm-promotion/confirm-promotion.component.css
+++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.css
@@ -29,11 +29,3 @@
 h3 {
   margin: 80px 0 20px -20px;
 }
-
-.label {
-  display: block;
-  position: absolute;
-  font-size: 12px;
-  padding: 5px;
-  margin-left: 25%;
-}
diff --git a/static/src/app/request/confirm-promotion/confirm-promotion.component.html b/static/src/app/request/confirm-promotion/confirm-promotion.component.html
index 3feac76..dad3f1d 100644
--- a/static/src/app/request/confirm-promotion/confirm-promotion.component.html
+++ b/static/src/app/request/confirm-promotion/confirm-promotion.component.html
@@ -2,7 +2,7 @@
   <h3>Offene Anträge - Beförderung</h3>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small">
+        class="absolute-label label label-success label-small">
   Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/request/promotion/req-promotion.component.css b/static/src/app/request/promotion/req-promotion.component.css
index fcaba41..936e755 100644
--- a/static/src/app/request/promotion/req-promotion.component.css
+++ b/static/src/app/request/promotion/req-promotion.component.css
@@ -31,11 +31,3 @@
 h3 {
   margin: 80px 0 20px -20px;
 }
-
-.label {
-  display: block;
-  position: absolute;
-  font-size: 12px;
-  padding: 5px;
-  margin-left: 25%;
-}
diff --git a/static/src/app/request/promotion/req-promotion.component.html b/static/src/app/request/promotion/req-promotion.component.html
index c379568..0a43f6d 100644
--- a/static/src/app/request/promotion/req-promotion.component.html
+++ b/static/src/app/request/promotion/req-promotion.component.html
@@ -58,7 +58,7 @@
   </button>
 
   <span *ngIf="showSuccessLabel"
-        class="label label-success label-small">
+        class="absolute-label label label-success label-small">
   Erfolgreich gespeichert
   </span>
 
diff --git a/static/src/app/style/overview.css b/static/src/app/style/overview.css
index df5f887..6f3e5eb 100644
--- a/static/src/app/style/overview.css
+++ b/static/src/app/style/overview.css
@@ -7,3 +7,11 @@
   height: 100vh;
   bottom: 10px;
 }
+
+.absolute-label {
+  display: block;
+  position: absolute;
+  font-size: 12px;
+  padding: 5px;
+  margin-left: 25%;
+}

From 6b18811ce8e2e18763724ee47da395effc180155 Mon Sep 17 00:00:00 2001
From: Florian Hartwich <hardi@noarch.de>
Date: Sat, 7 Oct 2017 21:11:16 +0200
Subject: [PATCH 6/6] Assign version number

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2a33baf..1e1a860 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "opt-cc",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "license": "MIT",
   "private": true,
   "scripts": {