From 94048ba2fec3aec92d2eb4a71801f2b75721f5b9 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Sat, 27 Oct 2018 12:21:00 +0200
Subject: [PATCH] Show percentage as a whole number, clarify strings

---
 basic/srv/vm/static/js/admin.js            | 16 +++++++++++-----
 basic/srv/vm/templates/setup-apps-row.html |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/basic/srv/vm/static/js/admin.js b/basic/srv/vm/static/js/admin.js
index 93fca95..f154dfc 100644
--- a/basic/srv/vm/static/js/admin.js
+++ b/basic/srv/vm/static/js/admin.js
@@ -166,7 +166,8 @@ function install_app(ev) {
 }
 
 function uninstall_app(ev) {
-    if (confirm('Do you really want to uninstall this application?')) {
+    var app = $(ev.target).closest('tr').children().first().text()
+    if (confirm('Opravdu chcete tuto odinstalovat aplikaci '+app+'?')) {
         return _do_app('uninstall', ev);
     }
     return false;
@@ -175,11 +176,16 @@ function uninstall_app(ev) {
 function check_progress() {
     var progress = $('#install-progress');
     if (progress.length) {
+        var td = progress.closest('td');
         var tr = progress.closest('tr');
         $.post('/get-install-progress', {'app': tr.data('app')}, function(data) {
             if (data.progress) {
-                var value = Math.max(0.1, Math.min(data.progress / progress.data('total') * 100, 99.9));
-                progress.text(parseFloat(value).toFixed(1));
+                var value = parseInt(Math.max(1, data.progress / progress.data('total') * 100));
+                if (value < 100) {
+                    progress.text(parseInt(value));
+                } else {
+                    td.text('Instaluje se')
+                }
             } else {
                 tr.replaceWith(data.ok);
             }
@@ -210,14 +216,14 @@ function _do_vm(action) {
 }
 
 function reboot_vm() {
-    if (confirm('Do you really want to reboot VM?')) {
+    if (confirm('Opravdu chcete restartovat VM?')) {
         _do_vm('reboot');
     }
     return false;
 }
 
 function shutdown_vm() {
-    if (confirm('Do you really want to shutdown VM?')) {
+    if (confirm('Opravdu chcete vypnout VM?')) {
         _do_vm('shutdown');
     }
     return false;
diff --git a/basic/srv/vm/templates/setup-apps-row.html b/basic/srv/vm/templates/setup-apps-row.html
index b7bd6d7..3edcea3 100644
--- a/basic/srv/vm/templates/setup-apps-row.html
+++ b/basic/srv/vm/templates/setup-apps-row.html
@@ -2,6 +2,6 @@
     <td>{{ app_title }}</td>
     <td class="center"><input type="checkbox" class="app-visible"{% if app not in conf['apps'] %} disabled{% elif conf['apps'][app]['visible'] %} checked{% endif %}></td>
     <td class="center"><input type="checkbox" class="app-autostart"{% if app not in conf['apps'] %} disabled{% elif is_service_autostarted(app) %} checked{% endif %}></td>
-    <td>{% if total_size %}Instalace (<span id="install-progress" data-total="{{ total_size }}">0.1</span> %){% elif app not in conf['apps'] %} Není nainstalována{% elif is_service_started(app) %}<span class="info">Spuštěna</span>{% else %}<span class="error">Zastavena</span>{% endif %}</td>
+    <td>{% if total_size %}Stahuje se (<span id="install-progress" data-total="{{ total_size }}">1</span> %){% elif app not in conf['apps'] %} Není nainstalována{% elif is_service_started(app) %}<span class="info">Spuštěna</span>{% else %}<span class="error">Zastavena</span>{% endif %}</td>
     <td>{% if total_size %}<div class="loader"></div>{% elif app not in conf['apps'] %}<a href="#" class="app-install">Instalovat</a>{% elif is_service_started(app) %}<a href="#" class="app-stop">Zastavit</a>{% else %}<a href="#" class="app-start">Spustit</a>, <a href="#" class="app-uninstall">Odinstalovat</a>{% endif %}</td>
 </tr>