diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..9dca038 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,25 @@ +**/__pycache__ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +README.md \ No newline at end of file diff --git a/accounts/templates/account.html b/accounts/templates/account.html index 0f9bbb7..a3b1166 100644 --- a/accounts/templates/account.html +++ b/accounts/templates/account.html @@ -6,7 +6,7 @@
{% include 'create_user_inst_block.html' %} -

{{ user }}

+

{{ user }}

@@ -44,7 +44,7 @@
- {% trans "Warning:" %} {% trans "User doesn't have any Instace" %} + {% trans "Warning" %}: {% trans "User doesn't have any Instance" %}
{% else %} @@ -69,8 +69,8 @@ {{ inst.is_change }} {{ inst.is_delete }} - - + + @@ -78,14 +78,14 @@
+
{% trans "Edit privilegies for" %} {{ inst.instance.name }}
-

{% trans "Edit privilegies for" %} {{ inst.instance.name }}

-
{% csrf_token %} + {% csrf_token %} -
- +
+
-
- +
+
-
- +
+
- diff --git a/accounts/templates/accounts-list.html b/accounts/templates/accounts-list.html new file mode 100644 index 0000000..c149dd2 --- /dev/null +++ b/accounts/templates/accounts-list.html @@ -0,0 +1,175 @@ +{% extends "base.html" %} +{% load i18n %} +{% load staticfiles %} +{% block title %}{% trans "Users" %}{% endblock %} +{% block content %} + +
+
+ {% include 'create_user_block.html' %} +
+ +
+

{% trans "Users" %}

+
+
+ + + {% include 'errors_block.html' %} + +
+ {% if not users %} +
+
+ + {% trans "Warning" %}: {% trans "You don't have any User" %} +
+
+ {% else %} +
+ + + + + + + + + + + + {% for user in users %} + + + + + + + + {% endfor %} + +
{% trans "Username" %}{% trans "Status" %}{% trans "Staff" %}{% trans "Superuser" %}{% trans "Clone" %}
+ {{ user.username }} + + + + + {% if user.is_active %} + {% trans "Active" %} + {% else %} + {% trans "Blocked" %} + {% endif %} + {% if user.is_staff %}{% endif %}{% if user.is_superuser %}{% endif %}{% if user.userattributes.can_clone_instances %}{% endif %}
+ + {% for user in users %} + + + {% endfor %} +
+ {% endif %} +
+{% endblock %} +{% block script %} + +{% endblock %} diff --git a/accounts/templates/accounts.html b/accounts/templates/accounts.html new file mode 100644 index 0000000..b89de8c --- /dev/null +++ b/accounts/templates/accounts.html @@ -0,0 +1,151 @@ +{% extends "base.html" %} +{% load i18n %} +{% block title %}{% trans "Users" %}{% endblock %} +{% block content %} + +
+
+ {% include 'create_user_block.html' %} +

{% trans "Users" %}

+
+
+ + +{% include 'errors_block.html' %} + +
+ {% if not users %} +
+
+ + {% trans "Warning" %}: {% trans "You don't have any User" %} +
+
+ {% else %} + {% for user in users %} +
+ {% if user.is_active %} +
+
+ {% else %} +
+
+ {% endif %} +
+ {{ user.username }} + + + +
+
+
+
+
+

{% trans "Status" %}:

+
+
+ {% if user.is_active %} +

{% trans "Active" %}

+ {% else %} +

{% trans "Blocked" %}

