From 75c4a9e05a3ae02a62fa84f7313bfbc9b2503f8c Mon Sep 17 00:00:00 2001 From: Adam Glasgall Date: Thu, 14 Jun 2018 22:04:31 -0400 Subject: [PATCH] Fix hostname in generated JNLP file and address code review feedback --- code/main.py | 1 - code/templates/vnc.mako | 3 ++- code/templates/vnc_jnlp.mako | 5 +++-- debian/changelog | 12 ++++++++++++ 4 files changed, 17 insertions(+), 4 deletions(-) diff --git a/code/main.py b/code/main.py index 59a31f8..b4e659e 100755 --- a/code/main.py +++ b/code/main.py @@ -319,7 +319,6 @@ console will suffer artifacts. @cherrypy.expose @cherrypy.tools.mako(filename="/vnc.mako") - def vnc(self, machine_id): """VNC applet page""" return self._vnc(machine_id) diff --git a/code/templates/vnc.mako b/code/templates/vnc.mako index b7b6857..1c9afbc 100644 --- a/code/templates/vnc.mako +++ b/code/templates/vnc.mako @@ -20,5 +20,6 @@ Console to ${machine.name} -You must have Java enabled in your browser to use the VNC console applet. If your browser does not support Java, but you do have a Java Runtime Environment installed, try clicking here to launch the VNC console via Java Web Start. +You must have Java enabled in your browser to use the VNC console applet. +

If your browser does not support Java, but you do have a Java Runtime Environment installed, try clicking here to launch the VNC console via Java Web Start.

diff --git a/code/templates/vnc_jnlp.mako b/code/templates/vnc_jnlp.mako index 60f3269..66884ba 100644 --- a/code/templates/vnc_jnlp.mako +++ b/code/templates/vnc_jnlp.mako @@ -1,4 +1,4 @@ - + XVM Java Console Invirt Project @@ -14,7 +14,8 @@ - + diff --git a/debian/changelog b/debian/changelog index 58385e6..43113e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +invirt-web (0.1.53) precise; urgency=medium + + * Fix hostname of URL in codebase in vnc_jnlp.mako + * Move the "try in javaws" text on vnc.mako outside the applet tag so + it's accessible even if the user has the java plugin and it's + disabled. + * Add documentbase attribute to applet-desc tag in vnc_jnlp.mako, so + that the "login again" button does something for people whose javaws + knows how to talk to their browser. + + -- Adam Glasgall Thu, 14 Jun 2018 22:01:19 -0400 + invirt-web (0.1.53~glasgall1) precise; urgency=medium * Add Java Web Start support for Java HVM console as a stopgap until we -- 1.7.9.5