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.

Sign up for GitHub

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

[Backport 4.2.x] Metadata editor / Fix display of multiple choice elements with custom label #8495

Merged
merged 1 commit into from
Nov 12, 2024
Merged

[Backport 4.2.x] Metadata editor / Fix display of multiple choice elements with custom label #8495

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,7 +561,7 @@
<xsl:attribute name="aria-haspopup">true</xsl:attribute>
<xsl:attribute name="aria-expanded">false</xsl:attribute>
</xsl:if>
<i class="{if ($btnClass != '') then $btnClass else 'fa fa-plus'}"/>
<i class="{if ($btnClass != '') then $btnClass else 'fa fa-plus'}"></i>
<xsl:if test="$btnLabel != ''">&#160;
<span>
<xsl:value-of select="$btnLabel"/>
Expand Down Expand Up @@ -919,9 +919,9 @@
<xsl:when test="$qualifiedName = 'gfc:code' and $schema='iso19110'">

<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle fa fa-plus gn-add" data-toggle="dropdown" title="{$i18n/addA} {$label}">
<span/>
<span class="caret"/>
<button type="button" class="btn btn-default dropdown-toggle gn-add" data-toggle="dropdown" title="{$i18n/addA} {$label}">
<i class="fa fa-plus"></i>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<xsl:variable name="name" select="'gco:CharacterString'"/>
Expand Down Expand Up @@ -967,10 +967,10 @@
<xsl:when test="count($childEditInfo/gn:choose) > 1">
<div class="btn-group">
<button type="button"
class="btn btn-default dropdown-toggle {if ($btnClass != '') then $btnClass else 'fa fa-plus'} gn-add"
class="btn btn-default dropdown-toggle gn-add"
data-toggle="dropdown"
title="{$i18n/addA} {$label}">
<span/>
<i class="{if ($btnClass != '') then $btnClass else 'fa fa-plus'}"></i>
<xsl:if test="$btnLabel != ''">&#160;
<span>
<xsl:value-of select="$btnLabel"/>
Expand Down Expand Up @@ -1004,7 +1004,7 @@
<a class="btn btn-default"
title="{$i18n/addA} {$label}"
data-gn-click-and-spin="add({$parentEditInfo/@ref}, '{if ($name != '') then $name else concat(@prefix, ':', @name)}', '{$id}', 'before');">
<i class="{if ($btnClass != '') then $btnClass else 'fa fa-plus'} gn-add"/>
<i class="{if ($btnClass != '') then $btnClass else 'fa fa-plus'} gn-add"></i>
<xsl:if test="$btnLabel != ''">&#160;
<span>
<xsl:value-of select="$btnLabel"/>
Expand Down Expand Up @@ -1462,7 +1462,7 @@
<a class="btn btn-default"
title="{$i18n/addA} {$name}"
data-gn-click-and-spin="add({$parentEditInfo/@parent}, '{$name}', {$editInfo/@ref})">
<i class="fa fa-plus gn-add"/>
<i class="fa fa-plus gn-add"></i>
</a>
</xsl:if>
</xsl:template>
Expand Down Expand Up @@ -1623,7 +1623,7 @@
id="gn-attr-add-button-{$fieldName}"
data-gn-click-and-spin="add('{$ref}', '{@name}', '{$insertRef}', null, true)"
title="{$attributeLabel/description}">
<i class="fa fa-plus fa-fw"/>
<i class="fa fa-plus fa-fw"></i>
<xsl:value-of select="$attributeLabel/label"/>
</button>
</xsl:template>
Expand Down