From f8d9a6f3154911238870b8e77cc79a7a8b6fb021 Mon Sep 17 00:00:00 2001 From: Dominik Csapak Date: Tue, 7 Mar 2017 11:18:19 +0100 Subject: [PATCH] generate index.html.tpl from vnc.html we do not want to have the html for novnc in the pve-manager package, so we have it in the novnc-pve package as a template, which we will load using Template::Toolkit the changes are copied from NoVncIndex.pm from pve-manager/PVE/ Signed-off-by: Dominik Csapak --- Makefile | 1 + debian/install | 1 + debian/patches/customize-html-tpl.diff | 207 +++++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 210 insertions(+) create mode 100644 debian/patches/customize-html-tpl.diff diff --git a/Makefile b/Makefile index b6e1777..9ddde44 100644 --- a/Makefile +++ b/Makefile @@ -25,6 +25,7 @@ ${DEB}: ${TARSRC} tar xf ${NOVNCSRC} cp -a debian ${NOVNCDIR}/debian cp ${NOVNCDIR}/include/ui.js ${NOVNCDIR}/pveui.js + cp ${NOVNCDIR}/vnc.html ${NOVNCDIR}/index.html.tpl # fix file permissions chmod 0644 ${NOVNCDIR}/include/jsunzip.js echo "git clone git://git.proxmox.com/git/novnc-pve.git\\ngit checkout ${GITVERSION}" > ${NOVNCDIR}/debian/SOURCE diff --git a/debian/install b/debian/install index 2594cec..e272398 100644 --- a/debian/install +++ b/debian/install @@ -20,3 +20,4 @@ include/Orbitron700.ttf /usr/share/novnc-pve/include include/Orbitron700.woff /usr/share/novnc-pve/include include/keysym.js /usr/share/novnc-pve/include include/inflator.js /usr/share/novnc-pve/include +index.html.tpl /usr/share/novnc-pve diff --git a/debian/patches/customize-html-tpl.diff b/debian/patches/customize-html-tpl.diff new file mode 100644 index 0000000..46e38d3 --- /dev/null +++ b/debian/patches/customize-html-tpl.diff @@ -0,0 +1,207 @@ +--- a/index.html.tpl ++++ b/index.html.tpl +@@ -1,18 +1,7 @@ + + + +- +- +- noVNC ++ [% nodename %] - Proxmox Console + + + +@@ -22,46 +11,39 @@ + + + +- +- +- +- +- +- +- +- +- + +- +- +- +- +- ++ + ++ [% IF langfile %] ++ ++ [% ELSE %] ++ ++ [% END %] ++ + + + +
+ +
+- +
+- +- +- +- +- + +
+- +- +- ++ +- +- +- +- ++ +
+ +- +- +
+- noVNC is a browser based VNC client implemented using HTML5 Canvas +- and WebSockets. You will either need a VNC server with WebSockets +- support (such as libvncserver) +- or you will need to use +- websockify +- to bridge between your browser and VNC server. See the noVNC +- README +- and website +- for more information. +-
+- +
+ + +@@ -142,14 +104,11 @@ + value="Clear"> +
+ +- +-
+- +- +- +- +- +-
++ ++
++ ++ ++
+ + +
+@@ -191,6 +150,12 @@ + +
+ ++ ++
++ ++ ++
++ + +
+
    +@@ -215,8 +180,8 @@ +
+ +
+- +- ++ ++ + + + diff --git a/debian/patches/series b/debian/patches/series index c12bbac..ad0f372 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ +customize-html-tpl.diff pveui.patch fix-base-css.patch fix-ie11-resize.patch -- 2.39.2