tsai
/
squidex
mirror of https://github.com/Squidex/squidex.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Last tweaks.

pull/271/head
Sebastian Stehle 8 years ago
parent
7638a55251
commit
2e460f7159
14 changed files with 148 additions and 109 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/Squidex/app/features/administration/pages/users/users-page.component.html
  2. 4
      src/Squidex/app/features/administration/pages/users/users-page.component.ts
  3. 168
      src/Squidex/app/features/content/pages/contents/contents-page.component.html
  4. 2
      src/Squidex/app/features/content/pages/contents/contents-page.component.ts
  5. 5
      src/Squidex/app/features/content/pages/contents/search-form.component.ts
  6. 10
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
  7. 4
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts
  8. 14
      src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html
  9. 18
      src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts
  10. 7
      src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
  11. 11
      src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts
  12. 2
      src/Squidex/app/framework/angular/pager.component.html
  13. 2
      src/Squidex/app/shared/components/assets-list.component.html
  14. 4
      src/Squidex/app/shared/components/assets-list.component.ts

6
src/Squidex/app/features/administration/pages/users/users-page.component.html
View File

@ -49,7 +49,7 @@
<div sqxIgnoreScrollbar> <div sqxIgnoreScrollbar>
<table class="table table-items table-fixed"> <table class="table table-items table-fixed">
<tbody> <tbody>
<ng-template ngFor let-user [ngForOf]="usersState.users | async"> <ng-template ngFor let-user [ngForOf]="usersState.users | async" [ngForTrackBy]="trackByUser">
<tr [routerLink]="user.id" routerLinkActive="active"> <tr [routerLink]="user.id" routerLinkActive="active">
<td class="cell-user"> <td class="cell-user">
<img class="user-picture" [attr.title]="user.name" [attr.src]="user | sqxUserDtoPicture" /> <img class="user-picture" [attr.title]="user.name" [attr.src]="user | sqxUserDtoPicture" />
@ -81,7 +81,9 @@
</div> </div>
</div> </div>
<sqx-pager [pager]="usersState.usersPager | async" (prev)="goPrev()" (next)="goNext()"></sqx-pager> <div class="grid-footer">
<sqx-pager [pager]="usersState.usersPager | async" (prev)="goPrev()" (next)="goNext()"></sqx-pager>
</div>
</ng-container> </ng-container>
</sqx-panel> </sqx-panel>

4
src/Squidex/app/features/administration/pages/users/users-page.component.ts
View File

@ -55,5 +55,9 @@ export class UsersPageComponent implements OnInit {
public goNext() { public goNext() {
this.usersState.goNext().subscribe(); this.usersState.goNext().subscribe();
} }
public trackByUser(index: number, user: UserDto) {
return user.id;
}
} }

168
src/Squidex/app/features/content/pages/contents/contents-page.component.html
View File

