paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-10-30 03:56:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move 'Filter by:' inline with title field, icon stuff

Browse Source
This commit is contained in:
Michael Shamoon
2021-01-11 16:15:55 -08:00
parent 579d6a0d39
commit 3e200dbeb5
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html
View File

@@ -1,11 +1,9 @@
<div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown"> <div class="btn-group w-100" ngbDropdown role="group" (openChange)="dropdownOpenChange($event)" #dropdown="ngbDropdown">
<button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'"> <button class="btn btn-sm" id="dropdown{{title}}" ngbDropdownToggle [ngClass]="!editing && selectionModel.selectionSize() > 0 ? 'btn-primary' : 'btn-outline-primary'">
<div class="d-none d-md-inline">{{title}}</div> <svg class="toolbaricon" fill="currentColor">
<div class="d-inline-block d-md-none"> <use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" />
<svg class="toolbaricon" fill="currentColor"> </svg>
<use attr.xlink:href="assets/bootstrap-icons.svg#{{icon}}" /> <div class="d-none d-sm-inline">&nbsp;{{title}}</div>
</svg>
</div>
<ng-container *ngIf="!editing && selectionModel.selectionSize() > 0"> <ng-container *ngIf="!editing && selectionModel.selectionSize() > 0">
<div class="badge bg-secondary text-light rounded-pill badge-corner"> <div class="badge bg-secondary text-light rounded-pill badge-corner">
{{selectionModel.selectionSize()}} {{selectionModel.selectionSize()}}

2
src-ui/src/app/components/document-list/document-list.component.html
View File

@@ -2,7 +2,7 @@
<div ngbDropdown class="mr-2 flex-fill d-flex"> <div ngbDropdown class="mr-2 flex-fill d-flex">
<button class="btn btn-sm btn-outline-primary flex-fill" id="dropdownSelect" ngbDropdownToggle> <button class="btn btn-sm btn-outline-primary flex-fill" id="dropdownSelect" ngbDropdownToggle>
<svg class="toolbaricon d-md-none" fill="currentColor"> <svg class="toolbaricon" fill="currentColor">
<use xlink:href="assets/bootstrap-icons.svg#text-indent-left" /> <use xlink:href="assets/bootstrap-icons.svg#text-indent-left" />
</svg>&nbsp;<ng-container i18n>Select</ng-container> </svg>&nbsp;<ng-container i18n>Select</ng-container>
</button> </button>

6
src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
View File

@@ -1,8 +1,8 @@
<div class="row"> <div class="row">
<div class="col mb-2 mb-xl-0"> <div class="col mb-2 mb-xl-0">
<div class="form-inline d-flex"> <div class="form-inline d-flex align-items-center">
<label class="text-muted mr-2" i18n>Filter by:</label> <label class="text-muted mr-2 mb-0" i18n>Filter by:</label>
<input class="form-control form-control-sm flex-grow-1" type="text" [(ngModel)]="titleFilter" placeholder="Title" i18n-placeholder> <input class="form-control form-control-sm flex-fill w-auto" type="text" [(ngModel)]="titleFilter" placeholder="Title" i18n-placeholder>
</div> </div>
</div> </div>
<div class="w-100 d-xl-none"></div> <div class="w-100 d-xl-none"></div>