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

Fix wrong HTML self-closed elements #8542

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions web/src/main/webapp/xslt/ui-metadata/form-builder.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@
data-gn-click-and-spin="remove({$elementToRemove/@ref}, {$elementToRemove/@parent}, {$editInfo/@ref})"
data-gn-field-highlight-remove="{$editInfo/@ref}"
data-toggle="tooltip" data-placement="top" title="{{{{'deleteField' | translate}}}}">
<i class="fa fa-times text-danger gn-control"/>
<i class="fa fa-times text-danger gn-control"></i>
</a>
</xsl:if>
</xsl:template>
Expand Down Expand Up @@ -1538,7 +1538,7 @@
<div class="form-group {$class} gn-attr-{replace($attributeName, ':', '_')}" id="gn-attr-{$fieldName}">
<label class="col-sm-4">
<xsl:if test="$attributeName = 'xlink:href'">
<i class="fa fa-link fa-fw"/>
<i class="fa fa-link fa-fw"></i>
</xsl:if>
<xsl:value-of select="gn-fn-metadata:getLabel($schema, $attributeName, $labels, name(..), '', gn-fn-metadata:getXPath(.))/label"/>
</label>
Expand Down Expand Up @@ -1659,7 +1659,7 @@
data-params="{$process-params}"
data-icon="{$btnClass}"
data-name="{normalize-space($strings/*[name() = $process-label-key])}"
data-help="{normalize-space($strings/*[name() = concat($process-name, 'Help')])}"/>
data-help="{normalize-space($strings/*[name() = concat($process-name, 'Help')])}"></span>
</div>
</div>
</xsl:template>
Expand All @@ -1676,7 +1676,7 @@
data-params="{$process-params}"
data-icon="{$btnClass}"
data-name="{normalize-space($strings/*[name() = $process-name])}"
data-help="{normalize-space($strings/*[name() = concat($process-name, 'Help')])}"/>
data-help="{normalize-space($strings/*[name() = concat($process-name, 'Help')])}"></span>
</div>
</div>
</xsl:template>
Expand Down
6 changes: 3 additions & 3 deletions web/src/main/webapp/xslt/ui-metadata/menu-builder.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<div class="gn-scroll-spy"
data-gn-scroll-spy="gn-editor-{$metadataId}"
data-watch=""
data-all-depth="{if ($isFlatMode) then 'true' else 'false'}"/>
data-all-depth="{if ($isFlatMode) then 'true' else 'false'}"></div>

<div class="nav nav-tabs">
<!-- Make a drop down choice to swith to one view to another -->
Expand Down Expand Up @@ -108,15 +108,15 @@
<li role="menuitem">
<a data-ng-click="toggleAttributes(true)" href="">
<i class="fa"
data-ng-class="gnCurrentEdit.displayAttributes ? 'fa-check-square-o' : 'fa-square-o'"/>
data-ng-class="gnCurrentEdit.displayAttributes ? 'fa-check-square-o' : 'fa-square-o'"></i>
&#160;
<span data-translate="">toggleAttributes</span>
</a>
</li>
<li role="menuitem">
<a data-ng-click="toggleTooltips(true)" href="">
<i class="fa"
data-ng-class="gnCurrentEdit.displayTooltips ? 'fa-check-square-o' : 'fa-square-o'"/>
data-ng-class="gnCurrentEdit.displayTooltips ? 'fa-check-square-o' : 'fa-square-o'"></i>
&#160;
<span data-translate="">toggleTooltips</span>
</a>
Expand Down
Loading