hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

adjust design army overview & stats

pull/1/head
Florian Hartwich 2017-07-10 20:51:15 +02:00
parent 00edd2ff57
commit 4c522a4e27
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/src/app/app.component.html
View File

@ -45,7 +45,7 @@
<li *ngIf="loginService.hasPermission(2)" routerLinkActive="active"> <li *ngIf="loginService.hasPermission(2)" routerLinkActive="active">
<a routerLink='/cc-ranks' class="link">Ränge</a> <a routerLink='/cc-ranks' class="link">Ränge</a>
</li> </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" <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false"> aria-expanded="false">
Beantragen Beantragen
@ -60,7 +60,7 @@
</li> </li>
</ul> </ul>
</li> </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" <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false"> aria-expanded="false">
Anträge Anträge

3
static/src/app/army/army.component.css
View File

@ -1,7 +1,7 @@
h1 { h1 {
width: 920px; width: 920px;
float: left;
margin-bottom: 50px; margin-bottom: 50px;
margin-left: 25%
} }
img { img {
@ -9,7 +9,6 @@ img{
padding-right: 30px; padding-right: 30px;
} }
.div-table { .div-table {
display: table; display: table;
border-radius: 10px; border-radius: 10px;

4
static/src/app/army/army.component.html
View File

@ -1,6 +1,6 @@
<h1>Übersicht über alle Spieler, Squads und Armeen</h1> <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"> <div class="div-table" style="width: 490px; float:left">
<h3 class="text-blufor army-head">NATO</h3> <h3 class="text-blufor army-head">NATO</h3>
@ -30,7 +30,7 @@
<div style="padding-left: 80px">Armeemitglieder: {{army.NATO.memberCount}}</div> <div style="padding-left: 80px">Armeemitglieder: {{army.NATO.memberCount}}</div>
</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> <h3 class="text-opfor army-head">CSAT</h3>
<div *ngFor="let squad of army.CSAT.squads" style="outline:1px solid #D4D4D4;"> <div *ngFor="let squad of army.CSAT.squads" style="outline:1px solid #D4D4D4;">
<div class="div-table-row"> <div class="div-table-row">

5
static/src/app/services/login-service/login-service.ts
View File

@ -45,4 +45,9 @@ export class LoginService {
return this.isLoggedIn() && currentUser.permission >= level; return this.isLoggedIn() && currentUser.permission >= level;
} }
hasSquad() {
let currentUser = JSON.parse(localStorage.getItem('currentUser'));
return currentUser.squad != null;
}
} }

6
static/src/app/wars/war-detail.component.css
View File

@ -19,6 +19,12 @@
table-layout: fixed; table-layout: fixed;
} }
.scoreboard-table-container {
min-width: 920px;
max-width: 920px;
margin-left: 5%
}
.table-container { .table-container {
margin-top: 10px; margin-top: 10px;
overflow-x: auto; overflow-x: auto;

4
static/src/app/wars/war-detail.component.html
View File

@ -9,7 +9,7 @@
<span class="text-opfor" style="font-weight: bold; margin-left: 10px;">{{war.ptOpfor}} CSAT</span> <span class="text-opfor" style="font-weight: bold; margin-left: 10px;">{{war.ptOpfor}} CSAT</span>
</h3> </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 <a class="btn btn-default btn-" style="margin: 20px" target="_blank" href="resource/logs/{{war._id}}/clean.log">Logfile
anzeigen</a> anzeigen</a>
<form class="form-group"> <form class="form-group">
@ -37,7 +37,7 @@
</div> </div>
<div class="pull-left" style="margin-top:20px;"> <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" <table class="table table-hover" [mfData]="players" #mf="mfDataTable" [(mfSortBy)]="sortBy"
[(mfSortOrder)]="sortOrder"> [(mfSortOrder)]="sortOrder">
<thead> <thead>