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