design tweaks for dashboard - admin pages and start on remove sticky header when reaching footer
This commit is contained in:
parent
da6636ee79
commit
d26f56e260
|
@ -7,7 +7,7 @@
|
|||
<h1 class="uk-h4 uk-margin-remove">{{name}}</h1>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-margin">
|
||||
<div class="uk-margin uk-margin-remove-bottom">
|
||||
<admin-tabs tab="entity" [portal]="portal"></admin-tabs>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -16,7 +16,7 @@
|
|||
<loading></loading>
|
||||
</div>
|
||||
<div *ngIf="!showLoading">
|
||||
<div class="uk-grid uk-grid-medium-bottom" uk-grid>
|
||||
<div class="uk-grid uk-margin-medium-bottom" uk-grid>
|
||||
<div class="uk-width-expand">
|
||||
<ul *ngIf="!isPortalAdministrator" class="uk-subnav uk-subnav-pill">
|
||||
<li [class.uk-active]="filterForm.get('status').value === 'all'"><a
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
<h1 class="uk-h4 uk-margin-remove">{{name}}</h1>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-margin">
|
||||
<div class="uk-margin uk-margin-remove-bottom">
|
||||
<admin-tabs tab="page" [portal]="portal"></admin-tabs>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -45,6 +45,11 @@ export class LayoutService {
|
|||
*/
|
||||
private activeMenuItemSubject: BehaviorSubject<string> = new BehaviorSubject<string>("");
|
||||
|
||||
/**
|
||||
* Add isStickyPageHeader:
|
||||
*/
|
||||
private isStickyPageHeaderSubject: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
|
||||
|
||||
sub: any;
|
||||
|
||||
ngOnDestroy() {
|
||||
|
@ -171,4 +176,12 @@ export class LayoutService {
|
|||
setActiveMenuItem(value: string) {
|
||||
this.activeMenuItemSubject.next(value);
|
||||
}
|
||||
|
||||
get isStickyPageHeader(): Observable<boolean> {
|
||||
return this.isStickyPageHeaderSubject.asObservable();
|
||||
}
|
||||
|
||||
setIsStickyPageHeader(value: boolean) {
|
||||
this.isStickyPageHeaderSubject.next(value);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="!loadActive && !loadPending">
|
||||
<div *ngIf="!loadActive && !loadPending" class="uk-section uk-section-small">
|
||||
<div *ngIf="(showCurrent && showActive.length == 0) || (!showCurrent && showPending.length == 0)"
|
||||
class="uk-card uk-card-default uk-padding-large uk-text-center uk-margin-bottom uk-text-bold">
|
||||
<div *ngIf="showCurrent">No {{role}}s found</div>
|
||||
|
|
|
@ -17,7 +17,7 @@ declare var UIkit;
|
|||
<ng-template [ngIf]="form.get('notify')">
|
||||
<mat-checkbox formControlName="notify" class="uk-text-small">{{label}}</mat-checkbox>
|
||||
<div [class.uk-hidden]="!form.get('notify').value" class="uk-grid uk-grid-small uk-margin-top" uk-grid>
|
||||
<div style="margin-left: -5px;">
|
||||
<div>
|
||||
<notification-user [name]="user.firstname" [surname]="user.lastname"></notification-user>
|
||||
</div>
|
||||
<div dashboard-input [formInput]="form.get('message')"
|
||||
|
|
|
@ -91,7 +91,6 @@ constructor(private config: ConfigurationService, private route: ActivatedRoute
|
|||
communityId = properties.adminToolsCommunity;
|
||||
}
|
||||
this.subs.push(this.helper.getDivHelpContents(this.properties, communityId, "/").subscribe(contents => {
|
||||
console.log(contents);
|
||||
this.divContents = contents;
|
||||
}));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue