Skip to content

Commit 5f6571e

Browse files
authored
FIX: Map Layer Ellipsis not always clickable based on title of map (#9140)
* Prevent overflow of long layer names [#8745] * Fix formatting [#8745]
1 parent eb0e8d8 commit 5f6571e

File tree

5 files changed

+43
-29
lines changed

5 files changed

+43
-29
lines changed

web-ui/src/main/resources/catalog/components/viewer/layermanager/partials/layermanager.html

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,15 @@
1111
</ul>
1212
<ul class="list-group">
1313
<li class="list-group-item list-group-item-warning" data-ng-repeat="l in failedLayers">
14-
<h4 class="list-group-item-heading">
15-
<i class="fa fa-warning text-warning"></i>
16-
&nbsp; {{l.name}}
17-
18-
<a class="pull-right gn-close-btn" ng-click="removeFailed(l)">
14+
<h4 class="list-group-item-heading gn-break-anywhere flex-row">
15+
<i class="fa fa-warning text-warning flex-self-center"></i>
16+
<span class="flex-spacer"></span>
17+
<span class="flex-self-center">{{l.name}}</span>
18+
<span class="flex-spacer"></span>
19+
<a
20+
class="gn-close-btn flex-self-center gn-padding-vertical-sm"
21+
ng-click="removeFailed(l)"
22+
>
1923
<i class="fa fa-times"></i>
2024
</a>
2125
</h4>

web-ui/src/main/resources/catalog/components/viewer/layermanager/partials/layermanageritem.html

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
class="flex-row width-100 flex-align-stretch"
44
data-ng-class="{'active': layer.showInfo}"
55
>
6-
<div class="flex-col">
6+
<div class="flex-self-center">
77
<a
88
href=""
99
class="btn btn-sm btn-link gn-layer-radio"
@@ -16,7 +16,7 @@
1616
></i>
1717
</a>
1818
</div>
19-
<div class="flex-col">
19+
<div class="flex-self-center">
2020
<input
2121
type="checkbox"
2222
id="layer-{{$index}}"
@@ -27,31 +27,29 @@
2727

2828
<div class="flex-spacer"></div>
2929

30-
<div class="flex-col flex-grow">
31-
<div class="width-100 flex-grow">
32-
<label
33-
class="gn-map-layer"
34-
for="layer-{{$index}}"
35-
data-ng-class="{'gn-map-layer-selected': layer.showInfo}"
30+
<div class="flex-self-center flex-grow gn-break-anywhere">
31+
<label
32+
class="gn-map-layer"
33+
for="layer-{{$index}}"
34+
data-ng-class="{'gn-map-layer-selected': layer.showInfo}"
35+
>
36+
<span
37+
class="clickable"
38+
data-ng-class="layer.get('errors').length > 0 ? 'text-danger' : ''"
39+
title="{{layer.get('label')}}"
3640
>
41+
{{layer.get('layerTitleFromMetadata') || layer.get('label')}}
3742
<span
38-
class="clickable"
39-
data-ng-class="layer.get('errors').length > 0 ? 'text-danger' : ''"
40-
title="{{layer.get('label')}}"
41-
>
42-
{{layer.get('layerTitleFromMetadata') || layer.get('label')}}
43-
<span
44-
><em>
45-
{{layer.get('currentStyle') ? '(' + (layer.get('currentStyle').Title ||
46-
layer.get('currentStyle').Name) + ')' : ''}}
47-
</em>
48-
</span>
43+
><em>
44+
{{layer.get('currentStyle') ? '(' + (layer.get('currentStyle').Title ||
45+
layer.get('currentStyle').Name) + ')' : ''}}
46+
</em>
4947
</span>
50-
</label>
51-
</div>
48+
</span>
49+
</label>
5250
</div>
5351

54-
<div class="flex-col flex-self-center">
52+
<div class="flex-self-center gn-padding-vertical-sm">
5553
<div class="dropdown dropdown-left">
5654
<button
5755
class="btn btn-default dropdown-toggle"

web-ui/src/main/resources/catalog/style/gn.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ a {
221221
word-wrap: break-word;
222222
word-break: break-word;
223223
}
224+
.gn-break-anywhere {
225+
word-break: break-word;
226+
overflow-wrap: anywhere; // breaks long strings if word break is not working out
227+
}
224228
.gn-break-all {
225229
word-break: break-all;
226230
}

web-ui/src/main/resources/catalog/style/gn_viewer.less

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
@gn-popup-max-width: 1200px;
77

88
[data-gn-layer-styles] {
9-
word-break: break-all;
9+
word-break: break-word;
10+
overflow-wrap: anywhere; // breaks long "unbreakable" strings if necessary
1011
}
1112

1213
[gn-main-viewer],
@@ -391,6 +392,10 @@
391392
}
392393
}
393394
}
395+
//li.list-group-item.list-group-item-warning {
396+
// display: flex;
397+
// flex-wrap: wrap;
398+
//}
394399
.gn-facet-container {
395400
.list-group-item {
396401
border: 0;
@@ -454,7 +459,6 @@
454459
}
455460
}
456461
h4 {
457-
margin: 1em 0 0 0;
458462
font-size: 16px;
459463
}
460464
h5 {

web-ui/src/main/resources/catalog/views/default/less/gn_view.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@
3131
.gn-padding-left-sm {
3232
padding-left: @gn-spacing-sm !important;
3333
}
34+
.gn-padding-vertical-sm {
35+
padding-top: @gn-spacing-sm !important;
36+
padding-bottom: @gn-spacing-sm !important;
37+
}
3438
// ----- large
3539
.gn-padding-top-lg {
3640
padding-top: @gn-spacing-lg !important;

0 commit comments

Comments
 (0)