Skip to content

Commit

Permalink
Merge pull request #43363 from elpaso/bugfix-gh42269-wfs3-getfeature-…
Browse files Browse the repository at this point in the history 
…overlapping-text

Fix WFS3 overlapping text template
  • Loading branch information
@elpaso
elpaso committed May 25, 2021
2 parents b8fe026 + 888547e commit 0ee907d
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 22 deletions.
1 change: 1 addition & 0 deletions resources/server/api/ogc/static/style.css
View file
Expand Up @@ -73,3 +73,4 @@ table.table-params td.small
background-color: red;
border-color: red;
}

4 changes: 2 additions & 2 deletions resources/server/api/ogc/templates/wfs3/getFeature.html
View file
Expand Up @@ -7,8 +7,8 @@ <h1>{{ metadata.pageTitle }}</h1>

<dl class="row">
{% for name, value in properties %}
<dt class="col-sm-3">{{ name }}</dt>
<dd class="col-sm-9">{{ value }}</dd>
<dt class="col-sm-12">{{ name }}</dt>
<dd class="col-sm-12">{{ value }}</dd>
{% endfor %}
</dl>
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/server/api/ogc/templates/wfs3/getFeatures.html
View file
Expand Up @@ -25,8 +25,8 @@ <h1>{{ metadata.pageTitle }}</h1>
<h2><a href="{{ path_append( feature.id ) }}">{{ metadata.layerTitle }} {{ feature.id }}</a></h2>
<dl class="row">
{% for name, value in feature.properties %}
<dt class="col-sm-3">{{ name }}</dt>
<dd class="col-sm-9">{{ value }}</dd>
<dt class="col-sm-12">{{ name }}</dt>
<dd class="col-sm-12">{{ value }}</dd>
{% endfor %}
</dl>
{% endfor %}
Expand Down
36 changes: 18 additions & 18 deletions tests/testdata/qgis_server/api/test_wfs3_collections_items_testlayer_èé.html
View file
Expand Up @@ -78,42 +78,42 @@ <h1>Features in layer A test vector layer èé</h1>
<h2><a href="http://server.qgis.org/wfs3/collections/testlayer èé/items/0.html">A test vector layer èé 0</a></h2>
<dl class="row">

<dt class="col-sm-3">id</dt>
<dd class="col-sm-9">1</dd>
<dt class="col-sm-12">id</dt>
<dd class="col-sm-12">1</dd>

<dt class="col-sm-3">name</dt>
<dd class="col-sm-9">one</dd>
<dt class="col-sm-12">name</dt>
<dd class="col-sm-12">one</dd>

<dt class="col-sm-3">utf8nameè</dt>
<dd class="col-sm-9">one èé</dd>
<dt class="col-sm-12">utf8nameè</dt>
<dd class="col-sm-12">one èé</dd>

</dl>

<h2><a href="http://server.qgis.org/wfs3/collections/testlayer èé/items/1.html">A test vector layer èé 1</a></h2>
<dl class="row">

<dt class="col-sm-3">id</dt>
<dd class="col-sm-9">2</dd>
<dt class="col-sm-12">id</dt>
<dd class="col-sm-12">2</dd>

<dt class="col-sm-3">name</dt>
<dd class="col-sm-9">two</dd>
<dt class="col-sm-12">name</dt>
<dd class="col-sm-12">two</dd>

<dt class="col-sm-3">utf8nameè</dt>
<dd class="col-sm-9">two àò</dd>
<dt class="col-sm-12">utf8nameè</dt>
<dd class="col-sm-12">two àò</dd>

</dl>

<h2><a href="http://server.qgis.org/wfs3/collections/testlayer èé/items/2.html">A test vector layer èé 2</a></h2>
<dl class="row">

<dt class="col-sm-3">id</dt>
<dd class="col-sm-9">3</dd>
<dt class="col-sm-12">id</dt>
<dd class="col-sm-12">3</dd>

<dt class="col-sm-3">name</dt>
<dd class="col-sm-9">three</dd>
<dt class="col-sm-12">name</dt>
<dd class="col-sm-12">three</dd>

<dt class="col-sm-3">utf8nameè</dt>
<dd class="col-sm-9">three èé↓</dd>
<dt class="col-sm-12">utf8nameè</dt>
<dd class="col-sm-12">three èé↓</dd>

</dl>

Expand Down

0 comments on commit 0ee907d

Please sign in to comment.