remove xhtml structures; merge changes from www layout to doc layout

rouilj · rouilj · commit 8e68ae0eb18b · 2023-02-15T12:01:44.000-05:00
diff --git a/doc/_templates/layout.html b/doc/_templates/layout.html
@@ -6,8 +6,7 @@
 
 #}
 {%- block doctype -%}
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 {%- endblock %}
 {%- macro relbar(class) %}
     <div class="related {{ class }}">
@@ -82,9 +81,14 @@ <h3>{{ _('Quick search') }}</h3>
     {%- endfor %}
 {%- endmacro %}
 
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    {%- if 'name="description"' not in metatags %}
+      <meta name="description"
+        content="Page {{ pagename }} in documentation on the Roundup issue tracker, version {{ release|e }}.">
+    {%- endif %}
     {{ metatags }}
     {%- if builder != 'htmlhelp' %}
       {%- set titlesuffix = " &mdash; "|safe + docstitle|e %}
diff --git a/website/www/_templates/layout.html b/website/www/_templates/layout.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
-<html lang="en" xmlns="http://www.w3.org/1999/xhtml">
+<html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     {%- if 'name="description"' not in metatags %}
       <meta name="description"
@@ -21,7 +21,6 @@
     {%- endfor %}
     {%- else %}
     <link rel="stylesheet" href="{{ pathto('_static/style.css', 1) }}" type="text/css" />
-
     {%- endif %}
     {%- if builder != 'htmlhelp' %}
     <script type="text/javascript">
