Minor RDFa cleanups

I changed the XMLSchema prefix to the example used by the W3c "xsd"
instead of the random other sites example "xmls".

More importantly the content tag is content and not contents so
the places I was trying to replace the human readable value with
a standardized number or date were being ignored.

Lastly I figured out how to get django 1.1 to spit out a
XMLSchema#dateTime value. (which is not XMLSchema#datetime value)

diff --git a/htsworkflow/frontend/templates/base.html b/htsworkflow/frontend/templates/base.html
index ba17cbda121d2c2bf6dd646df4c85450d01f77e9..22dad4bfea6f13007bfedded02373a82e3ee9800 100644 (file)
--- a/htsworkflow/frontend/templates/base.html
+++ b/htsworkflow/frontend/templates/base.html
@@ -5,7 +5,7 @@
       version="XHTML+RDFa 1.0"
       xmlns:xml="http://www.w3.org/1999/xhtml"
       xmlns:dc="http://purl.org/dc/elements/1.1/"
-      xmlns:xmls="http://www.w3.org/2001/XMLSchema#"
+      xmlns:xsd="http://www.w3.org/2001/XMLSchema#"
       xmlns:libns="http://jumpgate.caltech.edu/wiki/LibraryOntology#"
       xml:lang="en"
 >

diff --git a/htsworkflow/frontend/templates/samples/library_detail.html b/htsworkflow/frontend/templates/samples/library_detail.html
index 1bbd65b2986caf766d832ac8fd86b294d992b8a5..d0731032d1190c3278f2dbc8cdf1a8b8a6d7cb01 100644 (file)
--- a/htsworkflow/frontend/templates/samples/library_detail.html
+++ b/htsworkflow/frontend/templates/samples/library_detail.html
@@ -98,7 +98,7 @@
     <span property="libns:made_by">{{ lib.made_by }}</span>
   <br/>
   <b>Creation Date</b>
-    <span property="libns:creation_date">{{ lib.creation_date }}</span>
+    <span property="libns:creation_date" content="{{result.creation_date|date:'Y-m-d\TH:i:s'}}" datatype="xsd:dateTime">{{ lib.creation_date }}</span>
   <br/> 
   <b>Protocol Stopping Point</b>
     <span property="libns:stopping_point">{{ lib.stopping_point_name }}</span>
@@ -129,7 +129,7 @@
   <tbody>
     {% for result in eland_results %}
     <tr about="/flowcell/{{result.flowcell_id}}/lane/{{result.lane}}">
-      <td property="libns:run_date" contents="{{result.run_date}}" datatype="xmls:datetime">{{ result.run_date|date}}</td>
+      <td property="libns:sequencing_run_date" content="{{result.run_date|date:'Y-m-d\TH:i:s'}}" datatype="xsd:dateTime">{{ result.run_date|date}}</td>
       <td>{{ result.cycle }}</td>
       <td property="libns:flowcell_id">{{ result.flowcell_id }}</td>
       <td property="libns:lane">{{ result.lane }}</td>
@@ -201,7 +201,7 @@
         <td>{{ lane.match_codes.U0|intcomma }}</td>
         <td>{{ lane.match_codes.U1|intcomma }}</td>
         <td>{{ lane.match_codes.U2|intcomma }}</td>
-        <td property="libns:sequence_unique_location" contents="{{lane.unique_reads}}" datatype="xmls:decimal">{{ lane.unique_reads|intcomma }}</td>
+        <td {% if lane.unique_reads %}property="libns:total_unique_locations" content="{{lane.unique_reads}}" datatype="xsd:decimal"{% endif %}>{{ lane.unique_reads|intcomma }}</td>
         <td>{{ lane.match_codes.R0|intcomma }}</td>
         <td>{{ lane.match_codes.R1|intcomma }}</td>
         <td>{{ lane.match_codes.R2|intcomma }}</td>