From a47d0067719b5328735523795aeca96bfe45ca9b Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Thu, 10 Jun 2021 13:46:08 +0300
Subject: [PATCH 1/3] fix edit instance volume for running instances to prevent
 bus error

---
 instances/templates/{ => instances}/edit_instance_volume.html | 2 +-
 instances/templates/instances/settings_tab.html               | 2 +-
 instances/views.py                                            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename instances/templates/{ => instances}/edit_instance_volume.html (98%)

diff --git a/instances/templates/edit_instance_volume.html b/instances/templates/instances/edit_instance_volume.html
similarity index 98%
rename from instances/templates/edit_instance_volume.html
rename to instances/templates/instances/edit_instance_volume.html
index ec0c3df..ff5fbdc 100644
--- a/instances/templates/edit_instance_volume.html
+++ b/instances/templates/instances/edit_instance_volume.html
@@ -121,7 +121,7 @@
                 <div class="clearfix"></div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-secondary" data-dismiss="modal">{% trans "Close" %}</button>
-                    <button type="submit" class="btn btn-success" name="edit_volume">{% trans "Save" %}</button>
+                    <button type="submit" class="btn btn-success" name="edit_volume" onclick="return confirm('{% trans "Are you sure to change volume properties?" %}')">{% trans "Save" %}</button>
                 </div><!-- /.modal-footer -->
 
             </div> <!-- /.modal-content -->
diff --git a/instances/templates/instances/settings_tab.html b/instances/templates/instances/settings_tab.html
index ef79a45..ddcf390 100644
--- a/instances/templates/instances/settings_tab.html
+++ b/instances/templates/instances/settings_tab.html
@@ -290,7 +290,7 @@
                                             <input type="hidden" name="dev" value="{{ disk.dev }}">
                                             <input type="hidden" name="storage" value="{{ disk.storage }}">
                                             <input type="hidden" name="name" value="{{ disk.image }}">
-                                            {% include 'edit_instance_volume.html' with id=forloop.counter0 %}
+                                            {% include 'instances/edit_instance_volume.html' with id=forloop.counter0 %}
                                         </form>
                                         <form class="d-inline" action="{% url 'instances:detach_vol' instance.id %}" method="post">
                                             {% csrf_token %}
diff --git a/instances/views.py b/instances/views.py
index 2fb3ab5..6669aa9 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -596,8 +596,8 @@ def edit_volume(request, pk):
         shareable = bool(request.POST.get("vol_shareable", False))
         readonly = bool(request.POST.get("vol_readonly", False))
         disk_type = request.POST.get("vol_type", "")
-        new_bus = request.POST.get("vol_bus", "")
         bus = request.POST.get("vol_bus_old", "")
+        new_bus = request.POST.get("vol_bus", bus)
         serial = request.POST.get("vol_serial", "")
         format = request.POST.get("vol_format", "")
         cache = request.POST.get("vol_cache", app_settings.INSTANCE_VOLUME_DEFAULT_CACHE)

From d7c0f9445d86105608720c487731e489b3accd11 Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Thu, 10 Jun 2021 15:17:53 +0300
Subject: [PATCH 2/3] rearrange search functionality

---
 admin/templates/admin/group_list.html      |  4 +---
 admin/templates/admin/user_list.html       |  4 +---
 computes/templates/computes/instances.html |  4 +---
 computes/templates/computes/list.html      |  9 ++++----
 instances/templates/allinstances.html      |  8 +++----
 nwfilters/templates/nwfilter.html          | 23 ++++----------------
 nwfilters/templates/nwfilters.html         | 25 +++++-----------------
 static/js/filter-table.js                  |  8 +++----
 storages/templates/storage.html            | 24 ++++++---------------
 templates/search_block.html                |  2 +-
 10 files changed, 31 insertions(+), 80 deletions(-)

diff --git a/admin/templates/admin/group_list.html b/admin/templates/admin/group_list.html
index d101466..1f9562f 100644
--- a/admin/templates/admin/group_list.html
+++ b/admin/templates/admin/group_list.html
@@ -9,9 +9,7 @@
         <a href="{% url 'admin:group_create' %}" class="btn btn-success btn-header float-right">
             {% icon 'plus' %}
         </a>
