Replace arcodion

pull/40/head
HardiReady 2018-06-30 22:22:46 +02:00
parent 99a4e0ceb6
commit 5f0dcae272
4 changed files with 55 additions and 54 deletions

View File

@ -9,11 +9,12 @@ import {CampaignService} from '../services/logs/campaign.service';
import {NgxDatatableModule} from '@swimlane/ngx-datatable'; import {NgxDatatableModule} from '@swimlane/ngx-datatable';
import {PlayerService} from '../services/logs/player.service'; import {PlayerService} from '../services/logs/player.service';
import {LogsService} from '../services/logs/logs.service'; import {LogsService} from '../services/logs/logs.service';
import {MatExpansionModule, MatFormFieldModule} from '@angular/material';
@NgModule({ @NgModule({
declarations: statsRoutingComponents, declarations: statsRoutingComponents,
imports: [CommonModule, SharedModule, statsRouterModule, NgxChartsModule, imports: [CommonModule, SharedModule, statsRouterModule, NgxChartsModule, ButtonsModule.forRoot(), NgxDatatableModule,
AccordionModule.forRoot(), ButtonsModule.forRoot(), NgxDatatableModule], MatExpansionModule, MatFormFieldModule],
providers: [WarService, CampaignService, PlayerService, LogsService] providers: [WarService, CampaignService, PlayerService, LogsService]
}) })
export class StatsModule { export class StatsModule {

View File

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<div [ngClass]="[loginService.hasPermission(3) ? 'col-xs-9' : 'col-xs-11']"> <div [ngClass]="[loginService.hasPermission(3) ? 'col-xs-9' : 'col-xs-11']">
<span> <span>
<a style="font-size: 22px;">{{war.title}}</a> <a style="font-size: 20px;">{{war.title}}</a>
</span> </span>
<br> <br>
<small>vom {{war.date | date: 'dd.MM.yyyy'}}</small> <small>vom {{war.date | date: 'dd.MM.yyyy'}}</small>

View File

@ -1,14 +1,18 @@
:host /deep/ .card-header { .top-list-entry {
background-color: rgba(34, 34, 34, 0.80); display: flex;
cursor: pointer; margin: 6px 0;
padding: 15px;
color: white;
font-weight: 600;
} }
.top-list-entry { .top-list-entry > div {
margin-top: -16px;
margin-bottom: 10px;
width: 50%; width: 50%;
float: left; float: left;
} }
.war-interaction-panel {
display: block;
}
.war-interaction-panel > span {
color: #4b4b4b;
padding: 0 3px;
}

View File

@ -8,60 +8,56 @@
</a> </a>
</div> </div>
<accordion *ngFor="let campaign of campaigns; let isFirstRow=first"> <mat-accordion *ngFor="let campaign of campaigns;">
<accordion-group [isOpen]="isFirstRow"> <mat-expansion-panel>
<div accordion-heading> <mat-expansion-panel-header style="height:auto; padding: 30px 15px;">
<span (click)="editCampaign(campaign); $event.stopPropagation()" title="Bearbeiten" <mat-panel-title style="font-size: 20px; font-weight: 700; border-bottom: 1px solid;">
style="color: whitesmoke; padding-top: 0; padding-right: 10px;" {{campaign.title}}
class="glyphicon glyphicon-edit trash pull-left" </mat-panel-title>
*ngIf="loginService.hasPermission(3)"> <mat-panel-description class="war-interaction-panel" *ngIf="loginService.hasPermission(3)">
</span> <span (click)="editCampaign(campaign); $event.stopPropagation()" title="Bearbeiten"
<span (click)="deleteCampaign(campaign); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-edit trash">
style="color: whitesmoke; padding-top: 0; padding-right: 10px;" </span>
class="glyphicon glyphicon-trash trash pull-left" <span (click)="deleteCampaign(campaign); $event.stopPropagation()" title="Löschen"
*ngIf="loginService.hasPermission(3)"> class="glyphicon glyphicon-trash trash">
</span> </span>
{{campaign.title}} </mat-panel-description>
<span class="pull-right"></span> </mat-expansion-panel-header>
</div> <div class="top-list-entry">
<div class="fade-in list-entry"
<div class="fade-in list-entry top-list-entry" [ngClass]="{selected : selectedWarId == campaign._id}" (click)="selectOverview(campaign._id)">
[ngClass]="{selected : selectedWarId == campaign._id}" (click)="selectOverview(campaign._id)"> <div>
<div style="margin: auto;"> <span>
<span style="margin:auto"> <a style="font-size: 20px;">Übersicht</a>
<a style="font-size: 22px;">Übersicht</a>
</span> </span>
</div>
</div> </div>
</div> <div class="fade-in list-entry"
[ngClass]="{selected : selectedWarId == campaign._id + highscore}" (click)="selectHighscore(campaign._id)">
<div class="fade-in list-entry top-list-entry" <div style="margin: auto">
[ngClass]="{selected : selectedWarId == campaign._id + highscore}" (click)="selectHighscore(campaign._id)">
<div style="margin: auto">
<span style="margin:auto"> <span style="margin:auto">
<a style="font-size: 22px;">Highscore</a> <a style="font-size: 20px;">Highscore</a>
</span> </span>
</div>
</div> </div>
</div> </div>
<div *ngFor="let war of campaign.wars">
<div style="padding-top: 40px;"> <pjm-war-item
<div *ngFor="let war of campaign.wars"> [war]="war"
<pjm-war-item (warEdit)="editWar($event)"
[war]="war" (warDelete)="deleteWar(war)"
(warEdit)="editWar($event)" (warSelected)="selectWar($event)"
(warDelete)="deleteWar(war)" [selected]="war._id == selectedWarId">
(warSelected)="selectWar($event)" </pjm-war-item>
[selected]="war._id == selectedWarId">
</pjm-war-item>
</div>
</div> </div>
</accordion-group> </mat-expansion-panel>
</accordion> </mat-accordion>
<div class="fade-in list-entry" style="margin-top: 20px; margin-bottom: 20px;" <div class="fade-in list-entry" style="margin-top: 20px; margin-bottom: 20px;"
[ngClass]="{selected : selectedWarId == 'all'}" (click)="selectOverview('all')"> [ngClass]="{selected : selectedWarId == 'all'}" (click)="selectOverview('all')">
<div class="row"> <div class="row">
<div class="col-xs-9"> <div class="col-xs-9">
<span style="margin:auto"> <span>
<a style="font-size: 22px;">Gesamtübersicht</a> <a style="font-size: 22px;">Gesamtübersicht</a>
</span> </span>
</div> </div>