Browse Source

New buttons.

pull/282/head
Sebastian Stehle 8 years ago
parent
commit
2a0a4029a9
  1. 2
      src/Squidex/app/features/administration/state/event-consumers.state.ts
  2. 4
      src/Squidex/app/features/content/shared/contents-selector.component.ts
  3. 4
      src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts
  4. 4
      src/Squidex/app/features/rules/pages/rules/rules-page.component.html
  5. 4
      src/Squidex/app/features/rules/pages/rules/rules-page.component.ts
  6. 2
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
  7. 4
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss
  8. 4
      src/Squidex/app/features/settings/pages/backups/backups-page.component.html
  9. 4
      src/Squidex/app/features/settings/pages/plans/plans-page.component.ts
  10. 4
      src/Squidex/app/shared/state/assets.state.ts

2
src/Squidex/app/features/administration/state/event-consumers.state.ts

@ -38,7 +38,7 @@ export class EventConsumersState extends State<Snapshot> {
return this.eventConsumersService.getEventConsumers()
.do(dtos => {
if (notifyLoad) {
this.dialogs.notifyInfo('Event consumers reloaded.');
this.dialogs.notifyInfo('Event Consumers reloaded.');
}
this.next(s => {

4
src/Squidex/app/features/content/shared/contents-selector.component.ts

@ -60,7 +60,7 @@ export class ContentsSelectorComponent implements OnInit {
this.load(true);
}
private load(showInfo = false) {
private load(notifyLod = false) {
this.contentsService.getContents(this.appsState.appName, this.schema.name, this.contentsPager.pageSize, this.contentsPager.skip, this.contentsQuery, undefined, false)
.finally(() => {
this.selectedItems = {};
@ -71,7 +71,7 @@ export class ContentsSelectorComponent implements OnInit {
this.contentItems = ImmutableArray.of(dtos.items);
this.contentsPager = this.contentsPager.setCount(dtos.total);
if (showInfo) {
if (notifyLod) {
this.dialogs.notifyInfo('Contents reloaded.');
}
}, error => {

4
src/Squidex/app/features/rules/pages/events/rule-events-page.component.ts

@ -38,13 +38,13 @@ export class RuleEventsPageComponent implements OnInit {
this.load();
}
public load(showInfo = false) {
public load(notifyLoad = false) {
this.rulesService.getEvents(this.ctx.appName, this.eventsPager.pageSize, this.eventsPager.skip)
.subscribe(dtos => {
this.eventsItems = ImmutableArray.of(dtos.items);
this.eventsPager = this.eventsPager.setCount(dtos.total);
if (showInfo) {
if (notifyLoad) {
this.ctx.notifyInfo('Events reloaded.');
}
}, error => {

4
src/Squidex/app/features/rules/pages/rules/rules-page.component.html

@ -21,6 +21,10 @@
<ng-container content>
<div class="table-items-row table-items-row-empty" *ngIf="rules && rules.length === 0">
No Rule created yet.
<button class="btn btn-success btn-sm ml-2" (click)="createNew()">
<i class="icon icon-plus"></i> Add Rule
</button>
</div>
<table class="table table-items table-fixed" *ngIf="rules && rules.length > 0">

4
src/Squidex/app/features/rules/pages/rules/rules-page.component.ts

@ -50,14 +50,14 @@ export class RulesPageComponent implements OnInit {
this.load();
}
public load(showInfo = false) {
public load(notifyLoad = false) {
this.schemasService.getSchemas(this.ctx.appName)
.combineLatest(this.rulesService.getRules(this.ctx.appName), (s, w) => { return { rules: w, schemas: s }; })
.subscribe(dtos => {
this.schemas = dtos.schemas;
this.rules = ImmutableArray.of(dtos.rules);
if (showInfo) {
if (notifyLoad) {
this.ctx.notifyInfo('Rules reloaded.');
}
}, error => {

2
src/Squidex/app/features/schemas/pages/schema/schema-page.component.html

@ -54,7 +54,7 @@
<div class="table-items-row table-items-row-empty" *ngIf="schema && schema.fields.length === 0">
No field created yet.
<button class="btn btn-success ml-2" (click)="addFieldDialog.show()">
<button class="btn btn-success btn-sm ml-2" (click)="addFieldDialog.show()">
<i class="icon icon-plus"></i> Add Field
</button>
</div>

4
src/Squidex/app/features/schemas/pages/schema/schema-page.component.scss

@ -16,6 +16,10 @@
margin-top: .25rem;
}
.btn-success {
margin: 0;
}
.btn-export {
margin-right: 1rem;
}

4
src/Squidex/app/features/settings/pages/backups/backups-page.component.html

@ -19,6 +19,10 @@
<ng-container *ngIf="backupsState.backups | async; let backups">
<div class="table-items-row table-items-row-empty" *ngIf="backups.length === 0">
No backups created yet.
<button class="btn btn-success btn-sm ml-2" (click)="start()">
Start Backup
</button>
</div>
<div class="table-items-row" *ngFor="let backup of backups; trackBy: trackByBackup">

4
src/Squidex/app/features/settings/pages/plans/plans-page.component.ts

@ -58,7 +58,7 @@ export class PlansPageComponent implements OnDestroy, OnInit {
this.load();
}
public load(showInfo = false) {
public load(notifyLoad = false) {
this.plansService.getPlans(this.appsState.appName)
.subscribe(dto => {
if (this.overridePlanId) {
@ -69,7 +69,7 @@ export class PlansPageComponent implements OnDestroy, OnInit {
this.planOwned = !dto.planOwner || (dto.planOwner === this.authState.user!.id);
if (showInfo) {
if (notifyLoad) {
this.dialogs.notifyInfo('Plans reloaded.');
}
}, error => {

4
src/Squidex/app/shared/state/assets.state.ts

@ -60,14 +60,14 @@ export class AssetsState extends State<Snapshot> {
super({ assets: ImmutableArray.empty(), assetsPager: new Pager(0, 0, 30), loaded: false });
}
public load(notify = false, noReload = false): Observable<any> {
public load(notifyLoad = false, noReload = false): Observable<any> {
if (this.snapshot.loaded && noReload) {
return Observable.of({});
}
return this.assetsService.getAssets(this.appName, this.snapshot.assetsPager.pageSize, this.snapshot.assetsPager.skip, this.snapshot.assetsQuery)
.do(dtos => {
if (notify) {
if (notifyLoad) {
this.dialogs.notifyInfo('Assets reloaded.');
}

Loading…
Cancel
Save