From 50c7a54b1e92f13f4f7f5ceb074189b3912395bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= <martynas@atomgraph.com>
Date: Sun, 5 Jul 2026 01:41:10 +0200
Subject: [PATCH] XSLT refactoring prep + ldh/ fork entry point
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Prep 1: uncomment @typeof on all block outer divs (typed/XHTML/SaxonJS
wrapper) in resource.xsl so CSS [typeof~="..."] selectors and depth-
independent handler anchors work.

Prep 2: emit aria-current="page" on active mode link; emit and keep
aria-expanded in sync on left-sidebar show/hide in navigation.xsl.

Prep 3: replace depth-locked axes in block.xsl with ancestor::*[...][1]
traversal (ondragover/enter/leave/drop document-body lookup, drag-handle
span12 lookup); replace sibling-relative btn-edit match with ancestor
RDFa match; replace ixsl:style() readback in onmousemove with
aria-expanded attribute check.

Fork: add xsl/ldh/layout.xsl — imports bootstrap/2.3.2/layout.xsl and
overrides structural templates to remove Bootstrap grid classes (row-fluid,
span7, span2, container-fluid) while keeping load-bearing DOM anchor
classes (document-body, content-body, block, span12). Introduces
ldh:BlockContent mode to share SSR/CSR content dispatch without the
Bootstrap SaxonJS wrapper's hardcoded div.span12.

Add css/ldh.css — initial design layer keyed on RDFa typeof selectors
and ARIA state attributes; flex layout for .ldh-content/.ldh-block.

Activate the ldh tree by changing the import in static/xsl/layout.xsl
from ../bootstrap/2.3.2/layout.xsl to ../ldh/layout.xsl.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 .../com/atomgraph/linkeddatahub/css/ldh.css   |  73 +++++
 .../xsl/bootstrap/2.3.2/client/block.xsl      |  14 +-
 .../xsl/bootstrap/2.3.2/client/navigation.xsl |   3 +
 .../xsl/bootstrap/2.3.2/resource.xsl          |  16 +-
 .../linkeddatahub/xsl/ldh/layout.xsl          | 273 ++++++++++++++++++
 5 files changed, 367 insertions(+), 12 deletions(-)
 create mode 100644 src/main/webapp/static/com/atomgraph/linkeddatahub/css/ldh.css
 create mode 100644 src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/ldh/layout.xsl

diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/ldh.css b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/ldh.css
new file mode 100644
index 000000000..abaa38f0d
--- /dev/null
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/ldh.css
@@ -0,0 +1,73 @@
+/* LinkedDataHub design layer — loaded on top of the Bootstrap stack.
+ * Selectors key on RDFa (@typeof, @about) and ARIA, never on Bootstrap grid classes.
+ * Bootstrap grid classes (span2, span7, row-fluid, etc.) intentionally absent here.
+ */
+
+/* ─── Document layout ────────────────────────────────────────── */
+
+.ldh-document {
+    display: grid;
+    grid-template-rows: auto 1fr;
+}
+
+/* ─── Content area: stacked blocks ───────────────────────────── */
+
+.ldh-content {
+    display: flex;
+    flex-direction: column;
+    gap: 1rem;
+    padding: 1rem;
+}
+
+/* ─── Generic resource block ──────────────────────────────────── */
+
+.ldh-block {
+    display: flex;
+    gap: 1rem;
+}
+
+.ldh-block-body {
+    flex: 1 1 auto;
+    min-width: 0;
+}
+
+.ldh-block-nav {
+    flex: 0 0 200px;
+}
+
+/* ─── Resource header ─────────────────────────────────────────── */
+
+.ldh-header {
+    padding: 0.75rem 0;
+    border-bottom: 1px solid #e0e0e0;
+    margin-bottom: 0.75rem;
+}
+
+/* ─── RDFa typeof selectors (examples; extend per vocabulary) ─── */
+
+/* Containers get a subtle left border */
+[typeof~="https://www.w3.org/ns/ldt/document-hierarchy#Container"] > .ldh-block-body {
+    border-left: 3px solid #5b9bd5;
+    padding-left: 0.75rem;
+}
+
+/* XHTML content blocks — full width, no nav sidebar */
+[typeof~="https://w3id.org/atomgraph/linkeddatahub#XHTML"] {
+    flex-direction: column;
+}
+
+[typeof~="https://w3id.org/atomgraph/linkeddatahub#XHTML"] > .ldh-block-nav {
+    display: none;
+}
+
+/* ─── ARIA state selectors ────────────────────────────────────── */
+
+/* Active mode link */
+a[aria-current="page"] {
+    font-weight: bold;
+}
+
+/* Collapsed left sidebar */
+.left-sidebar[aria-expanded="false"] {
+    display: none;
+}
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 96fa08abf..3046087f6 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
@@ -237,7 +237,7 @@ exclude-result-prefixes="#all"
 
     <!-- show drag handle on left edge hover, but not when left sidebar is active -->
 