@ -1,6 +1,6 @@
<sqx-title message="{app} | {schema} | Contents" parameter1="app" parameter2="schema" [value1]="ctx.appName" [value2]="schema?.displayName"></sqx-title> <sqx-title message="{app} | {schema} | Contents" parameter1="app" parameter2="schema" [value1]="ctx.appName" [value2]="schema?.displayName"></sqx-title>
<sqx-panel [desiredWidth]="isReadOnly ? '40rem' : '60rem'"> <sqx-panel [desiredWidth]="isReadOnly ? '40rem' : '60rem'" contentClass="grid">
<ng-container title> <ng-container title>
<ng-container *ngIf="!isReadOnly && !isArchive"> <ng-container *ngIf="!isReadOnly && !isArchive">
Contents Contents
@ -58,93 +58,93 @@
</ng-container> </ng-container>
<ng-container content> <ng-container content>
<div class="grid"> <div class="grid-header">
<div class="grid-header"> <table class="table table-items table-fixed" *ngIf="contentItems">
<table class="table table-items table-fixed" *ngIf="contentItems"> <thead>
<thead> <tr>
<tr> <th class="cell-select" *ngIf="!isReadOnly">
<th class="cell-select" *ngIf="!isReadOnly"> <input type="checkbox" class="form-control" [ngModel]="isAllSelected" (ngModelChange)="selectAll($event)" />
<input type="checkbox" class="form-control" [ngModel]="isAllSelected" (ngModelChange)="selectAll($event)" /> </th>
</th> <th class="cell-auto" *ngFor="let field of contentFields">
<th class="cell-auto" *ngFor="let field of contentFields"> <span class="field">{{field.displayName}}</span>
<span class="field">{{field.displayName}}</span> </th>
</th> <th class="cell-time">
<th class="cell-time"> Updated
Updated </th>
</th> <th class="cell-user">
<th class="cell-user"> By
By </th>
</th> <th class="cell-actions" *ngIf="!isReadOnly">
<th class="cell-actions" *ngIf="!isReadOnly"> Actions
Actions </th>
</th> </tr>
</tr> </thead>
</thead> </table>
</table> </div>
</div>
<div class="selection" *ngIf="selectionCount > 0"> <div class="selection" *ngIf="selectionCount > 0">
{{selectionCount}} items selected:&nbsp;&nbsp; {{selectionCount}} items selected:&nbsp;&nbsp;
<button class="btn btn-secondary" (click)="publishSelected()" *ngIf="canPublish"> <button class="btn btn-secondary" (click)="publishSelected()" *ngIf="canPublish">
Publish Publish
</button> </button>
<button class="btn btn-secondary" (click)="unpublishSelected()" *ngIf="canUnpublish"> <button class="btn btn-secondary" (click)="unpublishSelected()" *ngIf="canUnpublish">
Unpublish Unpublish
</button> </button>
<button class="btn btn-secondary" (click)="archiveSelected()" *ngIf="!isArchive"> <button class="btn btn-secondary" (click)="archiveSelected()" *ngIf="!isArchive">
Archive Archive
</button> </button>
<button class="btn btn-secondary" (click)="restoreSelected()" *ngIf="isArchive"> <button class="btn btn-secondary" (click)="restoreSelected()" *ngIf="isArchive">
Restore Restore
</button> </button>
<button class="btn btn-danger" <button class="btn btn-danger"
(sqxConfirmClick)="deleteSelected()" (sqxConfirmClick)="deleteSelected()"
confirmTitle="Delete content" confirmTitle="Delete content"
confirmText="Do you really want to delete the selected content items?"> confirmText="Do you really want to delete the selected content items?">
Delete Delete
</button> </button>
</div> </div>
<div class="grid-content"> <div class="grid-content">
<div sqxIgnoreScrollbar> <div sqxIgnoreScrollbar>
<table class="table table-items table-fixed" *ngIf="contentItems" > <table class="table table-items table-fixed" *ngIf="contentItems" >
<tbody *ngIf="!isReadOnly"> <tbody *ngIf="!isReadOnly">
<ng-template ngFor let-content [ngForOf]="contentItems" [ngForTrackBy]="trackBy"> <ng-template ngFor let-content [ngForOf]="contentItems" [ngForTrackBy]="trackByContent">
<tr [sqxContent]="content" [routerLink]="[content.id]" routerLinkActive="active" <tr [sqxContent]="content" [routerLink]="[content.id]" routerLinkActive="active"
[language]="languageSelected" [language]="languageSelected"
[schemaFields]="contentFields" [schemaFields]="contentFields"
[schema]="schema" [schema]="schema"
[selected]="isItemSelected(content)" [selected]="isItemSelected(content)"
(selectedChange)="selectItem(content, $event)" (selectedChange)="selectItem(content, $event)"
(unpublishing)="unpublishContent(content)" (unpublishing)="unpublishContent(content)"
(publishing)="publishContent(content)" (publishing)="publishContent(content)"
(archiving)="archiveContent(content)" (archiving)="archiveContent(content)"
(restoring)="restoreContent(content)" (restoring)="restoreContent(content)"
(deleting)="deleteContent(content)" (deleting)="deleteContent(content)"
(saved)="onContentSaved(content, $event)"></tr> (saved)="onContentSaved(content, $event)"></tr>
<tr class="spacer"></tr> <tr class="spacer"></tr>
</ng-template> </ng-template>
</tbody> </tbody>
<tbody *ngIf="isReadOnly"> <tbody *ngIf="isReadOnly">
<ng-template ngFor let-content [ngForOf]="contentItems"> <ng-template ngFor let-content [ngForOf]="contentItems">
<tr [sqxContent]="content" dnd-draggable [dragData]="dropData(content)" <tr [sqxContent]="content" dnd-draggable [dragData]="dropData(content)"
[language]="languageSelected" [language]="languageSelected"
[schemaFields]="contentFields" [schemaFields]="contentFields"
[schema]="schema" [schema]="schema"
isReadOnly="true"></tr> isReadOnly="true"></tr>
<tr class="spacer"></tr> <tr class="spacer"></tr>
</ng-template> </ng-template>
</tbody> </tbody>
</table> </table>
</div>
</div> </div>
</div>
<div class="grid-footer">
<sqx-pager [pager]="contentsPager"></sqx-pager> <sqx-pager [pager]="contentsPager"></sqx-pager>
</div> </div>
</ng-container> </ng-container>

