Merge branch 'master' of https://github.com/FHIR/sample-ig

_genonce.bat

@@ -1,5 +1,5 @@
 @ECHO OFF
-SET publisher_jar=org.hl7.fhir.publisher.jar
+SET publisher_jar=publisher.jar
 SET input_cache_path=%CD%\input-cache
 
 ECHO Checking internet connection...

_genonce.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-publisher_jar=org.hl7.fhir.publisher.jar
+publisher_jar=publisher.jar
 input_cache_path=./input-cache/
 echo Checking internet connection...
 curl -sSf tx.fhir.org > /dev/null

_updatePublisher.bat

@@ -2,8 +2,8 @@
 
 SETLOCAL
 
-SET dlurl=https://storage.googleapis.com/ig-build/org.hl7.fhir.publisher.jar
+SET dlurl=https://github.com/HL7/fhir-ig-publisher/releases/latest/download/publisher.jar
-SET publisher_jar=org.hl7.fhir.publisher.jar
+SET publisher_jar=publisher.jar
 SET input_cache_path=%CD%\input-cache\
 SET skipPrompts=false
 

_updatePublisher.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
-dlurl=https://storage.googleapis.com/ig-build/org.hl7.fhir.publisher.jar
+dlurl=https://github.com/HL7/fhir-ig-publisher/releases/latest/download/publisher.jar
-publisher_jar=org.hl7.fhir.publisher.jar
+publisher_jar=publisher.jar
 input_cache_path=./input-cache/
 
 set -e
@@ -58,7 +58,7 @@ fi
 if [[ "$FORCE" == true ]] || [[ "$response" =~ ^([yY])$ ]]; then
 	echo "Downloading most recent publisher to $jarlocationname - it's ~100 MB, so this may take a bit"
 #	wget "https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.publisher.jar" -O "$jarlocation" 
-	curl $dlurl -o "$jarlocation" --create-dirs
+	curl -L $dlurl -o "$jarlocation" --create-dirs
 else
 	echo cancel...
 fi

templates/liquid/Library.liquid

@@ -307,7 +307,7 @@
         {% if c.contentType = 'text/cql' %}
         <tr>
           <table>
-            <tr><th><b>Content: </b> {{c.contentType}}</th></tr>
+            <tr><th><a id="cql-content"><b>Content: </b></a> {{c.contentType}}</th></tr>
             <tr><td><pre><code>{{c.data.decode('base64').escape('html')}}</code></pre></td></tr>
           </table>
         </tr>