-        <div class="float-right search">
-            <input id="filter" class="form-control" type="text" placeholder="{% trans "Search" %}">
-        </div>
+        {% include 'search_block.html' %}
         <h1 class="page-header">{% trans "Groups" %}</h1>
     </div>
 </div>
diff --git a/admin/templates/admin/user_list.html b/admin/templates/admin/user_list.html
index f1a6323..9bcb683 100644
--- a/admin/templates/admin/user_list.html
+++ b/admin/templates/admin/user_list.html
@@ -12,9 +12,7 @@
 <a href="{% url 'admin:user_create' %}" class="btn btn-success btn-header float-right">
     {% icon 'plus' %}
 </a>
-<div class="float-right search">
-    <input id="filter" class="form-control" type="text" placeholder="{% trans "Search" %}">
-</div>
+{% include 'search_block.html' %}
 {% endblock page_heading_extra %}
 
 {% block content %}
diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html
index f69143f..bdac072 100644
--- a/computes/templates/computes/instances.html
+++ b/computes/templates/computes/instances.html
@@ -14,9 +14,7 @@
     {% icon 'plus' %}
 </a>
 {% if instances %}
-<div class="float-right search">
-    <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
-</div>
+    {% include 'search_block.html' %}
 {% endif %}
 {% endblock page_heading_extra %}
 
diff --git a/computes/templates/computes/list.html b/computes/templates/computes/list.html
index 8e4b899..9cb3233 100644
--- a/computes/templates/computes/list.html
+++ b/computes/templates/computes/list.html
@@ -22,9 +22,9 @@
         </div>
     {% else %}
         <div class="col-lg-12">
-            <table class="table table-striped table-hover">
+            <table class="table table-striped table-hover sortable-theme-bootstrap" data-sortable>
                 <thead>
-                    <tr class="d-flex">
+                    <tr>
                         <th span="col" class="col-sm-3">{% trans "Name" %}</th>
                         <th span="col" class="col-sm-2">{% trans "Status" %}</th>
                         <th span="col" class="col-sm-5">{% trans "Details" %}</th>
@@ -33,7 +33,7 @@
                 </thead>
                 <tbody class="searchable">
                 {% for compute in computes %}
-                    <tr class="d-flex">
+                    <tr>
                         <td class="col-sm-3">
                             {{ compute.name }}
                         </td>
@@ -64,5 +64,6 @@
 {% endblock content %}
 
 {% block script %}
-<script src="{% static "js/filter-table.js" %}"></script>
+<script src="{% static 'js/sortable.min.js' %}"></script>
+<script src="{% static 'js/filter-table.js' %}"></script>
 {% endblock script %}
diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html
index 8c29794..8a71a44 100644
--- a/instances/templates/allinstances.html
+++ b/instances/templates/allinstances.html
@@ -4,7 +4,7 @@
 {% load staticfiles %}
 {% block title %}{% trans "Instances" %}{% endblock %}
 {% block style %}
-    <link rel="stylesheet" href="{% static "css/sortable-theme-bootstrap.css" %}" />
+    <link rel="stylesheet" href="{% static 'css/sortable-theme-bootstrap.css' %}" />
 {% endblock %}
 {% block page_heading %}{% trans "Instances" %}{% endblock page_heading %}
 
@@ -12,9 +12,7 @@
 {% if request.user.is_superuser %}
     {% include 'create_inst_block.html' %}
 {% endif %}
-<div class="float-right search">
-    <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
-</div>
+    {% include 'search_block.html' %}
 {% endblock page_heading_extra %}
 
 {% block content %}
@@ -37,7 +35,7 @@
     </div>
 {% endblock content %}
 {% block script %}
-    <script src="{% static "js/sortable.min.js" %}"></script>
+    <script src="{% static 'js/sortable.min.js' %}"></script>
     <script src="{% static 'js/filter-table.js' %}"></script>
     {% if request.user.is_superuser %}
         <script>
diff --git a/nwfilters/templates/nwfilter.html b/nwfilters/templates/nwfilter.html
index c14282f..2034cdb 100644
--- a/nwfilters/templates/nwfilter.html
+++ b/nwfilters/templates/nwfilter.html
@@ -66,8 +66,6 @@
     <div class="row">
         <div class="col-lg-12">
         <h5 class="page-header mr-auto">{% trans "Filter References" %}
