use consistent HTML framing

n-gist · Oct 13, 2022 · 64c0c9e · 64c0c9e
1 parent 05de70f
commit 64c0c9e
Show file tree

Hide file tree

Showing 98 changed files with 408 additions and 286 deletions.
diff --git a/TODO b/TODO
@@ -7,10 +7,6 @@ missing licence:
 - auto_tests/tests/update_options.js
 https://github.com/danvk/dygraphs/issues/1024
 
-missing usage of SSI, maybe? sync anyway:
-- gallery/index.html
-- … others in gallery/tests/…?
-
 site generation is a pita
 - symlinks
 - extras (src/src-es5 is not actually needed)

diff --git a/auto_tests/coverage.html b/auto_tests/coverage.html
@@ -1,17 +1,19 @@
+<!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8">
+  <meta charset="UTF-8">
   <title>dygraphs tests</title>
-  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
-  <link rel="stylesheet" href="../css/dygraph.css" />
+
+  <link rel="stylesheet" type="text/css" href="../node_modules/mocha/mocha.css" />
+  <link rel="stylesheet" type="text/css" href="../css/dygraph.css" />
 </head>
 <body>
   <div id="graph"></div>
   <div id="mocha"></div>
 
   <!-- Mocha -->
-  <script src="../node_modules/mocha/mocha.js"></script>
-  <script src="../node_modules/chai/chai.js"></script>
+  <script type="text/javascript" src="../node_modules/mocha/mocha.js"></script>
+  <script type="text/javascript" src="../node_modules/chai/chai.js"></script>
   <script type="text/javascript"><!--//--><![CDATA[//><!--
   if (window.initMochaPhantomJS) {
     window.initMochaPhantomJS();
@@ -44,13 +46,13 @@
     });
   }
   //--><!]]></script>
-  <script>mocha.setup('bdd')</script>
+  <script type="text/javascript">mocha.setup('bdd')</script>
 
   <!-- Test data -->
-  <script src="data/data.js"></script>
+  <script type="text/javascript" src="data/data.js"></script>
 
   <!-- Bundled tests -->
-  <script src="../coverage/tests.js"></script>
+  <script type="text/javascript" src="../coverage/tests.js"></script>
 
   <script type="text/javascript"><!--//--><![CDATA[//><!--
     mocha.checkLeaks();

diff --git a/auto_tests/runner.html b/auto_tests/runner.html
@@ -1,17 +1,19 @@
+<!DOCTYPE html>
 <html>
 <head>
-  <meta charset="utf-8">
+  <meta charset="UTF-8">
   <title>dygraphs tests</title>
-  <link rel="stylesheet" href="../node_modules/mocha/mocha.css" />
-  <link rel="stylesheet" href="../css/dygraph.css" />
+
+  <link rel="stylesheet" type="text/css" href="../node_modules/mocha/mocha.css" />
+  <link rel="stylesheet" type="text/css" href="../css/dygraph.css" />
 </head>
 <body>
   <div id="graph"></div>
   <div id="mocha"></div>
 
   <!-- Mocha -->
-  <script src="../node_modules/mocha/mocha.js"></script>
-  <script src="../node_modules/chai/chai.js"></script>
+  <script type="text/javascript" src="../node_modules/mocha/mocha.js"></script>
+  <script type="text/javascript" src="../node_modules/chai/chai.js"></script>
   <script type="text/javascript"><!--//--><![CDATA[//><!--
   if (window.initMochaPhantomJS) {
     window.initMochaPhantomJS();
@@ -44,13 +46,13 @@
     });
   }
   //--><!]]></script>
-  <script>mocha.setup('bdd')</script>
+  <script type="text/javascript">mocha.setup('bdd')</script>
 
   <!-- Test data -->
-  <script src="data/data.js"></script>
+  <script type="text/javascript" src="data/data.js"></script>
 
   <!-- Bundled tests -->
-  <script src="../dist/tests.js"></script>
+  <script type="text/javascript" src="../dist/tests.js"></script>
 
   <script type="text/javascript"><!--//--><![CDATA[//><!--
     mocha.checkLeaks();

diff --git a/docs/header.html b/docs/header.html
@@ -1,15 +1,16 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Dygraphs — <!--#echo var="pagetitle" --></title>
-    <script src=".jslibs/jquery.min.js"></script>
-    <link rel="stylesheet" href=".jslibs/bootstrap.min.css">
-    <link rel="stylesheet" href="site.css">
-    <link rel="stylesheet" href="dist/dygraph.css">
 