-    <xsl:template match="div[contains-token(@class, 'block')][key('elements-by-class', 'drag-handle', .)][acl:mode() = '&acl;Write'][not(ixsl:style(ancestor::div[contains-token(@class, 'tab-pane')]/div[contains-token(@class, 'left-sidebar')])?display = 'block')]" mode="ixsl:onmousemove" priority="2">
+    <xsl:template match="div[contains-token(@class, 'block')][key('elements-by-class', 'drag-handle', .)][acl:mode() = '&acl;Write'][not(ancestor::div[contains-token(@class, 'tab-pane')][1]/div[contains-token(@class, 'left-sidebar')]/@aria-expanded = 'true')]" mode="ixsl:onmousemove" priority="2">
         <xsl:variable name="uri" select="xs:anyURI(ancestor::div[contains-token(@class, 'document-body')]/@about)" as="xs:anyURI"/>
         <xsl:variable name="contents" select="ixsl:get(ixsl:window(), 'LinkedDataHub.contents')"/>
         <xsl:variable name="cache-key" select="'`' || $uri || '`'" as="xs:string"/>
@@ -258,7 +258,7 @@ exclude-result-prefixes="#all"
             <xsl:choose>
                 <xsl:when test="$offset-x &lt;= $left-edge-threshold and ixsl:style($drag-handle)?display = 'none'">
                     <!-- get both block and span12 rectangles to calculate intersection -->
-                    <xsl:variable name="span12" select="$drag-handle/parent::*[contains-token(@class, 'span12')]" as="element()"/>
+                    <xsl:variable name="span12" select="$drag-handle/ancestor::*[contains-token(@class, 'span12')][1]" as="element()"/>
                     <xsl:variable name="block-rect" select="$rect"/> <!-- block's getBoundingClientRect -->
                     <xsl:variable name="span12-rect" select="ixsl:call($span12, 'getBoundingClientRect', [])"/>
 
@@ -311,7 +311,7 @@ exclude-result-prefixes="#all"
 
     <!-- override inline editing form for block types (do nothing if the button is disabled) - prioritize over form.xsl -->
     
-    <xsl:template match="div[following-sibling::div[@typeof = ('&ldh;XHTML', '&ldh;Object')]]//button[contains-token(@class, 'btn-edit')][not(contains-token(@class, 'disabled'))]" mode="ixsl:onclick" priority="1">
+    <xsl:template match="button[contains-token(@class, 'btn-edit')][not(contains-token(@class, 'disabled'))][ancestor::*[@typeof = ('&ldh;XHTML', '&ldh;Object')][1]]" mode="ixsl:onclick" priority="1">
         <xsl:param name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
         <!-- for block types, button.btn-edit is placed in its own div.row-fluid, therefore the next row is the actual container -->
         <xsl:param name="container" select="$block/descendant::div[@typeof][1]" as="element()"/> <!-- other resources can be nested within object -->
@@ -419,7 +419,7 @@ exclude-result-prefixes="#all"
 
     <xsl:template match="*[ancestor-or-self::div[contains-token(@class, 'block')][parent::div[contains-token(@class, 'content-body')]][acl:mode() = '&acl;Write']]" mode="ixsl:ondragover" priority="1">
         <xsl:variable name="block" select="ancestor-or-self::div[contains-token(@class, 'block')][parent::div[contains-token(@class, 'content-body')]][1]" as="element()"/>
-        <xsl:variable name="uri" select="xs:anyURI($block/parent::div/parent::div[contains-token(@class, 'document-body')]/@about)" as="xs:anyURI"/>
+        <xsl:variable name="uri" select="xs:anyURI($block/ancestor::*[contains-token(@class, 'document-body')][1]/@about)" as="xs:anyURI"/>
         <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
         <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
 
