From 69b955261f43ca4a393b2afa4b98208c8cf4265d Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Mon, 18 Apr 2016 00:25:46 +0200 Subject: [PATCH] Unified VNC/SPICE console interfaces with bootstrap --- console/templates/console-base.html | 127 +++++++ console/templates/console-spice.html | 481 ++++++++++----------------- console/templates/console-vnc.html | 154 +++++---- 3 files changed, 374 insertions(+), 388 deletions(-) create mode 100644 console/templates/console-base.html diff --git a/console/templates/console-base.html b/console/templates/console-base.html new file mode 100644 index 0000000..d0e0e7a --- /dev/null +++ b/console/templates/console-base.html @@ -0,0 +1,127 @@ +{% load i18n %} + + + + + + + + + + +{% block head %}{% endblock %} + + + + + +
+{% block content %}{% endblock %} +
+ + + + + +{% block foot %}{% endblock %} + + diff --git a/console/templates/console-spice.html b/console/templates/console-spice.html index 4704ef3..1a1cbf8 100644 --- a/console/templates/console-spice.html +++ b/console/templates/console-spice.html @@ -1,333 +1,194 @@ +{% extends "console-base.html" %} {% load i18n %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +{% load staticfiles %} +{% block head %} + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - -
-
-
+ } - - - + var password = '{{ console_passwd }}'; + log_info('Connecting ...'); + connect(uri,password); + +{% endblock %} diff --git a/console/templates/console-vnc.html b/console/templates/console-vnc.html index 59d0afa..b0a3334 100644 --- a/console/templates/console-vnc.html +++ b/console/templates/console-vnc.html @@ -1,48 +1,37 @@ +{% extends "console-base.html" %} {% load i18n %} - - - - - - - - -
-
- - - - - -
-
{% trans "Loading..." %}
- 		-
- - - - - +{% load staticfiles %} +{% block head %} + - - -
-
-
+{% endblock %} + +{% block navbarmenu %} + +
  • {% trans "Show Keyboad" %}
    • +{% endblock %} + +{% block content %} +
    {% trans "Canvas not supported." %} -
    +
    + + + + + +{% endblock %} + +{% block foot %} - - +{% endblock %}