Skip to content

Commit 1e9cd8a

Browse files
namedgraphnamedgraph
committed
Simplified tab rendering
1 parent e34db78 commit 1e9cd8a

1 file changed

Lines changed: 20 additions & 48 deletions

File tree

  • src/main/webapp/static/com/atomgraph/linkeddatahub/xsl

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl‎

Lines changed: 20 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -557,61 +557,33 @@ WHERE
557557
<ixsl:set-property name="etag" select="$etag" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $uri || '`')"/>
558558

559559
<xsl:variable name="tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'content-body')]/@about = $uri]" as="element()?"/>
560-
<xsl:message>$tab-pane? <xsl:value-of select="exists($tab-pane)"/></xsl:message>
561-
562-
<xsl:message>
563-
A <xsl:value-of select="exists(id('tab-content', ixsl:page()))"/>
564-
B <xsl:value-of select="exists(id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')])"/>
565-
C <xsl:value-of select="exists(id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'content-body')]])"/>
566-
D <xsl:value-of select="exists(id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'content-body')]/@about = $uri])"/>
567-
</xsl:message>
568-
569-
<xsl:variable name="tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'content-body')]/@about = $uri]" as="element()?"/>
570-
<xsl:message>
571-
tab-pane/@id: <xsl:value-of select="$tab-pane/@id"/>
572-
</xsl:message>
573-
<xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
574-
<xsl:message>ac:mode uri: <xsl:value-of select="$uri"/></xsl:message>
575-
560+
<xsl:variable name="mode" select="ac:mode($results)" as="xs:anyURI"/>
576561
<xsl:variable name="tab-body" as="element()">
577562
<xsl:apply-templates select="$results/rdf:RDF" mode="bs2:TabBody">
578563
<xsl:with-param name="mode" select="$mode"/>
579564
</xsl:apply-templates>
580565
</xsl:variable>
581566

582-
<xsl:choose>
583-
<!-- no tab yet: create tab for the external document -->
584-
<xsl:when test="not(starts-with($uri, $ldt:base)) and not($tab-pane)">
585-
<xsl:message>ldh:AddTabNavBarListItem</xsl:message>
586-
587-
<xsl:call-template name="ldh:AddTabNavBarListItem">
588-
<xsl:with-param name="uri" select="$uri"/>
589-
<xsl:with-param name="label" select="ac:label(key('resources', $uri, $results))"/>
590-
<xsl:with-param name="endpoint" select="$endpoint"/>
591-
</xsl:call-template>
592-
593-
<xsl:variable name="local-tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'content-body')]/@about = ac:absolute-path(ldh:request-uri())]" as="element()"/>
594-
<ixsl:set-style name="display" select="'none'" object="$local-tab-pane"/>
595-
596-
<xsl:message>CREATE EXTERNAL TAB PANE</xsl:message>
597-
<!-- create external pane for this URI if it doesn't exist yet (scales to N panes, one per URI) -->
598-
<xsl:result-document href="#tab-content" method="ixsl:append-content">
599-
<xsl:sequence select="$tab-body"/>
600-
</xsl:result-document>
601-
</xsl:when>
602-
<xsl:otherwise>
603-
<xsl:message>RE-RENDER CURRENT TAB PANE</xsl:message>
604-
605-
<!-- re-render current tab pane -->
606-
<xsl:for-each select="$tab-pane">
607-
<xsl:result-document href="?." method="ixsl:replace-content">
608-
<xsl:sequence select="$tab-body/*"/>
609-
</xsl:result-document>
610-
</xsl:for-each>
611-
</xsl:otherwise>
612-
</xsl:choose>
567+
<!-- no tab yet: create tab for the external document -->
568+
<xsl:if test="not(starts-with($uri, $ldt:base)) and not($tab-pane)">
569+
<xsl:message>ldh:AddTabNavBarListItem</xsl:message>
570+
571+
<xsl:call-template name="ldh:AddTabNavBarListItem">
572+
<xsl:with-param name="uri" select="$uri"/>
573+
<xsl:with-param name="label" select="ac:label(key('resources', $uri, $results))"/>
574+
<xsl:with-param name="endpoint" select="$endpoint"/>
575+
</xsl:call-template>
576+
577+
<xsl:variable name="local-tab-pane" select="id('tab-content', ixsl:page())/div[contains-token(@class, 'tab-pane')][./div[contains-token(@class, 'content-body')]/@about = ac:absolute-path(ldh:request-uri())]" as="element()"/>
578+
<ixsl:set-style name="display" select="'none'" object="$local-tab-pane"/>
579+
580+
<xsl:message>CREATE EXTERNAL TAB PANE</xsl:message>
581+
<!-- create external pane for this URI if it doesn't exist yet (scales to N panes, one per URI) -->
582+
<xsl:result-document href="#tab-content" method="ixsl:append-content">
583+
<xsl:sequence select="$tab-body"/>
584+
</xsl:result-document>
585+
</xsl:if>
613586

614-
<xsl:message>ldh:RenderTab uri: <xsl:value-of select="$uri"/></xsl:message>
615587
<xsl:call-template name="ldh:RenderTab">
616588
<xsl:with-param name="tab-pane-id" select="if ($tab-pane) then $tab-pane/@id else $tab-body/@id"/>
617589
<xsl:with-param name="uri" select="$uri"/>

0 commit comments

Comments
 (0)