@@ -438,7 +438,7 @@ exclude-result-prefixes="#all"
 
     <xsl:template match="*[ancestor-or-self::div[contains-token(@class, 'block')][parent::div[contains-token(@class, 'content-body')]][acl:mode() = '&acl;Write']]" mode="ixsl:ondragenter" priority="1">
         <xsl:variable name="block" select="ancestor-or-self::div[contains-token(@class, 'block')][parent::div[contains-token(@class, 'content-body')]][1]" as="element()"/>
-        <xsl:variable name="uri" select="xs:anyURI($block/parent::div/parent::div[contains-token(@class, 'document-body')]/@about)" as="xs:anyURI"/>
+        <xsl:variable name="uri" select="xs:anyURI($block/ancestor::*[contains-token(@class, 'document-body')][1]/@about)" as="xs:anyURI"/>
         <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
         <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
 
@@ -455,7 +455,7 @@ exclude-result-prefixes="#all"
 
     <xsl:template match="*[ancestor-or-self::div[contains-token(@class, 'block')][parent::div[contains-token(@class, 'content-body')]][acl:mode() = '&acl;Write']]" mode="ixsl:ondragleave" priority="1">
         <xsl:variable name="block" select="ancestor-or-self::div[contains-token(@class, 'block')][parent::div[contains-token(@class, 'content-body')]][1]" as="element()"/>
-        <xsl:variable name="uri" select="xs:anyURI($block/parent::div/parent::div[contains-token(@class, 'document-body')]/@about)" as="xs:anyURI"/>
+        <xsl:variable name="uri" select="xs:anyURI($block/ancestor::*[contains-token(@class, 'document-body')][1]/@about)" as="xs:anyURI"/>
         <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
         <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
 
@@ -478,7 +478,7 @@ exclude-result-prefixes="#all"
 
     <xsl:template match="*[ancestor-or-self::div[contains-token(@class, 'block')][parent::div[contains-token(@class, 'content-body')]][acl:mode() = '&acl;Write']]" mode="ixsl:ondrop" priority="1">
         <xsl:variable name="block" select="ancestor-or-self::div[contains-token(@class, 'block')][parent::div[contains-token(@class, 'content-body')]][1]" as="element()"/>
-        <xsl:variable name="uri" select="xs:anyURI($block/parent::div/parent::div[contains-token(@class, 'document-body')]/@about)" as="xs:anyURI"/>
+        <xsl:variable name="uri" select="xs:anyURI($block/ancestor::*[contains-token(@class, 'document-body')][1]/@about)" as="xs:anyURI"/>
         <xsl:variable name="results" select="ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`'), 'results')" as="document-node()"/>
         <xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
 
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl
index ba5c52a93..553edf89a 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl
@@ -105,6 +105,7 @@ ORDER BY DESC(?created)
             <xsl:if test="$class">
                 <xsl:attribute name="class" select="$class"/>
             </xsl:if>
+            <xsl:attribute name="aria-expanded" select="'false'"/>
 
             <!-- dataspace-scoped search form -->
             <form class="form-search search-form" accept-charset="UTF-8" title="{ac:label(key('resources', 'search-title', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', lapp:origin()))))}">
@@ -304,6 +305,7 @@ ORDER BY DESC(?created)
             <xsl:variable name="active-sidebar" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][contains-token(@class, 'active')]/div[contains-token(@class, 'left-sidebar')]" as="element()?"/>
             <xsl:if test="$active-sidebar">
                 <ixsl:set-style name="display" select="'block'" object="$active-sidebar"/>
+                <ixsl:set-attribute name="aria-expanded" select="'true'" object="$active-sidebar"/>
             </xsl:if>
         </xsl:if>
     </xsl:template>
@@ -315,6 +317,7 @@ ORDER BY DESC(?created)
         <!-- only hide if the related target does not have this div as ancestor (is not its child) -->
         <xsl:if test="not($related-target/ancestor-or-self::div[. is current()])">
             <ixsl:set-style name="display" select="'none'"/>
+            <ixsl:set-attribute name="aria-expanded" select="'false'"/>
         </xsl:if>
     </xsl:template>
 
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 747b5dff0..b53f3ceed 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
@@ -425,6 +425,9 @@ extension-element-prefixes="ixsl"
                 <xsl:if test="$href">
                     <xsl:attribute name="href" select="$href"/>
                 </xsl:if>
