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

Fix user list select area

pull/1/head
Florian Hartwich 2017-05-15 17:18:04 +02:00
parent ec756028aa
commit e689e00dd7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static/src/app/users/user-list/user-item.component.html
View File

@ -1,9 +1,9 @@
<div class="fade-in user-list-entry" [ngClass]="{selected : selected}"> <div class="fade-in user-list-entry" [ngClass]="{selected : selected}" style="cursor: pointer;" (click)="select()">
<div class="row"> <div class="row">
<div class="col-xs-9"> <div class="col-xs-9">
<span> <span>
<a (click)="select()">{{user.username}}</a> <a>{{user.username}}</a>
</span> </span>
<br> <br>
<small *ngIf="user.squad && user.squad.fraction == 'OPFOR'">CSAT - {{user.squad.name}}</small> <small *ngIf="user.squad && user.squad.fraction == 'OPFOR'">CSAT - {{user.squad.name}}</small>
@ -12,8 +12,8 @@
</div> </div>
<div class="col-xs-3"> <div class="col-xs-3">
<span (click)="select()" title="Name, Squad, Rang" class="glyphicon glyphicon-pencil pull-left edit"></span> <span (click)="select(); $event.stopPropagation()" title="Name, Squad, Rang" class="glyphicon glyphicon-pencil pull-left edit"></span>
<span (click)="award()" title="Auszeichnungen" class="icon-award pull-left"></span> <span (click)="award(); $event.stopPropagation()" title="Auszeichnungen" class="icon-award pull-left"></span>
<span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash"></span> <span (click)="delete(); $event.stopPropagation()" title="Löschen" class="glyphicon glyphicon-trash trash"></span>
</div> </div>
</div> </div>

2
static/src/app/users/user-list/user-list.component.html
View File

@ -44,7 +44,7 @@
[user]="user" [user]="user"
(userDelete)="deleteUser(user)" (userDelete)="deleteUser(user)"
(userSelected)="selectUser($event)" (userSelected)="selectUser($event)"
(userAward)="awardUser($event)" (userAward)="awardUser($event, $event)"
[selected]="user._id == selectedUserId"> [selected]="user._id == selectedUserId">
</pjm-user-item> </pjm-user-item>
</div> </div>

2
static/src/app/users/user-list/user-list.component.ts
View File

@ -57,7 +57,7 @@ export class UserListComponent implements OnInit {
this.router.navigate([{outlets: {'right': ['overview', userId]}}], {relativeTo: this.route}); this.router.navigate([{outlets: {'right': ['overview', userId]}}], {relativeTo: this.route});
} }
awardUser(userId: string) { awardUser(userId) {
this.selectedUserId = userId; this.selectedUserId = userId;
this.router.navigate([{outlets: {'right': ['award', userId]}}], {relativeTo: this.route}); this.router.navigate([{outlets: {'right': ['award', userId]}}], {relativeTo: this.route});
} }