Skip to content

Commit b06c996

Browse files
committed
BS5: add form-select class to <select>
1 parent 05bb5d2 commit b06c996

File tree

16 files changed

+25
-24
lines changed

16 files changed

+25
-24
lines changed

assets/src/components/ActionSelector.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export default class ActionSelector extends HTMLElement {
3434

3535
// Add the options from the actions object
3636
const select = this.querySelector('select');
37+
select.classList.add('form-select');
3738
for (let a in this.actions) {
3839
let action = this.actions[a];
3940
let option = document.createElement("option");

assets/src/components/BaseLayers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default class BaseLayers extends HTMLElement {
3131
this._template = () => html`
3232
${mainLizmap.state.baseLayers.baseLayers.length > 1
3333
? keyed(mainLizmap.state.baseLayers.selectedBaseLayerName, html`
34-
<select @change=${(event) => { mainLizmap.state.baseLayers.selectedBaseLayerName = event.target.value }}>
34+
<select class="form-select" @change=${(event) => { mainLizmap.state.baseLayers.selectedBaseLayerName = event.target.value }}>
3535
${mainLizmap.state.baseLayers.baseLayers.map((config) =>
3636
html`<option ?selected="${mainLizmap.state.baseLayers.selectedBaseLayerName === config.name}" value="${config.name}">${config.type === BaseLayerTypes.Empty ? lizDict['baselayer.empty.title'] : config.title}</option>`
3737
)}

assets/src/components/MousePosition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export default class MousePosition extends HTMLElement {
5555
<button class="btn btn-sm" title="${lizDict['mouseposition.removeCenterPoint']}" @click=${() => this._removeCenterPoint()}><i class="icon-refresh"></i></button>
5656
</div>
5757
<div class="coords-unit">
58-
<select title="${lizDict['mouseposition.select']}" @change=${(event) => { this.displayUnit = event.target.value }}>
58+
<select class="form-select" title="${lizDict['mouseposition.select']}" @change=${(event) => { this.displayUnit = event.target.value }}>
5959
${this._qgisProjectProjectionUnits === 'm' ? html`
6060
<option selected value="m">${lizDict['mouseposition.units.m']}</option>` : ''}
6161
${ ['ft', 'us-ft'].includes(this._qgisProjectProjectionUnits) ? html`

assets/src/components/Print.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ export default class Print extends HTMLElement {
129129
</tr>
130130
<tr>
131131
<td>
132-
<select id="print-template" @change=${(event) => { this.printTemplate = event.target.value }}>
132+
<select id="print-template" class="form-select" @change=${(event) => { this.printTemplate = event.target.value }}>
133133
${this._printTemplates.map((template, index) => html`<option value=${index}>${template.title}</option>`)}
134134
</select>
135135
</td>
136136
<td>
137-
<select id="print-scale" class="btn-print-scales" .value=${this._printScale} @change=${(event) => { this.printScale = parseInt(event.target.value) }}>
137+
<select id="print-scale" class="btn-print-scales form-select" .value=${this._printScale} @change=${(event) => { this.printScale = parseInt(event.target.value) }}>
138138
${this._printScales.map( scale => html`<option .selected=${scale === this._printScale} value=${scale}>${scale.toLocaleString()}</option>`)}
139139
</select>
140140
</td>
@@ -157,7 +157,7 @@ export default class Print extends HTMLElement {
157157
${this.printDPIs.length > 1 ? keyed(this.defaultDPI, html`
158158
<div class="print-dpi">
159159
<span>${lizDict['print.toolbar.dpi']}</span>
160-
<select class="btn-print-dpis" .value=${this.defaultDPI} @change=${(event) => { this._printDPI = event.target.value }}>
160+
<select class="btn-print-dpis form-select" .value=${this.defaultDPI} @change=${(event) => { this._printDPI = event.target.value }}>
161161
${this.printDPIs.map( dpi => html`<option ?selected=${dpi === this.defaultDPI} value=${dpi}>${dpi}</option>`)}
162162
</select>
163163
</div>`) : ''}
@@ -184,7 +184,7 @@ export default class Print extends HTMLElement {
184184
</details>
185185
<div class="flex">
186186
${this.printFormats.length > 1 ? keyed(this.defaultFormat, html`
187-
<select id="print-format" title="${lizDict['print.toolbar.format']}" class="btn-print-format" .value=${this.defaultFormat} @change=${(event) => { this._printFormat = event.target.value }}>
187+
<select id="print-format" title="${lizDict['print.toolbar.format']}" class="btn-print-format form-select" .value=${this.defaultFormat} @change=${(event) => { this._printFormat = event.target.value }}>
188188
${this.printFormats.map( format => html`<option ?selected=${format === this.defaultFormat} value="${format}">${format.toUpperCase()}</option>`)}
189189
</select>`) : ''}
190190
<button id="print-launch" class="btn-print-launch btn btn-primary flex-grow-1" @click=${() => { this._launch() }}>${lizDict['print.launch']}</button>

assets/src/components/SelectionTool.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export default class SelectionTool extends HTMLElement {
3333
<div class="menu-content">
3434
<div>${lizDict['selectiontool.toolbar.layer']}</div>
3535
<div>
36-
<select class="selectiontool-layer-list" @change=${ (event) => mainLizmap.selectionTool.allFeatureTypeSelected = event.target.value}>
36+
<select class="selectiontool-layer-list form-select" @change=${ (event) => mainLizmap.selectionTool.allFeatureTypeSelected = event.target.value}>
3737
<optgroup label="${lizDict['selectiontool.toolbar.layers.single']}">
3838
${mainLizmap.selectionTool.layers.map((layer) => html`<option value="${layer.name}">${layer.title}</option>`)}
3939
</optgroup>
@@ -52,7 +52,7 @@ export default class SelectionTool extends HTMLElement {
5252
</label>
5353
</div>
5454
<div>
55-
<select class="selection-geom-operator" @change=${ (event) => mainLizmap.selectionTool.geomOperator = event.target.value} data-bs-toggle="tooltip" data-bs-title="${lizDict['selectiontool.toolbar.geomOperator']}">
55+
<select class="selection-geom-operator form-select" @change=${ (event) => mainLizmap.selectionTool.geomOperator = event.target.value} data-bs-toggle="tooltip" data-bs-title="${lizDict['selectiontool.toolbar.geomOperator']}">
5656
<option value="intersects">${lizDict['selectiontool.toolbar.geomOperator.intersects']}</option>
5757
<option value="within">${lizDict['selectiontool.toolbar.geomOperator.within']}</option>
5858
<option value="overlaps">${lizDict['selectiontool.toolbar.geomOperator.overlaps']}</option>

assets/src/components/Tooltip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default class Tooltip extends HTMLElement {
1111
this._tooltipLayersCfgs = mainLizmap.initialConfig.tooltipLayers.layerConfigs;
1212

1313
this._template = () => html`
14-
<select @change=${ event => { mainLizmap.tooltip.activate(event.target.value) }}>
14+
<select class="form-select" @change=${ event => { mainLizmap.tooltip.activate(event.target.value) }}>
1515
<option value="">---</option>
1616
${this._tooltipLayersCfgs.map(tooltipLayerCfg =>
1717
html`<option ?selected=${this._tooltipLayersCfgs.length === 1} value="${tooltipLayerCfg.order}">${mainLizmap.state.layersAndGroupsCollection.getLayerByName(tooltipLayerCfg.name).title}</option>`

assets/src/legacy/atlas.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ import DOMPurify from 'dompurify';
263263

264264
// Add combobox with all data
265265
home += '<p style="padding:0px 10px;">';
266-
home += '<select id="liz-atlas-select">';
266+
home += '<select id="liz-atlas-select" class="form-select">';
267267
home += '<option value="-1"> --- </option>';
268268
var pkey_field = lizAtlasConfig['primaryKey'];
269269
for (var i in lizAtlasConfig['features_sorted']) {
@@ -306,7 +306,7 @@ import DOMPurify from 'dompurify';
306306
// Multiple atlas
307307
if (lizAtlasConfigArray.length > 1){
308308
// Build select to choose between atlas layers
309-
atlasHTML = '<i class="icon-globe icon-white" style="margin-right: 4px;vertical-align: baseline;"></i><select id="select-atlas-layer">';
309+
atlasHTML = '<i class="icon-globe icon-white" style="margin-right: 4px;vertical-align: baseline;"></i><select id="select-atlas-layer" class="form-select">';
310310
for (let i = 0; i < lizAtlasConfigArray.length; i++) {
311311
atlasHTML += '<option value="' + lizAtlasConfigArray[i].layerId + '">' + lizMap.config.layers[lizAtlasConfigArray[i].layername]['title'] + '</option>';
312312
}

assets/src/legacy/filter.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ var lizLayerFilterTool = function () {
2828

2929
html += '<div class="menu-content">';
3030
// Add combo box to select the layer
31-
html += '<select id="liz-filter-layer-selector">';
31+
html += '<select id="liz-filter-layer-selector" class="form-select">';
3232
var flayers = {};
3333
for (var o in globalThis['filterConfig']) {
3434
var conf = globalThis['filterConfig'][o];
@@ -504,7 +504,7 @@ var lizLayerFilterTool = function () {
504504
html += getFormFieldHeader(field_item);
505505

506506
if (field_item.format == 'select') {
507-
html += '<select id="liz-filter-field-' + lizMap.cleanName(field_item.title) + '" class="liz-filter-field-select">';
507+
html += '<select id="liz-filter-field-' + lizMap.cleanName(field_item.title) + '" class="liz-filter-field-select form-select">';
508508
html += '<option value=""> --- </option>';
509509
html += '</select>';
510510
}

assets/src/legacy/map.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ window.lizMap = function() {
986986

987987

988988
// add filter values list
989-
$('#locate-layer-'+layerName).parent().before('<div class="locate-layer"><select id="locate-layer-'+layerName+'-'+locate.filterFieldName+'">'+fOptions+'</select></div><br/>');
989+
$('#locate-layer-'+layerName).parent().before('<div class="locate-layer"><select class="form-select" id="locate-layer-'+layerName+'-'+locate.filterFieldName+'">'+fOptions+'</select></div><br/>');
990990
// listen to filter select changes
991991
$('#locate-layer-'+layerName+'-'+locate.filterFieldName).change(function(){
992992
var filterValue = $(this).children(':selected').val();
@@ -1141,7 +1141,7 @@ window.lizMap = function() {
11411141
var lname = locateByLayerList[l];
11421142
var lConfig = config.layers[lname];
11431143
var html = '<div class="locate-layer">';
1144-
html += '<select id="locate-layer-' + cleanName(lname) + '" class="label">';
1144+
html += '<select id="locate-layer-' + cleanName(lname) + '" class="label form-select">';
11451145
html += '<option>' + lConfig.title + '...</option>';
11461146
html += '</select>';
11471147
html += '</div>';

assets/src/legacy/switcher-layers-actions.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ var lizLayerActionButtons = function() {
142142
html+= ' <dt>'+lizDict['layer.metadata.style.title']+'</dt>';
143143
html+= '<dd>';
144144
html+= '<input type="hidden" class="styleLayer '+isBaselayer+'" value="'+aName+'">';
145-
html+= '<select class="styleLayer '+isBaselayer+'">';
145+
html+= '<select class="styleLayer form-select '+isBaselayer+'">';
146146
html+= options;
147147
html+= '</select>';
148148
html+= '</dd>';
@@ -184,7 +184,7 @@ var lizLayerActionButtons = function() {
184184
if( options != '' && layerConfig.typename != undefined) {
185185
html+= ' <dt>'+lizDict['layer.metadata.export.title']+'</dt>';
186186
html+= '<dd>';
187-
html+= '<select class="exportLayer '+isBaselayer+'">';
187+
html+= '<select class="exportLayer form-select '+isBaselayer+'">';
188188
html+= options;
189189
html+= '</select>';
190190
html+= '<button class="btn btn-sm exportLayer '+isBaselayer+'" title="'+lizDict['layer.metadata.export.title']+'" value="'+aName+'"><i class="icon-download"></i></button>';

0 commit comments

Comments
 (0)