2
src/Squidex/app/features/content/pages/contents/contents-page.component.ts
View File

@ -361,7 +361,7 @@ export class ContentsPageComponent implements OnDestroy, OnInit {
this.ctx.bus.emit(new ContentRemoved(content)); this.ctx.bus.emit(new ContentRemoved(content));
} }
public trackBy(content: ContentDto): string { public trackByContent(content: ContentDto): string {
return content.id; return content.id;
} }

5
src/Squidex/app/features/content/pages/contents/search-form.component.ts
View File

@ -5,13 +5,14 @@
* Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved. * Copyright (c) Squidex UG (haftungsbeschränkt). All rights reserved.
*/ */
import { Component, EventEmitter, Input, OnChanges, Output } from '@angular/core'; import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
import { FormBuilder } from '@angular/forms'; import { FormBuilder } from '@angular/forms';
@Component({ @Component({
selector: 'sqx-search-form', selector: 'sqx-search-form',
styleUrls: ['./search-form.component.scss'], styleUrls: ['./search-form.component.scss'],
templateUrl: './search-form.component.html' templateUrl: './search-form.component.html',
changeDetection: ChangeDetectionStrategy.OnPush
}) })
export class SearchFormComponent implements OnChanges { export class SearchFormComponent implements OnChanges {
private queryValue = ''; private queryValue = '';

10
src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
View File

@ -51,8 +51,16 @@
</ng-container> </ng-container>
<ng-container content> <ng-container content>
<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()">
<i class="icon icon-plus"></i> Add Field
</button>
</div>
<div dnd-sortable-container [sortableData]="schema.fields"> <div dnd-sortable-container [sortableData]="schema.fields">
<div *ngFor="let field of schema.fields; let i = index;" dnd-sortable [sortableIndex]="i" (sqxSorted)="sortFields($event)"> <div *ngFor="let field of schema.fields; let i = index; trackBy: trackByField" dnd-sortable [sortableIndex]="i" (sqxSorted)="sortFields($event)">
<sqx-field [field]="field" [schema]="schema" [patterns]="patterns"></sqx-field> <sqx-field [field]="field" [schema]="schema" [patterns]="patterns"></sqx-field>
</div> </div>

4
src/Squidex/app/features/schemas/pages/schema/schema-page.component.ts
View File

@ -136,6 +136,10 @@ export class SchemaPageComponent implements OnDestroy, OnInit {
this.schemaExport = result; this.schemaExport = result;
} }
public trackByField(index: number, field: FieldDto) {
return field.fieldId;
}
private back() { private back() {
this.router.navigate(['../'], { relativeTo: this.route }); this.router.navigate(['../'], { relativeTo: this.route });
} }

14
src/Squidex/app/features/schemas/pages/schemas/schema-form.component.html
View File

@ -1,5 +1,5 @@
<form [formGroup]="createForm.form" (ngSubmit)="createSchema()"> <form [formGroup]="createForm.form" (ngSubmit)="createSchema()">
<sqx-modal-dialog (close)="complete()" [large]="false"> <sqx-modal-dialog (close)="cancel()" [large]="false">
<ng-container title> <ng-container title>
<ng-container *ngIf="import; else noImport"> <ng-container *ngIf="import; else noImport">
Clone Schema Clone Schema
@ -27,12 +27,7 @@
</small> </small>
</div> </div>
<div class="form-group clearfix"> <div class="form-group">
<button type="reset" class="float-left btn btn-secondary" (click)="complete()">Cancel</button>
<button type="submit" class="float-right btn btn-success">Create</button>
</div>
<div>
<button class="btn btn-sm btn-link" (click)="toggleImport()" [class.hidden]="showImport"> <button class="btn btn-sm btn-link" (click)="toggleImport()" [class.hidden]="showImport">
Import schema Import schema
</button> </button>
@ -43,5 +38,10 @@
<sqx-json-editor *ngIf="showImport" formControlName="import"></sqx-json-editor> <sqx-json-editor *ngIf="showImport" formControlName="import"></sqx-json-editor>
</div> </div>
</ng-container> </ng-container>
<ng-container footer>
<button type="reset" class="float-left btn btn-secondary" (click)="cancel()">Cancel</button>
<button type="submit" class="float-right btn btn-success">Create</button>
</ng-container>
</sqx-modal-dialog> </sqx-modal-dialog>
</form> </form>

18
src/Squidex/app/features/schemas/pages/schemas/schema-form.component.ts
View File

@ -12,7 +12,8 @@ import {
ApiUrlConfig, ApiUrlConfig,
AppsState, AppsState,
CreateSchemaForm, CreateSchemaForm,
SchemasState SchemasState,
SchemaDto
} from '@app/shared'; } from '@app/shared';
@Component({ @Component({
@ -22,7 +23,10 @@ import {
}) })
export class SchemaFormComponent implements OnInit { export class SchemaFormComponent implements OnInit {
@Output() @Output()
public completed = new EventEmitter(); public created = new EventEmitter<SchemaDto>();
@Output()
public cancelled = new EventEmitter();
@Input() @Input()
public import: any; public import: any;
@ -51,8 +55,12 @@ export class SchemaFormComponent implements OnInit {
return false; return false;
} }
public complete() { public complete(schema: SchemaDto) {
this.completed.emit(); this.created.emit(schema);
}
public cancel() {
this.cancelled.emit();
} }
public createSchema() { public createSchema() {
@ -64,7 +72,7 @@ export class SchemaFormComponent implements OnInit {
this.schemasState.create(schemaDto) this.schemasState.create(schemaDto)
.subscribe(dto => { .subscribe(dto => {
this.complete(); this.complete(dto);
}, error => { }, error => {
this.createForm.submitFailed(error); this.createForm.submitFailed(error);
}); });

7
src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
View File

@ -9,7 +9,7 @@
<sqx-shortcut keys="ctrl+shift+g" (trigger)="addSchemaDialog.show()"></sqx-shortcut> <sqx-shortcut keys="ctrl+shift+g" (trigger)="addSchemaDialog.show()"></sqx-shortcut>
<sqx-shortcut keys="ctrl+shift+f" (trigger)="inputFind.focus()"></sqx-shortcut> <sqx-shortcut keys="ctrl+shift+f" (trigger)="inputFind.focus()"></sqx-shortcut>
<button class="btn btn-success subheader-button" (click)="createSchema(null)" title="New Schema (CTRL + SHIFT + G)"> <button class="btn btn-success subheader-button" (click)="createSchema()" title="New Schema (CTRL + SHIFT + G)">
<i class="icon-plus"></i> <i class="icon-plus"></i>
</button> </button>
@ -46,8 +46,9 @@
</sqx-panel> </sqx-panel>
<ng-container *sqxModalView="addSchemaDialog;onRoot:true"> <ng-container *sqxModalView="addSchemaDialog;onRoot:true">
<sqx-schema-form [import]="import" <sqx-schema-form [import]="import"
(completed)="addSchemaDialog.hide()"> (cancelled)="addSchemaDialog.hide()"
(created)="onSchemaCreated($event)">
</sqx-schema-form> </sqx-schema-form>
</ng-container> </ng-container>

11
src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.ts
View File

@ -7,7 +7,7 @@
import { Component, OnDestroy, OnInit } from '@angular/core'; import { Component, OnDestroy, OnInit } from '@angular/core';
import { FormControl } from '@angular/forms'; import { FormControl } from '@angular/forms';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { import {
@ -48,6 +48,7 @@ export class SchemasPageComponent implements OnDestroy, OnInit {
public readonly appsState: AppsState, public readonly appsState: AppsState,
private readonly messageBus: MessageBus, private readonly messageBus: MessageBus,
private readonly route: ActivatedRoute, private readonly route: ActivatedRoute,
private readonly router: Router,
private readonly schemasState: SchemasState private readonly schemasState: SchemasState
) { ) {
} }
@ -75,7 +76,13 @@ export class SchemasPageComponent implements OnDestroy, OnInit {
this.schemasState.loadSchemas().subscribe(); this.schemasState.loadSchemas().subscribe();
} }
public createSchema(importing: any) { public onSchemaCreated(schema: SchemaDto) {
this.router.navigate([schema.name], { relativeTo: this.route });
this.addSchemaDialog.hide();
}
public createSchema(importing: any = null) {
this.import = importing; this.import = importing;
this.addSchemaDialog.show(); this.addSchemaDialog.show();

2
src/Squidex/app/framework/angular/pager.component.html
View File

@ -1,4 +1,4 @@
<div class="grid-footer clearfix" *ngIf="pager && pager.numberOfItems > 0 && (!hideWhenButtonsDisabled || pager.canGoPrev || pager.canGoNext)"> <div class="clearfix" *ngIf="pager && pager.numberOfItems > 0 && (!hideWhenButtonsDisabled || pager.canGoPrev || pager.canGoNext)">
<div class="float-right pagination"> <div class="float-right pagination">
<span class="pagination-text">{{pager.itemFirst}}-{{pager.itemLast}} of {{pager.numberOfItems}}</span> <span class="pagination-text">{{pager.itemFirst}}-{{pager.itemLast}} of {{pager.numberOfItems}}</span>

2
src/Squidex/app/shared/components/assets-list.component.html
View File

@ -21,7 +21,7 @@
</sqx-asset> </sqx-asset>
<ng-container *ngIf="state.assets | async; let assets"> <ng-container *ngIf="state.assets | async; let assets">
<sqx-asset class="{{assetClass}}" *ngFor="let asset of assets" [asset]="asset" <sqx-asset class="{{assetClass}}" *ngFor="let asset of assets; trackBy: trackByAsset" [asset]="asset"
[isDisabled]="isDisabled" [isDisabled]="isDisabled"
[isSelectable]="selectedIds" [isSelectable]="selectedIds"
[isSelected]="isSelected(asset)" [isSelected]="isSelected(asset)"

4
src/Squidex/app/shared/components/assets-list.component.ts
View File

@ -68,6 +68,10 @@ export class AssetsListComponent {
this.state.goPrev().subscribe(); this.state.goPrev().subscribe();
} }
public trackByAsset(index: number, asset: AssetDto) {
return asset.id;
}
public isSelected(asset: AssetDto) { public isSelected(asset: AssetDto) {
return this.selectedIds && this.selectedIds[asset.id]; return this.selectedIds && this.selectedIds[asset.id];
} }

Write Preview
Loading…
Cancel
Save