Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aus-3926/3929 UI Fixes #262

Merged
merged 2 commits into from
May 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Select layers below to add to map
</div>
<div class="activeLayersBoundary" cdkDropList (cdkDropListDropped)="layerDropped($event)">
<li class="activeLayerItem" *ngFor="let layer of getActiveLayers()" cdkDrag cdkDragLockAxis="y" cdkDragBoundary=".activeLayersBoundary">
<li class="activeLayerItem" *ngFor="let layer of getActiveLayers()" cdkDrag cdkDragLockAxis="y" cdkDragBoundary=".activeLayersBoundary" [cdkDragDisabled]="getActiveLayers().length <= 1">
<div *ngIf="getActiveLayers().length > 1" cdkDragHandle>
<i class="activeLayerGrabber fa fa-arrows-v" title="Drag to reorder"></i>
</div>
Expand Down
1 change: 1 addition & 0 deletions src/app/menupanel/login/login.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
text-align: center;
color: #fff;
padding: 3em;
z-index: 999999999;

.user-avatar {
-webkit-border-radius: 50%;
Expand Down
2 changes: 1 addition & 1 deletion src/app/portal/portal.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h5 class="mb-1">
<!-- END Active Layers -->

<!-- BEGIN Featured Layers -->
<input type="checkbox" class="menuBtn" id="featuredLayersBtn"/>
<input type="checkbox" class="menuBtn" id="featuredLayersBtn" [(ngModel)]="featuredLayersCheckbox"/>
<h5 class="mb-1">
<label id="featuredLayersLink" for="featuredLayersBtn" class="mb-0" title="Select predefined layers">
<i class="ti-layers"></i>
Expand Down
13 changes: 12 additions & 1 deletion src/app/portal/portal.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,21 @@ import { AuthService } from 'app/services/auth/auth.service';
})
export class PortalComponent {

featuredLayersCheckbox: boolean;
featuredLayersCheckbox: boolean = true;

constructor(private authService: AuthService) {}

/**
* Featured layers would not display after logging in due to a strange UI bug, so by binding
* the panel checkbox to a variable we can set it immediately after display to ensure the
* panel is always expanded after a page refresh
*/
ngAfterViewInit() {
setTimeout(() => {
this.featuredLayersCheckbox = true;
}, 10);
}

/**
* Check is a user is logged in.
*
Expand Down