+                <xsl:if test="$active">
+                    <xsl:attribute name="aria-current" select="'page'"/>
+                </xsl:if>
                 <xsl:apply-templates select="." mode="ldh:logo"/>
                 <xsl:value-of>
                     <xsl:apply-templates select="." mode="ac:label"/>
@@ -481,9 +484,9 @@ extension-element-prefixes="ixsl"
             <xsl:if test="$about">
                 <xsl:attribute name="about" select="$about"/>
             </xsl:if>
-<!--            <xsl:if test="exists($typeof)">
+            <xsl:if test="exists($typeof)">
                 <xsl:attribute name="typeof" select="string-join($typeof, ' ')"/>
-            </xsl:if>-->
+            </xsl:if>
             <xsl:if test="$draggable = true()">
                 <xsl:attribute name="draggable" select="'true'"/>
             </xsl:if>
@@ -542,13 +545,13 @@ extension-element-prefixes="ixsl"
             <xsl:if test="$about">
                 <xsl:attribute name="about" select="$about"/>
             </xsl:if>
-<!--            <xsl:if test="exists($typeof)">
+            <xsl:if test="exists($typeof)">
                 <xsl:attribute name="typeof" select="string-join($typeof, ' ')"/>
-            </xsl:if>-->
+            </xsl:if>
             <xsl:if test="$draggable = true()">
                 <xsl:attribute name="draggable" select="'true'"/>
             </xsl:if>
-            
+
             <div class="span12">
                 <div class="drag-handle">
                     <xsl:if test="acl:mode() = '&acl;Write'">
@@ -621,6 +624,9 @@ extension-element-prefixes="ixsl"
             <xsl:if test="$about">
                 <xsl:attribute name="about" select="$about"/>
             </xsl:if>
+            <xsl:if test="exists($typeof)">
+                <xsl:attribute name="typeof" select="string-join($typeof, ' ')"/>
+            </xsl:if>
 
             <div class="span12">
                 <xsl:next-match>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/ldh/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/ldh/layout.xsl
