From 6f9514dd46848aceed2cc252c87a5aad4a889b53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= <martynas@atomgraph.com>
Date: Tue, 12 May 2026 23:08:22 +0200
Subject: [PATCH 1/2] Load property metadata client-side and apply to
 property/object sort keys

Adds ldh:load-property-metadata/ldh:set-property-metadata to the promise chain after object metadata, fetching vocabulary labels via DESCRIBE against /ns. Threads property-metadata and object-metadata tunnel params through bs2:DocumentBody and bs2:PropertyList so sort keys resolve vocabulary labels client-side. Also adds ac:object-label 2-arg overload and preloads common namespace ontologies into the document cache.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 src/main/resources/location-mapping.ttl       |  4 +-
 src/main/resources/prefix-mapping.ttl         |  4 +-
 .../xsl/bootstrap/2.3.2/client/block.xsl      | 44 +++++++++++++++++++
 .../xsl/bootstrap/2.3.2/document.xsl          |  6 ++-
 .../xsl/bootstrap/2.3.2/imports/default.xsl   | 21 ++++++++-
 .../xsl/bootstrap/2.3.2/layout.xsl            | 26 +++++++++--
 .../xsl/bootstrap/2.3.2/resource.xsl          | 24 +++++++++-
 .../atomgraph/linkeddatahub/xsl/client.xsl    | 16 ++++++-
 8 files changed, 128 insertions(+), 17 deletions(-)

diff --git a/src/main/resources/location-mapping.ttl b/src/main/resources/location-mapping.ttl
index 91856575c..6db880201 100644
--- a/src/main/resources/location-mapping.ttl
+++ b/src/main/resources/location-mapping.ttl
@@ -16,7 +16,5 @@
    [ lm:name "http://spinrdf.org/spin#" ;                                       lm:altName "etc/spin.ttl" ] ,
    [ lm:name "http://spinrdf.org/spin" ;                                        lm:altName "etc/spin.ttl" ] ,
    [ lm:name "http://spinrdf.org/spl#" ;                                        lm:altName "etc/spl.spin.ttl" ] ,
-   [ lm:name "http://spinrdf.org/spl" ;                                         lm:altName "etc/spl.spin.ttl" ] ,
-   [ lm:name "https://packages.linkeddatahub.com/skos/" ;                       lm:altName "com/linkeddatahub/packages/skos/package.ttl" ] ,
-   [ lm:name "https://raw.githubusercontent.com/AtomGraph/LinkedDataHub-Apps/refs/heads/develop/packages/skos/ns.ttl" ; lm:altName "com/linkeddatahub/packages/skos/ns.ttl" ]
+   [ lm:name "http://spinrdf.org/spl" ;                                         lm:altName "etc/spl.spin.ttl" ]
 .
\ No newline at end of file
diff --git a/src/main/resources/prefix-mapping.ttl b/src/main/resources/prefix-mapping.ttl
index 872c5b932..34377bd1b 100644
--- a/src/main/resources/prefix-mapping.ttl
+++ b/src/main/resources/prefix-mapping.ttl
@@ -71,7 +71,5 @@
    [ lm:prefix "http://purl.org/goodrelations/v1" ;                              lm:altName "com/atomgraph/client/goodrelations.owl" ] ,
    [ lm:prefix "http://spinrdf.org/sp" ;                                         lm:altName "etc/sp.ttl" ] ,
    [ lm:prefix "http://spinrdf.org/spin" ;                                       lm:altName "etc/spin.ttl" ] ,
-   [ lm:prefix "http://spinrdf.org/spl" ;                                        lm:altName "etc/spl.spin.ttl" ] ,
-   [ lm:prefix "https://packages.linkeddatahub.com/skos/" ;                      lm:altName "com/linkeddatahub/packages/skos/package.ttl" ] ,
-   [ lm:prefix "https://raw.githubusercontent.com/AtomGraph/LinkedDataHub-Apps/refs/heads/develop/packages/skos/ns.ttl" ; lm:altName "com/linkeddatahub/packages/skos/ns.ttl" ]
+   [ lm:prefix "http://spinrdf.org/spl" ;                                        lm:altName "etc/spl.spin.ttl" ]
 .
