Improve responsive view

static/src/app/app.component.html

@@ -14,7 +14,7 @@
     </mat-sidenav>
   </mat-sidenav-container>
 
-  <div (click)="sidenav.close()">
+  <div style="overflow-x: auto;position: relative;min-height: calc(100vh - 50px);" (click)="sidenav.close()">
     <router-outlet></router-outlet>
     <div id="left">
       <router-outlet name="left"></router-outlet>

static/src/app/app.component.scss

@@ -22,4 +22,14 @@ mat-sidenav {
   &:hover {
     background: #101010;
   }
+
+  @media all and (max-width: 959px) {
+    bottom: 0;
+    left: 0;
+    width: 100vw;
+    border-radius: 3px 3px 0 0;
+    background: #101010;
+    min-height: 34px;
+    height: 3vw;
+  }
 }

static/src/app/army/army-squad/army-squad.component.scss

@@ -5,12 +5,12 @@
 
 @media all and (max-width: 599px) {
   .squad-layout {
-    width: 100vw;
     padding: 1vh 1vw;
   }
 
   img {
     right: 3vw;
+    max-width: 27%;
   }
 
   div.name-cell {
@@ -61,7 +61,10 @@
 img {
   position: absolute;
   margin-top: 8px;
-  margin-left: 25px;
+  margin-left: 2%;
+  @media all and (max-width: 959px) {
+    margin-left: 0;
+  }
 }
 
 .title {
@@ -72,7 +75,7 @@ img {
 
 .name-cell {
   display: inherit;
-  margin-left: 200px;
+  margin-left: 38%;
 }
 
 

static/src/app/army/army.component.scss

@@ -1,15 +1,12 @@
 @import url('../style/background-image.scss');
 
 .army-content-container {
-  width: 1100px;
+  width: 90%;
+  max-width: 1100px;
   margin: auto;
   position: relative;
 }
 
-.army-column-right {
-  float: right;
-}
-
 @media all and (max-width: 599px) {
   h1 {
     font-size: 26px;
@@ -21,16 +18,17 @@
   }
 
   div.army-column {
-    width: 100%;
+    width: 100%!important;
 
     h3 {
       background: #222;
+      font-size: 18px;
       margin: 0.2em 0;
       padding: 1.5vh 0;
 
       button {
         position: absolute;
-        margin-top: -7px;
+        margin-top: -10px;
         display: inline-block;
 
         &.switch-btn-blufor {
@@ -43,14 +41,23 @@
         }
 
         mat-icon {
-          width: 3em;
+          width: 2.5em;
-          height: 3em;
+          height: 2.5em;
         }
       }
     }
   }
 }
 
+@media all and (max-width: 959px) {
+  div.army-column {
+    width: 49%;
+  }
+  .army-content-container {
+    width: 98%;
+  }
+}
+
 .army-column {
   width: 45%;
 }

static/src/app/login/login.component.scss

@@ -1,11 +1,12 @@
 .form-signin {
-  max-width: 330px;
+  width: 100%;
   padding: 15px;
   margin: 0 auto;
 }
 
 .form-signin > .row {
-  width: 400px;
+  max-width: 400px;
+  margin: auto;
 }
 
 .form-signin-heading {

static/src/app/pub/decoration-overview/decoration-overview.component.scss

@@ -8,7 +8,7 @@ h1 {
 .decoration-overview-container {
   position: relative;
   z-index: 0;
-  margin: auto 140px 30px;
+  margin: auto 4vw 0;
 }
 
 @media all and (max-width: 959px) {
@@ -73,6 +73,10 @@ h1 {
   background: #222222;;
   box-shadow: #666666 2px 2px 8px;
 
+  & > div:hover {
+    color: #ffffff;
+  }
+
   @media all and (max-width: 959px) {
     width: 100%;
     height: 50px

static/src/app/pub/decoration-overview/decoration-panel/decoration-panel.component.scss

@@ -52,8 +52,9 @@ img.img-medal {
 }
 
 img.img-ribbon {
-  padding-top: 10%;
+  padding-top: 20px;
-  width: 55%;
+  width: 60%;
+  max-width: 130px;
 }
 
 .gradient {

static/src/app/pub/rank-overview/rank-overview.component.scss

@@ -22,6 +22,7 @@
 
   h3 {
     margin-top: 0;
+    font-size: 18px;
   }
 
   .mat-column-picture {
@@ -30,6 +31,7 @@
 
   .mat-column-name {
     max-width: 7.5vw;
+    overflow: hidden;
   }
 
   td.mat-cell:first-child {
@@ -39,12 +41,9 @@
   td > img {
     height: 13vh !important;
     max-height: 120px;
+    max-width: 100%;
     padding: 4px;
   }
-
-  :host {
-    margin-bottom: -50vh;
-  }
 }
 
 table {

static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.html

@@ -1,3 +1,4 @@
+<div *ngIf="!isSmallLayout">
   <div class="scroll-btn"
        *ngIf="isLeftScrollVisible"
        (mouseenter)="setRepeater(-10)"
@@ -44,4 +45,25 @@
        (mouseleave)="clearRepeater()">
     <mat-icon svgIcon="chevron-right"></mat-icon>
   </div>
+</div>
 
+
+<div *ngIf="isSmallLayout" class="campaign-select-small">
+  <mat-list-item [matMenuTriggerFor]="menuCampaign">
+    <div matline class="select-menu-text">
+      <span *ngIf="selectedCampaignId === 'all'">{{'stats.campaign.title.all.time.overview' | translate}}</span>
+      <span *ngIf="selectedCampaignId !== 'all' && selectedCampaign">{{selectedCampaign.title}}</span>
+      <span class="caret"></span>
+    </div>
+  </mat-list-item>
+  <mat-menu #menuCampaign="matMenu">
+    <button mat-menu-item (click)="select({_id:'all'})">
+      {{'stats.campaign.title.all.time.overview' | translate}}
+    </button>
+    <mat-divider></mat-divider>
+    <button mat-menu-item *ngFor="let campaign of campaigns$ | async"
+            (click)="select(campaign)">
+      {{campaign.title}}
+    </button>
+  </mat-menu>
+</div>

static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.scss

@@ -6,7 +6,7 @@
 }
 
 .scroll-btn-right {
-  top: 50px;
+  top: 0;
   left: calc(100vw - 50px);
 }
 
@@ -36,10 +36,6 @@
   float: left;
   background: #424242;
   color: #9d9d9d;
-
-  @media all and (max-width: 959px) {
-    min-width: 33%;
-  }
 }
 
 .active {
@@ -51,3 +47,21 @@
 .campaign-entry:hover {
   border-bottom: 3px solid #ffd740;
 }
+
+.campaign-select-small {
+  background: #424242;
+  height: 3em;
+  color: #9d9d9d;
+  text-align: center;
+  border-bottom: 1px solid #9d9d9d;
+
+  .select-menu-text {
+    font-size: 16px;
+  }
+}
+
+:host /deep/ div.mat-list-item-content {
+  height: 100%;
+  padding: 10px;
+  cursor: pointer;
+}

static/src/app/statistic/campaign/campaign-navigation/campaign-navigation.component.ts

@@ -1,12 +1,4 @@
-import {
+import {Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, ViewChild} from '@angular/core';
-  Component,
-  ElementRef,
-  EventEmitter,
-  Input,
-  OnInit,
-  Output,
-  ViewChild
-} from '@angular/core';
 import {Campaign} from '../../../models/model-interfaces';
 import {LoginService} from '../../../services/app-user-service/login-service';
 import {Observable} from 'rxjs';
@@ -17,12 +9,14 @@ import {CampaignService} from '../../../services/logs/campaign.service';
   templateUrl: './campaign-navigation.component.html',
   styleUrls: ['./campaign-navigation.component.scss']
 })
-export class CampaignNavigationComponent implements OnInit {
+export class CampaignNavigationComponent implements OnInit, OnChanges {
 
   campaigns$: Observable<Campaign[]>;
 
   @Input() selectedCampaignId;
 
+  @Input() isSmallLayout;
+
   @Output() campaignSelect = new EventEmitter();
 
   @Output() campaignEdit = new EventEmitter();
@@ -31,6 +25,8 @@ export class CampaignNavigationComponent implements OnInit {
 
   @ViewChild('horizontalList', {read: ElementRef}) public panel: ElementRef<any>;
 
+  selectedCampaign;
+
   isLeftScrollVisible = false;
 
   isRightScrollVisible = true;
@@ -48,8 +44,18 @@ export class CampaignNavigationComponent implements OnInit {
     });
   }
 
+  ngOnChanges() {
+    this.campaigns$.subscribe(campaigns => {
+      const campaignIdx = campaigns.findIndex(c => c._id === this.selectedCampaignId);
+      if (campaignIdx !== -1) {
+        this.selectedCampaign = campaigns[campaignIdx];
+      }
+    });
+  }
+
   select(campaign) {
     if (campaign && campaign._id) {
+      this.selectedCampaign = campaign;
       this.selectedCampaignId = campaign._id;
       this.campaignSelect.emit(campaign);
     }

static/src/app/statistic/campaign/highscore/highscore.component.scss

@@ -14,6 +14,7 @@ h2 {
 
 .search-field {
   width: 40%;
+  min-width: $highscore-table-width;
   margin: 50px 0 50px 8%;
 }
 

static/src/app/statistic/campaign/overview/campaign-overview.component.scss

@@ -4,21 +4,26 @@
   height: 650px;
   margin: auto;
   padding-left: 5%;
+}
 
 @media all and (max-width: 959px) {
+  .slide-chart-container {
     width: 100%;
     min-width: unset;
-    padding-top: 105px;
+    margin-top: 105px;
-  }
+    margin-bottom: 35px;
   }
 
   .chart-select-group {
-  @media all and (max-width: 959px) {
     display: inline-grid;
     width: 70%;
     text-align: center;
     margin-left: 10%;
   }
+
+  .chart-select-group /deep/ button.mat-button-toggle-button {
+    width: 100%;
+  }
 }
 
 mat-button-toggle.mat-button-toggle-checked {

static/src/app/statistic/stats.component.html

@@ -1,18 +1,22 @@
+<div>
   <campaign-navigation
     [selectedCampaignId]="selectedCampaign._id"
+    [isSmallLayout]="isSmallLayout"
     (campaignSelect)="switchCampaign($event)"
     (campaignEdit)="editCampaign($event)"
     (campaignDelete)="deleteCampaign($event)">
   </campaign-navigation>
+</div>
 
-<div class="side-bar"
+<div [ngClass]="{collapsed: collapsed}"
-     [ngClass]="{collapsed: collapsed}"
+     [style.display]="selectedCampaign._id === 'all' ? 'none' : 'block'"
-     [style.display]="selectedCampaign._id === 'all' ? 'none' : 'block'">
+     class="side-bar">
   <war-list
     [collapsed]="collapsed"
-    [campaign]="selectedCampaign">
+    [campaign]="selectedCampaign"
+    [isSmallLayout]="isSmallLayout">
   </war-list>
-  <div class="button-container" *ngIf="collapseBtnVisible">
+  <div *ngIf="!isSmallLayout" class="button-container">
     <button mat-icon-button
             class="sidebar-toggle-btn"
             (click)="toggleCollapse()">

static/src/app/statistic/stats.component.scss

@@ -1,6 +1,10 @@
 .side-bar {
   width: 20%;
   float: left;
+
+  @media all and (max-width: 959px) {
+    width: 100%;
+  }
 }
 
 .collapsed {
@@ -10,9 +14,8 @@
 .button-container {
   position: relative;
   z-index: 100;
-}
 
-.button-container > button {
+  & > button {
     position: fixed;
     top: calc(100vh - 35px);
     left: -10px;
@@ -20,3 +23,4 @@
     border: 1px solid #dadada;
     box-shadow: #ffd740 0 0 3px;
   }
+}

static/src/app/statistic/stats.component.ts

@@ -21,7 +21,7 @@ export class StatisticComponent implements OnInit {
 
   collapsed = false;
 
-  collapseBtnVisible = true;
+  isSmallLayout = false;
 
   constructor(private campaignService: CampaignService,
               private warService: WarService,
@@ -40,17 +40,9 @@ export class StatisticComponent implements OnInit {
           this.resolveCampaignFromUrl();
         });
 
-    if (window.innerWidth <= BaseConfig.responsive.breakpointPx) {
+    this.isSmallLayout = window.innerWidth <= BaseConfig.responsive.breakpointPx;
-      this.collapsed = true;
-      this.collapseBtnVisible = false;
-    }
     Observable.fromEvent(window, 'resize').subscribe(event => {
-      if (event.target['innerWidth'] <= BaseConfig.responsive.breakpointPx) {
+      this.isSmallLayout = event.target['innerWidth'] <= BaseConfig.responsive.breakpointPx;
-        this.collapsed = true;
-        this.collapseBtnVisible = false;
-      } else {
-        this.collapseBtnVisible = true;
-      }
     });
   }
 

static/src/app/statistic/stats.module.ts

@@ -7,10 +7,10 @@ import {NgxChartsModule} from '@swimlane/ngx-charts';
 import {CampaignService} from '../services/logs/campaign.service';
 import {PlayerService} from '../services/logs/player.service';
 import {LogsService} from '../services/logs/logs.service';
-import {MatButtonToggleModule, MatMenuModule, MatSortModule, MatTableModule} from '@angular/material';
+import {MatButtonToggleModule, MatListModule, MatMenuModule, MatSortModule, MatTableModule} from '@angular/material';
 import {HttpClient} from '@angular/common/http';
 import {TranslateHttpLoader} from '@ngx-translate/http-loader';
-import {TranslateModule, TranslateLoader} from '@ngx-translate/core';
+import {TranslateLoader, TranslateModule} from '@ngx-translate/core';
 
 export function createTranslateLoader(http: HttpClient) {
   return new TranslateHttpLoader(http, './assets/i18n/statistics/', '.json');
@@ -27,6 +27,7 @@ export function createTranslateLoader(http: HttpClient) {
     MatTableModule,
     MatSortModule,
     MatMenuModule,
+    MatListModule,
     statsRouterModule,
 
     TranslateModule.forChild({

static/src/app/statistic/war/fraction-stats/fraction-stats.component.scss

@@ -38,3 +38,18 @@
   padding: 15px;
   float: left;
 }
+
+@media all and (max-width: 959px) {
+  .chart-container {
+    width: 150%;
+    min-width: 0;
+    height: 70vh
+  }
+
+  .chart-select-group {
+    background: #dadada;
+    max-width: fit-content;
+    width: 200%;
+    flex-wrap: wrap;
+  }
+}

static/src/app/statistic/war/fraction-stats/fraction-stats.component.ts

@@ -20,6 +20,8 @@ export class FractionStatsComponent implements OnInit, OnChanges {
 
   @Input() logData: any;
 
+  @Input() isSmallLayout: boolean;
+
   startDateObj: Date;
 
   initialized: any;

static/src/app/statistic/war/scoreboard/scoreboard.component.scss

@@ -33,8 +33,24 @@
 .mat-column-vehicleHeavy, .mat-column-vehicleAir, .mat-column-travelDistance, .mat-column-driverDistance,
 .mat-column-death, .mat-column-respawn, .mat-column-interact {
   flex: 0 0 62px;
+
+  @media all and (max-width: 959px) {
+    flex: 0 0 50px;
+  }
 }
 
 :host /deep/ .mat-table .mat-icon {
   color: #666666;
 }
+
+@media all and (max-width: 959px) {
+  .mat-column-name {
+    flex: 0 0 160px;
+    word-wrap: break-word;
+    white-space: pre-wrap;
+  }
+
+  .mat-header-row, .scoreboard-table {
+    width: 768px;
+  }
+}

static/src/app/statistic/war/scoreboard/scoreboard.component.ts

@@ -20,6 +20,8 @@ export class ScoreboardComponent implements OnChanges {
 
   @Input() fractionFilterSelected: string;
 
+  @Input() isSmallLayout: boolean;
+
   @Output() playerTabSwitch = new EventEmitter();
 
   tableHead = PlayerUtils.attributeDisplayNames;
@@ -47,8 +49,16 @@ export class ScoreboardComponent implements OnChanges {
   }
 
   ngOnChanges(changes: SimpleChanges) {
-    if (changes.war) {
+    if (changes['isSmallLayout'] && changes['isSmallLayout'].previousValue !== changes['isSmallLayout'].currentValue) {
+      const colIdxFraction = this.displayedColumns.findIndex(c => c === 'fraction');
+      if (this.isSmallLayout) {
+        this.displayedColumns.splice(colIdxFraction, 1);
+      } else if (colIdxFraction === -1) {
+        this.displayedColumns.splice(1, 0, 'fraction');
+      }
+    }
 
+    if (changes.war) {
       changes.war.currentValue.players
              .filter(player => !player.initalized)
              .forEach(player => {

static/src/app/statistic/war/server-stats/server-stats.component.scss

@@ -38,3 +38,12 @@
   padding: 15px;
   float: left;
 }
+
+@media all and (max-width: 959px) {
+  .chart-container {
+    width: 200%;
+    margin: 1%;
+    min-width: 0;
+    height: 80vh
+  }
+}

static/src/app/statistic/war/war-header/war-header.component.html

@@ -9,7 +9,7 @@
             style="font-weight: bold; margin-left: 10px;">{{war.ptOpfor}} {{fraction.OPFOR}}</span>
     </div>
 
-    <div class="pull-left head-field " style="padding-left: 100px;">
+    <div class="pull-left head-field-pie-chart">
       <h4 class="pull-left" style="margin-bottom: 0;">{{'stats.scoreboard.participants' | translate}}</h4>
       <ngx-charts-pie-chart
         class="pull-left"
@@ -24,7 +24,7 @@
       </ngx-charts-pie-chart>
     </div>
 
-    <div class="pull-left " style="padding-left: 100px; padding-top:15px">
+    <div class="btn-clean-log">
       <a class="btn btn-default" style="margin: 20px" target="_blank" href="resource/logs/{{war._id}}/clean.log">
         {{'stats.scoreboard.show.logs' | translate}}
       </a>
@@ -83,7 +83,9 @@
             {{fraction.OPFOR}}
           </label>
         </form>
-        <span class="btn btn-default pull-left tab-control" (click)="scoreBoardComponent.exportCSV()">
+        <span class="btn btn-default pull-left tab-control"
+              *ngIf="!isSmallLayout"
+              (click)="scoreBoardComponent.exportCSV()">
           {{'stats.scoreboard.download.csv' | translate}}
         </span>
       </div>
@@ -97,12 +99,14 @@
       #scoreboard
       [war]="war"
       [fractionFilterSelected]="fractionFilterSelected"
+      [isSmallLayout]="isSmallLayout"
       (playerTabSwitch)="switchToPlayerTab($event)">
     </cc-scoreboard>
     <war-detail-fraction
       *ngIf="tab === 1 && logData"
       [war]="war"
-      [logData]="logData">
+      [logData]="logData"
+      [isSmallLayout]="isSmallLayout">
     </war-detail-fraction>
     <campaign-player-detail
       *ngIf="tab === 2 && singlePlayerView === 1"

static/src/app/statistic/war/war-header/war-header.component.scss

@@ -1,6 +1,10 @@
 @import url('../../../style/list-entry.scss');
 @import url('../../../style/hide-scrollbar.scss');
 
+.war-header {
+  padding-left: 1.5vw;
+}
+
 .war-header-container {
   width: 920px;
   min-height: 165px;
@@ -14,6 +18,11 @@
   margin-bottom: 10px;
 }
 
+.head-field-pie-chart {
+  @extend .head-field;
+  padding-left: 100px;
+}
+
 form.tab-control {
   padding: 10px;
 }
@@ -80,3 +89,33 @@ span.tab-control {
   cursor: pointer !important;
   color: #666666 !important;
 }
+
+.btn-clean-log {
+  padding-left: 100px;
+  padding-top: 15px;
+  float: left;
+}
+
+@media all and (max-width: 959px) {
+  .war-header {
+    position: relative;
+    overflow: auto;
+    margin-bottom: 34px; /*do not cover anything with back to top bar*/
+  }
+
+  .war-header-container, .nav-tabs {
+    width: 768px;
+  }
+
+  .head-field-pie-chart {
+    padding-left: 0;
+  }
+
+  .nav-tabs > li:last-child {
+    margin-left: 25px;
+  }
+
+  div.btn-clean-log {
+    padding-left: 57px;
+  }
+}

static/src/app/statistic/war/war-header/war-header.component.ts

@@ -6,6 +6,8 @@ import {ChartUtils} from '../../../utils/chart-utils';
 import {Fraction} from '../../../utils/fraction.enum';
 import {LogsService} from '../../../services/logs/logs.service';
 import {ScoreboardComponent} from '../scoreboard/scoreboard.component';
+import {BaseConfig} from '../../../app.config';
+import {Observable} from 'rxjs';
 
 
 @Component({
@@ -37,6 +39,8 @@ export class WarHeaderComponent implements OnInit {
 
   fractionFilterSelected: string;
 
+  isSmallLayout = false;
+
   playerChart: any[] = [];
 
   colorScheme = {
@@ -64,6 +68,11 @@ export class WarHeaderComponent implements OnInit {
             ChartUtils.getSingleDataArray(Fraction.OPFOR, war.playersOpfor, Fraction.BLUFOR, war.playersBlufor);
           Object.assign(this, [this.playerChart]);
         });
+
+    this.isSmallLayout = window.innerWidth <= BaseConfig.responsive.breakpointPx;
+    Observable.fromEvent(window, 'resize').subscribe(event => {
+      this.isSmallLayout = event.target['innerWidth'] <= BaseConfig.responsive.breakpointPx;
+    });
   }
 
   switchTab(index: number) {

static/src/app/statistic/war/war-list/war-list.component.html

@@ -1,3 +1,4 @@
+<div *ngIf="!isSmallLayout">
   <div class="war-list-header" *ngIf="!collapsed && loginService.hasPermission(3)">
     <button mat-stroked-button (click)="selectNewCampaign()">
       {{'stats.sidebar.campaign.add' | translate}}
@@ -51,3 +52,28 @@
          [ngClass]="{collapsed: collapsed}">
     </div>
   </div>
+</div>
+
+<div class="war-select-small" *ngIf="isSmallLayout">
+  <mat-list-item [matMenuTriggerFor]="menuWars">
+    <div matline class="select-menu-text">
+      <span *ngIf="selectedWarId === (campaign._id + highscore)">{{'stats.sidebar.highscore' | translate}}</span>
+      <span *ngIf="selectedWarId === campaign._id">{{'stats.sidebar.overview' | translate}}</span>
+      <span *ngIf="selectedWar">{{selectedWar.title}}</span>
+      <span class="caret"></span>
+    </div>
+  </mat-list-item>
+  <mat-menu #menuWars="matMenu">
+    <button mat-menu-item (click)="selectOverview(campaign._id)">
+      {{'stats.sidebar.overview' | translate}}
+    </button>
+    <button mat-menu-item (click)="selectHighscore(campaign._id)">
+      {{'stats.sidebar.highscore' | translate}}
+    </button>
+    <mat-divider></mat-divider>
+    <button mat-menu-item *ngFor="let war of campaign.wars$ | async"
+            (click)="selectWar(war._id)">
+      {{war.title}}
+    </button>
+  </mat-menu>
+</div>

static/src/app/statistic/war/war-list/war-list.component.scss

@@ -98,6 +98,24 @@
   }
 }
 
+.war-select-small {
+  background: #424242;
+  height: 3em;
+  color: #9d9d9d;
+  text-align: center;
+
+  .select-menu-text {
+    font-size: 16px;
+  }
+}
+
+:host /deep/ div.mat-list-item-content {
+  height: 100%;
+  padding: 10px;
+  cursor: pointer;
+}
+
+
 /* Table Scrollbar BEGIN */
 
 .battle-list::-webkit-scrollbar {

static/src/app/statistic/war/war-list/war-list.component.ts

@@ -18,8 +18,12 @@ export class WarListComponent implements OnChanges {
 
   @Input() collapsed: boolean;
 
+  @Input() isSmallLayout: boolean;
+
   selectedWarId: string | number;
 
+  selectedWar: War;
+
   changeCount = 0;
 
   toolTipTranslation = {};
@@ -65,15 +69,30 @@ export class WarListComponent implements OnChanges {
     } else if (changes.campaign) {
       this.selectOverview(this.campaign._id);
     }
+
+    this.fetchSelectedWar(this.selectedWarId);
+  }
+
+  fetchSelectedWar(newSelect) {
+    this.campaign.wars$.subscribe(wars => {
+      const warIdx = wars.findIndex(w => w._id === newSelect);
+      if (warIdx !== -1) {
+        this.selectedWar = wars[warIdx];
+      } else {
+        this.selectedWar = null;
+      }
+    });
   }
 
   selectNewCampaign() {
     this.selectedWarId = null;
+    this.selectedWar = null;
     this.router.navigate([{outlets: {'right': ['campaign']}}], {relativeTo: this.route});
   }
 
   selectWar(warId) {
     if (this.selectedWarId !== warId) {
+      this.fetchSelectedWar(warId);
       this.selectedWarId = warId;
       this.router.navigate([{outlets: {'right': ['war', warId]}}], {relativeTo: this.route});
     }
@@ -82,6 +101,7 @@ export class WarListComponent implements OnChanges {
   selectOverview(campaignId) {
     if (this.selectedWarId !== campaignId) {
       this.selectedWarId = campaignId;
+      this.selectedWar = null;
       this.router.navigate([{outlets: {'right': ['overview', campaignId]}}], {relativeTo: this.route});
     }
   }
@@ -89,6 +109,7 @@ export class WarListComponent implements OnChanges {
   selectHighscore(campaignId) {
     if (this.selectedWarId !== campaignId + this.highscore) {
       this.selectedWarId = campaignId + this.highscore;
+      this.selectedWar = null;
       this.router.navigate([{outlets: {'right': ['highscore', campaignId]}}], {relativeTo: this.route});
     }
   }