debian/patches/0006-change-source-directory-for-fetching-images-js-files.patch

   1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
   2 From: Dominik Csapak <d.csapak@proxmox.com>
   3 Date: Tue, 17 Jan 2017 17:24:03 +0100
   4 Subject: [PATCH] change source-directory for fetching images/js files
   5
   6 since they will be served from `/novnc/`
   7 also change the directory in the build script
   8
   9 Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
  10 ---
  11  app/ui.js |  4 ++--
  12  vnc.html  | 52 ++++++++++++++++++++++++++--------------------------
  13  2 files changed, 28 insertions(+), 28 deletions(-)
  14
  15 diff --git a/app/ui.js b/app/ui.js
  16 index b40d1f8..f7b7dc4 100644
  17 --- a/app/ui.js
  18 +++ b/app/ui.js
  19 @@ -64,7 +64,7 @@ const UI = {
  20          // Translate the DOM
  21          l10n.translateDOM();
  22
  23 -        fetch('./package.json')
  24 +        fetch('/novnc/package.json')
  25              .then((response) => {
  26                  if (!response.ok) {
  27                      throw Error("" + response.status + " " + response.statusText);
  28 @@ -1768,7 +1768,7 @@ l10n.setup(LINGUAS);
  29  if (l10n.language === "en" || l10n.dictionary !== undefined) {
  30      UI.prime();
  31  } else {
  32 -    fetch('app/locale/' + l10n.language + '.json')
  33 +    fetch('/novnc/app/locale/' + l10n.language + '.json')
  34          .then((response) => {
  35              if (!response.ok) {
  36                  throw Error("" + response.status + " " + response.statusText);
  37 diff --git a/vnc.html b/vnc.html
  38 index 216b33f..8ca4ea4 100644
  39 --- a/vnc.html
  40 +++ b/vnc.html
  41 @@ -22,16 +22,16 @@
  42      <meta name="apple-mobile-web-app-capable" content="yes" />
  43      <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
  44      <!-- Stylesheets -->
  45 -    <link rel="stylesheet" href="app/styles/base.css" />
  46 +    <link rel="stylesheet" href="/novnc/app/styles/base.css" />
  47      <link rel="stylesheet" href="/novnc/app/styles/pve.css" />
  48
  49      <!-- Images that will later appear via CSS -->
  50 -    <link rel="preload" as="image" href="app/images/info.svg">
  51 -    <link rel="preload" as="image" href="app/images/error.svg">
  52 -    <link rel="preload" as="image" href="app/images/warning.svg">
  53 +    <link rel="preload" as="image" href="/novnc/app/images/info.svg">
  54 +    <link rel="preload" as="image" href="/novnc/app/images/error.svg">
  55 +    <link rel="preload" as="image" href="/novnc/app/images/warning.svg">
  56
  57 -    <script src="app/error-handler.js"></script>
  58 -    <script type="module" crossorigin="anonymous" src="app/ui.js"></script>
  59 +    <script src="/novnc/app/error-handler.js"></script>
  60 +    <script type="module" crossorigin="anonymous" src="/novnc/app/ui.js"></script>
  61  </head>
  62
  63  <body>
  64 @@ -55,51 +55,51 @@
  65              <h1 class="noVNC_logo" translate="no"><span>no</span><br>VNC</h1>
  66
  67              <!-- Drag/Pan the viewport -->
  68 -            <input type="image" alt="Drag" src="app/images/drag.svg"
  69 +            <input type="image" alt="Drag" src="/novnc/app/images/drag.svg"
  70                  id="noVNC_view_drag_button" class="noVNC_button noVNC_hidden"
  71                  title="Move/Drag Viewport">
  72
  73              <!--noVNC Touch Device only buttons-->
  74              <div id="noVNC_mobile_buttons">
  75 -                <input type="image" alt="Keyboard" src="app/images/keyboard.svg"
  76 +                <input type="image" alt="Keyboard" src="/novnc/app/images/keyboard.svg"
  77                      id="noVNC_keyboard_button" class="noVNC_button" title="Show Keyboard">
  78              </div>
  79
  80              <!-- Extra manual keys -->
  81 -            <input type="image" alt="Extra keys" src="app/images/toggleextrakeys.svg"
  82 +            <input type="image" alt="Extra keys" src="/novnc/app/images/toggleextrakeys.svg"
  83                  id="noVNC_toggle_extra_keys_button" class="noVNC_button"
  84                  title="Show Extra Keys">
  85              <div class="noVNC_vcenter">
  86              <div id="noVNC_modifiers" class="noVNC_panel">
  87 -                <input type="image" alt="Ctrl" src="app/images/ctrl.svg"
  88 +                <input type="image" alt="Ctrl" src="/novnc/app/images/ctrl.svg"
  89                      id="noVNC_toggle_ctrl_button" class="noVNC_button"
  90                      title="Toggle Ctrl">
  91 -                <input type="image" alt="Alt" src="app/images/alt.svg"
  92 +                <input type="image" alt="Alt" src="/novnc/app/images/alt.svg"
  93                      id="noVNC_toggle_alt_button" class="noVNC_button"
  94                      title="Toggle Alt">
  95 -                <input type="image" alt="Windows" src="app/images/windows.svg"
  96 +                <input type="image" alt="Windows" src="/novnc/app/images/windows.svg"
  97                      id="noVNC_toggle_windows_button" class="noVNC_button"
  98                      title="Toggle Windows">
  99 -                <input type="image" alt="Tab" src="app/images/tab.svg"
 100 +                <input type="image" alt="Tab" src="/novnc/app/images/tab.svg"
 101                      id="noVNC_send_tab_button" class="noVNC_button"
 102                      title="Send Tab">
 103 -                <input type="image" alt="Esc" src="app/images/esc.svg"
 104 +                <input type="image" alt="Esc" src="/novnc/app/images/esc.svg"
 105                      id="noVNC_send_esc_button" class="noVNC_button"
 106                      title="Send Escape">
 107 -                <input type="image" alt="Ctrl+Alt+Del" src="app/images/ctrlaltdel.svg"
 108 +                <input type="image" alt="Ctrl+Alt+Del" src="/novnc/app/images/ctrlaltdel.svg"
 109                      id="noVNC_send_ctrl_alt_del_button" class="noVNC_button"
 110                      title="Send Ctrl-Alt-Del">
 111              </div>
 112              </div>
 113
 114              <!-- Shutdown/Reboot -->
 115 -            <input type="image" alt="Shutdown/Reboot" src="app/images/power.svg"
 116 +            <input type="image" alt="Shutdown/Reboot" src="/novnc/app/images/power.svg"
 117                  id="noVNC_power_button" class="noVNC_button"
 118                  title="Shutdown/Reboot...">
 119              <div class="noVNC_vcenter">
 120              <div id="noVNC_power" class="noVNC_panel">
 121                  <div class="noVNC_heading">
 122 -                    <img alt="" src="app/images/power.svg"> Power
 123 +                    <img alt="" src="/novnc/app/images/power.svg"> Power
 124                  </div>
 125                  <input type="button" id="noVNC_shutdown_button" value="Shutdown">
 126                  <input type="button" id="noVNC_reboot_button" value="Reboot">
 127 @@ -108,13 +108,13 @@
 128              </div>
 129
 130              <!-- Clipboard -->
 131 -            <input type="image" alt="Clipboard" src="app/images/clipboard.svg"
 132 +            <input type="image" alt="Clipboard" src="/novnc/app/images/clipboard.svg"
 133                  id="noVNC_clipboard_button" class="noVNC_button"
 134                  title="Clipboard">
 135              <div class="noVNC_vcenter">
 136              <div id="noVNC_clipboard" class="noVNC_panel">
 137                  <div class="noVNC_heading">
 138 -                    <img alt="" src="app/images/clipboard.svg"> Clipboard
 139 +                    <img alt="" src="/novnc/app/images/clipboard.svg"> Clipboard
 140                  </div>
 141                  <textarea id="noVNC_clipboard_text" rows=5></textarea>
 142                  <br>
 143 @@ -124,19 +124,19 @@
 144              </div>
 145
 146              <!-- Toggle fullscreen -->
 147 -            <input type="image" alt="Fullscreen" src="app/images/fullscreen.svg"
 148 +            <input type="image" alt="Fullscreen" src="/novnc/app/images/fullscreen.svg"
 149                  id="noVNC_fullscreen_button" class="noVNC_button noVNC_hidden"
 150                  title="Fullscreen">
 151
 152              <!-- Settings -->
 153 -            <input type="image" alt="Settings" src="app/images/settings.svg"
 154 +            <input type="image" alt="Settings" src="/novnc/app/images/settings.svg"
 155                  id="noVNC_settings_button" class="noVNC_button"
 156                  title="Settings">
 157              <div class="noVNC_vcenter">
 158              <div id="noVNC_settings" class="noVNC_panel">
 159                  <ul>
 160                      <li class="noVNC_heading">
 161 -                        <img alt="" src="app/images/settings.svg"> Settings
 162 +                        <img alt="" src="/novnc/app/images/settings.svg"> Settings
 163                      </li>
 164                      <li style="display:none;">
 165                          <label><input id="noVNC_setting_shared" type="checkbox"> Shared Mode</label>
 166 @@ -227,7 +227,7 @@
 167              </div>
 168
 169              <!-- Connection Controls -->
 170 -            <input type="image" alt="Disconnect" src="app/images/disconnect.svg"
 171 +            <input type="image" alt="Disconnect" src="/novnc/app/images/disconnect.svg"
 172                  id="noVNC_disconnect_button" class="noVNC_button"
 173                  title="Disconnect">
 174
 175 @@ -246,7 +246,7 @@
 176          <div id="noVNC_connect_dlg">
 177              <div class="noVNC_logo" translate="no"><span>no</span>VNC</div>
 178              <div id="noVNC_connect_button"><div>
 179 -                <img alt="" src="app/images/connect.svg"> Connect
 180 +                <img alt="" src="/novnc/app/images/connect.svg"> Connect
 181              </div></div>
 182          </div>
 183      </div>
 184 @@ -290,8 +290,8 @@
 185      </div>
 186
 187      <audio id="noVNC_bell">
 188 -        <source src="app/sounds/bell.oga" type="audio/ogg">
 189 -        <source src="app/sounds/bell.mp3" type="audio/mpeg">
 190 +        <source src="/novnc/app/sounds/bell.oga" type="audio/ogg">
 191 +        <source src="/novnc/app/sounds/bell.mp3" type="audio/mpeg">
 192      </audio>
 193   </body>
 194  </html>