\ No newline at end of file
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
index 12c40317c..83f2089ea 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
@@ -675,6 +675,50 @@ exclude-result-prefixes="#all"
         </xsl:for-each>
     </xsl:function>
 
+    <!-- property-metadata fetch helpers: mirror the object-metadata pair above, but DESCRIBE the property URIs (rdfs:label / skos:prefLabel etc. resolved via the application's /ns ontology store) so that ac:property-label can resolve vocabulary labels client-side. Chain wiring: ldh:http-request-threaded(?, 'property-metadata-request', 'property-metadata-response') then ldh:set-property-metadata stores the body under 'property-metadata' for the tunnel consumed by ac:property-label. -->
+
+    <xsl:function name="ldh:load-property-metadata" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+
+        <xsl:sequence select="ldh:load-property-metadata($context, 'response')"/>
+    </xsl:function>
+
+    <xsl:function name="ldh:load-property-metadata" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:param name="response-key" as="xs:string"/>
+        <xsl:variable name="response" select="$context($response-key)" as="map(*)"/>
+        <xsl:variable name="property-uris" as="xs:string*" select="
+            if ($response?status = 200 and $response?media-type = 'application/rdf+xml')
+            then distinct-values($response?body/rdf:RDF/rdf:Description/*/concat(namespace-uri(), local-name()))
+            else ()"/>
+        <xsl:variable name="query-string" select="$property-metadata-query || ' VALUES $Type { ' || string-join(for $uri in $property-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
+        <xsl:variable name="request" select="map{ 'method': 'POST', 'href': ldh:href(resolve-uri('ns', ldt:base())), 'media-type': 'application/sparql-query', 'body': $query-string, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
+
+        <xsl:message>ldh:load-property-metadata</xsl:message>
+
+        <xsl:sequence select="map:merge(($context, map{ 'property-metadata-request': $request }))"/>
+    </xsl:function>
+
+    <xsl:function name="ldh:set-property-metadata" as="map(*)" ixsl:updating="yes">
+        <xsl:param name="context" as="map(*)"/>
+        <xsl:variable name="response" select="$context('property-metadata-response')" as="map(*)"/>
+
+        <xsl:message>ldh:set-property-metadata</xsl:message>
+
+        <xsl:for-each select="$response">
+            <xsl:choose>
+                <xsl:when test="?status = 200 and ?media-type = 'application/rdf+xml'">
+                    <xsl:variable name="property-metadata" select="?body" as="document-node()?"/>
+                    <xsl:sequence select="map:merge(($context, map{ 'property-metadata': $property-metadata }))"/>
+                </xsl:when>
+                <xsl:otherwise>
+                    <!-- ignore property metadata loading errors - treat as empty metadata -->
+                    <xsl:sequence select="$context"/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </xsl:for-each>
+    </xsl:function>
+
     <xsl:function name="ldh:hide-block-progress-bar" as="map(*)" ixsl:updating="yes">
         <xsl:param name="context" as="map(*)"/>
         <xsl:param name="ignored" as="item()?"/>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
index a6b6b102f..838851776 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
@@ -665,10 +665,12 @@ extension-element-prefixes="ixsl"
     <xsl:template match="rdf:RDF" mode="xhtml:Table">
         <xsl:param name="id" as="xs:string?"/>
         <xsl:param name="class" select="'table table-bordered table-striped'" as="xs:string?"/>
+        <xsl:param name="property-uris" select="distinct-values(*/*/concat(namespace-uri(), local-name()))" as="xs:string*"/>
+        <xsl:param name="property-metadata" select="if (exists($property-uris)) then ldh:send-request(resolve-uri('ns', ldt:base()), 'POST', 'application/sparql-query', 'DESCRIBE $Type' || ' VALUES $Type { ' || string-join(for $uri in $property-uris return '&lt;' || $uri || '&gt;', ' ') || ' }', map{ 'Accept': 'application/rdf+xml' }) else ()" as="document-node()?" tunnel="yes"/>
         <xsl:param name="predicates" as="element()*">
             <xsl:for-each-group select="*/*" group-by="concat(namespace-uri(), local-name())">
-                <xsl:sort select="ac:property-label(.)" order="ascending" lang="{$ldt:lang}" use-when="system-property('xsl:product-name') = 'SAXON'"/>
-                <xsl:sort select="ac:property-label(.)" order="ascending" use-when="system-property('xsl:product-name') eq 'SaxonJS'"/>
+                <xsl:sort select="if ($property-metadata) then ac:property-label(., $property-metadata) else ac:property-label(.)" order="ascending" lang="{$ldt:lang}" use-when="system-property('xsl:product-name') = 'SAXON'"/>
+                <xsl:sort select="if ($property-metadata) then ac:property-label(., $property-metadata) else ac:property-label(.)" order="ascending" use-when="system-property('xsl:product-name') eq 'SaxonJS'"/>
 
                 <xsl:sequence select="current-group()[1]"/>
             </xsl:for-each-group>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
index fa19a713b..6b6ec1c73 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl
@@ -71,7 +71,19 @@ exclude-result-prefixes="#all"
         </xsl:variable>
         <xsl:sequence select="upper-case(substring($labels[1], 1, 1)) || substring($labels[1], 2)"/>
     </xsl:function>
-    
+
+    <xsl:function name="ac:object-label" as="xs:string?">
+        <xsl:param name="object" as="node()"/>
+        <xsl:param name="object-metadata" as="document-node()"/>
+
+        <xsl:variable name="labels" as="xs:string*">
+            <xsl:apply-templates select="$object" mode="ac:object-label">
+                <xsl:with-param name="object-metadata" select="$object-metadata" tunnel="yes"/>
+            </xsl:apply-templates>
+        </xsl:variable>
+        <xsl:sequence select="$labels[1]"/>
+    </xsl:function>
+
     <xsl:template match="@rdf:resource | @rdf:nodeID | srx:uri" mode="ac:object-label" priority="1">
         <xsl:param name="object-metadata" as="document-node()?" tunnel="yes"/>
         <xsl:variable name="this" select="." as="xs:anyURI"/>
@@ -404,12 +416,17 @@ exclude-result-prefixes="#all"
                 <xsl:apply-templates select="key('resources', $this)" mode="ac:label"/>
             </xsl:when>
             <xsl:when test="$property-metadata/key('resources', $this, .)">
+               <xsl:message>ac:property-label mode B $this: <xsl:value-of select="$this"/></xsl:message>
+
                 <xsl:apply-templates select="$property-metadata/key('resources', $this, .)" mode="ac:label"/>
             </xsl:when>
-            <xsl:when test="doc-available(namespace-uri()) and key('resources', $this, document(namespace-uri()))" use-when="system-property('xsl:product-name') = 'SAXON'">
+            <xsl:when test="doc-available(namespace-uri()) and key('resources', $this, document(namespace-uri()))">
+                <xsl:message>ac:property-label mode C $this: <xsl:value-of select="$this"/></xsl:message>
                 <xsl:apply-templates select="key('resources', $this, document(namespace-uri()))" mode="ac:label"/>
             </xsl:when>
             <xsl:otherwise>
+                <xsl:message>ac:property-label mode D $this: <xsl:value-of select="$this"/></xsl:message>
+    
                 <xsl:sequence select="local-name()"/>
             </xsl:otherwise>
         </xsl:choose>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
index ead396b6a..89e383b40 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
@@ -138,6 +138,25 @@ exclude-result-prefixes="#all">
             <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&sd;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&sd;'))), 'accept': 'application/rdf+xml' })"/>
             <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&sh;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&sh;'))), 'accept': 'application/rdf+xml' })"/>
             <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&nfo;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&nfo;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('http://www.semanticdesktop.org/ontologies/2007/01/19/nie#')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('http://www.semanticdesktop.org/ontologies/2007/01/19/nie#'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&http;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&http;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&sc;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&sc;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&ldt;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&ldt;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&c;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&c;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&sioc;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&sioc;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&void;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&void;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&foaf;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&foaf;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&spl;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&spl;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&cert;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&cert;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('http://www.w3.org/ns/prov#')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('http://www.w3.org/ns/prov#'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&geo;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&geo;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('http://www.w3.org/2004/02/skos/core#')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('http://www.w3.org/2004/02/skos/core#'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('http://www.w3.org/2006/time#')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('http://www.w3.org/2006/time#'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('http://purl.org/dc/elements/1.1/')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('http://purl.org/dc/elements/1.1/'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('&dct;')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('&dct;'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('http://purl.org/dc/dcmitype/')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('http://purl.org/dc/dcmitype/'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('http://purl.org/goodrelations/v1#')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('http://purl.org/goodrelations/v1#'))), 'accept': 'application/rdf+xml' })"/>
+            <xsl:map-entry key="resolve-uri(ac:document-uri(xs:anyURI('http://usefulinc.com/ns/doap#')), $ac:contextUri)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri(xs:anyURI('http://usefulinc.com/ns/doap#'))), 'accept': 'application/rdf+xml' })"/>
             <xsl:if test="$acl:agent">
                 <xsl:map-entry key="ac:document-uri($acl:agent)" select="ac:build-uri($ldt:base, map{ 'uri': string(ac:document-uri($acl:agent)), 'accept': 'application/rdf+xml' })"/>
             </xsl:if>
@@ -777,6 +796,7 @@ exclude-result-prefixes="#all">
         <xsl:param name="endpoint" select="sd:endpoint()" as="xs:anyURI"/>
         <xsl:param name="property-uris" select="distinct-values(*/concat(namespace-uri(), local-name()))" as="xs:anyURI*"/>
         <xsl:param name="property-metadata" select="ldh:send-request(resolve-uri('ns', $ldt:base), 'POST', 'application/sparql-query', 'DESCRIBE ' || string-join(for $uri in distinct-values(/rdf:RDF/*/*/concat(namespace-uri(), local-name())) return '&lt;' || $uri || '&gt;', ' '), map{ 'Accept': 'application/rdf+xml' })" as="document-node()"/>
+        <xsl:param name="object-metadata" as="document-node()?" tunnel="yes"/>
         <xsl:variable name="local-doc" select="ldh:query-result($endpoint, 'DESCRIBE &lt;' || @rdf:about || '&gt;')" as="document-node()"/>
         <xsl:variable name="original-doc" as="document-node()">
             <xsl:try>
@@ -824,7 +844,7 @@ exclude-result-prefixes="#all">
                         <dl class="dl-horizontal">
                             <xsl:apply-templates select="$properties-original" mode="#current">
                                 <xsl:sort select="ac:property-label(., $property-metadata)" order="ascending" lang="{$ldt:lang}"/>
-                                <xsl:sort select="if (exists((text(), @rdf:resource, @rdf:nodeID))) then ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1]) else()" order="ascending" lang="{$ldt:lang}"/>
+                                <xsl:sort select="if (exists((text(), @rdf:resource, @rdf:nodeID))) then (if ($object-metadata) then ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1], $object-metadata) else ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1])) else ()" order="ascending" lang="{$ldt:lang}"/>
                                 <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
                             </xsl:apply-templates>
                         </dl>
@@ -849,7 +869,7 @@ exclude-result-prefixes="#all">
                         <dl class="dl-horizontal">
                             <xsl:apply-templates select="$properties-local" mode="#current">
                                 <xsl:sort select="ac:property-label(., $property-metadata)" order="ascending" lang="{$ldt:lang}"/>
-                                <xsl:sort select="if (exists((text(), @rdf:resource, @rdf:nodeID))) then ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1]) else()" order="ascending" lang="{$ldt:lang}"/>
+                                <xsl:sort select="if (exists((text(), @rdf:resource, @rdf:nodeID))) then (if ($object-metadata) then ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1], $object-metadata) else ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1])) else ()" order="ascending" lang="{$ldt:lang}"/>
                                 <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
                             </xsl:apply-templates>
                         </dl>
@@ -874,7 +894,7 @@ exclude-result-prefixes="#all">
                         <dl class="dl-horizontal">
                             <xsl:apply-templates select="$properties-common" mode="#current">
                                 <xsl:sort select="ac:property-label(., $property-metadata)" order="ascending" lang="{$ldt:lang}"/>
-                                <xsl:sort select="if (exists((text(), @rdf:resource, @rdf:nodeID))) then ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1]) else()" order="ascending" lang="{$ldt:lang}"/>
+                                <xsl:sort select="if (exists((text(), @rdf:resource, @rdf:nodeID))) then (if ($object-metadata) then ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1], $object-metadata) else ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1])) else ()" order="ascending" lang="{$ldt:lang}"/>
                                 <xsl:with-param name="property-metadata" select="$property-metadata" tunnel="yes"/>
                             </xsl:apply-templates>
                         </dl>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
index df393fb63..bbff6cf15 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
@@ -286,7 +286,7 @@ extension-element-prefixes="ixsl"
     <xsl:template match="*[@rdf:about = '&acl;Access']" mode="ldh:logo">
         <xsl:param name="class" as="xs:string?"/>
         
-        <xsl:attribute name="class" select="concat($class, ' ', 'btn-access-form')"/>
+        <xsl:attribute name="class" select="concat($class, ' ', 'btn-acl btn-access-form')"/>
     </xsl:template>
 
     <xsl:template match="*[rdf:type/@rdf:resource = '&http;Response'][lacl:requestAccess/@rdf:resource]" mode="ldh:logo">
@@ -744,10 +744,30 @@ extension-element-prefixes="ixsl"
     </xsl:template>
 
     <!-- PROPERTY LIST -->
-    
+
     <!-- suppress types in property list - we show them in the bs2:Header instead -->
     <xsl:template match="rdf:type[@rdf:resource]" mode="bs2:PropertyList"/>
 
+    <!-- override outer bs2:PropertyList so sort keys consume tunneled $property-metadata and $object-metadata
+         (tunnel params don't cross xsl:function boundaries, so 1-arg ac:property-label/ac:object-label can't see them) -->
+    <xsl:template match="*[*][@rdf:about] | *[*][@rdf:nodeID]" mode="bs2:PropertyList">
+        <xsl:param name="property-metadata" as="document-node()?" tunnel="yes"/>
+        <xsl:param name="object-metadata" as="document-node()?" tunnel="yes"/>
+
+        <xsl:variable name="definitions" as="document-node()">
+            <xsl:document>
+                <dl class="dl-horizontal">
+                    <xsl:apply-templates select="*" mode="#current">
+                        <xsl:sort select="if ($property-metadata) then ac:property-label(., $property-metadata) else ac:property-label(.)" order="ascending" lang="{$ldt:lang}"/>
+                        <xsl:sort select="if (exists((text(), @rdf:resource, @rdf:nodeID))) then (if ($object-metadata) then ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1], $object-metadata) else ac:object-label((text(), @rdf:resource, @rdf:nodeID)[1])) else ()" order="ascending" lang="{$ldt:lang}"/>
+                    </xsl:apply-templates>
+                </dl>
+            </xsl:document>
+        </xsl:variable>
+
+        <xsl:apply-templates select="$definitions" mode="bs2:PropertyListIdentity"/>
+    </xsl:template>
+
     <!-- IMAGE -->
     
     <!-- TO-DO: move down to Web-Client -->
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
index de3a6d8a5..72f3e2e3e 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl
@@ -203,8 +203,8 @@ WHERE
             PREFIX  sioc: <http://rdfs.org/sioc/ns#>
             PREFIX  dc:   <http://purl.org/dc/elements/1.1/>
 
-            CONSTRUCT 
-              { 
+            CONSTRUCT
+              {
                 $this ?p ?literal .
               }
             WHERE
@@ -217,6 +217,12 @@ WHERE
         ]]>
         <!-- VALUES $this goes here -->
     </xsl:param>
+    <xsl:param name="property-metadata-query" as="xs:string">
+        <![CDATA[
+            DESCRIBE $Type
+        ]]>
+        <!-- VALUES $Type goes here -->
+    </xsl:param>
     <xsl:param name="body-id" select="'visible-body'" as="xs:string"/>
     
     <xsl:key name="resources" match="*[*][@rdf:about] | *[*][@rdf:nodeID]" use="@rdf:about | @rdf:nodeID"/>
@@ -514,6 +520,7 @@ WHERE
                                         <xsl:apply-templates select="$results/rdf:RDF" mode="bs2:DocumentBody">
                                             <xsl:with-param name="mode" select="$mode"/>
                                             <xsl:with-param name="object-metadata" select="$context('object-metadata')" tunnel="yes"/>
+                                            <xsl:with-param name="property-metadata" select="$context('property-metadata')" tunnel="yes"/>
                                         </xsl:apply-templates>
                                     </xsl:result-document>
 
@@ -531,6 +538,7 @@ WHERE
                                         <xsl:with-param name="endpoint" select="$endpoint"/>
                                         <xsl:with-param name="application" select="$application"/>
                                         <xsl:with-param name="object-metadata" select="$context('object-metadata')" tunnel="yes"/>
+                                        <xsl:with-param name="property-metadata" select="$context('property-metadata')" tunnel="yes"/>
                                     </xsl:apply-templates>
                                 </xsl:variable>
 
@@ -846,6 +854,10 @@ WHERE
             ixsl:then(ldh:http-request-threaded(?, 'metadata-request', 'metadata-response')) =>
             ixsl:then(ldh:handle-response(?, 'metadata-response')) =>
             ixsl:then(ldh:set-object-metadata#1) =>
+            ixsl:then(ldh:load-property-metadata#1) =>
+            ixsl:then(ldh:http-request-threaded(?, 'property-metadata-request', 'property-metadata-response')) =>
+            ixsl:then(ldh:handle-response(?, 'property-metadata-response')) =>
+            ixsl:then(ldh:set-property-metadata#1) =>
             ixsl:then(ldh:rdf-document-response#1)"
             on-failure="ldh:promise-failure#1"/>
     </xsl:template>

From e4e5fe6498d3a275b18a7c9ee6f7bef0c4ef44ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= <martynas@atomgraph.com>
Date: Tue, 12 May 2026 23:29:28 +0200
Subject: [PATCH 2/2] Undone SKOS package mapping changes

---
 src/main/resources/location-mapping.ttl | 4 +++-
 src/main/resources/prefix-mapping.ttl   | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/location-mapping.ttl b/src/main/resources/location-mapping.ttl
index 6db880201..91856575c 100644
--- a/src/main/resources/location-mapping.ttl
+++ b/src/main/resources/location-mapping.ttl
@@ -16,5 +16,7 @@
    [ lm:name "http://spinrdf.org/spin#" ;                                       lm:altName "etc/spin.ttl" ] ,
    [ lm:name "http://spinrdf.org/spin" ;                                        lm:altName "etc/spin.ttl" ] ,
    [ lm:name "http://spinrdf.org/spl#" ;                                        lm:altName "etc/spl.spin.ttl" ] ,
-   [ lm:name "http://spinrdf.org/spl" ;                                         lm:altName "etc/spl.spin.ttl" ]
+   [ lm:name "http://spinrdf.org/spl" ;                                         lm:altName "etc/spl.spin.ttl" ] ,
+   [ lm:name "https://packages.linkeddatahub.com/skos/" ;                       lm:altName "com/linkeddatahub/packages/skos/package.ttl" ] ,
+   [ lm:name "https://raw.githubusercontent.com/AtomGraph/LinkedDataHub-Apps/refs/heads/develop/packages/skos/ns.ttl" ; lm:altName "com/linkeddatahub/packages/skos/ns.ttl" ]
 .
\ No newline at end of file
diff --git a/src/main/resources/prefix-mapping.ttl b/src/main/resources/prefix-mapping.ttl
index 34377bd1b..872c5b932 100644
--- a/src/main/resources/prefix-mapping.ttl
+++ b/src/main/resources/prefix-mapping.ttl
@@ -71,5 +71,7 @@
    [ lm:prefix "http://purl.org/goodrelations/v1" ;                              lm:altName "com/atomgraph/client/goodrelations.owl" ] ,
    [ lm:prefix "http://spinrdf.org/sp" ;                                         lm:altName "etc/sp.ttl" ] ,
    [ lm:prefix "http://spinrdf.org/spin" ;                                       lm:altName "etc/spin.ttl" ] ,
-   [ lm:prefix "http://spinrdf.org/spl" ;                                        lm:altName "etc/spl.spin.ttl" ]
+   [ lm:prefix "http://spinrdf.org/spl" ;                                        lm:altName "etc/spl.spin.ttl" ] ,
+   [ lm:prefix "https://packages.linkeddatahub.com/skos/" ;                      lm:altName "com/linkeddatahub/packages/skos/package.ttl" ] ,
+   [ lm:prefix "https://raw.githubusercontent.com/AtomGraph/LinkedDataHub-Apps/refs/heads/develop/packages/skos/ns.ttl" ; lm:altName "com/linkeddatahub/packages/skos/ns.ttl" ]
 .
\ No newline at end of file