retspen · retspen · Jun 24, 2019 · Jun 20, 2019 · Jun 21, 2019 · Jun 21, 2019
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM phusion/baseimage:0.9.17
+FROM phusion/baseimage:0.11
 MAINTAINER Jethro Yu <comet.jc@gmail.com>
 
 RUN echo 'APT::Get::Clean=always;' >> /etc/apt/apt.conf.d/99AutomaticClean

diff --git a/conf/requirements.txt b/conf/requirements.txt
@@ -1,7 +1,7 @@
-Django==1.11.20
+Django==1.11.21
 websockify==0.8.0
 gunicorn==19.9.0
 lxml==4.2.5
-libvirt-python==4.10.0
+libvirt-python==5.3.0
 pytz
 rwlock
diff --git a/console/templates/console-base.html b/console/templates/console-base.html
@@ -3,7 +3,7 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <link rel="shortcut icon" href="{% static "img/favicon.ico" %}">
+    <link rel="shortcut icon" href="{% static "favicon.ico" %}">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="{% static "css/bootstrap.min.css" %}">
     <link href="{% static "css/webvirtcloud.css" %}" rel="stylesheet">

diff --git a/console/templates/console-vnc-full.html b/console/templates/console-vnc-full.html
@@ -5,12 +5,9 @@
 {% block head %}
     <!--
     noVNC example: simple example using default UI
-    Copyright (C) 2012 Joel Martin
-    Copyright (C) 2016 Samuel Mannehed for Cendio AB
-    Copyright (C) 2016 Pierre Ossman for Cendio AB
+    Copyright (C) 2018 The noVNC Authors
     noVNC is licensed under the MPL 2.0 (see LICENSE.txt)
     This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
-
     Connect parameters are provided in query string:
         http://example.com/?host=HOST&port=PORT&encrypt=1
     or the fragment:
@@ -20,10 +17,6 @@
 
     <meta charset="utf-8" />
 
-    <!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame
-                Remove this if you use the .htaccess -->
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
-
     <!-- Icons (see Makefile for what the sizes are for) -->
     <link rel="icon" sizes="16x16" type="image/png" href="{% static "js/novnc/app/images/icons/novnc-16x16.png" %}">
     <link rel="icon" sizes="24x24" type="image/png" href="{% static "js/novnc/app/images/icons/novnc-24x24.png" %}">
@@ -140,6 +133,9 @@ <h1 class="noVNC_logo" translate="no"><span>no</span><br />VNC</h1>
                     <input type="image" alt="Alt" src="{% static "js/novnc/app/images/alt.svg" %}"
                         id="noVNC_toggle_alt_button" class="noVNC_button"
                         title="Toggle Alt"/>
+                     <input type="image" alt="Windows" src="{% static "js/novnc/app/images/windows.svg" %}"
+                        id="noVNC_toggle_windows_button" class="noVNC_button"
+                        title="Toggle Windows">
                     <input type="image" alt="Tab" src="{% static "js/novnc/app/images/tab.svg" %}"
                         id="noVNC_send_tab_button" class="noVNC_button"
                         title="Send Tab"/>
@@ -254,6 +250,10 @@ <h1 class="noVNC_logo" translate="no"><span>no</span><br />VNC</h1>
                                 <label for="noVNC_setting_reconnect_delay">Reconnect Delay (ms):</label>
                                 <input id="noVNC_setting_reconnect_delay" type="number" />
                             </li>
+                            <li><hr></li>
+                             <li>
+                                <label><input id="noVNC_setting_show_dot" type="checkbox"> Show Dot when No Cursor</label>
+                            </li>
                             <li><hr></li>
                             <!-- Logging selection dropdown -->
                             <li>

diff --git a/create/templates/create_instance.html b/create/templates/create_instance.html
@@ -689,8 +689,6 @@ <h4 class="modal-title">{% trans "Create Virtual Machine" %} ({{ flavor.label }}
         });
     });
 
