webface: w3c validator fixes

9 files changed, 43 insertions, 43 deletions

diff --git a/python/fatcat_web/templates/base.html b/python/fatcat_web/templates/base.html
index c3343652..ccb4e44c 100644
--- a/python/fatcat_web/templates/base.html
+++ b/python/fatcat_web/templates/base.html
@@ -20,17 +20,17 @@
 <header class="ui fixed inverted menu">
   <div class="ui container">
     {% if config.FATCAT_DOMAIN.startswith('qa.') %}
-      <span class="ui left corner orange small label">
-        <div data-tooltip="[QA] environment (data not preserved)" data-position="bottom left"></i>
+      <div class="ui left corner orange small label">
+        <div data-tooltip="[QA] environment (data not preserved)" data-position="bottom left">
           <i class="ui cogs icon"></i>
         </div>
-      </span>
+      </div>
     {% elif config.FATCAT_DOMAIN.startswith('dev.') %}
-      <span class="ui left corner pink small label">
-        <div data-tooltip="[DEV] environment (data not preserved)" data-position="bottom left"></i>
+      <div class="ui left corner pink small label">
+        <div data-tooltip="[DEV] environment (data not preserved)" data-position="bottom left">
           <i class="ui cogs icon"></i>
         </div>
-      </span>
+      </div>
     {% endif %}
     <a href="/" class="header item">
       <!-- <img class="logo" src="assets/images/logo.png"> -->
@@ -40,10 +40,10 @@
     <a href="https://guide.{{ config.FATCAT_DOMAIN }}/" class="item">Guide</a>
     <div class="right menu">
       <div class="item" style="padding: 0;">
-        <form class="" role="search" action="/release/search" method="get">
+        <form class="" action="/release/search" method="get" role="search" aria-label="Papers">
           <div class="ui transparent inverted icon input">
             <i class="search icon" style="padding-right: 2em;"></i>
-            <input type="text" placeholder="Search Papers..." name="q" aria-label="generic entity search" style="border: 1px solid #777 !important; padding: 5px !important; width: 15em;">
+            <input type="text" placeholder="Search Papers..." name="q" style="border: 1px solid #777 !important; padding: 5px !important; width: 15em;">
           </div>
         </form>
       </div>
diff --git a/python/fatcat_web/templates/container_view.html b/python/fatcat_web/templates/container_view.html
index 0eb11d36..1e9a524b 100644
--- a/python/fatcat_web/templates/container_view.html
+++ b/python/fatcat_web/templates/container_view.html
@@ -8,7 +8,7 @@
 <div class="one wide column"></div>
 <div class="fifteen wide column">
   <h1 class="ui header">{{ container.name }}
-  <div class="sub header"><code>container {{ container.ident }}</code></div></h1>
+  <span class="sub header"><code>container {{ container.ident }}</code></span></h1>
 </div>
 </div>
 
@@ -118,7 +118,7 @@
 <b>Lookup Links</b>
 <br><a href="http://www.sherpa.ac.uk/romeo/issn/{{ container.issnl }}/">SHERPA/RoMEO</a> (access policies)
 {% if not container.wikidata_qid %}
-  <br><a href="https://www.wikidata.org/w/index.php?search={{ container.name }}">wikidata.org</a>
+  <br><a href="https://www.wikidata.org/w/index.php?search={{ container.name|urlencode }}">wikidata.org</a>
 {% endif %}
 </div>
 
diff --git a/python/fatcat_web/templates/creator_view.html b/python/fatcat_web/templates/creator_view.html
index 0ddb6899..8f61d74b 100644
--- a/python/fatcat_web/templates/creator_view.html
+++ b/python/fatcat_web/templates/creator_view.html
@@ -8,7 +8,7 @@
 <div class="one wide column"></div>
 <div class="fifteen wide column">
   <h1 class="ui header">{{ creator.display_name }}
-  <div class="sub header"><code>creator {{ creator.ident }}</code></div></h1>
+  <span class="sub header"><code>creator {{ creator.ident }}</code></span></h1>
 </div>
 </div>
 
@@ -61,10 +61,10 @@ This creator has not contributed to any releases.
 {% endif %}
 
 <b>Lookup Links</b>