-            
-        
             <form class="form-inline float-right" method="post" role="form" aria-label="Add NWFilter form">{% csrf_token %}
                 <div class="form-group">
                     <div class="input-group">
@@ -108,7 +106,7 @@
                         <td style="width:30px;">
                             <form action="" method="post" role="form" aria-label="Delete NWFilter form">{% csrf_token %}
                                 <input type="hidden" name="ref" value="{{ ref }}">
-                                <button type="submit" class="btn btn-sm btn-danger" name="del_nwfilter_ref" title="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
+                                <button type="submit" class="btn btn-sm btn-danger" name="del_nwfilter_ref" title="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}');">
                                     <i class="fa fa-trash"></i>
                                 </button>
                             </form>
@@ -148,7 +146,7 @@
                             <input type="hidden" name="action" value="{{ rule.action }}">
                             <input type="hidden" name="direction" value="{{ rule.direction }}">
                             <input type="hidden" name="priority" value="{{ rule.priority }}">
-                            <button type="submit" class="btn btn-sm btn-danger" name="del_nwfilter_rule" title="{% trans "Delete" %}" onclick="return confirm('{% trans "Are you sure?" %}')">
+                            <button type="submit" class="btn btn-sm btn-danger" name="del_nwfilter_rule" title="{% trans 'Delete' %}" onclick="return confirm('{% trans "Are you sure?" %}');">
                                 <i class="fa fa-trash"></i>
                             </button>
                         </form>
@@ -162,21 +160,8 @@
 {% endblock %}
 
 {% block script %}
-    <script src="{% static "js/sortable.min.js" %}"></script>
-    <script>
-        $(document).ready(function () {
-            (function ($) {
-                $('#filter').keyup(function () {
-                    var rex = new RegExp($(this).val(), 'i');
-                    $('.searchable tr').hide();
-                    $('.searchable tr').filter(function () {
-                        return rex.test($(this).text());
-                    }).show();
-                })
-            }(jQuery));
-        });
-    </script>
-    <script src="{% static "js/ace/ace.js" %}"></script>
+    <script src="{% static 'js/sortable.min.js' %}"></script>
+    <script src="{% static 'js/ace/ace.js' %}"></script>
     <script>
         var editor = ace.edit("edit_editor");
         editor.getSession().setMode("ace/mode/xml");
diff --git a/nwfilters/templates/nwfilters.html b/nwfilters/templates/nwfilters.html
index eac9c96..73d75de 100644
--- a/nwfilters/templates/nwfilters.html
+++ b/nwfilters/templates/nwfilters.html
@@ -8,9 +8,7 @@
 
 {% block page_heading_extra %}
 {% include 'create_nwfilter_block.html' %}
-<div class="float-right search">
-    <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
-</div>
+{% include 'search_block.html' %}
 {% endblock page_heading_extra %}
 
 {% block content %}
@@ -142,24 +140,11 @@
 {% endblock %}
 
 {% block script %}
-<script src="{% static "js/sortable.min.js" %}"></script>
+<script src="{% static 'js/sortable.min.js' %}"></script>
+<script src="{% static 'js/filter-table.js' %}"></script>
+<script src="{% static 'js/ace/ace.js' %}"></script>
 <script>
-    $(document).ready(function () {
-        (function ($) {
-            $('#filter').keyup(function () {
-                var rex = new RegExp($(this).val(), 'i');
-                $('.searchable tr').hide();
-                $('.searchable tr').filter(function () {
-                    return rex.test($(this).text());
-                }).show();
-            })
-        }(jQuery));
-    });
-</script>
-
-<script src="{% static "js/ace/ace.js" %}"></script>
-<script>
-   var editor = ace.edit("editor");
+    var editor = ace.edit("editor");
     editor.getSession().setMode("ace/mode/xml");
 
     var input = $('input[name="nwfilter_xml"]');