new file mode 100644
index 000000000..d79958306
--- /dev/null
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/ldh/layout.xsl
@@ -0,0 +1,273 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE xsl:stylesheet [
+    <!ENTITY lapp   "https://w3id.org/atomgraph/linkeddatahub/apps#">
+    <!ENTITY def    "https://w3id.org/atomgraph/linkeddatahub/default#">
+    <!ENTITY ldh    "https://w3id.org/atomgraph/linkeddatahub#">
+    <!ENTITY ac     "https://w3id.org/atomgraph/client#">
+    <!ENTITY rdf    "http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+    <!ENTITY rdfs   "http://www.w3.org/2000/01/rdf-schema#">
+    <!ENTITY xsd    "http://www.w3.org/2001/XMLSchema#">
+    <!ENTITY srx    "http://www.w3.org/2005/sparql-results#">
+    <!ENTITY http   "http://www.w3.org/2011/http#">
+    <!ENTITY acl    "http://www.w3.org/ns/auth/acl#">
+    <!ENTITY ldt    "https://www.w3.org/ns/ldt#">
+    <!ENTITY dh     "https://www.w3.org/ns/ldt/document-hierarchy#">
+    <!ENTITY sh     "http://www.w3.org/ns/shacl#">
+    <!ENTITY sp     "http://spinrdf.org/sp#">
+    <!ENTITY spin   "http://spinrdf.org/spin#">
+]>
+<xsl:stylesheet version="3.0"
+xmlns="http://www.w3.org/1999/xhtml"
+xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+xmlns:xhtml="http://www.w3.org/1999/xhtml"
+xmlns:xs="http://www.w3.org/2001/XMLSchema"
+xmlns:map="http://www.w3.org/2005/xpath-functions/map"
+xmlns:lapp="&lapp;"
+xmlns:ldh="&ldh;"
+xmlns:ac="&ac;"
+xmlns:rdf="&rdf;"
+xmlns:rdfs="&rdfs;"
+xmlns:http="&http;"
+xmlns:acl="&acl;"
+xmlns:ldt="&ldt;"
+xmlns:dh="&dh;"
+xmlns:sh="&sh;"
+xmlns:sp="&sp;"
+xmlns:spin="&spin;"
+xmlns:srx="&srx;"
+xmlns:bs2="http://graphity.org/xsl/bootstrap/2.3.2"
+exclude-result-prefixes="#all">
+
+    <xsl:import href="../bootstrap/2.3.2/layout.xsl"/>
+
+    <!-- CSS: add ldh.css after the Bootstrap stack -->
+    <xsl:template match="rdf:RDF[lapp:origin()] | srx:sparql[lapp:origin()]" mode="xhtml:Style">
+        <xsl:next-match/>
+        <link href="{resolve-uri('static/com/atomgraph/linkeddatahub/css/ldh.css', lapp:origin())}" rel="stylesheet" type="text/css"/>
+    </xsl:template>
+
+    <!-- DocumentBody: add ldh-document class; document-body preserved for client handlers -->
+    <xsl:template match="rdf:RDF" mode="bs2:DocumentBody">
+        <xsl:param name="id" as="xs:string?"/>
+        <xsl:param name="class" select="'document-body ldh-document'" as="xs:string?"/>
+        <xsl:param name="mode" as="xs:anyURI"/>
+        <xsl:param name="about" as="xs:anyURI"/>
+        <xsl:param name="object-metadata" as="document-node()?" tunnel="yes"/>
+        <xsl:next-match>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="mode" select="$mode"/>
+            <xsl:with-param name="about" select="$about"/>
+        </xsl:next-match>
+    </xsl:template>
+
+    <!-- ContentBody (http:Response): drop container-fluid -->
+    <xsl:template match="rdf:RDF[key('resources-by-type', '&http;Response') and not(key('resources-by-type', '&spin;ConstraintViolation')) and not(key('resources-by-type', '&sh;ValidationResult'))]" mode="bs2:ContentBody" priority="1">
+        <xsl:param name="id" as="xs:string?"/>
+        <xsl:param name="class" select="'content-body ldh-content'" as="xs:string?"/>
+        <xsl:next-match>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
+        </xsl:next-match>
+    </xsl:template>
+
+    <!-- ContentBody (srx:sparql): drop container-fluid -->
+    <xsl:template match="srx:sparql" mode="bs2:ContentBody">
+        <xsl:param name="id" as="xs:string?"/>
+        <xsl:param name="class" select="'content-body ldh-content'" as="xs:string?"/>
+        <xsl:next-match>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
+        </xsl:next-match>
+    </xsl:template>
+
+    <!-- ContentBody (rdf:RDF): drop container-fluid -->
+    <xsl:template match="rdf:RDF" mode="bs2:ContentBody">
+        <xsl:param name="id" as="xs:string?"/>
+        <xsl:param name="class" select="'content-body ldh-content'" as="xs:string?"/>
+        <xsl:param name="mode" select="ac:mode(root())" as="xs:anyURI"/>
+        <xsl:next-match>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="mode" select="$mode"/>
+        </xsl:next-match>
+    </xsl:template>
+
+    <!-- Left nav: suppress empty Bootstrap span2 div -->
+    <xsl:template match="*[*][@rdf:about or @rdf:nodeID]" mode="bs2:Left" priority="1"/>
+
+    <!-- Right nav: replace Bootstrap span3 class -->
+    <xsl:template match="*[*][@rdf:about or @rdf:nodeID]" mode="bs2:Right">
+        <xsl:next-match>
+            <xsl:with-param name="class" select="'ldh-block-nav'"/>
+        </xsl:next-match>
+    </xsl:template>
+
+    <!-- Right nav (Object with resource): replace Bootstrap span3 class -->
+    <xsl:template match="*[rdf:type/@rdf:resource = '&ldh;Object'][rdf:value/@rdf:resource]" mode="bs2:Right" priority="1">
+        <xsl:next-match>
+            <xsl:with-param name="class" select="'ldh-block-nav'"/>
+        </xsl:next-match>
+    </xsl:template>
+
+    <!-- Block content dispatch: shared by generic SSR and SaxonJS block templates -->
+    <xsl:template match="*[*][@rdf:about] | *[*][@rdf:nodeID]" mode="ldh:BlockContent">
+        <xsl:param name="mode" as="xs:anyURI?"/>
+        <xsl:param name="main-class" select="'main ldh-block-body'" as="xs:string?"/>
+
+        <xsl:variable name="doc" as="document-node()">
+            <xsl:document>
+                <rdf:RDF>
+                    <xsl:copy-of select="."/>
+                </rdf:RDF>
+            </xsl:document>
+        </xsl:variable>
+
+        <div>
+            <xsl:if test="$main-class">
+                <xsl:attribute name="class" select="$main-class"/>
+            </xsl:if>
+            <xsl:choose>
+                <xsl:when test="$mode = '&ac;MapMode'">
+                    <xsl:apply-templates select="$doc" mode="bs2:Map">
+                        <xsl:with-param name="id" select="generate-id() || '-map-canvas'"/>
+                    </xsl:apply-templates>
+                </xsl:when>
+                <xsl:when test="$mode = '&ac;ChartMode'">
+                    <xsl:apply-templates select="$doc" mode="bs2:Chart">
+                        <xsl:with-param name="canvas-id" select="generate-id() || '-chart-canvas'"/>
+                        <xsl:with-param name="show-save" select="false()"/>
+                    </xsl:apply-templates>
+                </xsl:when>
+                <xsl:when test="$mode = '&ac;GraphMode'">
+                    <xsl:apply-templates select=".." mode="bs2:Graph"/>
+                </xsl:when>
+                <xsl:when test="$mode = '&ac;EditMode'">
+                    <xsl:apply-templates select="." mode="bs2:Form">
+                        <xsl:with-param name="required" select="rdf:type/@rdf:resource = ('&dh;Container', '&dh;Item')" tunnel="yes"/>
+                    </xsl:apply-templates>
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:apply-templates select="."/>
+                </xsl:otherwise>
+            </xsl:choose>
+        </div>
+
+        <xsl:apply-templates select="." mode="bs2:Right"/>
+    </xsl:template>
+
+    <!-- Generic resource block (SSR): no Bootstrap grid, content via ldh:BlockContent -->
+    <xsl:template match="*[*][@rdf:about] | *[*][@rdf:nodeID]" mode="bs2:Row">
+        <xsl:param name="id" select="if (contains(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#')) then substring-after(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#') else generate-id()" as="xs:string?"/>
+        <xsl:param name="class" select="'block ldh-block'" as="xs:string?"/>
+        <xsl:param name="about" select="@rdf:about" as="xs:anyURI?"/>
+        <xsl:param name="typeof" select="rdf:type/@rdf:resource/xs:anyURI(.)" as="xs:anyURI*"/>
+        <xsl:param name="mode" as="xs:anyURI?"/>
+        <xsl:param name="style" as="xs:string?"/>
+        <xsl:param name="main-class" select="'main ldh-block-body'" as="xs:string?"/>
+
+        <div>
+            <xsl:if test="$id">
+                <xsl:attribute name="id" select="$id"/>
+            </xsl:if>
+            <xsl:if test="$class">
+                <xsl:attribute name="class" select="$class"/>
+            </xsl:if>
+            <xsl:if test="$about">
+                <xsl:attribute name="about" select="$about"/>
+            </xsl:if>
+            <xsl:if test="exists($typeof)">
+                <xsl:attribute name="typeof" select="string-join($typeof, ' ')"/>
+            </xsl:if>
+            <xsl:if test="$style">
+                <xsl:attribute name="style" select="$style"/>
+            </xsl:if>
+
+            <xsl:apply-templates select="." mode="ldh:BlockContent">
+                <xsl:with-param name="mode" select="$mode"/>
+                <xsl:with-param name="main-class" select="$main-class"/>
+            </xsl:apply-templates>
+        </div>
+    </xsl:template>
+
+    <!-- Generic resource block (SaxonJS CSR): same structure, overrides Bootstrap SaxonJS wrapper to remove span12 -->
+    <xsl:template match="*[*][@rdf:about][not(rdf:type/@rdf:resource = ('&http;Response', '&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart', '&sp;Describe', '&sp;Construct', '&sp;Ask', '&sp;Select'))] | *[*][@rdf:nodeID][not(rdf:type/@rdf:resource = ('&http;Response', '&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart', '&sp;Describe', '&sp;Construct', '&sp;Ask', '&sp;Select'))]" mode="bs2:Row" priority="0.7" use-when="system-property('xsl:product-name') eq 'SaxonJS'">
+        <xsl:param name="id" select="if (contains(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#')) then substring-after(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#') else generate-id()" as="xs:string?"/>
+        <xsl:param name="class" select="'block ldh-block'" as="xs:string?"/>
+        <xsl:param name="about" select="@rdf:about" as="xs:anyURI?"/>
+        <xsl:param name="typeof" select="rdf:type/@rdf:resource/xs:anyURI(.)" as="xs:anyURI*"/>
+        <xsl:param name="mode" as="xs:anyURI?"/>
+        <xsl:param name="style" as="xs:string?"/>
+        <xsl:param name="main-class" select="'main ldh-block-body'" as="xs:string?"/>
+
+        <div>
+            <xsl:if test="$id">
+                <xsl:attribute name="id" select="$id"/>
+            </xsl:if>
+            <xsl:if test="$class">
+                <xsl:attribute name="class" select="$class"/>
+            </xsl:if>
+            <xsl:if test="$about">
+                <xsl:attribute name="about" select="$about"/>
+            </xsl:if>
+            <xsl:if test="exists($typeof)">
+                <xsl:attribute name="typeof" select="string-join($typeof, ' ')"/>
+            </xsl:if>
+            <xsl:if test="$style">
+                <xsl:attribute name="style" select="$style"/>
+            </xsl:if>
+
+            <xsl:apply-templates select="." mode="ldh:BlockContent">
+                <xsl:with-param name="mode" select="$mode"/>
+                <xsl:with-param name="main-class" select="$main-class"/>
+            </xsl:apply-templates>
+        </div>
+    </xsl:template>
+
+    <!-- Typed resource blocks (Object, View, charts, queries): drop row-fluid from outer div -->
+    <xsl:template match="*[@rdf:about][rdf:type/@rdf:resource = ('&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart', '&sp;Describe', '&sp;Construct', '&sp;Ask', '&sp;Select')]" mode="bs2:Row" priority="1">
+        <xsl:param name="id" select="if (contains(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#')) then substring-after(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#') else generate-id()" as="xs:string?"/>
+        <xsl:param name="class" select="'block ldh-block'" as="xs:string?"/>
+        <xsl:param name="about" select="@rdf:about" as="xs:anyURI?"/>
+        <xsl:param name="typeof" select="rdf:type/@rdf:resource/xs:anyURI(.)" as="xs:anyURI*"/>
+        <xsl:param name="draggable" select="false()" as="xs:boolean?"/>
+        <xsl:param name="show-row-block-controls" select="true()" as="xs:boolean"/>
+        <xsl:next-match>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="about" select="$about"/>
+            <xsl:with-param name="typeof" select="$typeof"/>
+            <xsl:with-param name="draggable" select="$draggable"/>
+            <xsl:with-param name="show-row-block-controls" select="$show-row-block-controls"/>
+        </xsl:next-match>
+    </xsl:template>
+
+    <!-- XHTML content blocks: drop row-fluid and span7 -->
+    <xsl:template match="*[@rdf:about][rdf:type/@rdf:resource = '&ldh;XHTML'][rdf:value[@rdf:parseType = 'Literal']/xhtml:div]" mode="bs2:Row" priority="1">
+        <xsl:param name="id" select="if (contains(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#')) then substring-after(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#') else generate-id()" as="xs:string?"/>
+        <xsl:param name="class" select="'block ldh-block'" as="xs:string?"/>
+        <xsl:param name="about" select="@rdf:about" as="xs:anyURI?"/>
+        <xsl:param name="typeof" select="rdf:type/@rdf:resource/xs:anyURI(.)" as="xs:anyURI*"/>
+        <xsl:param name="main-class" select="'main ldh-block-body'" as="xs:string?"/>
+        <xsl:param name="draggable" select="false()" as="xs:boolean?"/>
+        <xsl:next-match>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
+            <xsl:with-param name="about" select="$about"/>
+            <xsl:with-param name="typeof" select="$typeof"/>
+            <xsl:with-param name="main-class" select="$main-class"/>
+            <xsl:with-param name="draggable" select="$draggable"/>
+        </xsl:next-match>
+    </xsl:template>
+
+    <!-- Resource header: drop Bootstrap well class -->
+    <xsl:template match="*[*][@rdf:about] | *[*][@rdf:nodeID]" mode="bs2:Header">
+        <xsl:param name="id" as="xs:string?"/>
+        <xsl:param name="class" select="'ldh-header'" as="xs:string?"/>
+        <xsl:next-match>
+            <xsl:with-param name="id" select="$id"/>
+            <xsl:with-param name="class" select="$class"/>
+        </xsl:next-match>
+    </xsl:template>
+
+</xsl:stylesheet>