-<br><a href="https://www.wikidata.org/w/index.php?search=&search={{ creator.display_name }}">wikidata.org</a>
-<br><a href="https://viaf.org/viaf/search?query=local.personalNames%20all%20%22{{ creator.display_name }}">VIAF</a>
-<br><a href="http://dblp.uni-trier.de/search?q={{ creator.display_name }}">dblp</a> (CS)
-<br><a href="https://scholar.google.com/scholar?q={{ creator.display_name }}">Google Scholar</a>
+<br><a href="https://www.wikidata.org/w/index.php?search=&search={{ creator.display_name|urlencode }}">wikidata.org</a>
+<br><a href="https://viaf.org/viaf/search?query=local.personalNames%20all%20%22{{ creator.display_name|urlencode }}">VIAF</a>
+<br><a href="http://dblp.uni-trier.de/search?q={{ creator.display_name|urlencode }}">dblp</a> (CS)
+<br><a href="https://scholar.google.com/scholar?q={{ creator.display_name|urlencode }}">Google Scholar</a>
 </div>
 
 {{ entity_macros.fatcat_bits(entity, "creator", "") }}
diff --git a/python/fatcat_web/templates/file_view.html b/python/fatcat_web/templates/file_view.html
index 780b5bc0..7a428b55 100644
--- a/python/fatcat_web/templates/file_view.html
+++ b/python/fatcat_web/templates/file_view.html
@@ -8,7 +8,7 @@
 <div class="one wide column"></div>
 <div class="fifteen wide column">
   <h1 class="ui header">
-  <div class="sub header"><code>file {{ file.ident }}</code></div></h1>
+  <span class="sub header"><code>file {{ file.ident }}</code></span></h1>
 </div>
 </div>
 
diff --git a/python/fatcat_web/templates/fileset_view.html b/python/fatcat_web/templates/fileset_view.html
index 11f69dd7..ada2ae51 100644
--- a/python/fatcat_web/templates/fileset_view.html
+++ b/python/fatcat_web/templates/fileset_view.html
@@ -8,7 +8,7 @@
 <div class="one wide column"></div>
 <div class="fifteen wide column">
   <h1 class="ui header">
-  <div class="sub header"><code>fileset {{ entity.ident }}</code></div></h1>
+  <span class="sub header"><code>fileset {{ entity.ident }}</code></span></h1>
 </div>
 </div>
 
diff --git a/python/fatcat_web/templates/home.html b/python/fatcat_web/templates/home.html
index 99e91ec3..09dc9b36 100644
--- a/python/fatcat_web/templates/home.html
+++ b/python/fatcat_web/templates/home.html
@@ -14,7 +14,7 @@
 
 <br>
 <h2 class="ui header centered">Cataloging of millions of research publications</h2>
-<form class="" role="search" action="/release/search" method="get" itemprop="potentialAction" itemscope itemtype="https://schema.org/SearchAction">
+<form class="" action="/release/search" method="get" role="search" aria-label="papers" itemprop="potentialAction" itemscope itemtype="https://schema.org/SearchAction">
   <meta itemprop="target" content="https://{{ config.FATCAT_DOMAIN }}/release/search?q={q}"/>
   <div class="ui form">
     <div class="ui action input huge fluid">
@@ -63,10 +63,10 @@ indexing (aka, linking together of pre-prints and final copies).
         <br><a href="/release/aaaaaaaaaaaaarceaaaaaaaaai">Dummy</a>
         <br><a href="/release/aaaaaaaaaaaaarceaaaaaaaaam">Realistic</a>
 {% endif %}
-    <td><form class="" role="lookup" action="/release/lookup" method="get">
+    <td><form class="" action="/release/lookup" method="get" role="search">
           <div class="ui icon input">
             <i class="search icon"></i>
-            <input type="text" placeholder="DOI" name="doi" aria-label="search by DOI">
+            <input type="text" placeholder="DOI" name="doi" aria-label="lookup paper by DOI">
           </div>
         </form>
 <tr><td><b>Container</b>
@@ -81,10 +81,10 @@ indexing (aka, linking together of pre-prints and final copies).
         <br><a href="/container/aaaaaaaaaaaaaeiraaaaaaaaai">Dummy</a>
         <br><a href="/container/aaaaaaaaaaaaaeiraaaaaaaaam">Realistic</a>
 {% endif %}
-    <td><form class="" role="lookup" action="/container/lookup" method="get">
+    <td><form class="" action="/container/lookup" method="get" role="search">
           <div class="ui icon input">
             <i class="search icon"></i>
-            <input type="text" placeholder="ISSN-L" name="issnl" aria-label="search by ISSN-L">
+            <input type="text" placeholder="ISSN-L" name="issnl" aria-label="lookup journal by ISSN-L">
           </div>
         </form>
 
@@ -99,10 +99,10 @@ indexing (aka, linking together of pre-prints and final copies).
         <br><a href="/creator/aaaaaaaaaaaaaircaaaaaaaaai">Dummy</a>
         <br><a href="/creator/aaaaaaaaaaaaaircaaaaaaaaam">Realistic</a>
 {% endif %}
