From 2aa3b5bc79a6ae33be93985469be27a6b787176f Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Tue, 2 Apr 2019 14:22:34 +0200
Subject: [PATCH] Get rid of self-closing tags

This is a remnant of XHTML and not used in standard HTML. Get rid
of them so that no-one mistakes our files for being XHTML compatible.
---
 vnc.html      | 148 +++++++++++++++++++++++++-------------------------
 vnc_lite.html |   2 +-
 2 files changed, 75 insertions(+), 75 deletions(-)

diff --git a/vnc.html b/vnc.html
index 01e76798..212321bd 100644
--- a/vnc.html
+++ b/vnc.html
@@ -15,40 +15,40 @@
     -->
     <title>noVNC</title>
 
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
 
     <!-- Icons (see app/images/icons/Makefile for what the sizes are for) -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png" />
-    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24x24.png" />
-    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32x32.png" />
-    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48x48.png" />
-    <link rel="icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png" />
-    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64x64.png" />
-    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72x72.png" />
-    <link rel="icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png" />
-    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96x96.png" />
-    <link rel="icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png" />
-    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144x144.png" />
-    <link rel="icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png" />
-    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192x192.png" />
+    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
+    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24x24.png">
+    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32x32.png">
+    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48x48.png">
+    <link rel="icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
+    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64x64.png">
+    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72x72.png">
+    <link rel="icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png">
+    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96x96.png">
+    <link rel="icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
+    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144x144.png">
+    <link rel="icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
+    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192x192.png">
     <!-- Firefox currently mishandles SVG, see #1419039
-    <link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg" />
+    <link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg">
     -->
     <!-- Repeated last so that legacy handling will pick this -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png" />
+    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
 
     <!-- Apple iOS Safari settings -->
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
     <!-- Home Screen Icons (favourites and bookmarks use the normal icons) -->
-    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png" />
-    <link rel="apple-touch-icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png" />
-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png" />
-    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png" />
+    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
+    <link rel="apple-touch-icon" sizes="76x76" type="image/png" href="app/images/icons/novnc-76x76.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
+    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
 
     <!-- Stylesheets -->
-    <link rel="stylesheet" href="app/styles/base.css" />
+    <link rel="stylesheet" href="app/styles/base.css">
 
     <!-- this is included as a normal file in order to catch script-loading errors as well -->
     <script src="app/error-handler.js"></script>
@@ -78,7 +78,7 @@
     <div id="noVNC_fallback_error" class="noVNC_center">
         <div>
             <div>noVNC encountered an error:</div>
-            <br />
+            <br>
             <div id="noVNC_fallback_errormsg"></div>
         </div>
     </div>
@@ -91,56 +91,56 @@
 
             <div class="noVNC_scroll">
 
-            <h1 class="noVNC_logo" translate="no"><span>no</span><br />VNC</h1>
+            <h1 class="noVNC_logo" translate="no"><span>no</span><br>VNC</h1>
 
             <!-- Drag/Pan the viewport -->
             <input type="image" alt="viewport drag" src="app/images/drag.svg"
                 id="noVNC_view_drag_button" class="noVNC_button noVNC_hidden"
-                title="Move/Drag Viewport" />
+                title="Move/Drag Viewport">
 
             <!--noVNC Touch Device only buttons-->
             <div id="noVNC_mobile_buttons">
                 <input type="image" alt="No mousebutton" src="app/images/mouse_none.svg"
                     id="noVNC_mouse_button0" class="noVNC_button"
-                    title="Active Mouse Button" />
+                    title="Active Mouse Button">
                 <input type="image" alt="Left mousebutton" src="app/images/mouse_left.svg"
                     id="noVNC_mouse_button1" class="noVNC_button"
-                    title="Active Mouse Button" />
+                    title="Active Mouse Button">
                 <input type="image" alt="Middle mousebutton" src="app/images/mouse_middle.svg"
                     id="noVNC_mouse_button2" class="noVNC_button"
-                    title="Active Mouse Button" />
+                    title="Active Mouse Button">
                 <input type="image" alt="Right mousebutton" src="app/images/mouse_right.svg"
                     id="noVNC_mouse_button4" class="noVNC_button"
-                    title="Active Mouse Button" />
+                    title="Active Mouse Button">
                 <input type="image" alt="Keyboard" src="app/images/keyboard.svg"
-                    id="noVNC_keyboard_button" class="noVNC_button" title="Show Keyboard" />
+                    id="noVNC_keyboard_button" class="noVNC_button" title="Show Keyboard">
             </div>
 
             <!-- Extra manual keys -->
             <div id="noVNC_extra_keys">
                 <input type="image" alt="Extra keys" src="app/images/toggleextrakeys.svg"
                     id="noVNC_toggle_extra_keys_button" class="noVNC_button"