-    <script src=".jslibs/bootstrap.min.js"></script>
+    <link rel="stylesheet" type="text/css" href=".jslibs/bootstrap.min.css" />
+    <link rel="stylesheet" type="text/css" href="dist/dygraph.css" />
+    <link rel="stylesheet" type="text/css" href="site.css" />
+
+    <script type="text/javascript" src=".jslibs/jquery.min.js"></script>
+    <script type="text/javascript" src=".jslibs/bootstrap.min.js"></script>
     <script type="text/javascript" src="dist/dygraph.min.js"></script>
   </head>
   <body>

diff --git a/gallery/index.html b/gallery/index.html
@@ -1,54 +1,55 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="UTF-8">
     <title>Dygraphs Gallery</title>
-    <link rel="stylesheet" href="../dist/dygraph.css" />
 
-    <script src="../dist/dygraph.js"></script>
-    <script src="../extras/synchronizer.js"></script>
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
+    <link rel="stylesheet" type="text/css" href="../common/textarea.css" />
+    <link rel="stylesheet" type="text/css" href="gallery.css" title="gallery" />
 
-    <script src="../.jslibs/jquery.min.js"></script>
-    <script src="../common/textarea.js"></script>
-    <script src="gallery.js"></script>
-    <script src="data.js"></script>
-    <script src="interaction-api.js"></script>
+    <script type="text/javascript" src="../.jslibs/jquery.min.js"></script>
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
+    <script type="text/javascript" src="../extras/synchronizer.js"></script>
+    <script type="text/javascript" src="../common/textarea.js"></script>
+    <script type="text/javascript" src="gallery.js"></script>
+    <script type="text/javascript" src="data.js"></script>
+    <script type="text/javascript" src="interaction-api.js"></script>
 
     <!-- gallery entries. Can these be auto-loaded? -->
-    <script src="annotations.js"></script>
-    <script src="drawing.js"></script>
-    <script src="dynamic-update.js"></script>
-    <script src="highlighted-series.js"></script>
-    <script src="highlighted-region.js"></script>
-    <script src="highlighted-weekends.js"></script>
-    <script src="independent-series.js"></script>
-    <script src="plotter.js"></script>
-    <script src="link-interaction.js"></script>
-    <script src="per-series.js"></script>
-    <script src="synchronize.js"></script>
-    <script src="range-selector.js"></script>
-    <script src="resize.js"></script>
-    <script src="stock.js"></script>
-    <script src="styled-chart-labels.js"></script>
-    <script src="temperature-sf-ny.js"></script>
-    <script src="interaction.js"></script>
-    <script src="linear-regression.js"></script>
+    <script type="text/javascript" src="annotations.js"></script>
+    <script type="text/javascript" src="drawing.js"></script>
+    <script type="text/javascript" src="dynamic-update.js"></script>
+    <script type="text/javascript" src="highlighted-series.js"></script>
+    <script type="text/javascript" src="highlighted-region.js"></script>
+    <script type="text/javascript" src="highlighted-weekends.js"></script>
+    <script type="text/javascript" src="independent-series.js"></script>
+    <script type="text/javascript" src="plotter.js"></script>
+    <script type="text/javascript" src="link-interaction.js"></script>
+    <script type="text/javascript" src="per-series.js"></script>
+    <script type="text/javascript" src="synchronize.js"></script>
+    <script type="text/javascript" src="range-selector.js"></script>
+    <script type="text/javascript" src="resize.js"></script>
+    <script type="text/javascript" src="stock.js"></script>
+    <script type="text/javascript" src="styled-chart-labels.js"></script>
+    <script type="text/javascript" src="temperature-sf-ny.js"></script>
+    <script type="text/javascript" src="interaction.js"></script>
+    <script type="text/javascript" src="linear-regression.js"></script>
 
     <!-- These might not remain in the gallery
-    <script src="dygraph-simple.js"></script>
-    <script src="demo.js"></script>
-    <script src="border.js"></script>
-    <script src="callbacks.js"></script>
-    <script src="color-cycle.js"></script>
-    <script src="color-visibility.js"></script>
-    <script src="two-axes.js"></script>
-    <script src="number-format.js"></script>
-    <script src="no-range.js"></script>
-    <script src="negative.js"></script>
-    <script src="annotations-gviz.js"></script>
-    <script src="annotations-native.js"></script>
+    <script type="text/javascript" src="dygraph-simple.js"></script>
+    <script type="text/javascript" src="demo.js"></script>
+    <script type="text/javascript" src="border.js"></script>
+    <script type="text/javascript" src="callbacks.js"></script>
+    <script type="text/javascript" src="color-cycle.js"></script>
+    <script type="text/javascript" src="color-visibility.js"></script>
+    <script type="text/javascript" src="two-axes.js"></script>
+    <script type="text/javascript" src="number-format.js"></script>
+    <script type="text/javascript" src="no-range.js"></script>
+    <script type="text/javascript" src="negative.js"></script>
+    <script type="text/javascript" src="annotations-gviz.js"></script>
+    <script type="text/javascript" src="annotations-native.js"></script>
     -->
