From a60cc9c62d1bb4a95c651dc2f384dc5847f4ede1 Mon Sep 17 00:00:00 2001
From: Lloyd McKenzie <lmckenzie@gevityinc.com>
Date: Sat, 8 Feb 2020 09:30:02 -0700
Subject: [PATCH] Improved layout of vocabulary, fixed messages for missing
 name and description

---
 layouts/layout-valueset.html | 17 ++++++++++-------
 scripts/onGenerate.qa.xslt   | 32 +++++++++++++++++---------------
 2 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/layouts/layout-valueset.html b/layouts/layout-valueset.html
index 7c5adf2..06e4110 100644
--- a/layouts/layout-valueset.html
+++ b/layouts/layout-valueset.html
@@ -5,20 +5,23 @@
   <!--ReleaseHeader--><p id="publish-box">Publish Box goes here</p><!--EndReleaseHeader-->
   <a name="root"> </a>
   <h2 id="root">{{site.data.pages[page.path].title}}</h2>
-  {% assign intro = site.data.pages[page.path].intro %}
-  {% if site.data.pages[page.path].intro != null %}
-  <div style="display:inline-block">
-  {% include {{intro}} %}
-  </div>
-  {% endif %}
   <p>
     <b>Summary</b>
   </p>
-
   {%include {{[type]}}-{{[id]}}-summary.xhtml%}
   
+  <p>
+    <b>References</b>
+  </p>
   {%include {{[type]}}-{{[id]}}-xref.xhtml%}
 
+  {% assign intro = site.data.pages[page.path].intro %}
+  {% if site.data.pages[page.path].intro != null %}
+  <div style="display:inline-block">
+  {% include {{intro}} %}
+  </div>
+  {% endif %}
+
   <a name="definition"> </a>
   <h3 id="definition">Content Logical Definition</h3>
 
diff --git a/scripts/onGenerate.qa.xslt b/scripts/onGenerate.qa.xslt
index df94a8b..51019f5 100644
--- a/scripts/onGenerate.qa.xslt
+++ b/scripts/onGenerate.qa.xslt
@@ -9,20 +9,22 @@
     <xsl:apply-templates select="f:definition/f:resource"/>
   </xsl:template>
   <xsl:template match="@*|node()"/>
-  <xsl:template match="f:definition/f:resource[not(f:name)]">
-    <xsl:call-template name="raiseIssue">
-      <xsl:with-param name="severity">error</xsl:with-param>
-      <xsl:with-param name="code">required</xsl:with-param>
-      <xsl:with-param name="details">Unable to find name for the resource.  Names are mandatory to allow proper population of the artifact list.</xsl:with-param>
-      <xsl:with-param name="location" select="concat('ImplementationGuide.definition.resource[', count(preceding::f:resource), ']')"/>
-    </xsl:call-template>
-  </xsl:template>
-  <xsl:template match="f:definition/f:resource[not(f:description)]">
-    <xsl:call-template name="raiseIssue">
-      <xsl:with-param name="severity">warning</xsl:with-param>
-      <xsl:with-param name="code">invariant</xsl:with-param>
-      <xsl:with-param name="details">Unable to find description for the resource.  Descriptions are strongly encouraged to allow proper population of the artifact list.</xsl:with-param>
-      <xsl:with-param name="location" select="concat('ImplementationGuide.definition.resource[', count(preceding::f:resource), ']')"/>
-    </xsl:call-template>
+  <xsl:template match="f:definition/f:resource">
+    <xsl:if test="not(f:name)">
+      <xsl:call-template name="raiseIssue">
+        <xsl:with-param name="severity">error</xsl:with-param>
+        <xsl:with-param name="code">required</xsl:with-param>
+        <xsl:with-param name="details" select="concat('Unable to find name for the resource ', f:reference/f:reference/@value, '.  Names are mandatory to allow proper population of the artifact list.')"/>
+        <xsl:with-param name="location" select="concat('ImplementationGuide.definition.resource[', count(preceding::f:resource), ']')"/>
+      </xsl:call-template>
+    </xsl:if>
+    <xsl:if test="not(f:description)">
+      <xsl:call-template name="raiseIssue">
+        <xsl:with-param name="severity">warning</xsl:with-param>
+        <xsl:with-param name="code">invariant</xsl:with-param>
+        <xsl:with-param name="details" select="concat('Unable to find description for the resource ', f:reference/f:reference/@value, '.  Descriptions are strongly encouraged to allow proper population of the artifact list.')"/>
+        <xsl:with-param name="location" select="concat('ImplementationGuide.definition.resource[', count(preceding::f:resource), ']')"/>
+      </xsl:call-template>
+    </xsl:if>
   </xsl:template>
 </xsl:stylesheet>  
\ No newline at end of file