Browse Source

Search input improved.

pull/294/head
Sebastian 8 years ago
parent
commit
f15a01546b
  1. 49
      src/Squidex/app/features/content/pages/contents/contents-page.component.html
  2. 4
      src/Squidex/app/features/content/pages/contents/contents-page.component.scss
  3. 2
      src/Squidex/app/features/content/pages/contents/search-form.component.html
  4. 3
      src/Squidex/app/features/content/pages/contents/search-form.component.ts
  5. 31
      src/Squidex/app/features/content/shared/contents-selector.component.html
  6. 15
      src/Squidex/app/framework/angular/panel.component.html

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

@ -12,29 +12,34 @@
</ng-container>
<ng-container menu>
<button class="btn btn-link btn-secondary" (click)="reload()" title="Refresh Contents (CTRL + SHIFT + R)">
<i class="icon-reset"></i> Refresh
</button>
<sqx-shortcut keys="ctrl+shift+r" (trigger)="reload()"></sqx-shortcut>
<sqx-search-form
(queryChanged)="search($event)"
[query]="contentsState.contentsQuery | async"
(archivedChanged)="goArchive($event)"
[archived]="contentsState.isArchive | async"
enableShortcut="true">
</sqx-search-form>
<ng-container *ngIf="languages.length > 1">
<sqx-language-selector class="languages-buttons" (selectedLanguageChange)="selectLanguage($event)" [languages]="languages.values"></sqx-language-selector>
</ng-container>
<div class="row no-gutters pl-1">
<div class="col col-auto offset-xl-4">
<button class="btn btn-link btn-secondary" (click)="reload()" title="Refresh Contents (CTRL + SHIFT + R)">
<i class="icon-reset"></i> Refresh
</button>
</div>
<div class="col pl-1">
<sqx-shortcut keys="ctrl+shift+r" (trigger)="reload()"></sqx-shortcut>
<button class="btn btn-success" #newButton routerLink="new" title="New Content (CTRL + SHIFT + G)">
<i class="icon-plus"></i> New
</button>
<sqx-shortcut keys="ctrl+shift+g" (trigger)="newButton.click()"></sqx-shortcut>
<sqx-search-form formClass="form"
(queryChanged)="search($event)"
[query]="contentsState.contentsQuery | async"
(archivedChanged)="goArchive($event)"
[archived]="contentsState.isArchive | async"
enableShortcut="true">
</sqx-search-form>
</div>
<div class="col col-auto pl-1" *ngIf="languages.length > 1">
<sqx-language-selector class="languages-buttons" (selectedLanguageChange)="selectLanguage($event)" [languages]="languages.values"></sqx-language-selector>
</div>
<div class="col col-auto pl-1">
<button class="btn btn-success" #newButton routerLink="new" title="New Content (CTRL + SHIFT + G)">
<i class="icon-plus"></i> New
</button>
<sqx-shortcut keys="ctrl+shift+g" (trigger)="newButton.click()"></sqx-shortcut>
</div>
</div>
</ng-container>
<ng-container content>

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

@ -1,6 +1,10 @@
@import '_vars';
@import '_mixins';
:host /deep/ .search-form {
display: block;
}
.content {
cursor: pointer;
}

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

@ -2,7 +2,7 @@
<sqx-shortcut keys="ctrl+shift+f" (trigger)="inputFind.focus()"></sqx-shortcut>
</ng-container>
<form class="form-inline search-form" (ngSubmit)="search()">
<form [class]="formClass" (ngSubmit)="search()">
<input class="form-control form-control-expandable" #inputFind [formControl]="contentsFilter" placeholder="Search for content" />
<a class="expand-search" (click)="searchModal.toggle()" #archive>

3
src/Squidex/app/features/content/pages/contents/search-form.component.ts

@ -35,6 +35,9 @@ export class SearchFormComponent implements OnChanges {
@Input()
public enableShortcut = false;
@Input()
public formClass = 'form-inline search-form';
public contentsFilter = new FormControl();
public searchModal = new ModalView();

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

@ -4,20 +4,23 @@
</ng-container>
<ng-container tabs>
<div class="text-right">
<button class="btn btn-link btn-secondary" (click)="reload()">
<i class="icon-reset"></i> Refresh
</button>
<sqx-search-form
[query]="contentsState.contentsQuery | async"
(queryChanged)="search($event)"
[canArchive]="false">
</sqx-search-form>
<ng-container *ngIf="languages.length > 1">
<sqx-language-selector class="languages-buttons" (selectedLanguageChange)="selectLanguage($event)" [languages]="languages.values"></sqx-language-selector>
</ng-container>
<div class="row no-gutters">
<div class="col col-auto offset-lg-4">
<button class="btn btn-link btn-secondary" (click)="reload()">
<i class="icon-reset"></i> Refresh
</button>
</div>
<div class="col pl-1">
<sqx-search-form formClass="form"
[query]="contentsState.contentsQuery | async"
(queryChanged)="search($event)"
[canArchive]="false">
</sqx-search-form>
<ng-container *ngIf="languages.length > 1">
<sqx-language-selector class="languages-buttons" (selectedLanguageChange)="selectLanguage($event)" [languages]="languages.values"></sqx-language-selector>
</ng-container>
</div>
</div>
</ng-container>

15
src/Squidex/app/framework/angular/panel.component.html

@ -4,13 +4,16 @@
<div class="panel-header" [class.large]="showSecondHeader" *ngIf="!isFullSize">
<div class="panel-title-row">
<div class="float-right">
<ng-content select=[menu]></ng-content>
<div class="row">
<div class="col col-auto">
<h3 class="panel-title">
<ng-content select=[title]></ng-content>
</h3>
</div>
<div class="col text-right">
<ng-content select=[menu]></ng-content>
</div>
</div>
<h3 class="panel-title">
<ng-content select=[title]></ng-content>
</h3>
</div>
<a class="panel-close" sqxParentLink [isLazyLoaded]="isLazyLoaded" *ngIf="showClose">

Loading…
Cancel
Save