-    <td><form class="" role="lookup" action="/creator/lookup" method="get">
+    <td><form class="" action="/creator/lookup" method="get" role="search">
           <div class="ui icon input">
             <i class="search icon"></i>
-            <input type="text" placeholder="ORCID" name="orcid" aria-label="search by ORCID">
+            <input type="text" placeholder="ORCID" name="orcid" aria-label="lookup author by ORCID">
           </div>
         </form>
 <tr><td><b>File</b>
@@ -116,10 +116,10 @@ indexing (aka, linking together of pre-prints and final copies).
         <br><a href="/file/aaaaaaaaaaaaamztaaaaaaaaai">Dummy</a>
         <br><a href="/file/aaaaaaaaaaaaamztaaaaaaaaam">Realistic</a>
 {% endif %}
-    <td><form class="" role="lookup" action="/file/lookup" method="get">
+    <td><form class="" action="/file/lookup" method="get" role="search">
           <div class="ui icon input">
             <i class="search icon"></i>
-            <input type="text" placeholder="SHA-1" name="sha1" aria-label="search by SHA1">
+            <input type="text" placeholder="SHA-1" name="sha1" aria-label="lookup file by SHA1">
           </div>
         </form>
 {% if config.FATCAT_DOMAIN != 'fatcat.wiki' %}
diff --git a/python/fatcat_web/templates/release_view.html b/python/fatcat_web/templates/release_view.html
index f5035c96..2130c0f7 100644
--- a/python/fatcat_web/templates/release_view.html
+++ b/python/fatcat_web/templates/release_view.html
@@ -71,11 +71,11 @@
 
 {% block fullbody %}
 
-<div class="ui stackable mobile reversed grid centered" itemscope itemtype="http://schema.org/ScholarlyArticle">
+<div class="ui stackable mobile reversed grid centered" itemscope itemtype="http://schema.org/ScholarlyArticle" itemid="#release">
 <div class="one wide column"></div>
 <div class="fifteen wide column">
   <h1 class="ui header"><span itemprop="headline"><span itemprop="name">{{ release.title }}</span></span>
-  <div class="sub header"><code>release {{ release.ident }}</code></div></h1>
+  <span class="sub header"><code>release {{ release.ident }}</code></span></h1>
   <p style="font-size: larger;">
   {% if authors != [] %} by {% endif %}
   {% for contrib in authors[:12] %}
@@ -95,17 +95,17 @@
 <div class="ten wide column" style="font-size: 16px;">
 
 <div class="ui accordion">
-<div class="title" itemprop="isPartOf" itemscope itemtype="http://schema.org/Periodical" itemid="#periodical">
+<div class="title" itemprop="isPartOf" itemscope itemtype="http://schema.org/Periodical" itemid="#container">
   {% if release.release_status == 'published' %}
     <i class="dropdown icon"></i>Published in <a href="/container/{{ container.ident }}"><span itemprop="name">{{ container.name }}</span></a>
   {% else %}
     <i class="dropdown icon"></i>Released as a <i>{{ release.release_type }}</i>
-    {% if container %} in <a href="/container/{{ container.ident }}" itemprop="name">{{ container.name }}</a> {% endif %}
+    {% if container %} in <a href="/container/{{ container.ident }}"><span itemprop="name" itemref="#container">{{ container.name }}</span></a> {% endif %}
   {% endif %}
   {% if release.publisher %}
-    by <span itemprop="publisher">{{ release.publisher }}</span>
+    by <span itemprop="publisher" itemref="#container">{{ release.publisher }}</span>
   {% endif %}
-</div><div class="content" itemscope itemtype="http://schema.org/Periodical" itemid="#periodical">
+</div><div class="content" itemscope itemtype="http://schema.org/Periodical" itemid="#container">
   <table class="ui definition single line fixed compact small collapsing unstackable table">
   <tbody>
     {% if container != None and container.issnl != None %}
@@ -162,7 +162,7 @@
 <tbody>
 {% for contrib in release.contribs %}
   <tr><td class="collapsing">{% if contrib.index or contrib.index == 0 %} {{ contrib.index + 1 }}{% endif %}
-      <td><span itemprop="author">
+      <td><span itemprop="author" itemref="#release">
       {% if contrib.creator_id %}
         <a href="/creator/{{contrib.creator_id}}">{{ contrib.raw_name or 'unknown' }}</a> 
       {% else %}
@@ -323,10 +323,10 @@
     <b>Status</b> &nbsp; <code>{{ release.release_status or 'unknown' }}</code><br>
   {% endif %}
   {% if release.release_date %}