+ {% endif %} +
+
+
+
+
+ + + + {% endfor %} + {% endif %} +
+{% endblock %} diff --git a/accounts/templates/base_auth.html b/accounts/templates/base_auth.html index a7680bb..d484ef1 100644 --- a/accounts/templates/base_auth.html +++ b/accounts/templates/base_auth.html @@ -13,7 +13,7 @@ {% block title %}{% endblock %} - + @@ -35,7 +35,7 @@ - + \ No newline at end of file diff --git a/accounts/templates/create_user_block.html b/accounts/templates/create_user_block.html new file mode 100644 index 0000000..d5811c9 --- /dev/null +++ b/accounts/templates/create_user_block.html @@ -0,0 +1,38 @@ +{% load i18n %} +{% if request.user.is_superuser %} + + + + + + +{% endif %} diff --git a/accounts/templates/create_user_inst_block.html b/accounts/templates/create_user_inst_block.html index df5937e..42b7a71 100644 --- a/accounts/templates/create_user_inst_block.html +++ b/accounts/templates/create_user_inst_block.html @@ -1,7 +1,7 @@ {% load i18n %} {% if request.user.is_superuser %} - - + + @@ -9,15 +9,15 @@
+
{% trans "Add Instance for User" %}
-

{% trans "Add Instance for User" %}

-
{% csrf_token %} -
- + {% csrf_token %} +
+
- {% for inst in instances %} {% endfor %} @@ -26,7 +26,7 @@
- +
diff --git a/accounts/templates/login.html b/accounts/templates/login.html index d8281b0..4d1faf9 100644 --- a/accounts/templates/login.html +++ b/accounts/templates/login.html @@ -1,12 +1,12 @@ {% extends "base_auth.html" %} {% load i18n %} -{% block title %}{% trans "WebVirtCloud - Sign In" %}{% endblock %} +{% block title %}{% trans "WebVirtCloud" %} - {% trans "Sign In" %}{% endblock %} {% block content %} -
+
-

WebVirtCloud

 +

WebVirtCloud
-
+
{% if form.errors %}
diff --git a/accounts/templates/logout.html b/accounts/templates/logout.html index 83161d3..eb3a325 100644 --- a/accounts/templates/logout.html +++ b/accounts/templates/logout.html @@ -1,14 +1,16 @@ {% extends "base_auth.html" %} {% load i18n %} -{% block title %}{% trans "WebVirtCloud - Sign Out" %}{% endblock %} +{% block title %} + {% trans "WebVirtCloud" %} - {% trans "Sign Out"%} +{% endblock %} {% block content %} -
+

WebVirtCloud
-
+
-

{% trans "Successful log out" %}

+

{% trans "Successful log out" %}

diff --git a/accounts/templates/profile.html b/accounts/templates/profile.html index e5888ff..a665082 100644 --- a/accounts/templates/profile.html +++ b/accounts/templates/profile.html @@ -6,7 +6,7 @@
-

{% trans "Profile" %}

+

{% trans "Profile" %}

@@ -18,19 +18,19 @@

{% trans "Edit Profile" %}

{% csrf_token %}
- +
- +
- +
@@ -45,19 +45,19 @@

{% trans "Edit Password" %}

{% csrf_token %}
- +
- +
- +
@@ -74,15 +74,15 @@
- + {% for key in publickeys %} @@ -95,23 +95,61 @@ {% endif %} {% csrf_token %}
- +
- +
-
+
+ {% if request.user.is_superuser %} +

{% trans "Themes" %}

+
{% csrf_token %} +
+ +
+ + + +
+

{% trans "After change please full refresh page with Ctrl + F5 "%}

