footer.html in wai-website-theme-1.2

- old
+ new
@@ -1,40 +1,68 @@
-{% assign col = site.collections | where: "label", page.collection | first %}
-{% unless page.nopagefooter %}
-<footer class="page-footer default-grid">
+{%- assign col = site.collections | where: "label", page.collection | first -%}
+{% if col.footer %}
+<footer class="page-footer default-grid" aria-label="Page">
   <div class="inner">
-    <p>
-      <strong>Updated:</strong> {{page.date | date: "%-d %B %Y"}}<br>
-      <strong>{{page.people.editorslabel}}:</strong> {% for p in page.people.editors%}<a href="{{p.url}}">{{p.name}}</a>{% if forloop.last %}.{% else %}, {% endif %}{% endfor %} <strong>Developed by the <a href="https://www.w3.org/WAI/EO/">Education and Outreach Working Group (EOWG)</a></strong>{% if page.support %} with support from {% for s in page.support%}{% unless forloop.first %}{% if forloop.last %}and {% endif %}{% endunless %}the <a href="{{s.url}}">{{s.name}}</a>{% if forloop.last %}.{% else %}, {% endif %}{% endfor %}{% endif %} {% if col.acknowledgements %}{% assign ackurl = page.collection | append: "/acknowledgements/" | prepend: site.github.url %}<a href="/{{ackurl}}">Acknowledgements</a>.{% endif %}
-    </p>
+    {{col.footer}}
   </div>
 </footer>
-{% endunless %}
+{% else %}
+  {% if page.footer %}
+  <footer class="page-footer default-grid" aria-label="Page">
+    <div class="inner">
+      {{page.footer}}
+    </div>
+  </footer>
+  {% endif %}
+{% endif %}
 
-<footer class="site-footer grid-4q">
-  <div class="q1-start q2-end">
-    <p><a class="largelink" href="https://w3.org/WAI/">Web Accessibility Initiative</a></p>
-    <p>Strategies, guidelines, resources to make the web accessible to people with disabilities</p>
-    <p>Copyright © 2017 W3C® (MIT, ERCIM, Keio, Beihang). Usage policies apply.</p>
-  </div>
-  <div class="q3-start q3-end">
-    <div class="footer-list-header">
-      Give Us Feedback
+<footer class="site-footer grid-4q" aria-label="Site">
+  <div class="q1-start q3-end about">
+    <div>
+      <p><a class="largelink" href="https://w3.org/WAI/">W3C Web Accessibility Initiative (WAI)</a></p>
+      <p>Strategies, standards, and supporting resources to make the Web accessible to people with disabilities.</p>
     </div>
-    <ul>
-      <li><a href="#">Publicly Archived List</a></li>
-      <li><a href="#">WAI Staff-only List</a></li>
-    </ul>
+    <div>
+      <p>Copyright &#xA9; {{ 'now' | date: "%Y" }} W3C <sup>&#xAE;</sup> (<a href="http://www.csail.mit.edu/"><abbr title="Massachusetts Institute of Technology">MIT</abbr></a>, <a href="http://www.ercim.eu/"><abbr title="European Research Consortium for Informatics and Mathematics">ERCIM</abbr></a>, <a href="http://www.keio.ac.jp/">Keio</a>, <a href="http://ev.buaa.edu.cn/">Beihang</a>) <a href="{{ "/about/using-wai-material/" | relative_url }}">Permission to Use WAI Material</a>.</p>
+    </div>
   </div>
   <div class="q4-start q4-end">
     <ul>
-      <li><a href="{{ site.github.url }}/wai/contact/">Contact WAI</a></li>
-      <li><a href="{{ site.github.url }}/sitemap/">Site Index</a></li>
-      <li><a href="{{ site.github.url }}/wai/get-involved/">Help with the WAI Website</a></li>
-      <li><a href="{{ site.github.url }}/privacy/">Privacy Statements</a></li>
+      <li><a href="{{ "/about/contacting/" | relative_url }}">Contact WAI</a></li>
+      <li><a href="{{ "/sitemap/" | relative_url }}">Site Map</a></li>
+      <li><a href="{{ "/news/" | relative_url }}">News</a></li>
+      <li><a href="{{ "/sitemap/#archive" | relative_url }}">Archive</a></li>
+      <li><a href="{{ "/about/accessibility-statement/" | relative_url }}">Accessibility Statement</a></li>
+      <li><a href="{{ "/roles/" | relative_url }}">Resources for Roles</a></li>
     </ul>
   </div>
 </footer>
+{%- unless site.published == true -%}
 <section class="default-grid info" tabindex="0">
-  <p class="inner">{% include_cached icon.html name="info" %} This is an unpublished draft preview. Please refer to our published website at <a href="https://www.w3.org/WAI/">w3.org/WAI/</a>.
+  <p class="inner">{% if site.warning_icon %}{% include_cached icon.html name="info" %} {% endif %}{% if site.warning_message %}{{site.warning_message}}{% else %}This is an unpublished draft preview that might include content that is not yet approved. The published website is at <a href="https://www.w3.org/WAI/">w3.org/WAI/</a>.{% endif %}
   </p>
-</section>
\ No newline at end of file
+</section>
+{%- endunless -%}
+<!-- Details4Everybody -->
+<script src="{{ '/assets/scripts/details4everybody.js' | append: timestamp | relative_url }}"></script>
+<!-- SVG4Everybody -->
+<script src="{{ '/assets/scripts/svg4everybody.js' | append: timestamp | relative_url }}"></script>
+<script>
+  svg4everybody();
+</script>
+<!-- Matomo -->
+<script>
+  var _paq = _paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["setDoNotTrack", true]);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//www.w3.org/analytics/piwik/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '328']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="//www.w3.org/analytics/piwik/piwik.php?idsite=328&rec=1" style="border:0;" alt="" /></p></noscript>
+<!-- End Matomo Code -->