updated the icon named templates to use a common named template with …

…different parameters.

supports issue #23

icons.xsl

@@ -26,49 +26,77 @@
     xmlns:ns_custom="http://ns.adobe.com/GenericCustomNamespace/1.0/"
     xmlns:ns_adobe_xpath="http://ns.adobe.com/XPath/1.0/">
 
-    <xsl:template name="iconCampaigns">
-      <div class="itemCategoryIcon">
-        <xsl:copy-of select="doc('images/campaign.svg')" />
+    <xsl:template name="iconGeneric">
+      <xsl:param name="class" />
+      <xsl:param name="baseFilename" />
+
+      <div>
+        <xsl:attribute name="class" select="string-join(('itemCategoryIcon', $class), ' ')" />
+        <xsl:copy-of select="doc(concat($baseFilename, '.svg'))" />
       </div>
     </xsl:template>
+
+    <xsl:template name="iconCampaigns">
+      <xsl:call-template name="iconGeneric">
+        <xsl:with-param name="class" select="'iconCampaigns'" />
+        <xsl:with-param name="baseFilename" select="'images/campaign'" />
+      </xsl:call-template>
+    </xsl:template>
+
     <xsl:template name="iconCOAs">
-      <div class="itemCategoryIcon">
-        <xsl:copy-of select="doc('images/course_of_action.svg')" />
-      </div>
+      <xsl:call-template name="iconGeneric">
+        <xsl:with-param name="class" select="'iconCoa'" />
+        <xsl:with-param name="baseFilename" select="'images/course_of_action'" />
+      </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="iconDataMarkings">
-      <div class="itemCategoryIcon">
-        <xsl:copy-of select="doc('images/data_marking.svg')" />
-      </div>
+      <xsl:call-template name="iconGeneric">
+        <xsl:with-param name="class" select="'iconDataMarkings'" />
+        <xsl:with-param name="baseFilename" select="'images/data_marking'" />
+      </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="iconExploitTargets">
-      <div class="itemCategoryIcon">
-        <xsl:copy-of select="doc('images/exploit_target.svg')" />
-      </div>
+      <xsl:call-template name="iconGeneric">
+        <xsl:with-param name="class" select="'iconExploitTargets'" />
+        <xsl:with-param name="baseFilename" select="'images/explit_target'" />
+      </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="iconIncidents">
-      <div class="itemCategoryIcon">
-        <xsl:copy-of select="doc('images/incident.svg')" />
-      </div>
+      <xsl:call-template name="iconGeneric">
+        <xsl:with-param name="class" select="'iconIncident'" />
+        <xsl:with-param name="baseFilename" select="'images/incident'" />
+      </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="iconIndicators">
-      <div class="itemCategoryIcon">
-        <xsl:copy-of select="doc('images/indicator.svg')" />
-      </div>
+      <xsl:call-template name="iconGeneric">
+        <xsl:with-param name="class" select="'iconIndicators'" />
+        <xsl:with-param name="baseFilename" select="'images/indicator'" />
+      </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="iconObservables">
-      <div class="itemCategoryIcon">
-        <xsl:copy-of select="doc('images/observable.svg')" />
-      </div>
+      <xsl:call-template name="iconGeneric">
+        <xsl:with-param name="class" select="'iconObservables'" />
+        <xsl:with-param name="baseFilename" select="'images/observable'" />
+      </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="iconThreatActors">
-      <div class="itemCategoryIcon">
-        <xsl:copy-of select="doc('images/threat_actor.svg')" />
-      </div>
+      <xsl:call-template name="iconGeneric">
+        <xsl:with-param name="class" select="'iconThreatActors'" />
+        <xsl:with-param name="baseFilename" select="'images/threat_actor'" />
+      </xsl:call-template>
     </xsl:template>
+
     <xsl:template name="iconTTPs">
-      <div class="itemCategoryIcon">
-        <xsl:copy-of select="doc('images/ttp.svg')" />
-      </div>
+      <xsl:call-template name="iconGeneric">
+        <xsl:with-param name="class" select="'iconTTPs'" />
+        <xsl:with-param name="baseFilename" select="'images/ttp'" />
+      </xsl:call-template>
     </xsl:template>
+
 </xsl:stylesheet>

stix_to_html.xsl

@@ -74,6 +74,14 @@ [email protected]
     fields, otherwise text descriptions will be flowed like normal html text
   -->
   <xsl:param name="enablePreformattedDescriptions" select="false()" />
+
+  <!--
+    set the style of how svg images to be used for item type icons:
+      * inlineLiteralXml - the svg xml will show up inline in the resulting html document
+      * dataUri          - the svg image will be included in the document via the img element's src attribute using a data uri whose contents are a the base64 encoded version of the gzipped svg
+      * relativeUri      - normal html image style references, e.g. <img src="images/logo.svg" /> 
+  -->
+  <xsl:param name="iconReferenceStyle" select="'inlineLiteralXml'" />
 
   <!--
     do you want to display the constraints in cyboxProperties-style displays?