-                    title="Show Extra Keys" />
+                    title="Show Extra Keys">
                 <div class="noVNC_vcenter">
                 <div id="noVNC_modifiers" class="noVNC_panel">
                     <input type="image" alt="Ctrl" src="app/images/ctrl.svg"
                         id="noVNC_toggle_ctrl_button" class="noVNC_button"
-                        title="Toggle Ctrl" />
+                        title="Toggle Ctrl">
                     <input type="image" alt="Alt" src="app/images/alt.svg"
                         id="noVNC_toggle_alt_button" class="noVNC_button"
-                        title="Toggle Alt" />
+                        title="Toggle Alt">
                     <input type="image" alt="Windows" src="app/images/windows.svg"
                         id="noVNC_toggle_windows_button" class="noVNC_button"
-                        title="Toggle Windows" />
+                        title="Toggle Windows">
                     <input type="image" alt="Tab" src="app/images/tab.svg"
                         id="noVNC_send_tab_button" class="noVNC_button"
-                        title="Send Tab" />
+                        title="Send Tab">
                     <input type="image" alt="Esc" src="app/images/esc.svg"
                         id="noVNC_send_esc_button" class="noVNC_button"
-                        title="Send Escape" />
+                        title="Send Escape">
                     <input type="image" alt="Ctrl+Alt+Del" src="app/images/ctrlaltdel.svg"
                         id="noVNC_send_ctrl_alt_del_button" class="noVNC_button"
-                        title="Send Ctrl-Alt-Del" />
+                        title="Send Ctrl-Alt-Del">
                 </div>
                 </div>
             </div>
@@ -148,58 +148,58 @@
             <!-- Shutdown/Reboot -->
             <input type="image" alt="Shutdown/Reboot" src="app/images/power.svg"
                 id="noVNC_power_button" class="noVNC_button"
-                title="Shutdown/Reboot..." />
+                title="Shutdown/Reboot...">
             <div class="noVNC_vcenter">
             <div id="noVNC_power" class="noVNC_panel">
                 <div class="noVNC_heading">
-                    <img alt="" src="app/images/power.svg" /> Power
+                    <img alt="" src="app/images/power.svg"> Power
                 </div>
-                <input type="button" id="noVNC_shutdown_button" value="Shutdown" />
-                <input type="button" id="noVNC_reboot_button" value="Reboot" />
-                <input type="button" id="noVNC_reset_button" value="Reset" />
+                <input type="button" id="noVNC_shutdown_button" value="Shutdown">
+                <input type="button" id="noVNC_reboot_button" value="Reboot">
+                <input type="button" id="noVNC_reset_button" value="Reset">
             </div>
             </div>
 
             <!-- Clipboard -->
             <input type="image" alt="Clipboard" src="app/images/clipboard.svg"
                 id="noVNC_clipboard_button" class="noVNC_button"
-                title="Clipboard" />
+                title="Clipboard">
             <div class="noVNC_vcenter">
             <div id="noVNC_clipboard" class="noVNC_panel">
                 <div class="noVNC_heading">
-                    <img alt="" src="app/images/clipboard.svg" /> Clipboard
+                    <img alt="" src="app/images/clipboard.svg"> Clipboard
                 </div>
                 <textarea id="noVNC_clipboard_text" rows=5></textarea>
-                <br />
+                <br>
                 <input id="noVNC_clipboard_clear_button" type="button"
-                    value="Clear" class="noVNC_submit" />
+                    value="Clear" class="noVNC_submit">
             </div>
             </div>
 
             <!-- Toggle fullscreen -->
             <input type="image" alt="Fullscreen" src="app/images/fullscreen.svg"
                 id="noVNC_fullscreen_button" class="noVNC_button noVNC_hidden"
-                title="Fullscreen" />
+                title="Fullscreen">
 
             <!-- Settings -->
             <input type="image" alt="Settings" src="app/images/settings.svg"
                 id="noVNC_settings_button" class="noVNC_button"
-                title="Settings" />
+                title="Settings">
             <div class="noVNC_vcenter">
             <div id="noVNC_settings" class="noVNC_panel">
                 <ul>
                     <li class="noVNC_heading">
-                        <img alt="" src="app/images/settings.svg" /> Settings
+                        <img alt="" src="app/images/settings.svg"> Settings
                     </li>
                     <li>
-                        <label><input id="noVNC_setting_shared" type="checkbox" /> Shared Mode</label>
+                        <label><input id="noVNC_setting_shared" type="checkbox"> Shared Mode</label>
                     </li>
                     <li>
-                        <label><input id="noVNC_setting_view_only" type="checkbox" /> View Only</label>
+                        <label><input id="noVNC_setting_view_only" type="checkbox"> View Only</label>
                     </li>
-                    <li><hr /></li>
+                    <li><hr></li>
                     <li>
-                        <label><input id="noVNC_setting_view_clip" type="checkbox" /> Clip to Window</label>
+                        <label><input id="noVNC_setting_view_clip" type="checkbox"> Clip to Window</label>
                     </li>
                     <li>
                         <label for="noVNC_setting_resize">Scaling Mode:</label>
