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

Release v6.5.2 #409

Merged
merged 219 commits into from
Jun 24, 2024
Merged
Changes from 1 commit
Commits
Show all changes
219 commits
Select commit Hold shift + click to select a range
8617f0b
Merge pull request #322 from AuScope/Release-6.4.0
PeterWarren Dec 20, 2023
1b81cd8
AUS-4085 Fixed broken links and corrected spelling
vjf Dec 20, 2023
0540a88
Merge branch 'master' of https://github.com/AuScope/AuScope-Portal-UI
vjf Dec 20, 2023
d2c6a82
AUS-4071 Status report should appear when user clicks on warning tria…
Jan 15, 2024
ff7e15a
Merge pull request #326 from laughing0li/master
jia020 Jan 15, 2024
1114abf
AUS-4087 Fixed classification sorting issue in NVCLAnalytical form.
jia020 Jan 17, 2024
a92620d
Merge pull request #327 from jia020/master
stuartwoodman Jan 17, 2024
266edb8
AUS-4066 info window close button is hidden when window is large
Jan 22, 2024
8384d7b
AUS-4066 info window close button is hidden when window is large
Jan 22, 2024
ebd4c95
Merge pull request #328 from laughing0li/master
stuartwoodman Jan 22, 2024
767b36a
Make all the popup windows movable and resizable like the feature popup
Feb 13, 2024
60d324c
Merge pull request #329 from laughing0li/master
jia020 Feb 13, 2024
947531d
AUS-4034 Added new browse UI
vjf Feb 21, 2024
c902f20
Merge pull request #331 from AuScope/AUS-4034-browse
jia020 Feb 27, 2024
8ca92f4
updated package version to v6.5.0 for next release
PeterWarren Feb 28, 2024
f66a7fa
updated prod deploy github action to target Release branch
PeterWarren Feb 28, 2024
f8b19fc
AUS-4096 Moved PermanentLink to Map area.
jia020 Feb 28, 2024
419d5c3
Removed docker files and github actions that use them
PeterWarren Feb 28, 2024
fdcdfec
clarify git hub actions and update
PeterWarren Feb 28, 2024
2a0d5e9
Merge pull request #333 from AuScope/AUS-4096
vjf Mar 5, 2024
bc33db3
Moving search to Elasticsearch
stuartwoodman Dec 5, 2023
9ede9e0
Tidy search code.
stuartwoodman Mar 14, 2024
8ddb544
Bump version
stuartwoodman Mar 14, 2024
738db08
AUS-4088 Make AuScope Portal UI colour scheme looks more like AuScope…
Mar 21, 2024
03ec42e
Merge pull request #335 from laughing0li/master
jia020 Mar 22, 2024
565be46
Update known layer search field names.
stuartwoodman Mar 26, 2024
b4ec36d
show package version in UI
PeterWarren Mar 26, 2024
798d881
updated portal-core-ui dependency version to 6.5.1
PeterWarren Mar 26, 2024
21c9ec0
Merge pull request #334 from stuartwoodman/AUS-4031-Elasticsearch-CSW…
PeterWarren Mar 26, 2024
b3c1ec7
Moved custom layers functionality to search bar.
stuartwoodman Apr 5, 2024
3726364
Fix search reset.
stuartwoodman Apr 5, 2024
94a8a6f
Merge pull request #337 from stuartwoodman/Fix-Search-Reset
jia020 Apr 8, 2024
10cc5d8
AUS-4097: Moved filters from LH sidebar to active layers
vjf Apr 10, 2024
a84042e
Merge pull request #336 from AuScope/showPackageVersion
vjf Apr 10, 2024
b3999dc
Merge branch 'master' of https://github.com/AuScope/AuScope-Portal-UI…
vjf Apr 11, 2024
00a2d11
AUS-4097 Fixed stack overflow on layer time extent
vjf Apr 11, 2024
98b4255
Download selector is a little bar in Chrome for zip/clip/ship function
Apr 12, 2024
bb236c9
Merge pull request #338 from AuScope/UI-Redesign-2024
stuartwoodman Apr 12, 2024
b837cdf
Merge pull request #339 from laughing0li/master
stuartwoodman Apr 12, 2024
97e8a9a
Moved custom layers functionality to search bar.
stuartwoodman Apr 5, 2024
5a512d8
Bump portal-core-ui version to 6.5.2
vjf Apr 14, 2024
222a0b3
Renamed a few buttons.
stuartwoodman Apr 16, 2024
535c55f
Merge branch 'AUS-4104-Move-Custom-Layers-To-Searchbar' of https://gi…
stuartwoodman Apr 16, 2024
d2581dd
Merge pull request #340 from stuartwoodman/AUS-4104-Move-Custom-Layer…
laughing0li Apr 16, 2024
7320e67
Shift the search query clear text button to right.
stuartwoodman Apr 17, 2024
eb76c46
Merge pull request #341 from stuartwoodman/AUS-4121-Shift-Search-Quer…
stuartwoodman Apr 17, 2024
91a9f8f
Changed cursor type and highlighted background colour on browse menu …
stuartwoodman Apr 17, 2024
3441a51
Merge pull request #342 from stuartwoodman/AUS-4116-Browse-Menu-Highl…
stuartwoodman Apr 17, 2024
ba30970
Groups/layer text now changes font colour when hovering over column p…
stuartwoodman Apr 17, 2024
8051cc1
Merge pull request #343 from stuartwoodman/AUS-4116-II-Highlighting
stuartwoodman Apr 17, 2024
7dfa196
Fixed bug with displaced previews on InfoPanel dialogs.
stuartwoodman Apr 19, 2024
01f6c98
Merge pull request #344 from stuartwoodman/AUS-4113-4115-InfoPanel-Ad…
stuartwoodman Apr 19, 2024
4dc48fb
AUS-4114 Rearrange icons on map
vjf Apr 22, 2024
016b932
Fixed alignment with ActiveLayers when more than 1 panel is present.
stuartwoodman Apr 22, 2024
3fd2ac9
Added split layer controls.
stuartwoodman Apr 22, 2024
098c055
Disabled panels during drag that weren't resizing correctly.
stuartwoodman Apr 22, 2024
35a3262
The relevant browse menu panels will not display when groups and/or l…
stuartwoodman Apr 23, 2024
83a96a7
AUS-4109 Links on browsemenu info panel should look like links
Apr 23, 2024
5cf30be
Merge branch 'master' into master
laughing0li Apr 23, 2024
6f7b723
Merge pull request #347 from laughing0li/master
laughing0li Apr 23, 2024
385cc5b
Merge pull request #345 from stuartwoodman/AUS-4118-ActiveLayers-Alig…
vjf Apr 23, 2024
19a86b1
AUS-4117 Darkened violet font colour, boldened and enlargeed some text
vjf Apr 24, 2024
1e7b156
Merge pull request #346 from stuartwoodman/AUS-Hide-Browse-Menu-Panels
vjf Apr 24, 2024
c1db5ab
AUS-4110 Make sidebar collapsible
Apr 26, 2024
2232d94
Merge pull request #348 from laughing0li/master
laughing0li Apr 26, 2024
cd40ca6
AUS-4035 Added ROI(region of interest) for user.
jia020 Apr 29, 2024
2663b0b
AUS-4035 Connected ROI to DB.
jia020 Apr 30, 2024
49d243e
AUS-4126 Upgrade zone.js in preparation for Angular v16 upgrade
vjf Apr 30, 2024
f9fc36c
AUS-4126 Upgrade to Angular v16
vjf Apr 30, 2024
10c7c9a
AUS-4126 Upgrade Angular cdk & material to v16
vjf Apr 30, 2024
007b18c
AUS-4126 Upgrade to Angular v17
vjf Apr 30, 2024
19e9a84
AUS-4126 Update .gitignore
vjf Apr 30, 2024
ae11c20
AUS-4126 Update Angular material and cdk to v17
vjf Apr 30, 2024
1534f57
The browse menu panel is now justified to the left of the map and wil…
stuartwoodman Apr 30, 2024
187366c
Merge pull request #350 from stuartwoodman/AUS-4128-Browse-Menu-Posit…
stuartwoodman Apr 30, 2024
8196280
AUS-4035 Removed unused storage.
jia020 May 1, 2024
fa55870
AUS-4126 Fix missing CSS compile error
vjf May 1, 2024
58da241
AUS-4126 Update plotly and nouislider
vjf May 1, 2024
751fd80
AUS-4035 Save ROI straightway.
jia020 May 1, 2024
7f3c443
AUS-4111 Unreadable text - white text on pale grey background
May 1, 2024
6bb0263
Merge pull request #351 from laughing0li/master
laughing0li May 1, 2024
accf36c
AUS-4111 Unreadable text - white text on pale grey background
May 2, 2024
cacc958
Merge pull request #353 from laughing0li/master
laughing0li May 2, 2024
d431d21
AUS-4130 Permanent links on logout menu unreadable
May 2, 2024
ad84b55
Merge pull request #354 from laughing0li/master
laughing0li May 2, 2024
27863ef
AUS-4126 Update portal-core-ui package version
vjf May 2, 2024
d26582f
Merge pull request #352 from AuScope/angular-v17-upgrade
vjf May 2, 2024
a575321
Merge branch 'master' into AUS-4035
vjf May 2, 2024
58ae331
Merge pull request #349 from AuScope/AUS-4035
vjf May 2, 2024
37e35db
Update build-package.yml
jia020 May 3, 2024
0bbb90f
upgraded portal-core-ui to v6.5.6
jia020 May 3, 2024
dd4ca04
Merge pull request #355 from AuScope/master
jia020 May 3, 2024
110f91c
Fixed eslint issue.
jia020 May 3, 2024
8d0b01d
Merge pull request #356 from AuScope/master
jia020 May 3, 2024
bb04b85
Merge pull request #357 from AuScope/jia020-node20
jia020 May 3, 2024
d5fc464
AUS-3379 Add tooltips for nvclAnalyticalJob.
jia020 May 8, 2024
b0a4d96
AUS-3379 Updated the tooltips.
jia020 May 8, 2024
c815630
Merge pull request #358 from AuScope/AUS-3379
jia020 May 8, 2024
772c0c5
AUS-3378 Using radio for algorithm group selecting.
jia020 May 8, 2024
c64d4d8
AUS-3381 Add tooltip for "apply-nvcl-filter"
jia020 May 8, 2024
4ea4dee
AUS-4126 Update README.md with new tool versions
vjf May 8, 2024
6cd65af
AUS-4133 Fix deploy to dev pipeline, upgrade node version
vjf May 8, 2024
bf69feb
AUS-4133 Update node version
vjf May 8, 2024
89cea69
AUS-4133 Upgrade npm version
vjf May 8, 2024
196814b
AUS-4133 Remove unusable github action
vjf May 8, 2024
70f6ab7
AUS-4133 Update actions to latest versions
vjf May 9, 2024
a0ffad1
AUS-4133 Update actions to latest versions
vjf May 9, 2024
491f2be
Info panel now displays
stuartwoodman May 10, 2024
21009a2
AUS-4102 Fix end date bug in IRIS (seismic) downloads
vjf May 10, 2024
4a36db7
AAUS-4134 AUS-4135
May 10, 2024
5ab40a7
Merge pull request #359 from AuScope/AUS-3378
laughing0li May 10, 2024
26b7ef2
Merge branch 'AuScope:master' into master
laughing0li May 10, 2024
2b088f9
Merge pull request #360 from stuartwoodman/AUS-4099-Add-Info-Panel-To…
jia020 May 10, 2024
01e724d
Merge pull request #361 from laughing0li/master
jia020 May 10, 2024
7c97f0c
Merge pull request #362 from AuScope/AUS-4102
laughing0li May 10, 2024
2b5439f
Updated package-lock for new portal-core-ui version
vjf May 10, 2024
80c4a03
Active layers panel no longer expects every layer to be associated wi…
stuartwoodman May 14, 2024
6e050af
Merge pull request #363 from stuartwoodman/AUS-4122-Custom-Layers-Bug
stuartwoodman May 14, 2024
3d7b87a
Replaced the background preview map with one hosted on the Community …
stuartwoodman May 14, 2024
7fe3e1e
Merge pull request #364 from stuartwoodman/AUS-4131-Preview-Map
stuartwoodman May 14, 2024
4528d1f
Have added scroll-bars to:
stuartwoodman May 15, 2024
0f4c06a
Modifications to Custom Layers:
stuartwoodman May 16, 2024
8d0ea50
Stop horizontal scroll bars from appearing in browse menu.
stuartwoodman May 16, 2024
a204b97
Merge pull request #365 from stuartwoodman/AUS-4143-Scroll-Bars
vjf May 16, 2024
8ee5a2d
AUS-4142 Update package-lock file to include new portal-core-ui version
vjf May 16, 2024
c7862ac
Merge pull request #366 from stuartwoodman/AUS-4144-Custom_layer-Impr…
stuartwoodman May 16, 2024
030c481
Hiding KML panel means it still takes up space and pushed search resu…
stuartwoodman May 16, 2024
2a6f6cb
Merge pull request #369 from stuartwoodman/AUS-4144-Quick-Fix
stuartwoodman May 16, 2024
60c06bf
Fixed bug where Custom Layers panel was obscuring map clicks.
stuartwoodman May 22, 2024
073d6f0
Merge pull request #370 from stuartwoodman/AUS-4084-Map-Click-Custom-…
stuartwoodman May 22, 2024
9106264
Improvements to InfoPanel:
stuartwoodman May 22, 2024
a579fd4
Prevent custom WMS or KML layers being added to the list of available…
stuartwoodman May 23, 2024
12e86e8
Permanent link button now immediately opens proper menu when user is …
stuartwoodman May 23, 2024
a9e8c27
Merge pull request #371 from stuartwoodman/AUS-4148-InfoPanel-Prettying
stuartwoodman May 23, 2024
d817f77
Merge pull request #373 from stuartwoodman/AUS-4149-Permanent-Link-Im…
stuartwoodman May 24, 2024
71adf4a
Merge pull request #372 from stuartwoodman/AUS-4149-Adding-Custom-Lay…
laughing0li May 28, 2024
ef63f75
fix AUS-4145
May 28, 2024
643a599
Merge pull request #374 from laughing0li/master
vjf May 29, 2024
e55623c
Increase z-index of search panel so it opens over browse panel.
stuartwoodman May 29, 2024
f84d559
Merge pull request #375 from stuartwoodman/AUS-4155-Search-Bar-Opens-…
stuartwoodman May 29, 2024
3ade3a6
AUS-4108 Restore bookmark functionality
vjf May 29, 2024
25414b5
Hard-code width of Featured Layer Groups browse menu column so Firefo…
stuartwoodman May 30, 2024
d880b39
Adjusted z-indices of search panel to allow help menu to display over…
stuartwoodman May 30, 2024
bbbb2b1
Merge pull request #377 from stuartwoodman/AUS-4156-Help-Menu-Obscured
stuartwoodman May 30, 2024
a838c08
Custom layers panel now collapses when user clicks outside it.
stuartwoodman May 30, 2024
e6f6001
Merge pull request #378 from stuartwoodman/AUS-4159-Custom-Layers-Col…
stuartwoodman May 30, 2024
9e00c8e
AUS-4027
chrisvpeters May 30, 2024
b29c0c1
Added a <rectangles-editor> editor component to the ac-map (via CsMap…
stuartwoodman Jun 3, 2024
6679f28
Merge pull request #379 from stuartwoodman/AUS-4163-Draw-Bounds-Broken
stuartwoodman Jun 3, 2024
e4c3810
AUS-4157 Remove Open Street Map because of CORS errors
vjf Jun 3, 2024
8af19c0
AUS-4157 Remove Open Street Map because of CORS errors
vjf Jun 3, 2024
9d70ae4
AUS-4157 Remove Open Street Map because of CORS errors
vjf Jun 3, 2024
0ab74d7
Merge pull request #376 from AuScope/AUS-4108
stuartwoodman Jun 3, 2024
3875a63
AUS-4027
chrisvpeters Jun 4, 2024
f6ee77f
Merge pull request #380 from chrisvpeters/AUS-4027
jia020 Jun 4, 2024
622f673
removed the unused url in env file.
jia020 Jun 5, 2024
feed827
Moved GRACE legend so it doesn't appear over shifted map buttons.
stuartwoodman Jun 5, 2024
18251cb
Merge pull request #381 from AuScope/AUS-4158-GRACE-Legend-Position
stuartwoodman Jun 5, 2024
010f9a7
Shifted browse menu closer to browse button.
stuartwoodman Jun 5, 2024
4b0d1d2
Merge pull request #382 from stuartwoodman/AUS-4183-Move-Browse-Menu-Up
stuartwoodman Jun 5, 2024
08c98c8
update from 6.5.11 to 6.5.12
chrisvpeters Jun 5, 2024
a5d38b4
Merge pull request #383 from chrisvpeters/AUS-4027B
chrisvpeters Jun 5, 2024
e447184
The check (is the user logged in) to see if the bookmarks checkbox sh…
stuartwoodman Jun 6, 2024
dc739a6
Merge pull request #384 from stuartwoodman/AUS-4174-Bookmarks-Logging…
stuartwoodman Jun 6, 2024
41148dc
AUS-4185
chrisvpeters Jun 6, 2024
752d604
Merge pull request #385 from chrisvpeters/AUS-4185
jia020 Jun 6, 2024
5edf429
AUS-4185 fix scrolling of header in Feature Info
chrisvpeters Jun 6, 2024
019c8c9
Merge pull request #386 from chrisvpeters/AUS-4185A
chrisvpeters Jun 6, 2024
3b77b8e
AUS-4185 removes Feature Information header from bottom left of Portal
chrisvpeters Jun 10, 2024
c942af0
AUS-4185 size of modal issue
chrisvpeters Jun 11, 2024
1ea11a6
AUS-4185 resize not working and drag by header
chrisvpeters Jun 11, 2024
a2269f1
AUS-4182 Added the copyToClipboard Button for polygon layers.
jia020 Jun 11, 2024
4c910b8
Merge pull request #387 from chrisvpeters/AUS-4185B
jia020 Jun 11, 2024
33bfd8e
* Reduced the size of active layer panels when dragged.
stuartwoodman Jun 11, 2024
c26c3de
Merge pull request #389 from stuartwoodman/AUS-4161-Layer-Reordering-…
stuartwoodman Jun 11, 2024
4d8e626
If a single word in a custom layer is too long it will end with ellip…
stuartwoodman Jun 11, 2024
714cac1
Merge pull request #390 from stuartwoodman/AUS-4168-Custom-Layer-Name…
stuartwoodman Jun 11, 2024
33479ef
* ROI icon colour on polygon clipboard made lighter.
stuartwoodman Jun 11, 2024
4ad4552
Merge pull request #391 from stuartwoodman/AUS-4169-4176-ROI-Colours
stuartwoodman Jun 11, 2024
49efd44
Merge pull request #388 from AuScope/AUS-4182
laughing0li Jun 11, 2024
741dccc
fix AUS-4190 Features with long names make layer selection impossible…
Jun 11, 2024
48bb7dd
Merge pull request #392 from laughing0li/master
vjf Jun 11, 2024
4224e47
fix AUS-4164 Active layers and the layer delete are too close together
Jun 12, 2024
8a2403c
Merge pull request #393 from laughing0li/master
laughing0li Jun 12, 2024
5d0dfb6
AUS-4189 Fixed problem of missing popup info upon map click
vjf Jun 12, 2024
baa94bf
AUS-4186
chrisvpeters Jun 12, 2024
4268d75
Removed ability for user to download polygon regions for layers that …
stuartwoodman Jun 13, 2024
063e624
Merge pull request #395 from chrisvpeters/AUS-4186
laughing0li Jun 13, 2024
3ab7bbc
skip dev deployment when credentials are not available
PeterWarren Jun 13, 2024
ba879b4
Merge branch 'master' of https://github.com/AuScope/AuScope-Portal-UI…
vjf Jun 13, 2024
a2fc230
Merge pull request #394 from AuScope/AUS-4189
laughing0li Jun 13, 2024
96366cf
AUS-4186
chrisvpeters Jun 14, 2024
dfdafd1
AUS-4186
chrisvpeters Jun 14, 2024
8976c46
Merge pull request #398 from chrisvpeters/master
jia020 Jun 14, 2024
6d041df
AUS-4192 Fixed tsgcachedownloadurl console error.
jia020 Jun 17, 2024
4494d04
Merge pull request #396 from stuartwoodman/AUS-4172-DIsable-Polygon-D…
vjf Jun 17, 2024
345a002
AUS-4194 Fix date error in Passive Seismic downloads
vjf Jun 18, 2024
3455287
Merge pull request #400 from AuScope/AUS-4194
stuartwoodman Jun 18, 2024
c357e0e
Merge pull request #399 from AuScope/AUS-4192
stuartwoodman Jun 18, 2024
f02eb37
AUS-4167 Minor inconsistent styling issues
Jun 18, 2024
51de2a7
AUS-4167 Minor inconsistent styling issues
Jun 19, 2024
858a14c
Merge pull request #401 from laughing0li/master
vjf Jun 19, 2024
bc17e3e
AUS-4153 When custom layers dropdown is displayed, search bar should …
Jun 19, 2024
2ef4ae0
Merge pull request #402 from laughing0li/master
vjf Jun 19, 2024
c1bae8c
AUS-4203
chrisvpeters Jun 19, 2024
0633ca7
Added feature info dialog messages:
stuartwoodman Jun 20, 2024
8a8e104
AUS-4202 Download tab and layer styling tab are different colours
Jun 20, 2024
3f7a1c5
Merge pull request #404 from stuartwoodman/AUS-4191-Feature-Info-Mess…
laughing0li Jun 20, 2024
3c488aa
Merge pull request #403 from chrisvpeters/AUS-4203
vjf Jun 20, 2024
203f567
Merge pull request #405 from laughing0li/master
jia020 Jun 20, 2024
254ebe1
Active layer names will only occupy a single row and use ellipses to …
stuartwoodman Jun 20, 2024
7387fce
Merge pull request #406 from stuartwoodman/AUS-4204-Active-Layer-Name…
stuartwoodman Jun 20, 2024
05ba743
AUS-4205 Fix problem of "Layer Styling" button not grey when selected
vjf Jun 21, 2024
2bb0692
Merge pull request #407 from AuScope/AUS-4205
laughing0li Jun 21, 2024
ba7ac78
AUS-4139
chrisvpeters Jun 21, 2024
bdb5f78
Merge branch 'master' into AUS-4139
vjf Jun 21, 2024
0e8be39
AUS-4139
chrisvpeters Jun 21, 2024
59d090b
AUS-4139
chrisvpeters Jun 21, 2024
236f857
Merge pull request #408 from chrisvpeters/AUS-4139
vjf Jun 21, 2024
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
Prev Previous commit
Next Next commit
Disabled panels during drag that weren't resizing correctly.
  • Loading branch information
stuartwoodman committed Apr 22, 2024
commit 098c055cc8e49be8c86b355ff251f9725f6774cc
163 changes: 38 additions & 125 deletions src/app/menupanel/activelayers/activelayerspanel.component.html
Original file line number Diff line number Diff line change
@@ -6,124 +6,36 @@
<div class="activeLayerItem" *ngFor="let layer of getActiveLayers()" cdkDrag cdkDragLockAxis="y" cdkDragBoundary=".activeLayersBoundary" [cdkDragDisabled]="getActiveLayers().length <= 1">
<!-- Active layer info column -->
<div class="activeLayerContent">
<div class="activeLayerTitleBar">
<!-- Grabber in first column if more than one layer -->
<div class="btn btn-sm btn-primary activeLayerGrabber" *ngIf="getActiveLayers().length > 1" cdkDragHandle>
<i style="margin-left: 0;" class="ti-exchange-vertical" title="Drag to reorder"></i>
</div>
<!-- Title, loader spinner and delete button -->
<div class="activeLayerTitle">{{ layer.name }}</div>
<span style="margin-left: auto;" *ngIf="getUILayerModel(layer.id).statusMap.getRenderStarted()" class="project-percentage hasEvent light-blue">
<i *ngIf="!getUILayerModel(layer.id).statusMap.getRenderComplete()" class="fa fa-spin fa-spinner"></i>
<i *ngIf="getUILayerModel(layer.id).statusMap.getContainsError()" class="fa fa-warning text-warning"></i>
</span>
<i style="margin-left: auto;" *ngIf="getUILayerModel(layer.id).statusMap.getRenderStarted()" class="fa fa-trash red layerLoadClickable" (click)="removeLayer(layer);$event.stopPropagation()"></i>
</div>
<!-- Opacity, legend and status buttons -->
<div class="activeLayerOpacityLegendStatusBar">
<div style="font-size: small;">Opacity {{ getUILayerModel(layer.id).opacity }}%&nbsp;</div>
<!-- Opacity slider -->
<mat-slider class="opacity-slider" min="0" max="100" (input)="layerOpacityChangeValue($event, layer)">
<input matSliderThumb
[(ngModel)]="getUILayerModel(layer.id).opacity">
</mat-slider>
<div style="display: flex;" *ngIf="hasLegend(layer)">
<!-- Display legend button -->
<button class="btn btn-primary btn-sm legend" [disabled]="isLegendShown(layer.id)" (click)="showLegend(layer)">Legend</button>
<!-- Display status button -->
<button class="btn btn-primary btn-sm status" (click)="openStatusReport(getUILayerModel(layer.id)); $event.stopPropagation();">Status</button>
</div>
</div>
<!-- Map split controls -->
<div class="split-panel" style="font-size: small;" *ngIf="getShowSplitMapButtons(layer)" (click)="$event.stopPropagation()">
Split Direction&nbsp;
<div *ngIf="getApplicableSplitLayer(layer)" class="split-button-panel">
<button [className]="getLayerSplitDirection(layer.id) === 'left' ? 'btn btn-split btn-primary' : 'btn btn-split btn-warning'" (click)="setLayerSplitDirection($event, layer, 'left')">Left</button>
<button [className]="getLayerSplitDirection(layer.id) === 'none' ? 'btn btn-split btn-primary' : 'btn btn-split btn-warning'" (click)="setLayerSplitDirection($event, layer, 'none')">Both</button>
<button [className]="getLayerSplitDirection(layer.id) === 'right' ? 'btn btn-split btn-primary' : 'btn btn-split btn-warning'" (click)="setLayerSplitDirection($event, layer, 'right')">Right</button>
</div>
<div *ngIf="!getApplicableSplitLayer(layer)" class="split-button-panel">
<button class="btn btn-split btn-primary" [disabled]="true">Layer not supported</button>
</div>
</div>
<!-- Filter panel -->
<div class="activeLayerFilterPanel"> <!-- this div seems unnecessary, but remove it and drag breaks (more) -->
<div style="position: inherit;" class="card card-info card-with-tabs layer-card">
<div class="rh_info_wrap">
<div class="card-header">
<ul id="card-tab" class="nav nav-tabs">
<!-- Layer Styling tab -->
<li (click)="selectTabPanel(layer.id,'filterpanel')" [ngClass]="{'active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.filterpanel.expanded}">
<a data-toggle="tab">
<span class="d-none d-sm-inline">Layer Styling</span>
</a>
</li>
<!-- Layer Download tab -->
<li *ngIf="isMapSupportedLayer(layer) && isDownloadSupportedLayer(layer)" (click)="selectTabPanel(layer.id,'downloadpanel')" [ngClass]="{'active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.downloadpanel.expanded}" class="d-none d-md-block">
<a data-toggle="tab">
<span>Download</span>
</a>
</li>
</ul>
</div>
<div class="top-layer-btn-panel">
<!-- Add bookmark button -->
<button *ngIf="isUserLoggedIn() && !isLayerBookmarked(layer.id)" (click)="addLayerBookmark(layer.id)" type="button" class="btn btn-sm btn-info top-layer-btn" title="Bookmark Layer"><i class="fa fa-sm fa-bookmark-o"></i></button>
<!-- Remove bookmark button -->
<button *ngIf="isUserLoggedIn() && isLayerBookmarked(layer.id)" (click)="removeLayerBookmark(layer.id)" type="button" class="btn btn-sm btn-info top-layer-btn" title="Remove Layer Bookmark"><i class="fa fa-sm fa-bookmark"></i></button>
<!-- Info button -->
<button (click)="displayRecordInformation(layer)" type="button" class="btn btn-sm btn-info top-layer-btn" title="Information" [ngClass]="{'active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.infopanel.expanded}">Info</button>
</div>
</div>
<div id="card-tab-content" class="tab-content">
<!-- Panel for layer styling -->
<div class="tab-pane fade" [ngClass]="{'show active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.filterpanel.expanded}">
<app-filter-panel *ngIf="getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.filterpanel.expanded" [layer]=layer></app-filter-panel>
</div>
<!-- Panel for layer download -->
<div class="tab-pane fade" [ngClass]="{'show active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.downloadpanel.expanded}">
<app-download-panel *ngIf="getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.downloadpanel.expanded" [layer]=layer></app-download-panel>
</div>
<div class="activeLayerTitleBar" cdkDragHandle>
<!-- Grabber in first column if more than one layer -->
<div class="btn btn-sm btn-primary activeLayerGrabber" *ngIf="getActiveLayers().length > 1">
<i style="margin-left: 0;" class="ti-exchange-vertical" title="Drag to reorder"></i>
</div>
<!-- Title, loader spinner and delete button -->
<div class="activeLayerTitle">{{ layer.name }}</div>
<span style="margin-left: auto;" *ngIf="getUILayerModel(layer.id).statusMap.getRenderStarted()" class="project-percentage hasEvent light-blue">
<i *ngIf="!getUILayerModel(layer.id).statusMap.getRenderComplete()" class="fa fa-spin fa-spinner"></i>
<i *ngIf="getUILayerModel(layer.id).statusMap.getContainsError()" class="fa fa-warning text-warning"></i>
</span>
<i style="margin-left: auto;" *ngIf="getUILayerModel(layer.id).statusMap.getRenderStarted()" class="fa fa-trash red layerLoadClickable" (click)="removeLayer(layer);$event.stopPropagation()"></i>
</div>
</div>
</div>
</div>
</div>

<!--
<div class="activeLayersBoundary" cdkDropList (cdkDropListDropped)="layerDropped($event)">
<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>
<div class="activeLayerContent">
<div>
// Layer name, status and warning icons
<u>{{ layer.name }}
<span *ngIf="getUILayerModel(layer.id).statusMap.getRenderStarted()" class="float-right project-percentage hasEvent light-blue">
<i *ngIf="!getUILayerModel(layer.id).statusMap.getRenderComplete()" class="fa fa-spin fa-spinner"></i>
<i *ngIf="getUILayerModel(layer.id).statusMap.getContainsError()" class="fa fa-warning text-warning"></i>
</span>
</u>
<i *ngIf="getUILayerModel(layer.id).statusMap.getRenderStarted()" class="fa fa-trash float-right red layerLoadClickable" (click)="removeLayer(layer);$event.stopPropagation()"></i>
</div>
<div style="clear: right" *ngIf="(showOpacitySlider(layer) && getUILayerModel(layer.id).statusMap.getRenderStarted()) || hasLegend(layer)" class="opacity-slider-panel d-flex" (click)="$event.stopPropagation()">
<div class="opacity-label">Opacity {{ getUILayerModel(layer.id).opacity }}%&nbsp;</div>
// Opacity slider
<mat-slider class="opacity-slider" min="0" max="100" (input)="layerOpacityChangeValue($event, layer)">
<!-- Opacity, legend and status buttons -->
<div class="activeLayerOpacityLegendStatusBar">
<div style="font-size: small;">Opacity {{ getUILayerModel(layer.id).opacity }}%&nbsp;</div>
<!-- Opacity slider -->
<mat-slider class="opacity-slider" min="0" max="100" (input)="layerOpacityChangeValue($event, layer)">
<input matSliderThumb
[(ngModel)]="getUILayerModel(layer.id).opacity">
</mat-slider>
<div style="display: flex;" *ngIf="hasLegend(layer)">
// Display legend button
<button class="btn btn-primary btn-sm legend" [disabled]="isLegendShown(layer.id)" (click)="showLegend(layer)">Legend</button>
// Display status button
<button class="btn btn-primary btn-sm status" (click)="openStatusReport(getUILayerModel(layer.id)); $event.stopPropagation();">Status</button>
<!-- Display legend button -->
<button class="btn btn-primary btn-sm legend" [disabled]="isLegendShown(layer.id)" (click)="showLegend(layer)">Legend</button>
<!-- Display status button -->
<button class="btn btn-primary btn-sm status" (click)="openStatusReport(getUILayerModel(layer.id)); $event.stopPropagation();">Status</button>
</div>
</div>
// Map split controls
<div class="split-panel" *ngIf="getShowSplitMapButtons(layer)" (click)="$event.stopPropagation()">
<!-- Map split controls -->
<div class="split-panel" style="font-size: small;" *ngIf="getShowSplitMapButtons(layer)" (click)="$event.stopPropagation()">
Split Direction&nbsp;
<div *ngIf="getApplicableSplitLayer(layer)" class="split-button-panel">
<button [className]="getLayerSplitDirection(layer.id) === 'left' ? 'btn btn-split btn-primary' : 'btn btn-split btn-warning'" (click)="setLayerSplitDirection($event, layer, 'left')">Left</button>
@@ -134,19 +46,19 @@
<button class="btn btn-split btn-primary" [disabled]="true">Layer not supported</button>
</div>
</div>

<div class="sidebar-card-menu-show">
<div class="card card-info card-with-tabs layer-card animated slideInRight">
<div class = "rh_info_wrap">
<!-- Filter panel -->
<div class="activeLayerFilterPanel"> <!-- this div seems unnecessary, but remove it and drag breaks (more) -->
<div style="position: inherit;" class="card card-info card-with-tabs layer-card">
<div class="rh_info_wrap">
<div class="card-header">
<ul id="card-tab" class="nav nav-tabs">
// Layer Styling tab
<!-- Layer Styling tab -->
<li (click)="selectTabPanel(layer.id,'filterpanel')" [ngClass]="{'active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.filterpanel.expanded}">
<a data-toggle="tab">
<span class="d-none d-sm-inline">Layer Styling</span>
</a>
</li>
// Layer Download tab
<!-- Layer Download tab -->
<li *ngIf="isMapSupportedLayer(layer) && isDownloadSupportedLayer(layer)" (click)="selectTabPanel(layer.id,'downloadpanel')" [ngClass]="{'active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.downloadpanel.expanded}" class="d-none d-md-block">
<a data-toggle="tab">
<span>Download</span>
@@ -155,28 +67,29 @@
</ul>
</div>
<div class="top-layer-btn-panel">
// Add bookmark button
<!-- Add bookmark button -->
<button *ngIf="isUserLoggedIn() && !isLayerBookmarked(layer.id)" (click)="addLayerBookmark(layer.id)" type="button" class="btn btn-sm btn-info top-layer-btn" title="Bookmark Layer"><i class="fa fa-sm fa-bookmark-o"></i></button>
// Remove bookmark button
<!-- Remove bookmark button -->
<button *ngIf="isUserLoggedIn() && isLayerBookmarked(layer.id)" (click)="removeLayerBookmark(layer.id)" type="button" class="btn btn-sm btn-info top-layer-btn" title="Remove Layer Bookmark"><i class="fa fa-sm fa-bookmark"></i></button>
// Info button
<!-- Info button -->
<button (click)="displayRecordInformation(layer)" type="button" class="btn btn-sm btn-info top-layer-btn" title="Information" [ngClass]="{'active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.infopanel.expanded}">Info</button>
</div>
</div>
<div id="card-tab-content" class="tab-content">
// Panel for layer styling
<!-- Panel for layer styling -->
<div class="tab-pane fade" [ngClass]="{'show active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.filterpanel.expanded}">
<app-filter-panel *ngIf="getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.filterpanel.expanded" [layer]=layer></app-filter-panel>
</div>
// Panel for layer download
<!-- Panel for layer download -->
<div class="tab-pane fade" [ngClass]="{'show active': getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.downloadpanel.expanded}">
<app-download-panel *ngIf="getUILayerModel(layer.id) && getUILayerModel(layer.id).tabpanel.downloadpanel.expanded" [layer]=layer></app-download-panel>
</div>
</div>
</div>
</div>

<div class="activeLayerDragMessagePanel">
Drag layer to change layer order.
</div>
</div>
</li>
</div>
-->
</div>
</div>
31 changes: 25 additions & 6 deletions src/app/menupanel/activelayers/activelayerspanel.component.scss
Original file line number Diff line number Diff line change
@@ -112,16 +112,14 @@
}
}

.activeLayerFilterPanel {
.cdk-drag-preview {
display: none;
}
}

.activeLayerContent {
width:100%;
color: $text-colour; // XXX Needs to be darker but may be fixed at a higher level
}

.activeLayerDragMessagePanel {
display: none;
}

// Slider min-width is 112px by default which can push components to right off the panel
::ng-deep {
@@ -140,6 +138,27 @@
box-shadow: 0 5px 5px -3px rgba(0, 0, 0, 0.2),
0 8px 10px 1px rgba(0, 0, 0, 0.14),
0 3px 14px 2px rgba(0, 0, 0, 0.12);

.activeLayerFilterPanel {
display: none;
}

.activeLayerOpacityLegendStatusBar {
display: none;
}

.split-panel {
display: none;
}

.activeLayerDragMessagePanel {
text-align: center;
display: block;
position: relative;
font-size: larger;
top: 3rem;
}

}

.cdk-drop-list-dragging {
Loading