Browse Source

fix bug. menu title should be changed follow the app selected.

pull/170/head
Jason Ma 9 years ago
parent
commit
984042d73a
  1. 8
      src/Squidex/app/shell/pages/internal/apps-menu.component.html
  2. 10
      src/Squidex/app/shell/pages/internal/apps-menu.component.ts

8
src/Squidex/app/shell/pages/internal/apps-menu.component.html

@ -1,6 +1,6 @@
<ul class="nav navbar-nav" *ngIf="apps"> <ul class="nav navbar-nav" *ngIf="apps">
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<span class="nav-link dropdown-toggle" id="app-name" (click)="modalMenu.toggle()">{{ctx.app ? ctx.app.name : 'Apps Overview'}}</span> <span class="nav-link dropdown-toggle" id="app-name" (click)="modalMenu.toggle()">{{selectedApp ? selectedApp.name : 'Apps Overview'}}</span>
<div class="dropdown-menu" *sqxModalView="modalMenu" closeAlways="true" @fade> <div class="dropdown-menu" *sqxModalView="modalMenu" closeAlways="true" @fade>
<a class="dropdown-item all-apps" routerLink="/app"> <a class="dropdown-item all-apps" routerLink="/app">
@ -22,12 +22,12 @@
</div> </div>
</li> </li>
<li class="nav-item" *ngIf="ctx.app && ctx.app.planUpgrade && ctx.app.planName && ctx.app.permission === 'Owner'"> <li class="nav-item" *ngIf="selectedApp && selectedApp.planUpgrade && selectedApp.planName && selectedApp.permission === 'Owner'">
<div class="btn-group app-upgrade"> <div class="btn-group app-upgrade">
<button type="button" class="btn btn-primary"> <button type="button" class="btn btn-primary">
You are on the <strong>{{ctx.app.planName}}</strong> plan. You are on the <strong>{{selectedApp.planName}}</strong> plan.
</button> </button>
<button type="button" class="btn btn-warning" [routerLink]="['/app', ctx.app.name, 'settings', 'plans']"> <button type="button" class="btn btn-warning" [routerLink]="['/app', selectedApp.name, 'settings', 'plans']">
Upgrade! Upgrade!
</button> </button>
</div> </div>

10
src/Squidex/app/shell/pages/internal/apps-menu.component.ts

@ -29,19 +29,22 @@ import {
}) })
export class AppsMenuComponent implements OnDestroy, OnInit { export class AppsMenuComponent implements OnDestroy, OnInit {
private appsSubscription: Subscription; private appsSubscription: Subscription;
private appSubscription: Subscription;
public modalMenu = new ModalView(false, true); public modalMenu = new ModalView(false, true);
public modalDialog = new ModalView(); public modalDialog = new ModalView();
public apps: AppDto[] = []; public apps: AppDto[] = [];
public selectedApp: AppDto;
constructor(public readonly ctx: AppContext, constructor(
private readonly appsStore: AppsStoreService private readonly appsStore: AppsStoreService
) { ) {
} }
public ngOnDestroy() { public ngOnDestroy() {
this.appsSubscription.unsubscribe(); this.appsSubscription.unsubscribe();
this.appSubscription.unsubscribe();
} }
public ngOnInit() { public ngOnInit() {
@ -49,6 +52,11 @@ export class AppsMenuComponent implements OnDestroy, OnInit {
this.appsStore.apps.subscribe(apps => { this.appsStore.apps.subscribe(apps => {
this.apps = apps; this.apps = apps;
}); });
this.appSubscription =
this.appsStore.selectedApp.subscribe(app => {
this.selectedApp = app;
});
} }
public createApp() { public createApp() {

Loading…
Cancel
Save