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  | 50 +++++++++++++++++++++++++-------------------------
  13  2 files changed, 27 insertions(+), 27 deletions(-)
  14
  15 diff --git a/app/ui.js b/app/ui.js
  16 index ef2c77f..1605565 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 -        WebUtil.fetchJSON('./package.json')
  24 +        WebUtil.fetchJSON('/novnc/package.json')
  25              .then((packageInfo) => {
  26                  Array.from(document.getElementsByClassName('noVNC_version')).forEach(el => el.innerText = packageInfo.version);
  27              })
  28 @@ -1767,7 +1767,7 @@ l10n.setup(LINGUAS);
  29  if (l10n.language === "en" || l10n.dictionary !== undefined) {
  30      UI.prime();
  31  } else {
  32 -    WebUtil.fetchJSON('app/locale/' + l10n.language + '.json')
  33 +    WebUtil.fetchJSON('/novnc/app/locale/' + l10n.language + '.json')
  34          .then((translations) => { l10n.dictionary = translations; })
  35          .catch(err => Log.Error("Failed to load translations: " + err))
  36          .then(UI.prime);
  37 diff --git a/vnc.html b/vnc.html
  38 index 12db665..396ded8 100644
  39 --- a/vnc.html
  40 +++ b/vnc.html
  41 @@ -26,19 +26,19 @@
  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      <!-- this is included as a normal file in order to catch script-loading errors as well -->
  50 -    <script src="app/error-handler.js"></script>
  51 +    <script src="/novnc/app/error-handler.js"></script>
  52
  53      <!-- begin scripts -->
  54      <!-- promise polyfills promises for IE11 -->
  55 -    <script src="vendor/promise.js"></script>
  56 +    <script src="/novnc/vendor/promise.js"></script>
  57      <!-- ES2015/ES6 modules polyfill -->
  58 -    <script nomodule src="vendor/browser-es-module-loader/dist/browser-es-module-loader.js"></script>
  59 +    <script nomodule src="/novnc/vendor/browser-es-module-loader/dist/browser-es-module-loader.js"></script>
  60      <!-- actual script modules -->
  61 -    <script type="module" crossorigin="anonymous" src="app/ui.js"></script>
  62 +    <script type="module" crossorigin="anonymous" src="/novnc/app/ui.js"></script>
  63      <!-- end scripts -->
  64  </head>
  65
  66 @@ -63,51 +63,51 @@
  67              <h1 class="noVNC_logo" translate="no"><span>no</span><br>VNC</h1>
  68
  69              <!-- Drag/Pan the viewport -->
  70 -            <input type="image" alt="Drag" src="app/images/drag.svg"
  71 +            <input type="image" alt="Drag" src="/novnc/app/images/drag.svg"
  72                  id="noVNC_view_drag_button" class="noVNC_button noVNC_hidden"
  73                  title="Move/Drag Viewport">
  74
  75              <!--noVNC Touch Device only buttons-->
  76              <div id="noVNC_mobile_buttons">
  77 -                <input type="image" alt="Keyboard" src="app/images/keyboard.svg"
  78 +                <input type="image" alt="Keyboard" src="/novnc/app/images/keyboard.svg"
  79                      id="noVNC_keyboard_button" class="noVNC_button" title="Show Keyboard">
  80              </div>
  81
  82              <!-- Extra manual keys -->
  83 -            <input type="image" alt="Extra keys" src="app/images/toggleextrakeys.svg"
  84 +            <input type="image" alt="Extra keys" src="/novnc/app/images/toggleextrakeys.svg"
  85                  id="noVNC_toggle_extra_keys_button" class="noVNC_button"
  86                  title="Show Extra Keys">
  87              <div class="noVNC_vcenter">
  88              <div id="noVNC_modifiers" class="noVNC_panel">
  89 -                <input type="image" alt="Ctrl" src="app/images/ctrl.svg"
  90 +                <input type="image" alt="Ctrl" src="/novnc/app/images/ctrl.svg"
  91                      id="noVNC_toggle_ctrl_button" class="noVNC_button"
  92                      title="Toggle Ctrl">
  93 -                <input type="image" alt="Alt" src="app/images/alt.svg"
  94 +                <input type="image" alt="Alt" src="/novnc/app/images/alt.svg"
  95                      id="noVNC_toggle_alt_button" class="noVNC_button"
  96                      title="Toggle Alt">
  97 -                <input type="image" alt="Windows" src="app/images/windows.svg"
  98 +                <input type="image" alt="Windows" src="/novnc/app/images/windows.svg"
  99                      id="noVNC_toggle_windows_button" class="noVNC_button"
 100                      title="Toggle Windows">
 101 -                <input type="image" alt="Tab" src="app/images/tab.svg"
 102 +                <input type="image" alt="Tab" src="/novnc/app/images/tab.svg"
 103                      id="noVNC_send_tab_button" class="noVNC_button"
 104                      title="Send Tab">
 105 -                <input type="image" alt="Esc" src="app/images/esc.svg"
 106 +                <input type="image" alt="Esc" src="/novnc/app/images/esc.svg"
 107                      id="noVNC_send_esc_button" class="noVNC_button"
 108                      title="Send Escape">
 109 -                <input type="image" alt="Ctrl+Alt+Del" src="app/images/ctrlaltdel.svg"
 110 +                <input type="image" alt="Ctrl+Alt+Del" src="/novnc/app/images/ctrlaltdel.svg"
 111                      id="noVNC_send_ctrl_alt_del_button" class="noVNC_button"
 112                      title="Send Ctrl-Alt-Del">
 113              </div>
 114              </div>
 115
 116              <!-- Shutdown/Reboot -->
 117 -            <input type="image" alt="Shutdown/Reboot" src="app/images/power.svg"
 118 +            <input type="image" alt="Shutdown/Reboot" src="/novnc/app/images/power.svg"
 119                  id="noVNC_power_button" class="noVNC_button"
 120                  title="Shutdown/Reboot...">
 121              <div class="noVNC_vcenter">
 122              <div id="noVNC_power" class="noVNC_panel">
 123                  <div class="noVNC_heading">
 124 -                    <img alt="" src="app/images/power.svg"> Power
 125 +                    <img alt="" src="/novnc/app/images/power.svg"> Power
 126                  </div>
 127                  <input type="button" id="noVNC_shutdown_button" value="Shutdown">
 128                  <input type="button" id="noVNC_reboot_button" value="Reboot">
 129 @@ -116,13 +116,13 @@
 130              </div>
 131
 132              <!-- Clipboard -->
 133 -            <input type="image" alt="Clipboard" src="app/images/clipboard.svg"
 134 +            <input type="image" alt="Clipboard" src="/novnc/app/images/clipboard.svg"
 135                  id="noVNC_clipboard_button" class="noVNC_button"
 136                  title="Clipboard">
 137              <div class="noVNC_vcenter">
 138              <div id="noVNC_clipboard" class="noVNC_panel">
 139                  <div class="noVNC_heading">
 140 -                    <img alt="" src="app/images/clipboard.svg"> Clipboard
 141 +                    <img alt="" src="/novnc/app/images/clipboard.svg"> Clipboard
 142                  </div>
 143                  <textarea id="noVNC_clipboard_text" rows=5></textarea>
 144                  <br>
 145 @@ -132,19 +132,19 @@
 146              </div>
 147
 148              <!-- Toggle fullscreen -->
 149 -            <input type="image" alt="Fullscreen" src="app/images/fullscreen.svg"
 150 +            <input type="image" alt="Fullscreen" src="/novnc/app/images/fullscreen.svg"
 151                  id="noVNC_fullscreen_button" class="noVNC_button noVNC_hidden"
 152                  title="Fullscreen">
 153
 154              <!-- Settings -->
 155 -            <input type="image" alt="Settings" src="app/images/settings.svg"
 156 +            <input type="image" alt="Settings" src="/novnc/app/images/settings.svg"
 157                  id="noVNC_settings_button" class="noVNC_button"
 158                  title="Settings">
 159              <div class="noVNC_vcenter">
 160              <div id="noVNC_settings" class="noVNC_panel">
 161                  <ul>
 162                      <li class="noVNC_heading">
 163 -                        <img alt="" src="app/images/settings.svg"> Settings
 164 +                        <img alt="" src="/novnc/app/images/settings.svg"> Settings
 165                      </li>
 166                      <li style="display:none;">
 167                          <label><input id="noVNC_setting_shared" type="checkbox"> Shared Mode</label>
 168 @@ -235,7 +235,7 @@
 169              </div>
 170
 171              <!-- Connection Controls -->
 172 -            <input type="image" alt="Disconnect" src="app/images/disconnect.svg"
 173 +            <input type="image" alt="Disconnect" src="/novnc/app/images/disconnect.svg"
 174                  id="noVNC_disconnect_button" class="noVNC_button"
 175                  title="Disconnect">
 176
 177 @@ -254,7 +254,7 @@
 178          <div id="noVNC_connect_dlg">
 179              <div class="noVNC_logo" translate="no"><span>no</span>VNC</div>
 180              <div id="noVNC_connect_button"><div>
 181 -                <img alt="" src="app/images/connect.svg"> Connect
 182 +                <img alt="" src="/novnc/app/images/connect.svg"> Connect
 183              </div></div>
 184          </div>
 185      </div>
 186 @@ -298,8 +298,8 @@
 187      </div>
 188
 189      <audio id="noVNC_bell">
 190 -        <source src="app/sounds/bell.oga" type="audio/ogg">
 191 -        <source src="app/sounds/bell.mp3" type="audio/mpeg">
 192 +        <source src="/novnc/app/sounds/bell.oga" type="audio/ogg">
 193 +        <source src="/novnc/app/sounds/bell.mp3" type="audio/mpeg">
 194      </audio>
 195   </body>
 196  </html>