+
+
+
+ +
+
+ + {% endif %}
{% endblock %} +{% block script %} + +{% endblock %} diff --git a/accounts/views.py b/accounts/views.py index 9a58e03..3d15e81 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -10,6 +10,8 @@ from accounts.models import * from admin.decorators import superuser_only from instances.models import Instance +import sass +import os def profile(request): """ @@ -21,6 +23,8 @@ def profile(request): # user = User.objects.get(id=request.user.id) publickeys = UserSSHKey.objects.filter(user_id=request.user.id) + themes_list = os.listdir(settings.SCSS_DIR +"/wvc-theme") + if request.method == 'POST': if 'username' in request.POST: username = request.POST.get('username', '') @@ -65,6 +69,20 @@ def profile(request): delkeypublic = UserSSHKey.objects.get(id=keyid) delkeypublic.delete() return HttpResponseRedirect(request.get_full_path()) + if 'change_theme' in request.POST: + theme = request.POST.get('theme_select', '') + scss_var = f"@import '{settings.SCSS_DIR}/wvc-theme/{theme}/variables';" + scss_bootswatch = f"@import '{settings.SCSS_DIR}/wvc-theme/{theme}/bootswatch';" + scss_boot = f"@import '{settings.SCSS_DIR}/bootstrap-overrides.scss';" + + with open(settings.SCSS_DIR + "/wvc-main.scss", "w") as main: + main.write(scss_var + "\n" + scss_boot + "\n" + scss_bootswatch) + + css_compressed = sass.compile(string=scss_var + "\n"+ scss_boot + "\n" + scss_bootswatch, output_style='compressed') + with open("static/" + "css/wvc-main.min.css", "w") as css: + css.write(css_compressed) + + return HttpResponseRedirect(request.get_full_path()) return render(request, 'profile.html', locals()) diff --git a/admin/templates/admin/common/confirm_delete.html b/admin/templates/admin/common/confirm_delete.html index 6ad93d4..df6392e 100644 --- a/admin/templates/admin/common/confirm_delete.html +++ b/admin/templates/admin/common/confirm_delete.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load bootstrap3 %} +{% load bootstrap4 %} {% load font_awesome %} {% load i18n %} diff --git a/admin/templates/admin/common/form.html b/admin/templates/admin/common/form.html index ced001e..b65ef30 100644 --- a/admin/templates/admin/common/form.html +++ b/admin/templates/admin/common/form.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load bootstrap3 %} +{% load bootstrap4 %} {% load font_awesome %} {% load i18n %} @@ -13,12 +13,12 @@ {% bootstrap_messages %}
-
-
+
+ {% csrf_token %} {% bootstrap_form form layout='horizontal' %} -
+
{% icon 'times' %} {% trans "Cancel" %}
{{ key.keyname }} ({% ssh_to_fingerprint key.keypublic %}) {% csrf_token %} -
{% for object in object_list %}
{{ object }} -
+
{% icon 'edit' %} {%trans "Edit"%} {% if extra_urls %} {% for url in extra_urls %} diff --git a/admin/templates/admin/group_list.html b/admin/templates/admin/group_list.html index 4ec6a19..f58614d 100644 --- a/admin/templates/admin/group_list.html +++ b/admin/templates/admin/group_list.html @@ -6,10 +6,10 @@ {% block content %}
- + {% icon 'plus' %} -
+

{% trans "Groups" %}

@@ -29,8 +29,8 @@ - - + + @@ -40,7 +40,7 @@ {{ group.name }}
{% trans "Group Name" %}{% trans "Actions" %}{% trans "Group Name" %}{% trans "Actions" %}
-
+
{% icon 'pencil' %} diff --git a/admin/templates/admin/logs.html b/admin/templates/admin/logs.html index f5f215c..8f42f68 100644 --- a/admin/templates/admin/logs.html +++ b/admin/templates/admin/logs.html @@ -5,7 +5,7 @@
-

{% trans "Logs" %}

+

{% trans "Logs" %}

diff --git a/admin/templates/admin/user_form.html b/admin/templates/admin/user_form.html index ff54117..b6d7919 100644 --- a/admin/templates/admin/user_form.html +++ b/admin/templates/admin/user_form.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load bootstrap3 %} +{% load bootstrap4 %} {% load font_awesome %} {% load i18n %} @@ -12,13 +12,13 @@
-
-
+
+ {% csrf_token %} {% bootstrap_form user_form layout='horizontal' %} {% bootstrap_form attributes_form layout='horizontal' %} -
+
{% icon 'times' %} {% trans "Cancel" %}