-    <meta itemprop="datePublished" content="{{ release.release_date }}">
+    <meta itemprop="datePublished" itemref="#release" content="{{ release.release_date }}">
     <b>Date</b> &nbsp; {{ release.release_date }}<br>
   {% elif release.release_year %}
-    <meta itemprop="datePublished" content="{{ release.release_year }}">
+    <meta itemprop="datePublished" itemref="#release" content="{{ release.release_year }}">
     <b>Year</b> &nbsp; {{ release.release_year }}<br>
   {% endif %}
   </div>
@@ -335,7 +335,7 @@
 {% if release.doi or release.pmid or release.pmcid or release.wikidata_qid %}
 <div class="ui segment attached" style="word-wrap: break-word;">
 {% if release.doi %}
-  <b>DOI </b> &nbsp;<a href="https://doi.org/{{ release.doi }}" title="{{ release.doi }}" itemprop="sameAs">{{ release.doi }}</a><br>
+  <b>DOI </b> &nbsp;<a href="https://doi.org/{{ release.doi }}" title="{{ release.doi }}" itemprop="sameAs" itemref="#release" >{{ release.doi }}</a><br>
 {% endif %}
 {% if release.pmid != None %}
   <b>PubMed</b> <a href="https://www.ncbi.nlm.nih.gov/pubmed/{{ release.pmid }}">&nbsp;<code>{{ release.pmid }}</code></a><br>
@@ -413,15 +413,15 @@
     <a href="https://openlibrary.org/search?isbn={{ release.isbn13 }}">Open Library</a><br>
     <a href="http://www.worldcat.org/search?q=bn%3A{{ release.isbn13 }}">Worldcat</a><br>
   {% else %}
-    <a href="http://www.worldcat.org/search?qt=worldcat_org_art&q={{ release.title }}">Worldcat</a><br>
+    <a href="http://www.worldcat.org/search?qt=worldcat_org_art&q={{ release.title|urlencode }}">Worldcat</a><br>
   {% endif %}
   {% if release.doi %}
   <a href="https://api.crossref.org/v1/works/http://dx.doi.org/{{ release.doi }}">Crossref Metadata</a> (via API)<br>
   {% endif %}
-  <a href="https://www.wikidata.org/w/index.php?search={{ release.title }}">wikidata.org</a><br>
-  <a href="https://core.ac.uk/search?q={{ release.title }}">CORE.ac.uk</a><br>
-  <a href="https://www.semanticscholar.org/search?q={{ release.title }}">Semantic Scholar</a> (CS, neuro)<br>
-  <a href="https://scholar.google.com/scholar?q={{ release.title }}">Google Scholar</a><br>
+  <a href="https://www.wikidata.org/w/index.php?search={{ release.title|urlencode  }}">wikidata.org</a><br>
+  <a href="https://core.ac.uk/search?q={{ release.title|urlencode  }}">CORE.ac.uk</a><br>
+  <a href="https://www.semanticscholar.org/search?q={{ release.title|urlencode  }}">Semantic Scholar</a> (CS, neuro)<br>
+  <a href="https://scholar.google.com/scholar?q={{ release.title|urlencode  }}">Google Scholar</a><br>
 </div>
 </div>
 
diff --git a/python/fatcat_web/templates/webcapture_view.html b/python/fatcat_web/templates/webcapture_view.html
index 08489fd3..a6c628d9 100644
--- a/python/fatcat_web/templates/webcapture_view.html
+++ b/python/fatcat_web/templates/webcapture_view.html
@@ -11,7 +11,7 @@
   {% if webcapture.original_url %}
     <a href="{{ webcapture.original_url }}" style="color: black;"><code>{{ webcapture.original_url }}</code></a>
   {% endif %}
-  <div class="sub header"><code>webcapture {{ webcapture.ident }}</code></div></h1>
+  <span class="sub header"><code>webcapture {{ webcapture.ident }}</code></span></h1>
 </div>
 </div>
 
diff --git a/python/fatcat_web/templates/work_view.html b/python/fatcat_web/templates/work_view.html
index 7fd2bbb2..7842ec50 100644
--- a/python/fatcat_web/templates/work_view.html
+++ b/python/fatcat_web/templates/work_view.html
@@ -8,7 +8,7 @@
 <div class="one wide column"></div>
 <div class="fifteen wide column">
   <h1 class="ui header">
-  <div class="sub header"><code>work {{ work.ident }}</code></div></h1>
+  <span class="sub header"><code>work {{ work.ident }}</code></span></h1>
 </div>
 </div>