]> git.proxmox.com Git - novnc-pve.git/blame_incremental - debian/patches/0006-change-src-directory-for-images-js-files.patch
projects / novnc-pve.git / blame_incremental
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (non-incremental) | history | HEAD
rebase patches on v1.1.0
[novnc-pve.git] / debian / patches / 0006-change-src-directory-for-images-js-files.patch
... / ...
CommitLineData
1From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2From: Dominik Csapak <d.csapak@proxmox.com>
3Date: Tue, 17 Jan 2017 17:24:03 +0100
4Subject: [PATCH 06/12] change src directory for images/js files
5
6since they will be in /novnc/
7also change the directory in the build script
8
9Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
10---
11 app/ui.js | 2 +-
12 vnc.html | 58 +++++++++++++++++++++++++++----------------------------
13 2 files changed, 30 insertions(+), 30 deletions(-)
14
15diff --git a/app/ui.js b/app/ui.js
16index 8cc6cfd..7201179 100644
17--- a/app/ui.js
18+++ b/app/ui.js
19@@ -1713,7 +1713,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);
28diff --git a/vnc.html b/vnc.html
29index 1420849..f93cf89 100644
30--- a/vnc.html
31+++ b/vnc.html
32@@ -22,15 +22,15 @@
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 type="module">
50 window._noVNC_has_module_support = true;
51@@ -39,12 +39,12 @@
52 window.addEventListener("load", function() {
53 if (window._noVNC_has_module_support) return;
54 var loader = document.createElement("script");
55- loader.src = "vendor/browser-es-module-loader/dist/browser-es-module-loader.js";
56+ loader.src = "/novnc/vendor/browser-es-module-loader/dist/browser-es-module-loader.js";
57 document.head.appendChild(loader);
58 });
59 </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@@ -69,51 +69,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="viewport drag" src="app/images/drag.svg"
71+ <input type="image" alt="viewport 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="No mousebutton" src="app/images/mouse_none.svg"
78+ <input type="image" alt="No mousebutton" src="/novnc/app/images/mouse_none.svg"
79 id="noVNC_mouse_button0" class="noVNC_button"
80 title="Active Mouse Button">
81- <input type="image" alt="Left mousebutton" src="app/images/mouse_left.svg"
82+ <input type="image" alt="Left mousebutton" src="/novnc/app/images/mouse_left.svg"
83 id="noVNC_mouse_button1" class="noVNC_button"
84 title="Active Mouse Button">
85- <input type="image" alt="Middle mousebutton" src="app/images/mouse_middle.svg"
86+ <input type="image" alt="Middle mousebutton" src="/novnc/app/images/mouse_middle.svg"
87 id="noVNC_mouse_button2" class="noVNC_button"
88 title="Active Mouse Button">
89- <input type="image" alt="Right mousebutton" src="app/images/mouse_right.svg"
90+ <input type="image" alt="Right mousebutton" src="/novnc/app/images/mouse_right.svg"
91 id="noVNC_mouse_button4" class="noVNC_button"
92 title="Active Mouse Button">
93- <input type="image" alt="Keyboard" src="app/images/keyboard.svg"
94+ <input type="image" alt="Keyboard" src="/novnc/app/images/keyboard.svg"
95 id="noVNC_keyboard_button" class="noVNC_button" title="Show Keyboard">
96 </div>
97
98 <!-- Extra manual keys -->
99 <div id="noVNC_extra_keys">
100- <input type="image" alt="Extra keys" src="app/images/toggleextrakeys.svg"
101+ <input type="image" alt="Extra keys" src="/novnc/app/images/toggleextrakeys.svg"
102 id="noVNC_toggle_extra_keys_button" class="noVNC_button"
103 title="Show Extra Keys">
104 <div class="noVNC_vcenter">
105 <div id="noVNC_modifiers" class="noVNC_panel">
106- <input type="image" alt="Ctrl" src="app/images/ctrl.svg"
107+ <input type="image" alt="Ctrl" src="/novnc/app/images/ctrl.svg"
108 id="noVNC_toggle_ctrl_button" class="noVNC_button"
109 title="Toggle Ctrl">
110- <input type="image" alt="Alt" src="app/images/alt.svg"
111+ <input type="image" alt="Alt" src="/novnc/app/images/alt.svg"
112 id="noVNC_toggle_alt_button" class="noVNC_button"
113 title="Toggle Alt">
114- <input type="image" alt="Windows" src="app/images/windows.svg"
115+ <input type="image" alt="Alt" src="/novnc/app/images/windows.svg"
116 id="noVNC_toggle_windows_button" class="noVNC_button"
117 title="Toggle Windows">
118- <input type="image" alt="Tab" src="app/images/tab.svg"
119+ <input type="image" alt="Tab" src="/novnc/app/images/tab.svg"
120 id="noVNC_send_tab_button" class="noVNC_button"
121 title="Send Tab">
122- <input type="image" alt="Esc" src="app/images/esc.svg"
123+ <input type="image" alt="Esc" src="/novnc/app/images/esc.svg"
124 id="noVNC_send_esc_button" class="noVNC_button"
125 title="Send Escape">
126- <input type="image" alt="Ctrl+Alt+Del" src="app/images/ctrlaltdel.svg"
127+ <input type="image" alt="Ctrl+Alt+Del" src="/novnc/app/images/ctrlaltdel.svg"
128 id="noVNC_send_ctrl_alt_del_button" class="noVNC_button"
129 title="Send Ctrl-Alt-Del">
130 </div>
131@@ -121,13 +121,13 @@
132 </div>
133
134 <!-- Shutdown/Reboot -->
135- <input type="image" alt="Shutdown/Reboot" src="app/images/power.svg"
136+ <input type="image" alt="Shutdown/Reboot" src="/novnc/app/images/power.svg"
137 id="noVNC_power_button" class="noVNC_button"
138 title="Shutdown/Reboot...">
139 <div class="noVNC_vcenter">
140 <div id="noVNC_power" class="noVNC_panel">
141 <div class="noVNC_heading">
142- <img alt="" src="app/images/power.svg"> Power
143+ <img alt="" src="/novnc/app/images/power.svg"> Power
144 </div>
145 <input type="button" id="noVNC_shutdown_button" value="Shutdown">
146 <input type="button" id="noVNC_reboot_button" value="Reboot">
147@@ -136,13 +136,13 @@
148 </div>
149
150 <!-- Clipboard -->
151- <input type="image" alt="Clipboard" src="app/images/clipboard.svg"
152+ <input type="image" alt="Clipboard" src="/novnc/app/images/clipboard.svg"
153 id="noVNC_clipboard_button" class="noVNC_button"
154 title="Clipboard">
155 <div class="noVNC_vcenter">
156 <div id="noVNC_clipboard" class="noVNC_panel">
157 <div class="noVNC_heading">
158- <img alt="" src="app/images/clipboard.svg"> Clipboard
159+ <img alt="" src="/novnc/app/images/clipboard.svg"> Clipboard
160 </div>
161 <textarea id="noVNC_clipboard_text" rows=5></textarea>
162 <br>
163@@ -152,19 +152,19 @@
164 </div>
165
166 <!-- Toggle fullscreen -->
167- <input type="image" alt="Fullscreen" src="app/images/fullscreen.svg"
168+ <input type="image" alt="Fullscreen" src="/novnc/app/images/fullscreen.svg"
169 id="noVNC_fullscreen_button" class="noVNC_button noVNC_hidden"
170 title="Fullscreen">
171
172 <!-- Settings -->
173- <input type="image" alt="Settings" src="app/images/settings.svg"
174+ <input type="image" alt="Settings" src="/novnc/app/images/settings.svg"
175 id="noVNC_settings_button" class="noVNC_button"
176 title="Settings">
177 <div class="noVNC_vcenter">
178 <div id="noVNC_settings" class="noVNC_panel">
179 <ul>
180 <li class="noVNC_heading">
181- <img alt="" src="app/images/settings.svg"> Settings
182+ <img alt="" src="/novnc/app/images/settings.svg"> Settings
183 </li>
184 <li style="display:none;">
185 <label><input id="noVNC_setting_shared" type="checkbox"> Shared Mode</label>
186@@ -241,7 +241,7 @@
187 </div>
188
189 <!-- Connection Controls -->
190- <input type="image" alt="Disconnect" src="app/images/disconnect.svg"
191+ <input type="image" alt="Disconnect" src="/novnc/app/images/disconnect.svg"
192 id="noVNC_disconnect_button" class="noVNC_button"
193 title="Disconnect">
194
195@@ -260,7 +260,7 @@
196 <div id="noVNC_connect_dlg">
197 <div class="noVNC_logo" translate="no"><span>no</span>VNC</div>
198 <div id="noVNC_connect_button"><div>
199- <img alt="" src="app/images/connect.svg"> Connect
200+ <img alt="" src="/novnc/app/images/connect.svg"> Connect
201 </div></div>
202 </div>
203 </div>
204@@ -300,8 +300,8 @@
205 </div>
206
207 <audio id="noVNC_bell">
208- <source src="app/sounds/bell.oga" type="audio/ogg">
209- <source src="app/sounds/bell.mp3" type="audio/mpeg">
210+ <source src="/novnc/app/sounds/bell.oga" type="audio/ogg">
211+ <source src="/novnc/app/sounds/bell.mp3" type="audio/mpeg">
212 </audio>
213 </body>
214 </html>
noVNC package for Provmox VE