From 612dc5e3290ba6bfddc22587f10a36eb372ec387 Mon Sep 17 00:00:00 2001 From: Alex ORLUC <alex.orluc@maarch.org> Date: Fri, 21 Dec 2018 16:59:35 +0100 Subject: [PATCH] link list v2 --- .../app/basket/basket-home.component.html | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/frontend/app/basket/basket-home.component.html b/src/frontend/app/basket/basket-home.component.html index 1b090657685..f4b66247cfc 100755 --- a/src/frontend/app/basket/basket-home.component.html +++ b/src/frontend/app/basket/basket-home.component.html @@ -14,7 +14,7 @@ <mat-divider *ngIf="regroupedBasket.baskets[0]"></mat-divider> <mat-nav-list> <ng-container *ngFor="let basket of regroupedBasket.baskets | filterList:listFilter.value:'basket_name'"> - <a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;"> + <!-- <a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;"> <mat-icon [ngStyle]="{'color': basket.color}" *ngIf="basket.redirected && !mobileMode" mat-list-icon class="fa fa-share"></mat-icon> <span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span> <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span> @@ -29,9 +29,9 @@ <p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}"> {{basket.basket_name}} </p> - </a> + </a> --> <!-- TODO NEW BASKET LIST--> - <!-- <a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;"> + <a mat-list-item *ngIf="basket.redirected" disableRipple="true" style="cursor:not-allowed;"> <mat-icon [ngStyle]="{'color': basket.color}" *ngIf="basket.redirected && !mobileMode" mat-list-icon class="fa fa-share"></mat-icon> <span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span> <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span> @@ -46,7 +46,7 @@ <p mat-line title="{{basket.basket_name}}" [ngStyle]="{'color': basket.color}"> {{basket.basket_name}} </p> - </a> --> + </a> </ng-container> </mat-nav-list> </ng-container> @@ -54,24 +54,23 @@ <span color="primary" style="font-weight:bold;">{{lang.othersBaskets}}</span> <mat-divider></mat-divider> <mat-nav-list> - <a mat-list-item *ngFor="let basket of homeData.assignedBaskets | filterList:listFilter.value:'basket_name'"> + <!-- <a mat-list-item *ngFor="let basket of homeData.assignedBaskets | filterList:listFilter.value:'basket_name'"> <mat-icon *ngIf="!mobileMode" style="color:#666" mat-list-icon class="fa fa-inbox"></mat-icon> <span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span> <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span> <p mat-line (click)="goToRedirect(basket.basket_id, basket.ownerLogin, basket.uselessGroupId)" title="{{basket.basket_name}}" style="color:#666"> {{basket.basket_name}}<br/><small color="primary">({{basket.userToDisplay}} - {{basket.group_desc}})</small> </p> - </a> + </a> --> <!-- TODO NEW BASKET LIST--> - <!-- <a mat-list-item *ngFor="let basket of homeData.assignedBaskets | filterList:listFilter.value:'basket_name'" routerLink="/basketList/users/{{basket.owner_user_id}}/groups/{{basket.group_id}}/baskets/{{basket.basket_id}}"> + <a mat-list-item *ngFor="let basket of homeData.assignedBaskets | filterList:listFilter.value:'basket_name'" routerLink="/basketList/users/{{basket.owner_user_id}}/groups/{{basket.group_id}}/baskets/{{basket.basket_id}}"> <mat-icon *ngIf="!mobileMode" style="color:#666" mat-list-icon class="fa fa-inbox"></mat-icon> <span *ngIf="basket.resourceNumber==0" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span> <span *ngIf="basket.resourceNumber!=0" bgcolor="warn" class="badge" style="min-width:auto;">{{basket.resourceNumber}}</span> <p mat-line title="{{basket.basket_name}}" style="color:#666"> {{basket.basket_name}}<br/><small color="primary">({{basket.userToDisplay}} - {{basket.group_desc}})</small> </p> - </a> --> - + </a> </mat-nav-list> </ng-container> </mat-expansion-panel> -- GitLab