[Kimchi-devel] [PATCH 2/6] Modify spice_auto.html for Kimchi proposals

Fri Oct 10 21:16:52 UTC 2014

The sources were updated according to Kimchi configuration to get the
Javascript and CSS files from the installed spice-html5 package.
Kimchi is not using the default spice_auto.html because Kimchi uses
wss:// for all connections and it is only supported by recent versions of
spice-html5.
In addition to it, Kimchi points user to the right token on URL which
requires a change on spice_auto.html

Signed-off-by: Aline Manera <alinefm at linux.vnet.ibm.com>
---
 ui/spice-html5/pages/spice_auto.html | 76 ++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 29 deletions(-)

diff --git a/ui/spice-html5/pages/spice_auto.html b/ui/spice-html5/pages/spice_auto.html
index 72c5be2..40afea4 100644
--- a/ui/spice-html5/pages/spice_auto.html
+++ b/ui/spice-html5/pages/spice_auto.html
@@ -27,35 +27,45 @@
 <html>
     <head>
 
+        <!--
+         The below sources were updated according to Kimchi configuration
+         to get the Javascript and CSS files from the installed spice-html5
+         package.
+         Kimchi is not using the default spice_auto.html because Kimchi uses
+         wss:// for all connections and it is only supported by recent
+         versions of spice-html5.
+         In addition to it, Kimchi points user to the right token on URL
+         (check line 146 of this file).
+        -->
         <title>Spice Javascript client</title>
-        <script src="spicearraybuffer.js"></script> 
-        <script src="enums.js"></script>
-        <script src="atKeynames.js"></script>
-        <script src="utils.js"></script>
-        <script src="png.js"></script>
-        <script src="lz.js"></script>
-        <script src="quic.js"></script>
-        <script src="bitmap.js"></script>
-        <script src="spicedataview.js"></script>
-        <script src="spicetype.js"></script>
-        <script src="spicemsg.js"></script>
-        <script src="wire.js"></script>
-        <script src="spiceconn.js"></script>
-        <script src="display.js"></script>
-        <script src="main.js"></script>
-        <script src="inputs.js"></script>
-        <script src="webm.js"></script>
-        <script src="playback.js"></script>
-        <script src="simulatecursor.js"></script>
-        <script src="cursor.js"></script>
-        <script src="thirdparty/jsbn.js"></script>
-        <script src="thirdparty/rsa.js"></script>
-        <script src="thirdparty/prng4.js"></script>
-        <script src="thirdparty/rng.js"></script>
-        <script src="thirdparty/sha1.js"></script>
-        <script src="ticket.js"></script>
-        <script src="resize.js"></script>
-        <link rel="stylesheet" type="text/css" href="spice.css" />
+        <script src="spice-html5/spicearraybuffer.js"></script>
+        <script src="spice-html5/enums.js"></script>
+        <script src="spice-html5/atKeynames.js"></script>
+        <script src="spice-html5/utils.js"></script>
+        <script src="spice-html5/png.js"></script>
+        <script src="spice-html5/lz.js"></script>
+        <script src="spice-html5/quic.js"></script>
+        <script src="spice-html5/bitmap.js"></script>
+        <script src="spice-html5/spicedataview.js"></script>
+        <script src="spice-html5/spicetype.js"></script>
+        <script src="spice-html5/spicemsg.js"></script>
+        <script src="spice-html5/wire.js"></script>
+        <script src="spice-html5/spiceconn.js"></script>
+        <script src="spice-html5/display.js"></script>
+        <script src="spice-html5/main.js"></script>
+        <script src="spice-html5/inputs.js"></script>
+        <script src="spice-html5/webm.js"></script>
+        <script src="spice-html5/playback.js"></script>
+        <script src="spice-html5/simulatecursor.js"></script>
+        <script src="spice-html5/cursor.js"></script>
+        <script src="spice-html5/thirdparty/jsbn.js"></script>
+        <script src="spice-html5/thirdparty/rsa.js"></script>
+        <script src="spice-html5/thirdparty/prng4.js"></script>
+        <script src="spice-html5/thirdparty/rng.js"></script>
+        <script src="spice-html5/thirdparty/sha1.js"></script>
+        <script src="spice-html5/ticket.js"></script>
+        <script src="spice-html5/resize.js"></script>
+        <link rel="stylesheet" type="text/css" href="spice-html5/spice.css" />
 
         <script>
             var host = null, port = null;
@@ -125,7 +135,15 @@
                     sc.stop();
                 }
 
-                uri = scheme + host + ":" + port;
+                /*
+                 * The following line was modified from the original one:
+                 *
+                 * 'uri = scheme + host + ":" + port;'
+                 *
+                 * to point Kimchi user to a specific console represented by
+                 * token value.
+                 */
+                uri = scheme + host + ":" + port + "/?token=" + token;
 
                 try
                 {
-- 
1.9.3


