Fix #233

Author: tfrancart

shacl-doc/src/main/java/fr/sparna/rdf/shacl/doc/model/ShapesDocumentationSection.java

@@ -29,10 +29,11 @@ public class ShapesDocumentationSection {
 	 */
 	private String sectionId;
 	private String title;
+
 	/**
-	 * The subtitle to display, set to the full URI. Can be null
+	 * The subtitle to display, set to the full URI. Can be null, or can point to an empty URL
 	 */
-	private String subtitleUri;	
+	private Link subtitleUri;
 	private String description;
 
 	private List<Link> targetClass;
@@ -138,14 +139,6 @@ public void setTitle(String title) {
 		this.title = title;
 	}
 
-	public String getSubtitleUri() {
-		return subtitleUri;
-	}
-
-	public void setSubtitleUri(String subtitleUri) {
-		this.subtitleUri = subtitleUri;
-	}
-	
 	public String getDescription() {
 		return description;
 	}
@@ -288,5 +281,13 @@ public String getHasValue() {
 
 	public void setHasValue(String hasValue) {
 		this.hasValue = hasValue;
+	}
+
+	public Link getSubtitleUri() {
+		return subtitleUri;
+	}
+
+	public void setSubtitleUri(Link subtitleUri) {
+		this.subtitleUri = subtitleUri;
 	}	
 }

shacl-doc/src/main/java/fr/sparna/rdf/shacl/doc/read/ShapesDocumentationSectionBuilder.java

@@ -44,7 +44,11 @@ public ShapesDocumentationSection build(
 		currentSection.setNodeShapeUriOrId(nodeShape.getURIOrId());
 		currentSection.setSectionId(nodeShape.getShortFormOrId());
 		// if the node shape is itself a class, set its subtitle to the URI
-		currentSection.setSubtitleUri(nodeShape.getNodeShape().getURI());
+		if(nodeShape.isAClass()) {
+			currentSection.setSubtitleUri(new Link(nodeShape.getNodeShape().getURI(), nodeShape.getNodeShape().getURI()));
+		} else {
+			currentSection.setSubtitleUri(new Link(null, nodeShape.getNodeShape().getURI()));
+		}
 
 		// title : either skos:prefLabel or rdfs:label or the URI short form
 		currentSection.setTitle(nodeShape.getDisplayLabel(owlGraph, lang));

shacl-doc/src/main/resources/doc2html.xsl

@@ -857,7 +857,14 @@
 						<xsl:apply-templates select="title" />
 
 						<xsl:if test="subtitleUri">
-							<code class="sp_section_uri"><xsl:value-of select="subtitleUri" /></code>
+							<xsl:choose>
+								<xsl:when test="subtitleUri/href">
+									<code class="sp_section_uri"><a href="{subtitleUri/href}"><xsl:value-of select="subtitleUri/label" /></a></code>
+								</xsl:when>
+								<xsl:otherwise>
+									<code class="sp_section_uri"><xsl:value-of select="subtitleUri/label" /></code>
+								</xsl:otherwise>
+							</xsl:choose>
 						</xsl:if>
 
 					</div>