-    <link rel="stylesheet" type="text/css" href="../common/textarea.css"/>
-    <link title="gallery" rel="stylesheet" type="text/css" href="gallery.css"/>
   </head>
   <body>
     <table>

diff --git a/tests/annotation-gviz.html b/tests/annotation-gviz.html
@@ -1,6 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta charset="UTF-8">
+    <title>Google Visualisations annotations</title>
+
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
     <script type="text/javascript" src="../dist/dygraph.js"></script>
 
     <script type="text/javascript" src="https://www.google.com/jsapi"></script>

diff --git a/tests/annotation-native.html b/tests/annotation-native.html
@@ -1,8 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>Native format annotations</title>
+
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
     <script type="text/javascript" src="../dist/dygraph.js"></script>
   </head>
   <body>
@@ -35,5 +37,5 @@
         text: 'Marker'
       }]);
     //--><!]]></script>
-</body>
+  </body>
 </html>
diff --git a/tests/annotation.html b/tests/annotation.html
@@ -1,8 +1,10 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>demo</title>
+
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
     <script type="text/javascript" src="../dist/dygraph.js"></script>
 
     <style type="text/css">
@@ -174,5 +176,5 @@ <h3>Annotations Demo</h3>
         }
       });
     //--><!]]></script>
-</body>
+  </body>
 </html>
diff --git a/tests/border.html b/tests/border.html
@@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>gadget border</title>
-    <script type="text/javascript" src="../dist/dygraph.js"></script>
 
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
     <script type="text/javascript" src="data.js"></script>
+
     <style type="text/css">
     #bordered {
       border: 1px solid red;

diff --git a/tests/callback.html b/tests/callback.html
@@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>callbacks</title>
-    <script type="text/javascript" src="../dist/dygraph.js"></script>
 
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
     <script type="text/javascript" src="data.js"></script>
+
     <style type="text/css">
       #div_g {
         position: absolute;

diff --git a/tests/century-scale.html b/tests/century-scale.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>demo</title>
-    <script type="text/javascript" src="../dist/dygraph.js"></script>
 
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
   </head>
   <body>
     <h2>Demo</h2>
@@ -36,5 +37,5 @@ <h2>Demo</h2>
               }
           );
     //--><!]]></script>
-</body>
+  </body>
 </html>
diff --git a/tests/charting-combinations.html b/tests/charting-combinations.html
@@ -1,10 +1,13 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>Charting combinations</title>
+
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
     <script type="text/javascript" src="../dist/dygraph.js"></script>
     <script type="text/javascript" src="data.js"></script>
+
     <style type="text/css">
       .chart {
         width: 600px;
@@ -86,6 +89,5 @@
       });
     });
   //--><!]]></script>
-
   </body>
 </html>
diff --git a/tests/color-cycle.html b/tests/color-cycle.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>color cycles</title>
-    <script type="text/javascript" src="../dist/dygraph.js"></script>
 
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
   </head>
   <body>
     <p>Different color cycles</p>

diff --git a/tests/color-visibility.html b/tests/color-visibility.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>color visibility</title>
-    <script type="text/javascript" src="../dist/dygraph.js"></script>
 
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
   </head>
   <body>
     <p>The lines should maintain their colors as their visibility is toggled.</p>

diff --git a/tests/connect-separated.html b/tests/connect-separated.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>connect separated</title>
-    <script type="text/javascript" src="../dist/dygraph.js"></script>
 
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
   </head>
   <body>
     <p>Connecting separated points.  All three of the series should have their points

diff --git a/tests/crosshair.html b/tests/crosshair.html
@@ -1,10 +1,11 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <link rel="stylesheet" href="../dist/dygraph.css">
+    <meta charset="UTF-8">
     <title>crosshairs</title>
-    <script type="text/javascript" src="../dist/dygraph.js"></script>
 
+    <link rel="stylesheet" type="text/css" href="../dist/dygraph.css" />
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
     <script type="text/javascript" src="../extras/crosshair.js"></script>
     <script type="text/javascript" src="data.js"></script>
   </head>