@@ -209,47 +209,47 @@
                             <option value="remote">Remote Resizing</option>
                         </select>
                     </li>
-                    <li><hr /></li>
+                    <li><hr></li>
                     <li>
                         <div class="noVNC_expander">Advanced</div>
                         <div><ul>
                             <li>
                                 <label for="noVNC_setting_repeaterID">Repeater ID:</label>
-                                <input id="noVNC_setting_repeaterID" type="text" value="" />
+                                <input id="noVNC_setting_repeaterID" type="text" value="">
                             </li>
                             <li>
                                 <div class="noVNC_expander">WebSocket</div>
                                 <div><ul>
                                     <li>
-                                        <label><input id="noVNC_setting_encrypt" type="checkbox" /> Encrypt</label>
+                                        <label><input id="noVNC_setting_encrypt" type="checkbox"> Encrypt</label>
                                     </li>
                                     <li>
                                         <label for="noVNC_setting_host">Host:</label>
-                                        <input id="noVNC_setting_host" />
+                                        <input id="noVNC_setting_host">
                                     </li>
                                     <li>
                                         <label for="noVNC_setting_port">Port:</label>
-                                        <input id="noVNC_setting_port" type="number" />
+                                        <input id="noVNC_setting_port" type="number">
                                     </li>
                                     <li>
                                         <label for="noVNC_setting_path">Path:</label>
-                                        <input id="noVNC_setting_path" type="text" value="websockify" />
+                                        <input id="noVNC_setting_path" type="text" value="websockify">
                                     </li>
                                 </ul></div>
                             </li>
-                            <li><hr /></li>
+                            <li><hr></li>
                             <li>
-                                <label><input id="noVNC_setting_reconnect" type="checkbox" /> Automatic Reconnect</label>
+                                <label><input id="noVNC_setting_reconnect" type="checkbox"> Automatic Reconnect</label>
                             </li>
                             <li>
                                 <label for="noVNC_setting_reconnect_delay">Reconnect Delay (ms):</label>
-                                <input id="noVNC_setting_reconnect_delay" type="number" />
+                                <input id="noVNC_setting_reconnect_delay" type="number">
                             </li>
-                            <li><hr /></li>
+                            <li><hr></li>
                             <li>
-                                <label><input id="noVNC_setting_show_dot" type="checkbox" /> Show Dot when No Cursor</label>
+                                <label><input id="noVNC_setting_show_dot" type="checkbox"> Show Dot when No Cursor</label>
                             </li>
-                            <li><hr /></li>
+                            <li><hr></li>
                             <!-- Logging selection dropdown -->
                             <li>
                                 <label>Logging:
@@ -266,7 +266,7 @@
             <!-- Connection Controls -->
             <input type="image" alt="Disconnect" src="app/images/disconnect.svg"
                 id="noVNC_disconnect_button" class="noVNC_button"
-                title="Disconnect" />
+                title="Disconnect">
 
             </div>
         </div>
@@ -283,7 +283,7 @@
         <div id="noVNC_connect_dlg">
             <div class="noVNC_logo" translate="no"><span>no</span>VNC</div>
             <div id="noVNC_connect_button"><div>
-                <img alt="" src="app/images/connect.svg" /> Connect
+                <img alt="" src="app/images/connect.svg"> Connect
             </div></div>
         </div>
     </div>
@@ -294,10 +294,10 @@
         <ul>
             <li>
                 <label>Password:</label>
-                <input id="noVNC_password_input" type="password" />
+                <input id="noVNC_password_input" type="password">
             </li>
             <li>
-                <input id="noVNC_password_button" type="submit" value="Send Password" class="noVNC_submit" />
+                <input id="noVNC_password_button" type="submit" value="Send Password" class="noVNC_submit">
             </li>
         </ul>
     </form></div>
@@ -307,7 +307,7 @@
     <div id="noVNC_transition">
         <div id="noVNC_transition_text"></div>
         <div>
-        <input type="button" id="noVNC_cancel_reconnect_button" value="Cancel" class="noVNC_submit" />
+        <input type="button" id="noVNC_cancel_reconnect_button" value="Cancel" class="noVNC_submit">
         </div>
         <div class="noVNC_spinner"></div>
     </div>
@@ -323,8 +323,8 @@
     </div>
 
     <audio id="noVNC_bell">
-        <source src="app/sounds/bell.oga" type="audio/ogg" />
-        <source src="app/sounds/bell.mp3" type="audio/mpeg" />
+        <source src="app/sounds/bell.oga" type="audio/ogg">
+        <source src="app/sounds/bell.mp3" type="audio/mpeg">
     </audio>
  </body>
 </html>
diff --git a/vnc_lite.html b/vnc_lite.html
index 1012a475..426d79b3 100644
--- a/vnc_lite.html
+++ b/vnc_lite.html
@@ -16,7 +16,7 @@
     -->
     <title>noVNC</title>
 
-    <meta charset="utf-8" />
+    <meta charset="utf-8">
 
     <style>