diff --git a/static/js/filter-table.js b/static/js/filter-table.js
index 3c73c8c..300a989 100644
--- a/static/js/filter-table.js
+++ b/static/js/filter-table.js
@@ -4,12 +4,12 @@ function filter_table() {
     $('.searchable tr').filter(function () {
         return rex.test($(this).text());
     }).show();
-    Cookies.set("instances_filter", $(this).val(), { expires: 1 });
+    Cookies.set(document.title + "_filter", $(this).val(), { expires: 1 });
 }
 $(document).ready(function () {
-    instances_filter_cookie = Cookies.get("instances_filter");
-    if (instances_filter_cookie) {
-        $('#filter').val(instances_filter_cookie);
+    filter_cookie = Cookies.get(document.title + "_filter");
+    if (filter_cookie) {
+        $('#filter').val(filter_cookie);
         $('#filter').each(filter_table);
     }
     (function ($) {
diff --git a/storages/templates/storage.html b/storages/templates/storage.html
index cec96b5..8a6bd46 100644
--- a/storages/templates/storage.html
+++ b/storages/templates/storage.html
@@ -81,10 +81,10 @@
     </dl>
     
     {% if state %}
-        <div class="row">
-            <h5 class="page-header mr-auto">{% trans "Volumes" %}</h5>
-            <div class="col-3 ">
-                <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
+        <div class="container">
+            <div class="row">
+                <h5 class="page-header mr-auto">{% trans "Volumes" %}</h5>
+                {% include 'search_block.html' %}
             </div>
         </div>
             
@@ -194,7 +194,8 @@
     {% include 'pleasewaitdialog.html' %}
 {% endblock %}
 {% block script %}
-    <script src="{% static "js/sortable.min.js" %}"></script>
+    <script src="{% static 'js/sortable.min.js' %}"></script>
+    <script src="{% static 'js/filter-table.js' %}"></script>
     <script>
         $('.format-convert').hide();
         $(document).on('change', '.volume-convert', function () {
@@ -216,17 +217,4 @@
             }
         });
     </script>
-    <script>
-        $(document).ready(function () {
-            (function ($) {
-                $('#filter').keyup(function () {
-                    var rex = new RegExp($(this).val(), 'i');
-                    $('.searchable tr').hide();
-                    $('.searchable tr').filter(function () {
-                        return rex.test($(this).text());
-                    }).show();
-                })
-            }(jQuery));
-        });
-    </script>
 {% endblock %}
diff --git a/templates/search_block.html b/templates/search_block.html
index 7f2b515..f80a4ce 100644
--- a/templates/search_block.html
+++ b/templates/search_block.html
@@ -1,4 +1,4 @@
 {% load i18n %}
 <div class="float-right search">
-    <input id="filter" class="form-control" type="text" placeholder="{% trans "Search" %}">
+    <input id="filter" class="form-control" type="text" placeholder="{% trans 'Search' %}">
 </div>

From 5aa22ac042dc3e9f30d74201decae25c1c41f36a Mon Sep 17 00:00:00 2001
From: catborise <catborise@yahoo.com>
Date: Tue, 15 Jun 2021 09:42:55 +0300
Subject: [PATCH 3/3] Django 3.2.4 LTS upgrade

---
 computes/templates/computes/instances.html    |  2 +-
 computes/templates/overview.html              |  2 +-
 computes/urls.py                              |  2 +-
 conf/requirements.txt                         |  2 +-
 console/templates/console-base.html           |  2 +-
 console/templates/console-spice-full.html     |  2 +-
 console/templates/console-spice-lite.html     |  2 +-
 console/templates/console-vnc-full.html       |  2 +-
 console/templates/console-vnc-lite.html       |  2 +-
 instances/templates/allinstances.html         |  2 +-
 instances/templates/create_instance_w1.html   |  2 +-
 instances/templates/create_instance_w2.html   |  2 +-
 instances/templates/instance.html             |  2 +-
 interfaces/templates/interfaces.html          |  2 +-
 networks/templates/network.html               |  2 +-
 nwfilters/templates/nwfilter.html             |  2 +-
 nwfilters/templates/nwfilters.html            |  2 +-
 storages/templates/storage.html               |  2 +-
 {secrets => virtsecrets}/__init__.py          |  0
 {secrets => virtsecrets}/forms.py             |  0
 .../migrations/__init__.py                    |  0
 {secrets => virtsecrets}/models.py            |  0
 .../templates/create_secret_block.html        |  0
 .../templates/secrets.html                    |  2 +-
 {secrets => virtsecrets}/tests.py             |  0
 {secrets => virtsecrets}/views.py             |  4 +-
 vrtManager/{secrets.py => virtsecrets.py}     |  0
 webvirtcloud/settings.py.template             | 44 ++++++++++++++++---
 28 files changed, 58 insertions(+), 28 deletions(-)
 rename {secrets => virtsecrets}/__init__.py (100%)
 rename {secrets => virtsecrets}/forms.py (100%)
 rename {secrets => virtsecrets}/migrations/__init__.py (100%)
 rename {secrets => virtsecrets}/models.py (100%)
 rename {secrets => virtsecrets}/templates/create_secret_block.html (100%)
 rename {secrets => virtsecrets}/templates/secrets.html (99%)
 rename {secrets => virtsecrets}/tests.py (100%)
 rename {secrets => virtsecrets}/views.py (97%)
 rename vrtManager/{secrets.py => virtsecrets.py} (100%)

diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html
index bdac072..e6416c5 100644
--- a/computes/templates/computes/instances.html
+++ b/computes/templates/computes/instances.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load icons %}
 {% block title %}{% trans "Instances" %} - {{ compute.name }}{% endblock %}
 {% block style %}
diff --git a/computes/templates/overview.html b/computes/templates/overview.html
index 2894ebb..bddaa83 100644
--- a/computes/templates/overview.html
+++ b/computes/templates/overview.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load icons %}
 
 {% block title %}{% trans "Overview" %} - {{ compute.name }}{% endblock %}
diff --git a/computes/urls.py b/computes/urls.py
index 6e43695..15f6331 100644
--- a/computes/urls.py
+++ b/computes/urls.py
@@ -1,4 +1,4 @@
-from secrets.views import secrets
+from virtsecrets.views import secrets
 
 from django.urls import include, path
 # from instances.views import create_instance, create_instance_select_type
diff --git a/conf/requirements.txt b/conf/requirements.txt
index 8d13382..235cd22 100644
--- a/conf/requirements.txt
+++ b/conf/requirements.txt
@@ -1,4 +1,4 @@
-Django==2.2.22
+Django==3.2.4
 django-bootstrap4==3.0.1
 django-icons==4.0.0
 django-login-required-middleware==0.6.1
diff --git a/console/templates/console-base.html b/console/templates/console-base.html
index 7875f7e..8627cec 100644
--- a/console/templates/console-base.html
+++ b/console/templates/console-base.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 <html>
 
diff --git a/console/templates/console-spice-full.html b/console/templates/console-spice-full.html
index da7dae1..0dfed9f 100644
--- a/console/templates/console-spice-full.html
+++ b/console/templates/console-spice-full.html
@@ -24,7 +24,7 @@
 -->
 {% extends "console-base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block head %}
 <title>WebVirtCloud - Spice Client - Full</title>
diff --git a/console/templates/console-spice-lite.html b/console/templates/console-spice-lite.html
index a984063..469c971 100644
--- a/console/templates/console-spice-lite.html
+++ b/console/templates/console-spice-lite.html
@@ -24,7 +24,7 @@
 -->
 {% extends "console-base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block head %}
 <title>WebVirtCloud - Spice - Lite</title>
diff --git a/console/templates/console-vnc-full.html b/console/templates/console-vnc-full.html
index 05bf5b4..fae93e5 100755
--- a/console/templates/console-vnc-full.html
+++ b/console/templates/console-vnc-full.html
@@ -1,6 +1,6 @@
 {% extends "console-base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block head %}
 <!--
diff --git a/console/templates/console-vnc-lite.html b/console/templates/console-vnc-lite.html
index 5d8547e..3da589a 100755
--- a/console/templates/console-vnc-lite.html
+++ b/console/templates/console-vnc-lite.html
@@ -1,6 +1,6 @@
 {% extends "console-base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block head %}
 <!--
diff --git a/instances/templates/allinstances.html b/instances/templates/allinstances.html
index 8a71a44..c126fa1 100644
--- a/instances/templates/allinstances.html
+++ b/instances/templates/allinstances.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load icons %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}{% trans "Instances" %}{% endblock %}
 {% block style %}
     <link rel="stylesheet" href="{% static 'css/sortable-theme-bootstrap.css' %}" />
diff --git a/instances/templates/create_instance_w1.html b/instances/templates/create_instance_w1.html
index 522da69..540a1ac 100644
--- a/instances/templates/create_instance_w1.html
+++ b/instances/templates/create_instance_w1.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "Create new instance" %} - {% trans "Select Type" %}{% endblock %}
 
diff --git a/instances/templates/create_instance_w2.html b/instances/templates/create_instance_w2.html
index 301f552..89f9a8d 100644
--- a/instances/templates/create_instance_w2.html
+++ b/instances/templates/create_instance_w2.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load icons %}
 {% block title %}{% trans "Create new instance" %}{% endblock %}
 
diff --git a/instances/templates/instance.html b/instances/templates/instance.html
index 161fe93..891a9eb 100644
--- a/instances/templates/instance.html
+++ b/instances/templates/instance.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load i18n %}
 
 {% block title %}{% trans "Instance" %} - {{ instance.name }}{% endblock %}
diff --git a/interfaces/templates/interfaces.html b/interfaces/templates/interfaces.html
index 413691f..d6ec05c 100644
--- a/interfaces/templates/interfaces.html
+++ b/interfaces/templates/interfaces.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "Interfaces" %} - {{ compute.name }}{% endblock %}
 
diff --git a/networks/templates/network.html b/networks/templates/network.html
index 7672038..471b767 100644
--- a/networks/templates/network.html
+++ b/networks/templates/network.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "Network" %} - {{ pool }}{% endblock %}
 