-
-
     function get_cust_vols(compute_id, pool) {
         get_vol_url = "/computes/" + compute_id + "/storage/" + pool + "/volumes";
         $.getJSON(get_vol_url, function (data) {
@@ -716,7 +714,7 @@ <h4 class="modal-title">{% trans "Create Virtual Machine" %} ({{ flavor.label }}
 
     }
 
-     function get_disk_bus_choices(compute_id, dev_idx, disk_type){
+    function get_disk_bus_choices(compute_id, dev_idx, disk_type){
         get_diskBus_url = "/computes/" + compute_id + "/disk/" + disk_type + "/buses";
 
         $.getJSON(get_diskBus_url, function (data) {

diff --git a/dev/requirements.txt b/dev/requirements.txt
@@ -1,4 +1,4 @@
 -r ../conf/requirements.txt
 pep8==1.7.1
-pyflakes==2.0.0
-pylint==1.9.2
+pyflakes==2.1.1
+pylint==1.9.4
diff --git a/instances/templates/add_instance_volume.html b/instances/templates/add_instance_volume.html
@@ -84,11 +84,7 @@ <h4 class="modal-title">{% trans "Add Instance Volume" %}</h4>
                                 </div>
                             </div>
                             <div class="modal-footer">
-                                {% ifequal status 5 %}
-                                    <button type="submit" class="btn btn-lg btn-success pull-right" name="add_new_vol">{% trans "Add Volume" %}</button>
-                                {% else %}
-                                    <button class="btn btn-lg btn-success pull-right disabled">{% trans "Add Volume" %}</button>
-                                {% endifequal %}
+                                <button type="submit" class="btn btn-lg btn-success pull-right" name="add_new_vol">{% trans "Add Volume" %}</button>
                             </div>
                         </form>
                         </div>
@@ -142,11 +138,7 @@ <h4 class="modal-title">{% trans "Add Instance Volume" %}</h4>
                                 </div>
                             </div>
                             <div class="modal-footer">
-                                {% ifequal status 5 %}
-                                    <button type="submit" class="btn btn-lg btn-success pull-right" name="add_existing_vol">{% trans "Add Volume" %}</button>
-                                {% else %}
-                                    <button class="btn btn-lg btn-success pull-right disabled">{% trans "Add Volume" %}</button>
-                                {% endifequal %}
+                                 <button type="submit" class="btn btn-lg btn-success pull-right" name="add_existing_vol">{% trans "Add Volume" %}</button>
                             </div>
                         </form>
                         </div>

diff --git a/static/js/novnc/app/error-handler.js b/static/js/novnc/app/error-handler.js
@@ -2,29 +2,31 @@
 // native support in the browsers, so that our error handler
 // can catch script-loading errors.
 
+// No ES6 can be used in this file since it's used for the translation
+/* eslint-disable prefer-arrow-callback */
 
-(function(){
+(function _scope() {
     "use strict";
 
     // Fallback for all uncought errors
-    function handleError (event, err) {
+    function handleError(event, err) {
         try {
-            var msg = document.getElementById('noVNC_fallback_errormsg');
+            const msg = document.getElementById('noVNC_fallback_errormsg');
 
             // Only show the initial error
             if (msg.hasChildNodes()) {
                 return false;
             }
 
-            var div = document.createElement("div");
+            let div = document.createElement("div");
             div.classList.add('noVNC_message');
             div.appendChild(document.createTextNode(event.message));
             msg.appendChild(div);
 
             if (event.filename) {
                 div = document.createElement("div");
                 div.className = 'noVNC_location';
-                var text = event.filename;
+                let text = event.filename;
                 if (event.lineno !== undefined) {
                     text += ":" + event.lineno;
                     if (event.colno !== undefined) {
@@ -35,7 +37,7 @@
                 msg.appendChild(div);
             }
 
-            if (err && (err.stack !== undefined)) {
+            if (err && err.stack) {
                 div = document.createElement("div");
                 div.className = 'noVNC_stack';
                 div.appendChild(document.createTextNode(err.stack));
@@ -51,6 +53,6 @@
         // from being printed to the browser console.
         return false;
     }
-    window.addEventListener('error', function (evt) { handleError(evt, evt.error); });
-    window.addEventListener('unhandledrejection', function (evt) { handleError(evt.reason, evt.reason); });
+    window.addEventListener('error', function onerror(evt) { handleError(evt, evt.error); });
+    window.addEventListener('unhandledrejection', function onreject(evt) { handleError(evt.reason, evt.reason); });
 })();
diff --git a/static/js/novnc/app/images/windows.svg b/static/js/novnc/app/images/windows.svg
diff --git a/static/js/novnc/app/locale/cs.json b/static/js/novnc/app/locale/cs.json
@@ -0,0 +1,71 @@
+{
+    "Connecting...": "Připojení...",
+    "Disconnecting...": "Odpojení...",
+    "Reconnecting...": "Obnova připojení...",
+    "Internal error": "Vnitřní chyba",
+    "Must set host": "Hostitel musí být nastavení",
+    "Connected (encrypted) to ": "Připojení (šifrované) k ",
+    "Connected (unencrypted) to ": "Připojení (nešifrované) k ",
+    "Something went wrong, connection is closed": "Něco se pokazilo, odpojeno",
+    "Failed to connect to server": "Chyba připojení k serveru",
+    "Disconnected": "Odpojeno",
+    "New connection has been rejected with reason: ": "Nové připojení bylo odmítnuto s odůvodněním: ",
+    "New connection has been rejected": "Nové připojení bylo odmítnuto",
+    "Password is required": "Je vyžadováno heslo",
+    "noVNC encountered an error:": "noVNC narazilo na chybu:",
+    "Hide/Show the control bar": "Skrýt/zobrazit ovládací panel",
+    "Move/Drag Viewport": "Přesunout/přetáhnout výřez",
+    "viewport drag": "přesun výřezu",
+    "Active Mouse Button": "Aktivní tlačítka myši",
+    "No mousebutton": "Žádné",
+    "Left mousebutton": "Levé tlačítko myši",
+    "Middle mousebutton": "Prostřední tlačítko myši",
+    "Right mousebutton": "Pravé tlačítko myši",
+    "Keyboard": "Klávesnice",
+    "Show Keyboard": "Zobrazit klávesnici",
+    "Extra keys": "Extra klávesy",
+    "Show Extra Keys": "Zobrazit extra klávesy",
+    "Ctrl": "Ctrl",
+    "Toggle Ctrl": "Přepnout Ctrl",
+    "Alt": "Alt",
+    "Toggle Alt": "Přepnout Alt",
+    "Send Tab": "Odeslat tabulátor",
+    "Tab": "Tab",
+    "Esc": "Esc",
+    "Send Escape": "Odeslat Esc",
+    "Ctrl+Alt+Del": "Ctrl+Alt+Del",
+    "Send Ctrl-Alt-Del": "Poslat Ctrl-Alt-Del",
+    "Shutdown/Reboot": "Vypnutí/Restart",
+    "Shutdown/Reboot...": "Vypnutí/Restart...",
+    "Power": "Napájení",
+    "Shutdown": "Vypnout",
+    "Reboot": "Restart",
+    "Reset": "Reset",
+    "Clipboard": "Schránka",
+    "Clear": "Vymazat",
+    "Fullscreen": "Celá obrazovka",
+    "Settings": "Nastavení",
+    "Shared Mode": "Sdílený režim",
+    "View Only": "Pouze prohlížení",
+    "Clip to Window": "Přizpůsobit oknu",
+    "Scaling Mode:": "Přizpůsobení velikosti",
+    "None": "Žádné",
+    "Local Scaling": "Místní",
+    "Remote Resizing": "Vzdálené",
+    "Advanced": "Pokročilé",
+    "Repeater ID:": "ID opakovače",
+    "WebSocket": "WebSocket",
+    "Encrypt": "Šifrování:",
+    "Host:": "Hostitel:",
+    "Port:": "Port:",
+    "Path:": "Cesta",
+    "Automatic Reconnect": "Automatická obnova připojení",
+    "Reconnect Delay (ms):": "Zpoždění připojení (ms)",
+    "Show Dot when No Cursor": "Tečka místo chybějícího kurzoru myši",
+    "Logging:": "Logování:",
+    "Disconnect": "Odpojit",
+    "Connect": "Připojit",
+    "Password:": "Heslo",
+    "Send Password": "Odeslat heslo",
+    "Cancel": "Zrušit"
+}