Simplify script and style tags for modern times

Author: Cito

webware/Examples/AjaxPage.py

@@ -89,7 +89,7 @@ class AjaxPage(BaseClass):
 
     def writeJavaScript(self):
         BaseClass.writeJavaScript(self)
-        s = '<script type="text/javascript" src="ajax{}.js"></script>'
+        s = '<script src="ajax{}.js"></script>'
         self.writeln(s.format('call'))
         if self._clientPolling:
             self.writeln(s.format('poll'))

webware/Examples/AjaxSuggest.py

@@ -26,12 +26,12 @@ class AjaxSuggest(AjaxPage):
     def writeJavaScript(self):
         AjaxPage.writeJavaScript(self)
         self.writeln(
-            '<script type="text/javascript" src="ajaxsuggest.js"></script>')
+            '<script src="ajaxsuggest.js"></script>')
 
     def writeStyleSheet(self):
         AjaxPage.writeStyleSheet(self)
         self.writeln(
-            '<link rel="stylesheet" href="ajaxsuggest.css" type="text/css">')
+            '<link rel="stylesheet" href="ajaxsuggest.css">')
 
     def htBodyArgs(self):
         return AjaxPage.htBodyArgs(self) + ' onload="initPage();"'

webware/Examples/JSONRPCClient.py

@@ -9,8 +9,8 @@ class JSONRPCClient(ExamplePage):
     def writeJavaScript(self):
         ExamplePage.writeJavaScript(self)
         self.write('''\
-            <script type="text/javascript" src="jsonrpc.js"></script>
-            <script type="text/javascript">
+            <script src="jsonrpc.js"></script>
+            <script>
             jsonrpc = new JSONRpcClient("JSONRPCExample");
             methods = jsonrpc.system.listMethods();
             function dojsonrpc() {
@@ -47,7 +47,7 @@ def writeContent(self):
             <input id="parameter" type="text" size="20" value="Hello, World!">
             </td><td>
             <select id="method" size="1">
-            <script type="text/javascript">
+            <script>
             for (m in methods)
                 document.writeln('<option>' + methods[m] + '</option>');
             </script>

webware/Examples/YattagDemo.py

@@ -108,7 +108,7 @@ def writeStyleSheet(self):
 }
             """
             doc, tag, text = Doc().tagtext()
-            with tag('style', klass='text/css'):
+            with tag('style'):
                 text(style)
 
             self.writeln(doc.getvalue())

webware/ExceptionHandler.py

@@ -657,8 +657,7 @@ def docType():
 
 def htStyle():
     """Return the page style."""
-    return '''<style type="text/css">
-<!--
+    return '''<style>
 body {
     background-color: white;
     color: #080810;
@@ -699,7 +698,6 @@ def htStyle():
     color: black;
     font-weight: normal;
 }
--->
 </style>'''
 
 

webware/Page.py

@@ -159,8 +159,7 @@ def writeStyleSheet(self):
 
         A typical implementation is::
 
-            self.writeln('<link rel="stylesheet"'
-                         ' href="StyleSheet.css" type="text/css">')
+            self.writeln('<link rel="stylesheet" href="StyleSheet.css">')
         """
         # base method does nothing
 
@@ -172,8 +171,7 @@ def writeJavaScript(self):
 
         A typical implementation is::
 
-            self.writeln('<script type="text/javascript"'
-                        ' src="ajax.js"></script>')
+            self.writeln('<script src="ajax.js"></script>')
         """
         # base method does nothing
 

webware/SidebarPage.py

@@ -24,7 +24,6 @@ class SidebarPage(Page):
     # region StyleSheet
 
     _styleSheet = '''
-<!--
 html {
   height: 100%;
 }
@@ -121,7 +120,6 @@ class SidebarPage(Page):
 table.NiceTable th a:link, table.NiceTable th a:visited {
     color: #101040;
 }
--->
 '''
 
     def writeStyleSheet(self):
@@ -130,7 +128,7 @@ def writeStyleSheet(self):
         This way we avoid having to care about where an external style
         sheet should be located when this class is used in another context.
         """
-        self.writeln(f'<style type="text/css">{self._styleSheet}</style>')
+        self.writeln(f'<style>{self._styleSheet}</style>')
 
     # endregion StyleSheet
 

webware/Tests/TestEndToEnd/TestExamples.py

@@ -28,7 +28,7 @@ def testStartPage(self):
         r.mustcontain(
             '<html lang="en">', '<head>', '</head>',
             '<title>Welcome</title>', '<meta charset="utf-8">',
-            '<style type="text/css">', 'table.NiceTable {', '</style>',
+            '<style>', 'table.NiceTable {', '</style>',
             '<body style="color:black;background-color:white">', '</body>',
             '<div id="Page">', '<div id="CornerTitle">Webware Examples</div>',
             '<div id="Banner">Welcome</div>', '<div id="Sidebar">',

webware/Tests/TestEndToEnd/TestServer.py

@@ -51,15 +51,13 @@
 <head>
 \s*<title>Welcome</title>
 \s*<meta charset="utf-8">
-<style type="text/css">
-<!--
+<style>
 html {
 }
 h1 { .+; }
 #Page {
 \s*display: table;
 }
--->
 </style>
 </head>
 <body style="color:black;background-color:white">

webware/WebUtils/CGITraceback.py

@@ -48,7 +48,7 @@ def html(context=5, options=None):
     inspect_trace = inspect.trace(context)
 
     javascript = """
-    <script type="text/javascript" language="JavaScript"><!--
+    <script>
     function tag(s) { return '<'+s+'>'; }
     function popup_repr(title, value) {
         w = window.open('', '_blank',
@@ -66,7 +66,6 @@ def html(context=5, options=None):
         w.document.close();
         return false;
     }
-    // -->
     </script>
     """