From 848e99b4aff8b5d1bb6f53dd38f570770f28d5a9 Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Fri, 26 Oct 2018 22:11:34 +0200
Subject: [PATCH] fixes

---
 basic/srv/vm/mgr/wsgiapp.py            |  4 +--
 basic/srv/vm/templates/setup-apps.html | 42 ++++++++++++++------------
 zz-build/usr/bin/lxc-pack              |  4 +--
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/basic/srv/vm/mgr/wsgiapp.py b/basic/srv/vm/mgr/wsgiapp.py
index 1742608..503dca3 100644
--- a/basic/srv/vm/mgr/wsgiapp.py
+++ b/basic/srv/vm/mgr/wsgiapp.py
@@ -295,14 +295,14 @@ class WSGIApp(object):
         except:
             return self.render_json({'error': request.session.lang.package_manager_error()})
         app_title = self.pkgmgr.online_packages[app]['title']
-        response = self.render_json({'ok': self.render_setup_apps_row(app, app_title, '{:.1f}'.print(total_size / 1048576))})
+        response = self.render_json({'ok': self.render_setup_apps_row(app, app_title, '{:.1f}'.format(total_size / 1048576))})
         response.call_on_close(lambda: self.pkgmgr.install_package(app))
         return response
 
     def get_install_progress_action(self, request):
         # Gets pending installation status
         if self.pkgmgr.pending:
-            return self.render_json({'progress': '{:.1f}'.print(self.pkgmgr.pending / 1048576)})
+            return self.render_json({'progress': '{:.1f}'.format(self.pkgmgr.pending / 1048576)})
         app = request.form['app']
         app_title = self.conf['apps'][app]['title']
         return self.render_json({'ok': self.render_setup_apps_row(app, app_title)})
diff --git a/basic/srv/vm/templates/setup-apps.html b/basic/srv/vm/templates/setup-apps.html
index 240d5a0..364c56b 100644
--- a/basic/srv/vm/templates/setup-apps.html
+++ b/basic/srv/vm/templates/setup-apps.html
@@ -34,25 +34,6 @@
 <div class="setup-box">
     <h2>Správce aplikací</h2>
     <p>Vyberte které aplikace mají být nainstalovány, které se mají zobrazovat na hlavní straně portálu a které mají být automaticky spuštěny při startu virtuálního stroje.</p>
-    <p><strong>Přístupové údaje k distribučnímu serveru:</strong></p>
-    <form id="update-repo" action="/update-repo" method="post">
-        <table>
-            <tr>
-                <td>Uživatelské jméno:</td>
-                <td><input type="text" name="repousername" id="repousername" value="{{ conf['repo']['user'] }}"></td>
-            </tr>
-            <tr>
-                <td>Heslo:</td>
-                <td><input type="password" name="repopassword" id="repopassword"></td>
-            </tr>
-            <tr>
-                <td>&nbsp;</td>
-                <td colspan="2">
-                    <input type="submit" id="repo-submit" value="Nastavit">
-                </td>
-            </tr>
-        </table>
-    </form>
     <table id="app-manager">
         <thead>
             <tr>
@@ -73,6 +54,29 @@
     {% if not online_packages %}
     <p class="error">Připojení k distribučnímu serveru se nezdařilo. Zkontrolujte přístupové údaje a připojení k síti.</p>
     {% endif %}
+    <p><strong>Přístupové údaje k distribučnímu serveru:</strong></p>
+    <form id="update-repo" action="/update-repo" method="post">
+        <table>
+            <tr>
+                <td>URL serveru:</td>
+                <td><input type="text" name="repourl" value="{{ conf['repo']['url'] }}"></td>
+            </tr>
+            <tr>
+                <td>Uživatelské jméno:</td>
+                <td><input type="text" name="repousername" value="{{ conf['repo']['user'] }}"></td>
+            </tr>
+            <tr>
+                <td>Heslo:</td>
+                <td><input type="password" name="repopassword"></td>
+            </tr>
+            <tr>
+                <td>&nbsp;</td>
+                <td colspan="2">
+                    <input type="submit" id="repo-submit" value="Nastavit">
+                </td>
+            </tr>
+        </table>
+    </form>
 </div>
 
 <div class="setup-box">
diff --git a/zz-build/usr/bin/lxc-pack b/zz-build/usr/bin/lxc-pack
index 33f9000..ecf331f 100755
--- a/zz-build/usr/bin/lxc-pack
+++ b/zz-build/usr/bin/lxc-pack
@@ -46,9 +46,9 @@ def pack(pkg_file):
         cwd = os.path.dirname(os.path.abspath(pkg_file))
         subprocess.run(['tar', '--transform', 's|^|srv/{}/|'.format(pkg_name), '-rpf', tar_path, 'install', 'install.sh', 'upgrade', 'upgrade.sh', 'uninstall', 'uninstall.sh'], cwd=cwd)
     # Compress the tarball with xz (LZMA2)
-    print('Compressing', tar_path, '({0:.2f} MB)'.format(os.path.getsize(tar_path)/1048576))
+    print('Compressing', tar_path, '({:.2f} MB)'.format(os.path.getsize(tar_path)/1048576))
     subprocess.run(['xz', '-9', tar_path])
-    print('Compressed ', xz_path, '({0:.2f} MB)'.format(os.path.getsize(xz_path)/1048576))
+    print('Compressed ', xz_path, '({:.2f} MB)'.format(os.path.getsize(xz_path)/1048576))
 
     # Register package
     print('Registering package')