diff --git a/nwfilters/templates/nwfilter.html b/nwfilters/templates/nwfilter.html
index 2034cdb..894f35a 100644
--- a/nwfilters/templates/nwfilter.html
+++ b/nwfilters/templates/nwfilter.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "NWFilter" %}: {{ name }}{% endblock %}
 
diff --git a/nwfilters/templates/nwfilters.html b/nwfilters/templates/nwfilters.html
index 73d75de..3a7f1bf 100644
--- a/nwfilters/templates/nwfilters.html
+++ b/nwfilters/templates/nwfilters.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}{% trans "NWFilters" %} - {{ compute.name }}{% endblock %}
 
diff --git a/storages/templates/storage.html b/storages/templates/storage.html
index 8a6bd46..bfcd7a7 100644
--- a/storages/templates/storage.html
+++ b/storages/templates/storage.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}{{ compute }} - {% trans "Storage" %}: {{ pool }}{% endblock %}
 {% block style %}
     <link rel="stylesheet" href="{% static "css/sortable-theme-bootstrap.css" %}"/>
diff --git a/secrets/__init__.py b/virtsecrets/__init__.py
similarity index 100%
rename from secrets/__init__.py
rename to virtsecrets/__init__.py
diff --git a/secrets/forms.py b/virtsecrets/forms.py
similarity index 100%
rename from secrets/forms.py
rename to virtsecrets/forms.py
diff --git a/secrets/migrations/__init__.py b/virtsecrets/migrations/__init__.py
similarity index 100%
rename from secrets/migrations/__init__.py
rename to virtsecrets/migrations/__init__.py
diff --git a/secrets/models.py b/virtsecrets/models.py
similarity index 100%
rename from secrets/models.py
rename to virtsecrets/models.py
diff --git a/secrets/templates/create_secret_block.html b/virtsecrets/templates/create_secret_block.html
similarity index 100%
rename from secrets/templates/create_secret_block.html
rename to virtsecrets/templates/create_secret_block.html
diff --git a/secrets/templates/secrets.html b/virtsecrets/templates/secrets.html
similarity index 99%
rename from secrets/templates/secrets.html
rename to virtsecrets/templates/secrets.html
index 7536032..74d8fbf 100644
--- a/secrets/templates/secrets.html
+++ b/virtsecrets/templates/secrets.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% block title %}{% trans "Secrets" %} - {{ compute.name }}{% endblock %}
 
 {% block style %}
