Browse Source

1) Links improved

2) Titles improved
pull/65/head
Sebastian Stehle 9 years ago
parent
commit
773bcbfa92
  1. 2
      src/Squidex/app/features/administration/pages/users/users-page.component.html
  2. 2
      src/Squidex/app/features/assets/pages/assets-page.component.html
  3. 4
      src/Squidex/app/features/content/pages/content/content-page.component.html
  4. 4
      src/Squidex/app/features/content/pages/contents/contents-page.component.html
  5. 2
      src/Squidex/app/features/content/pages/schemas/schemas-page.component.html
  6. 8
      src/Squidex/app/features/dashboard/pages/dashboard-page.component.html
  7. 2
      src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss
  8. 2
      src/Squidex/app/features/schemas/pages/schema/schema-page.component.html
  9. 2
      src/Squidex/app/features/schemas/pages/schemas/schemas-page.component.html
  10. 2
      src/Squidex/app/features/settings/pages/clients/clients-page.component.html
  11. 2
      src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html
  12. 2
      src/Squidex/app/features/settings/pages/languages/languages-page.component.html
  13. 4
      src/Squidex/app/features/settings/settings-area.component.html
  14. 13
      src/Squidex/app/features/settings/settings-area.component.ts
  15. 20
      src/Squidex/app/framework/angular/parent-link.directive.ts
  16. 1
      src/Squidex/app/framework/declarations.ts
  17. 3
      src/Squidex/app/framework/module.ts
  18. 2
      src/Squidex/app/shared/components/help.component.html
  19. 2
      src/Squidex/app/shared/components/history.component.html
  20. 1
      src/Squidex/app/shared/declarations.ts
  21. 3
      src/Squidex/app/shared/module.ts
  22. 2
      src/Squidex/app/shell/pages/not-found/not-found-page.component.html

2
src/Squidex/app/features/administration/pages/users/users-page.component.html

@ -18,7 +18,7 @@
<h3 class="panel-title">Users</h3> <h3 class="panel-title">Users</h3>
</div> </div>
<a class="panel-close" routerLink="../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

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

@ -18,7 +18,7 @@
<h3 class="panel-title">Assets</h3> <h3 class="panel-title">Assets</h3>
</div> </div>
<a class="panel-close" routerLink="./../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

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

@ -1,4 +1,4 @@
<sqx-title message="{app} | Content" parameter1="app" value1="{{appName() | async}}"></sqx-title> <sqx-title message="{app} | {schema} | Content" parameter1="app" parameter2="schema" value1="{{appName() | async}}" value2="{{schema.name}}"></sqx-title>
<form [formGroup]="contentForm" (ngSubmit)="saveAndPublish()"> <form [formGroup]="contentForm" (ngSubmit)="saveAndPublish()">
<sqx-panel panelWidth="53rem"> <sqx-panel panelWidth="53rem">
@ -31,7 +31,7 @@
</h3> </h3>
</div> </div>
<a class="panel-close" routerLink="../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

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

@ -1,4 +1,4 @@
<sqx-title message="{app} | Contents" parameter1="app" value1="{{appName() | async}}"></sqx-title> <sqx-title message="{app} | {schema} | Contents" parameter1="app" parameter2="schema" value1="{{appName() | async}}" value2="{{schema.name}}"></sqx-title>
<sqx-panel panelWidth="60rem"> <sqx-panel panelWidth="60rem">
<div class="panel-header"> <div class="panel-header">
@ -26,7 +26,7 @@
<h3 class="panel-title">Contents</h3> <h3 class="panel-title">Contents</h3>
</div> </div>
<a class="panel-close" routerLink="../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

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

@ -6,7 +6,7 @@
<h3 class="panel-title">Schemas</h3> <h3 class="panel-title">Schemas</h3>
</div> </div>
<a class="panel-close" sqxDashboardLink> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>

8
src/Squidex/app/features/dashboard/pages/dashboard-page.component.html

@ -12,7 +12,7 @@
</div> </div>
<div class="clearfix"> <div class="clearfix">
<a class="card card-link" [routerLink]="['schemas', { showDialog: true }]"> <a class="card card-href" [routerLink]="['schemas', { showDialog: true }]">
<div class="card-block"> <div class="card-block">
<div class="card-image"> <div class="card-image">
<img src="/images/dashboard-schema.png" /> <img src="/images/dashboard-schema.png" />
@ -23,7 +23,7 @@
</div> </div>
</a> </a>
<a class="card card-link" href="/api/content/{{appName() | async}}/docs" target="_blank"> <a class="card card-href" href="/api/content/{{appName() | async}}/docs" target="_blank">
<div class="card-block"> <div class="card-block">
<div class="card-image"> <div class="card-image">
<img src="/images/dashboard-api.png" /> <img src="/images/dashboard-api.png" />
@ -34,7 +34,7 @@
</div> </div>
</a> </a>
<a class="card card-link" (click)="showForum()"> <a class="card card-href" (click)="showForum()">
<div class="card-block"> <div class="card-block">
<div class="card-image"> <div class="card-image">
<img src="/images/dashboard-feedback.png" /> <img src="/images/dashboard-feedback.png" />
@ -45,7 +45,7 @@
</div> </div>
</a> </a>
<a class="card card-link" href="https://github.com/squidex/squidex" target="_blank"> <a class="card card-href" href="https://github.com/squidex/squidex" target="_blank">
<div class="card-block"> <div class="card-block">
<div class="card-image"> <div class="card-image">
<img src="/images/dashboard-github.png" /> <img src="/images/dashboard-github.png" />

