sidenav.html in wai-website-theme-1.2

- old
+ new
@@ -1,26 +1,45 @@
 <!DOCTYPE html>
-<html lang="en" prefix="og: http://ogp.me/ns#">
-  {% include head.html %}
-  <body id="top" class="{% include body-class.html %}">
+<html class="no-js" lang="en" prefix="og: http://ogp.me/ns#">
+  {%- assign timestamp = site.time | date: '%s%N' -%}
+  {%- assign timestamp = '?' | append: timestamp -%}
+  {% include_cached head.html type="start" timestamp=timestamp %}
+  <title>{%if page.doc-note-type == "archived" %}[Archived]{% endif%}{%if page.doc-note-type == "draft" %}[Draft]{% endif%} {{ page.title | escape }} | {{ site.title | escape }} | W3C</title>
+  {% if page.ext_css %}<link rel="stylesheet" href="{{ page.ext_css | prepend: '/css/' | prepend: page.collection | prepend: '/' | relative_url | append: include.timestamp }}">{% endif %}
+  {%- if page.inline_css %}<style>{{ page.inline_css }}</style>{% endif -%}
+  {%- capture seo -%}
+    {%- seo title=false -%}
+  {%- endcapture -%}
+  {{- seo | replace: '<meta name="twitter:card" content="summary" />', '<meta name="twitter:card" content="summary_large_image" />' -}}
+  {%- unless page.image -%}{%- if site.twitter.image -%}{% assign twimage = site.twitter.image -%}{%- else -%}{% assign twimage = '/assets/images/social-sharing-default.jpg' -%}{%- endif -%}
+  <meta name="twitter:image" property="og:image" content="{{ twimage | relative_url | prepend: site.url }}">
+  {%- endunless -%}
+  {% include_cached head.html type="end" %}
+  <body id="top" class="page-{{page.title | slugify}} {% include_cached body-class.html collection=page.collection doc-note-type=page.doc-note-type %}">
     {% include header.html %}
 
-<main id="main" class="default-grid with-gap leftcol" tabindex="-1">
+<div class="default-grid with-gap leftcol">
 
   {% include sidenav.html %}
 
-  <article>
-    <h1>{% if page.title_icon %}<svg class="icon-in-title" aria-hidden="true"><use xlink:href="{{site.github.url}}{{page.title_icon}}"></use></svg> {% endif %}{{ page.title }}</h1>
+  <main id="main"{% if page.lang %} lang="{{page.lang}}"{% endif %}>
+    <h1>{% if page.title_icon %}<svg class="icon-in-title" aria-hidden="true"><use xlink:href="{{page.title_icon | relative_url}}"></use></svg> {% endif %}{% if page.title_html %}{{ page.title_html }}{% else %}{{ page.title }}{% endif %}</h1>
+
+    {%- include doc-note-msg.html -%}
+
     {{ content }}
 
     {% if page.wcag_success_criteria or page.wcag_techniques %}
       {% include resources.html %}
     {% endif %}
 
+    {% include feedback-box.html %}
+
     {% include prevnext.html %}
-  </article>
-  <a class="button button-backtotop" href="#top"><span>{% include_cached icon.html name="arrow-up" %} Back to Top</span></a>
-</main>
+
+    {% include_cached backtotop.html %}
+  </main>
+</div>
 
 {% include footer.html %}
 
   </body>
 </html>