From 4c522a4e270062d12785a98d2244fdeaec29eb31 Mon Sep 17 00:00:00 2001
From: Florian Hartwich <hardi@noarch.de>
Date: Mon, 10 Jul 2017 20:51:15 +0200
Subject: [PATCH] adjust design army overview & stats

---
 static/src/app/app.component.html                      | 4 ++--
 static/src/app/army/army.component.css                 | 5 ++---
 static/src/app/army/army.component.html                | 4 ++--
 static/src/app/services/login-service/login-service.ts | 5 +++++
 static/src/app/wars/war-detail.component.css           | 6 ++++++
 static/src/app/wars/war-detail.component.html          | 4 ++--
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/static/src/app/app.component.html b/static/src/app/app.component.html
index 6beb80d..e8e6db8 100644
--- a/static/src/app/app.component.html
+++ b/static/src/app/app.component.html
@@ -45,7 +45,7 @@
           <li *ngIf="loginService.hasPermission(2)" routerLinkActive="active">
             <a routerLink='/cc-ranks' class="link">Ränge</a>
           </li>
-          <li *ngIf="loginService.hasPermission(1) && !loginService.hasPermission(2)" class="dropdown">
+          <li *ngIf="loginService.hasPermission(1) && !loginService.hasPermission(2) && loginService.hasSquad()" class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
                aria-expanded="false">
               Beantragen
@@ -60,7 +60,7 @@
               </li>
             </ul>
           </li>
-          <li *ngIf="loginService.hasPermission(2)" class="dropdown">
+          <li *ngIf="loginService.hasPermission(2) && loginService.hasSquad()" class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
                aria-expanded="false">
               Anträge
diff --git a/static/src/app/army/army.component.css b/static/src/app/army/army.component.css
index dc03295..7a0fe4c 100644
--- a/static/src/app/army/army.component.css
+++ b/static/src/app/army/army.component.css
@@ -1,15 +1,14 @@
 h1 {
   width: 920px;
-  float: left;
   margin-bottom: 50px;
+  margin-left: 25%
 }
 
-img{
+img {
   margin-top: 10px;
   padding-right: 30px;
 }
 
-
 .div-table {
   display: table;
   border-radius: 10px;
diff --git a/static/src/app/army/army.component.html b/static/src/app/army/army.component.html
index 078893d..7ecee78 100644
--- a/static/src/app/army/army.component.html
+++ b/static/src/app/army/army.component.html
@@ -1,6 +1,6 @@
 <h1>Übersicht über alle Spieler, Squads und Armeen</h1>
 
-<div style="width: 1000px;">
+<div style="width: 1900px; margin-left: 25%">
 
   <div class="div-table" style="width: 490px; float:left">
     <h3 class="text-blufor army-head">NATO</h3>
@@ -30,7 +30,7 @@
     <div style="padding-left: 80px">Armeemitglieder: {{army.NATO.memberCount}}</div>
   </div>
 
-  <div class="div-table" style="width: 490px; float:right">
+  <div class="div-table" style="width: 540px; padding-left: 50px">
     <h3 class="text-opfor army-head">CSAT</h3>
     <div *ngFor="let squad of army.CSAT.squads" style="outline:1px solid #D4D4D4;">
       <div class="div-table-row">
diff --git a/static/src/app/services/login-service/login-service.ts b/static/src/app/services/login-service/login-service.ts
index cc28f8a..4ee2460 100644
--- a/static/src/app/services/login-service/login-service.ts
+++ b/static/src/app/services/login-service/login-service.ts
@@ -45,4 +45,9 @@ export class LoginService {
     return this.isLoggedIn() && currentUser.permission >= level;
   }
 
+  hasSquad() {
+    let currentUser = JSON.parse(localStorage.getItem('currentUser'));
+    return currentUser.squad != null;
+  }
+
 }
diff --git a/static/src/app/wars/war-detail.component.css b/static/src/app/wars/war-detail.component.css
index a830235..bc262ad 100644
--- a/static/src/app/wars/war-detail.component.css
+++ b/static/src/app/wars/war-detail.component.css
@@ -19,6 +19,12 @@
   table-layout: fixed;
 }
 
+.scoreboard-table-container {
+  min-width: 920px;
+  max-width: 920px;
+  margin-left: 5%
+}
+
 .table-container {
   margin-top: 10px;
   overflow-x: auto;
diff --git a/static/src/app/wars/war-detail.component.html b/static/src/app/wars/war-detail.component.html
index 968e7a8..c35ad19 100644
--- a/static/src/app/wars/war-detail.component.html
+++ b/static/src/app/wars/war-detail.component.html
@@ -9,7 +9,7 @@
       <span class="text-opfor" style="font-weight: bold; margin-left: 10px;">{{war.ptOpfor}} CSAT</span>
     </h3>
 
-    <div style="margin-left: 50%; margin-top:1%">
+    <div style="margin-left: 500px; margin-top:1%">
       <a class="btn btn-default btn-" style="margin: 20px" target="_blank" href="resource/logs/{{war._id}}/clean.log">Logfile
         anzeigen</a>
       <form class="form-group">
@@ -37,7 +37,7 @@
   </div>
 
   <div class="pull-left" style="margin-top:20px;">
-    <div class="table-container" style="width: 75%; min-width: 500px">
+    <div class="table-container scoreboard-table-container">
       <table class="table table-hover" [mfData]="players" #mf="mfDataTable" [(mfSortBy)]="sortBy"
              [(mfSortOrder)]="sortOrder">
         <thead>