2
src/Squidex/app/features/dashboard/pages/dashboard-page.component.scss

@ -62,7 +62,7 @@
margin-top: .4rem; margin-top: .4rem;
} }
&-link { &-href {
& { & {
cursor: pointer; cursor: pointer;
} }

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

@ -30,7 +30,7 @@
</h3> </h3>
</div> </div>
<a class="panel-close" routerLink="../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

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

@ -6,7 +6,7 @@
<h3 class="panel-title">Schemas</h3> <h3 class="panel-title">Schemas</h3>
</div> </div>
<a class="panel-close" sqxDashboardLink> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>

2
src/Squidex/app/features/settings/pages/clients/clients-page.component.html

@ -6,7 +6,7 @@
<h3 class="panel-title">Clients</h3> <h3 class="panel-title">Clients</h3>
</div> </div>
<a class="panel-close" routerLink="../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

2
src/Squidex/app/features/settings/pages/contributors/contributors-page.component.html

@ -6,7 +6,7 @@
<h3 class="panel-title">Contributors</h3> <h3 class="panel-title">Contributors</h3>
</div> </div>
<a class="panel-close" routerLink="../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

2
src/Squidex/app/features/settings/pages/languages/languages-page.component.html

@ -6,7 +6,7 @@
<h3 class="panel-title">Languages</h3> <h3 class="panel-title">Languages</h3>
</div> </div>
<a class="panel-close" routerLink="../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

4
src/Squidex/app/features/settings/settings-area.component.html

@ -1,10 +1,12 @@
<sqx-title message="{app} | Settings" parameter1="app" value1="{{appName() | async}}"></sqx-title>
<sqx-panel theme="dark" panelWidth="16rem"> <sqx-panel theme="dark" panelWidth="16rem">
<div class="panel-header"> <div class="panel-header">
<div class="panel-title-row"> <div class="panel-title-row">
<h3 class="panel-title">Settings</h3> <h3 class="panel-title">Settings</h3>
</div> </div>
<a class="panel-close" sqxDashboardLink> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

13
src/Squidex/app/features/settings/settings-area.component.ts

@ -7,11 +7,20 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import {
AppComponentBase,
AppsStoreService,
NotificationService
} from 'shared';
@Component({ @Component({
selector: 'sqx-settings-area', selector: 'sqx-settings-area',
styleUrls: ['./settings-area.component.scss'], styleUrls: ['./settings-area.component.scss'],
templateUrl: './settings-area.component.html' templateUrl: './settings-area.component.html'
}) })
export class SettingsAreaComponent { export class SettingsAreaComponent extends AppComponentBase {
constructor(apps: AppsStoreService, notifications: NotificationService
) {
super(notifications, apps);
}
} }

20
src/Squidex/app/shared/components/dashboard-link.directive.ts → src/Squidex/app/framework/angular/parent-link.directive.ts

@ -6,34 +6,32 @@
*/ */
import { Directive, ElementRef, HostListener, OnDestroy, OnInit, Renderer } from '@angular/core'; import { Directive, ElementRef, HostListener, OnDestroy, OnInit, Renderer } from '@angular/core';
import { Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { Subscription } from 'rxjs'; import { Subscription } from 'rxjs';
import { AppsStoreService } from './../declarations-base';
@Directive({ @Directive({
selector: '[sqxDashboardLink]' selector: '[sqxParentLink]'
}) })
export class DashboardLinkDirective implements OnInit, OnDestroy { export class ParentLinkDirective implements OnInit, OnDestroy {
private appSubscription: Subscription; private urlSubscription: Subscription;
private url: string; private url: string;
constructor( constructor(
private readonly appsStore: AppsStoreService,
private readonly router: Router, private readonly router: Router,
private readonly route: ActivatedRoute,
private readonly element: ElementRef, private readonly element: ElementRef,
private readonly renderer: Renderer private readonly renderer: Renderer
) { ) {
} }
public ngOnDestroy() { public ngOnDestroy() {
this.appSubscription.unsubscribe(); this.urlSubscription.unsubscribe();
} }
public ngOnInit() { public ngOnInit() {
this.appSubscription = this.urlSubscription =
this.appsStore.selectedApp.subscribe(app => { this.route.url.subscribe(() => {
this.url = this.router.createUrlTree(['app', app!.name]).toString(); this.url = this.router.createUrlTree(['.'], { relativeTo: this.route.parent.parent }).toString();
this.renderer.setElementAttribute(this.element.nativeElement, 'href', this.url); this.renderer.setElementAttribute(this.element.nativeElement, 'href', this.url);
}); });

1
src/Squidex/app/framework/declarations.ts

@ -28,6 +28,7 @@ export * from './angular/money.pipe';
export * from './angular/name.pipe'; export * from './angular/name.pipe';
export * from './angular/panel.component'; export * from './angular/panel.component';
export * from './angular/panel-container.directive'; export * from './angular/panel-container.directive';
export * from './angular/parent-link.directive';
export * from './angular/progress-bar.component'; export * from './angular/progress-bar.component';
export * from './angular/rich-editor.component'; export * from './angular/rich-editor.component';
export * from './angular/scroll-active.directive'; export * from './angular/scroll-active.directive';

3
src/Squidex/app/framework/module.ts

@ -42,6 +42,7 @@ import {
PanelContainerDirective, PanelContainerDirective,
PanelComponent, PanelComponent,
PanelService, PanelService,
ParentLinkDirective,
ProgressBarComponent, ProgressBarComponent,
ResourceLoaderService, ResourceLoaderService,
RichEditorComponent, RichEditorComponent,
@ -92,6 +93,7 @@ import {
MonthPipe, MonthPipe,
PanelContainerDirective, PanelContainerDirective,
PanelComponent, PanelComponent,
ParentLinkDirective,
ProgressBarComponent, ProgressBarComponent,
RichEditorComponent, RichEditorComponent,
ScrollActiveDirective, ScrollActiveDirective,
@ -130,6 +132,7 @@ import {
MonthPipe, MonthPipe,
PanelContainerDirective, PanelContainerDirective,
PanelComponent, PanelComponent,
ParentLinkDirective,
ProgressBarComponent, ProgressBarComponent,
RichEditorComponent, RichEditorComponent,
ScrollActiveDirective, ScrollActiveDirective,

2
src/Squidex/app/shared/components/help.component.html

@ -4,7 +4,7 @@
<h3 class="panel-title">Help</h3> <h3 class="panel-title">Help</h3>
</div> </div>
<a class="panel-close" routerLink="../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

2
src/Squidex/app/shared/components/history.component.html

@ -4,7 +4,7 @@
<h3 class="panel-title">Activity</h3> <h3 class="panel-title">Activity</h3>
</div> </div>
<a class="panel-close" routerLink="../"> <a class="panel-close" sqxParentLink>
<i class="icon-close"></i> <i class="icon-close"></i>
</a> </a>
</div> </div>

1
src/Squidex/app/shared/declarations.ts

@ -10,7 +10,6 @@ export * from './components/app-form.component';
export * from './components/asset.component'; export * from './components/asset.component';
export * from './components/assets-editor.component'; export * from './components/assets-editor.component';
export * from './components/component-base'; export * from './components/component-base';
export * from './components/dashboard-link.directive';
export * from './components/help.component'; export * from './components/help.component';
export * from './components/history.component'; export * from './components/history.component';
export * from './components/language-selector.component'; export * from './components/language-selector.component';

3
src/Squidex/app/shared/module.ts

@ -25,7 +25,6 @@ import {
AssetsService, AssetsService,
AuthService, AuthService,
ContentsService, ContentsService,
DashboardLinkDirective,
EventConsumersService, EventConsumersService,
HelpComponent, HelpComponent,
HelpService, HelpService,
@ -62,7 +61,6 @@ import {
AppFormComponent, AppFormComponent,
AssetComponent, AssetComponent,
AssetsEditorComponent, AssetsEditorComponent,
DashboardLinkDirective,
HelpComponent, HelpComponent,
HistoryComponent, HistoryComponent,
LanguageSelectorComponent, LanguageSelectorComponent,
@ -77,7 +75,6 @@ import {
AppFormComponent, AppFormComponent,
AssetComponent, AssetComponent,
AssetsEditorComponent, AssetsEditorComponent,
DashboardLinkDirective,
HelpComponent, HelpComponent,
HistoryComponent, HistoryComponent,
LanguageSelectorComponent, LanguageSelectorComponent,

2
src/Squidex/app/shell/pages/not-found/not-found-page.component.html

@ -7,5 +7,5 @@
<p>Sorry, the page you are looking for does not exist</p> <p>Sorry, the page you are looking for does not exist</p>
<a routerLink="../">Back to Homepage</a> <a sqxParentLink>Back to Homepage</a>
</div> </div>
Loading…
Cancel
Save