diff --git a/secrets/tests.py b/virtsecrets/tests.py
similarity index 100%
rename from secrets/tests.py
rename to virtsecrets/tests.py
diff --git a/secrets/views.py b/virtsecrets/views.py
similarity index 97%
rename from secrets/views.py
rename to virtsecrets/views.py
index 3bcee54..d7804c6 100644
--- a/secrets/views.py
+++ b/virtsecrets/views.py
@@ -1,4 +1,4 @@
-from secrets.forms import AddSecret
+from virtsecrets.forms import AddSecret
 
 from admin.decorators import superuser_only
 from computes.models import Compute
@@ -13,7 +13,7 @@ from libvirt import (
     VIR_SECRET_USAGE_TYPE_VOLUME,
     libvirtError,
 )
-from vrtManager.secrets import wvmSecrets
+from vrtManager.virtsecrets import wvmSecrets
 
 
 @superuser_only
diff --git a/vrtManager/secrets.py b/vrtManager/virtsecrets.py
similarity index 100%
rename from vrtManager/secrets.py
rename to vrtManager/virtsecrets.py
diff --git a/webvirtcloud/settings.py.template b/webvirtcloud/settings.py.template
index 74be031..cc0312a 100644
--- a/webvirtcloud/settings.py.template
+++ b/webvirtcloud/settings.py.template
@@ -3,10 +3,10 @@ Django settings for webvirtcloud project.
 
 """
 
-import os
+from pathlib import Path
 
-# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
-BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+# Build paths inside the project like this: BASE_DIR / 'subdir'.
+BASE_DIR = Path(__file__).resolve().parent.parent
 
 SECRET_KEY = ""
 
@@ -63,7 +63,7 @@ TEMPLATES = [
     {
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         "DIRS": [
-            os.path.join(BASE_DIR, "templates"),
+            Path.joinpath(BASE_DIR, "templates"),
         ],
         "APP_DIRS": True,
         "OPTIONS": {
@@ -83,6 +83,7 @@ TEMPLATES = [
 
 WSGI_APPLICATION = "webvirtcloud.wsgi.application"
 
+
 # Settings for django-icons
 DJANGO_ICONS = {
 
@@ -96,19 +97,20 @@ DJANGO_ICONS = {
     },
 }
 
+
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
+        "NAME": Path.joinpath(BASE_DIR, "db.sqlite3"),
     }
 }
 
 AUTHENTICATION_BACKENDS = [
     "django.contrib.auth.backends.ModelBackend",
-    "webvirtcloud.ldapbackend.LdapAuthenticationBackend",
+    #"webvirtcloud.ldapbackend.LdapAuthenticationBackend",
 ]
 
 LOGIN_URL = "/accounts/login/"
@@ -128,13 +130,35 @@ USE_TZ = True
 STATIC_URL = "/static/"
 
 STATICFILES_DIRS = [
-    os.path.join(BASE_DIR, "static"),
+    Path.joinpath(BASE_DIR, "static"),
 ]
 
+
+# Default primary key field type
+# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
+
 LOCALE_PATHS = [
     "locale/",
 ]
 
+
+# Settings for django-icons
+DJANGO_ICONS = {
+
+    'DEFAULTS': {
+        'renderer': 'fontawesome4',
+    },
+
+    'RENDERERS': {
+        'fontawesome4': 'FontAwesome4Renderer',
+        'bootstrap3': 'Bootstrap3Renderer',
+    },
+}
+
+
 LOGGING = {
     "version": 1,
     "disable_existing_loggers": False,
@@ -150,6 +174,7 @@ LOGGING = {
     },
 }
 
+
 #
 # WebVirtCloud settings
 #
@@ -223,10 +248,15 @@ ALLOW_EMPTY_PASSWORD = False
 NEW_USER_DEFAULT_INSTANCES = []
 SHOW_PROFILE_EDIT_PASSWORD = True
 
+
+# OTP Config
 OTP_ENABLED = False
 
 LOGIN_REQUIRED_IGNORE_VIEW_NAMES = ["accounts:login", "accounts:email_otp"]
 
+# LDAP Config
+#
+
 LDAP_ENABLED = False
 LDAP_URL = ''
 LDAP_PORT = 389