[Library & Monitor Dashboard | new-theme]: Small update on notifications & filters offcanvas.
1. shadow.css: Added variable --shadow-main-dark. 2. offcanvas.css: a. Set --offcanvas-shadow: var(--shadow-main-dark); b. In class .offcanvas-switcher remove transition (will not be visible when offcanvas is open) c. [Bug fix] In class .offcanvas-count increased font size and make background always round, added line-height: 20px. d. In rule ".offcanvas .uk-offcanvas-bar" set border-radius to 4px. 3. notification-utils.ts: Full stop added in messages. 4. notification-sidebar.component.css: In rule "#notifications .notification-list ul" set height: calc(100% - 77px). 5. notifications-sidebar.component.ts: a. Removed anything related to offcavnas events b. Removed commented code c. Added in icons visuallyHidden. 6. monitor.component.html: a. Removed "open" class when offcanvas is open. b. Added in icons visuallyHidden c. Added sign in link in filters when user is not logged in d. Added uk-text-small class in "Clear". 7. monitor.component.ts: a. Removed anything related to offcavnas events b. Added method "logIn()".
This commit is contained in:
parent
9f1d4a8f8a
commit
84c155bb2e
|
@ -93,7 +93,7 @@
|
||||||
<div *ngIf="privateStakeholder" class="message">
|
<div *ngIf="privateStakeholder" class="message">
|
||||||
<div class="uk-text-center">
|
<div class="uk-text-center">
|
||||||
<h3 class="uk-flex uk-flex-middle">
|
<h3 class="uk-flex uk-flex-middle">
|
||||||
<icon name="incognito" ratio="2"></icon>
|
<icon name="incognito" ratio="2" visuallyHidden="private"></icon>
|
||||||
<span class="uk-margin-left">Private data</span>
|
<span class="uk-margin-left">Private data</span>
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
|
@ -235,7 +235,7 @@
|
||||||
<!--(click)="filterToggle= !filterToggle"
|
<!--(click)="filterToggle= !filterToggle"
|
||||||
[style.display]="(filterToggle?'none':'inherit')"-->
|
[style.display]="(filterToggle?'none':'inherit')"-->
|
||||||
<div *ngIf="stakeholder && !privateStakeholder " href="#style_switcher" uk-toggle="" id="filters_switcher_toggle"
|
<div *ngIf="stakeholder && !privateStakeholder " href="#style_switcher" uk-toggle="" id="filters_switcher_toggle"
|
||||||
class="offcanvas-switcher uk-flex uk-flex-center uk-flex-middle" [class.open]="offcanvasOpen">
|
class="offcanvas-switcher uk-flex uk-flex-center uk-flex-middle">
|
||||||
<icon name="filter_alt" ratio="1.5" customClass="uk-text-primary-gradient" visuallyHidden="Filters"></icon>
|
<icon name="filter_alt" ratio="1.5" customClass="uk-text-primary-gradient" visuallyHidden="Filters"></icon>
|
||||||
</div>
|
</div>
|
||||||
<div *ngIf="stakeholder && !privateStakeholder" id="style_switcher" class="uk-offcanvas offcanvas"
|
<div *ngIf="stakeholder && !privateStakeholder" id="style_switcher" class="uk-offcanvas offcanvas"
|
||||||
|
@ -243,21 +243,19 @@
|
||||||
<div class="uk-offcanvas-bar">
|
<div class="uk-offcanvas-bar">
|
||||||
<div class="uk-float-right">
|
<div class="uk-float-right">
|
||||||
<button class="uk-offcanvas-close offcanvas-close uk-close uk-icon" type="button">
|
<button class="uk-offcanvas-close offcanvas-close uk-close uk-icon" type="button">
|
||||||
<icon name="close" ratio="1.5"></icon>
|
<icon name="close" ratio="1.5" visuallyHidden="close"></icon>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-padding">
|
<div class="uk-padding">
|
||||||
<div class="uk-grid uk-flex uk-flex-middle">
|
<div class="uk-grid uk-flex uk-flex-middle">
|
||||||
<h4>Filters</h4>
|
<h4>Filters</h4>
|
||||||
<a *ngIf="countSelectedFilters() > 1"
|
<a *ngIf="countSelectedFilters() > 1"
|
||||||
class=" portal-link uk-width-1-2" (click)="clearAll()"> Clear All </a>
|
class="uk-text-small uk-width-1-2" (click)="clearAll()"> Clear All </a>
|
||||||
</div>
|
</div>
|
||||||
<div class="uk-grid uk-grid-small uk-text-small" uk-grid>
|
<div class="uk-grid uk-grid-small uk-text-small" uk-grid>
|
||||||
<ng-container *ngTemplateOutlet="selected_filters_pills; context: {margin:false}"></ng-container>
|
<ng-container *ngTemplateOutlet="selected_filters_pills; context: {margin:false}"></ng-container>
|
||||||
</div>
|
</div>
|
||||||
<div
|
<div *ngIf="!user" class="uk-margin-top"><a class="uk-link" (click)="logIn()"> Sign in</a> to apply filters.</div>
|
||||||
*ngIf="!user" class="uk-margin-top uk-alert uk-alert-warning"> Sign in to apply filters
|
|
||||||
</div>
|
|
||||||
<ul *ngIf="user" class="uk-list uk-list-divider uk-margin-top">
|
<ul *ngIf="user" class="uk-list uk-list-divider uk-margin-top">
|
||||||
<li>
|
<li>
|
||||||
<range-filter [filter]="periodFilter" yearMin="2000" [yearMax]="currentYear" [mandatoryRange]="true"
|
<range-filter [filter]="periodFilter" yearMin="2000" [yearMax]="currentYear" [mandatoryRange]="true"
|
||||||
|
|
|
@ -27,7 +27,6 @@ import {User} from "../openaireLibrary/login/utils/helper.class";
|
||||||
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
|
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
|
||||||
import {RangeFilter} from "../openaireLibrary/utils/rangeFilter/rangeFilterHelperClasses.class";
|
import {RangeFilter} from "../openaireLibrary/utils/rangeFilter/rangeFilterHelperClasses.class";
|
||||||
import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
|
import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
|
||||||
import {Location} from "@angular/common";
|
|
||||||
import {RouterHelper} from "../openaireLibrary/utils/routerHelper.class";
|
import {RouterHelper} from "../openaireLibrary/utils/routerHelper.class";
|
||||||
import {properties} from "../../environments/environment";
|
import {properties} from "../../environments/environment";
|
||||||
import {IndexInfoService} from "../openaireLibrary/utils/indexInfo.service";
|
import {IndexInfoService} from "../openaireLibrary/utils/indexInfo.service";
|
||||||
|
@ -79,7 +78,6 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
public keyword: FormControl;
|
public keyword: FormControl;
|
||||||
public statsUpdateDate: Date;
|
public statsUpdateDate: Date;
|
||||||
public stickyPageHeader: boolean = false;
|
public stickyPageHeader: boolean = false;
|
||||||
public offcanvasOpen: boolean = false;
|
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private route: ActivatedRoute,
|
private route: ActivatedRoute,
|
||||||
|
@ -220,14 +218,6 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
}));
|
}));
|
||||||
|
|
||||||
UIkit.util.on('#style_switcher', 'beforeshow', () => {
|
|
||||||
this.offcanvasOpen = true;
|
|
||||||
});
|
|
||||||
|
|
||||||
UIkit.util.on('#style_switcher', 'beforehide', () => {
|
|
||||||
this.offcanvasOpen = false;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private initializeFilters() {
|
private initializeFilters() {
|
||||||
|
@ -563,4 +553,8 @@ export class MonitorComponent implements OnInit, OnDestroy {
|
||||||
public printReport() {
|
public printReport() {
|
||||||
window.print();
|
window.print();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
logIn() {
|
||||||
|
this.userManagementService.login();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit dfd58762170aaf144599b815e7367d13312a73f8
|
Subproject commit 3af4eabea7b909829eb59bac7de506fe9eefde86
|
|
@ -1 +1 @@
|
||||||
Subproject commit e95be93cca857b74dc256fce2d22d157e51e0af1
|
Subproject commit ff4d2d2f957196d97d2bba86decd21153899e59b
|
Loading…
Reference in New Issue