Browse Source

Languages selector adapted to new state

pull/282/head
Sebastian Stehle 9 years ago
parent
commit
c4a9defd5a
  1. 2
      src/Squidex/app/features/content/pages/content/content-field.component.html
  2. 2
      src/Squidex/app/features/content/pages/content/content-field.component.scss
  3. 2
      src/Squidex/app/features/content/pages/content/content-field.component.ts
  4. 8
      src/Squidex/app/features/content/pages/content/content-page.component.ts
  5. 2
      src/Squidex/app/features/content/pages/contents/contents-page.component.html
  6. 2
      src/Squidex/app/features/content/shared/contents-selector.component.html

2
src/Squidex/app/features/content/pages/content/content-field.component.html

@ -7,7 +7,7 @@
<ng-container *ngIf="field.isLocalizable && languages.length > 1"> <ng-container *ngIf="field.isLocalizable && languages.length > 1">
<div class="languages-buttons" #buttonLanguages> <div class="languages-buttons" #buttonLanguages>
<sqx-language-selector size="sm" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages"></sqx-language-selector> <sqx-language-selector size="sm" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages.values"></sqx-language-selector>
</div> </div>
<sqx-onboarding-tooltip id="languages" [for]="buttonLanguages" position="topRight" after="120000"> <sqx-onboarding-tooltip id="languages" [for]="buttonLanguages" position="topRight" after="120000">

2
src/Squidex/app/features/content/pages/content/content-field.component.scss

@ -8,7 +8,7 @@
} }
.languages-buttons { .languages-buttons {
@include absolute(1rem, 1.25rem, auto, auto); @include absolute(.7rem, 1.25rem, auto, auto);
} }
.invalid { .invalid {

2
src/Squidex/app/features/content/pages/content/content-field.component.ts

@ -40,7 +40,7 @@ export class ContentFieldComponent implements OnInit {
public ngOnInit() { public ngOnInit() {
if (!this.language) { if (!this.language) {
this.language = this.languages[0]; this.language = this.languages.at(0);
} }
if (this.field.isLocalizable) { if (this.field.isLocalizable) {

8
src/Squidex/app/features/content/pages/content/content-page.component.ts

@ -13,7 +13,6 @@ import { Observable, Subscription } from 'rxjs';
import { ContentVersionSelected } from './../messages'; import { ContentVersionSelected } from './../messages';
import { import {
allData,
AppContext, AppContext,
AppLanguageDto, AppLanguageDto,
CanComponentDeactivate, CanComponentDeactivate,
@ -82,9 +81,6 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy,
this.selectedSchemaSubscription = this.selectedSchemaSubscription =
this.schemasState.selectedSchema this.schemasState.selectedSchema
.subscribe(schema => { .subscribe(schema => {
const routeData = allData(this.ctx.route);
this.setupLanguages(routeData);
this.setupContentForm(schema!); this.setupContentForm(schema!);
}); });
@ -205,10 +201,6 @@ export class ContentPageComponent implements CanComponentDeactivate, OnDestroy,
} }
} }
private setupLanguages(routeData: { [name: string]: any; }) {
this.languages = routeData.appLanguages;
}
private setupContentForm(schema: SchemaDetailsDto) { private setupContentForm(schema: SchemaDetailsDto) {
this.schema = schema; this.schema = schema;

2
src/Squidex/app/features/content/pages/contents/contents-page.component.html

@ -21,7 +21,7 @@
<sqx-search-form (queryChanged)="search($event)" [query]="contentsQuery" enableShortcut="true"></sqx-search-form> <sqx-search-form (queryChanged)="search($event)" [query]="contentsQuery" enableShortcut="true"></sqx-search-form>
<ng-container *ngIf="languages.length > 1"> <ng-container *ngIf="languages.length > 1">
<sqx-language-selector class="languages-buttons" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages"></sqx-language-selector> <sqx-language-selector class="languages-buttons" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages.values"></sqx-language-selector>
</ng-container> </ng-container>
<button class="btn btn-success" #newButton routerLink="new" title="New Content (CTRL + SHIFT + G)"> <button class="btn btn-success" #newButton routerLink="new" title="New Content (CTRL + SHIFT + G)">

2
src/Squidex/app/features/content/shared/contents-selector.component.html

@ -12,7 +12,7 @@
<sqx-search-form (queryChanged)="search($event)" [canArchive]="false"></sqx-search-form> <sqx-search-form (queryChanged)="search($event)" [canArchive]="false"></sqx-search-form>
<ng-container *ngIf="languages.length > 1"> <ng-container *ngIf="languages.length > 1">
<sqx-language-selector class="languages-buttons" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages"></sqx-language-selector> <sqx-language-selector class="languages-buttons" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages.values"></sqx-language-selector>
</ng-container> </ng-container>
</div> </div>
</ng-container> </ng-container>

Loading…
Cancel
Save