Project

General

Profile

« Previous | Next » 

Revision 56966

[mergeResultLandingPages | Library]: Merging Trunk into branch 56883:56965

View differences:

navigationBar.component.html
69 69
                    </ng-container>
70 70
                  </ng-container>
71 71
                      <ng-container *ngIf="userMenu">
72
                       <user-mini  mobileView=true [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
72
                       <user-mini  mobileView=true [redirectUrl]="(communityId)?null:properties.afterLoginRedirectLink" [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
73 73
                     </ng-container>
74 74
                  </ul>
75 75
               </div>
......
196 196
            <!-- </div> -->
197 197
            <!-- <div  *ngIf="userMenu" class="uk-navbar-right"> -->
198 198
            <!-- <div  *ngIf="userMenu" class="uk-navbar-right"> -->
199
                  <user-mini  *ngIf="userMenu"  [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
199
                  <user-mini  *ngIf="userMenu" [redirectUrl]="(communityId)?null:properties.afterLoginRedirectLink" [userMenuItems]=userMenuItems [logInUrl]=properties.loginUrl [logOutUrl]=properties.logoutUrl [cookieDomain]=properties.cookieDomain></user-mini>
200 200

  
201 201
            </div>
202 202
         </nav>

Also available in: Unified diff