start home

apps/maarch_entreprise/Views/basket-home.component.html

@@ -5,8 +5,8 @@
             <h4 *ngIf="regroupedBasket.baskets[0]" class="mat-toolbar mat-primary" style="padding-left:5px"><mat-icon mat-list-icon class="fa fa-users"></mat-icon> {{regroupedBasket.groupDesc}}</h4>
 
             <mat-list-item *ngFor="let basket of regroupedBasket.baskets" [ngStyle]="{'color': basket.color}">
-                <mat-icon mat-list-icon *ngIf="!basket.redirected" class="fa fa-inbox" matBadge="{{basket.resourceNumber}}" matBadgeColor="warn" [matBadgeHidden]="basket.resourceNumber==0" title="{{basket.resourceNumber}}"></mat-icon>
-                <mat-icon mat-list-icon *ngIf="basket.redirected" class="fa fa-share" matBadge="{{basket.resourceNumber}}" matBadgeColor="warn" [matBadgeHidden]="basket.resourceNumber==0" title="{{basket.resourceNumber}}"></mat-icon>
+                <mat-icon mat-list-icon *ngIf="!basket.redirected" class="fa fa-inbox" matBadge="{{basket.resourceNumber}}" matBadgePosition="before" matBadgeColor="warn" [matBadgeHidden]="basket.resourceNumber==0" title="{{basket.resourceNumber}}"></mat-icon>
+                <mat-icon mat-list-icon *ngIf="basket.redirected" class="fa fa-share" matBadge="{{basket.resourceNumber}}" matBadgePosition="before" matBadgeColor="warn" [matBadgeHidden]="basket.resourceNumber==0" title="{{basket.resourceNumber}}"></mat-icon>
                 <a *ngIf="!basket.redirected" href="index.php?page=view_baskets&module=basket&baskets={{basket.basket_id}}&groupId={{regroupedBasket.groupId}}">
                     <span mat-line title="{{basket.basket_desc}}">&nbsp;{{basket.basket_name}}</span>
                 </a>
@@ -21,7 +21,7 @@
         <ng-container *ngIf="homeData.assignedBaskets.length>0">
             <h4 class="mat-toolbar mat-primary" style="padding-left:5px">Autres bannettes</h4>
             <mat-list-item *ngFor="let basket of homeData.assignedBaskets">
-                <mat-icon mat-list-icon class="fa fa-inbox" matBadge="{{basket.resourceNumber}}" matBadgeColor="warn" [matBadgeHidden]="basket.resourceNumber==0" title="{{basket.resourceNumber}}"></mat-icon>
+                <mat-icon mat-list-icon class="fa fa-inbox" matBadge="{{basket.resourceNumber}}" matBadgePosition="before" matBadgeColor="warn" [matBadgeHidden]="basket.resourceNumber==0" title="{{basket.resourceNumber}}"></mat-icon>
                 <a href="index.php?page=view_baskets&module=basket&baskets={{basket.basket_id}}_{{basket.basket_owner}}&groupId=">
                     <span mat-line title="{{basket.basket_desc}}">&nbsp;{{basket.basket_name}} <h6>({{basket.userToDisplay}})</h6></span>
                 </a>

package.json

@@ -17,7 +17,7 @@
     "chosen-js": "^1.8.7",
     "core-js": "^2.5.7",
     "jquery": "^3.3.1",
-    "jquery-typeahead": "^2.10.5",
+    "jquery-typeahead": "^2.10.6",
     "jquery.nicescroll": "~3.6.8",
     "jstree-bootstrap-theme": "^1.0.1",
     "photoswipe": "^4.1.2",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.6.8",
     "@angular/animations": "^6.1.0",
-    "@angular/cdk": "^6.4.1",
+    "@angular/cdk": "^6.4.2",
     "@angular/cli": "^6.1.2",
     "@angular/common": "^6.1.0",
     "@angular/compiler": "^6.1.0",
@@ -38,7 +38,7 @@
     "@angular/core": "^6.1.0",
     "@angular/forms": "^6.1.0",
     "@angular/http": "^6.1.0",
-    "@angular/material": "^6.4.1",
+    "@angular/material": "^6.4.2",
     "@angular/platform-browser": "^6.1.0",
     "@angular/platform-browser-dynamic": "^6.1.0",
     "@angular/platform-server": "^6.1.0",