From 0e5840498ef2979bc19199826d946234c8ecca0d Mon Sep 17 00:00:00 2001 From: catborise Date: Tue, 19 May 2020 19:53:54 +0300 Subject: [PATCH] bootstrap 4.5 & Bootswatch Themes --- .dockerignore | 25 + accounts/templates/account.html | 30 +- accounts/templates/accounts-list.html | 175 ++ accounts/templates/accounts.html | 151 ++ accounts/templates/base_auth.html | 4 +- accounts/templates/create_user_block.html | 38 + .../templates/create_user_inst_block.html | 16 +- accounts/templates/login.html | 8 +- accounts/templates/logout.html | 10 +- accounts/templates/profile.html | 64 +- accounts/views.py | 18 + .../admin/common/confirm_delete.html | 2 +- admin/templates/admin/common/form.html | 8 +- admin/templates/admin/common/list.html | 4 +- admin/templates/admin/group_list.html | 10 +- admin/templates/admin/logs.html | 2 +- admin/templates/admin/user_form.html | 8 +- admin/templates/admin/user_list.html | 18 +- computes/templates/computes.html | 165 +- computes/templates/computes/form.html | 8 +- computes/templates/create_comp_block.html | 7 +- computes/templates/overview.html | 177 +- computes/views.py | 1 + conf/requirements.txt | 6 +- console/templates/console-base.html | 82 +- console/templates/console-spice-lite.html | 4 - console/templates/console-vnc-lite.html | 2 +- create/templates/create_flav_block.html | 32 +- create/templates/create_instance_w1.html | 36 +- create/templates/create_instance_w2.html | 341 +-- dev/requirements.txt | 5 +- dev/scss/bootstrap-overrides.scss | 46 + dev/scss/bootstrap/_alert.scss | 51 + dev/scss/bootstrap/_badge.scss | 54 + dev/scss/bootstrap/_breadcrumb.scss | 44 + dev/scss/bootstrap/_button-group.scss | 163 ++ dev/scss/bootstrap/_buttons.scss | 142 ++ dev/scss/bootstrap/_card.scss | 282 +++ dev/scss/bootstrap/_carousel.scss | 197 ++ dev/scss/bootstrap/_close.scss | 40 + dev/scss/bootstrap/_code.scss | 48 + dev/scss/bootstrap/_custom-forms.scss | 522 +++++ dev/scss/bootstrap/_dropdown.scss | 192 ++ dev/scss/bootstrap/_forms.scss | 347 +++ dev/scss/bootstrap/_functions.scss | 141 ++ dev/scss/bootstrap/_grid.scss | 77 + dev/scss/bootstrap/_images.scss | 42 + dev/scss/bootstrap/_input-group.scss | 192 ++ dev/scss/bootstrap/_jumbotron.scss | 17 + dev/scss/bootstrap/_list-group.scss | 154 ++ dev/scss/bootstrap/_media.scss | 8 + dev/scss/bootstrap/_mixins.scss | 47 + dev/scss/bootstrap/_modal.scss | 241 +++ dev/scss/bootstrap/_nav.scss | 121 ++ dev/scss/bootstrap/_navbar.scss | 324 +++ dev/scss/bootstrap/_pagination.scss | 74 + dev/scss/bootstrap/_popover.scss | 170 ++ dev/scss/bootstrap/_print.scss | 141 ++ dev/scss/bootstrap/_progress.scss | 47 + dev/scss/bootstrap/_reboot.scss | 480 +++++ dev/scss/bootstrap/_root.scss | 20 + dev/scss/bootstrap/_spinners.scss | 56 + dev/scss/bootstrap/_tables.scss | 185 ++ dev/scss/bootstrap/_toasts.scss | 44 + dev/scss/bootstrap/_tooltip.scss | 115 + dev/scss/bootstrap/_transitions.scss | 20 + dev/scss/bootstrap/_type.scss | 125 ++ dev/scss/bootstrap/_utilities.scss | 18 + dev/scss/bootstrap/_variables.scss | 1147 ++++++++++ dev/scss/bootstrap/bootstrap-grid.scss | 29 + dev/scss/bootstrap/bootstrap-reboot.scss | 12 + dev/scss/bootstrap/bootstrap.scss | 44 + dev/scss/bootstrap/mixins/_alert.scss | 13 + .../bootstrap/mixins/_background-variant.scss | 23 + dev/scss/bootstrap/mixins/_badge.scss | 17 + dev/scss/bootstrap/mixins/_border-radius.scss | 76 + dev/scss/bootstrap/mixins/_box-shadow.scss | 20 + dev/scss/bootstrap/mixins/_breakpoints.scss | 123 ++ dev/scss/bootstrap/mixins/_buttons.scss | 110 + dev/scss/bootstrap/mixins/_caret.scss | 62 + dev/scss/bootstrap/mixins/_clearfix.scss | 7 + dev/scss/bootstrap/mixins/_deprecate.scss | 10 + dev/scss/bootstrap/mixins/_float.scss | 14 + dev/scss/bootstrap/mixins/_forms.scss | 177 ++ dev/scss/bootstrap/mixins/_gradients.scss | 45 + .../bootstrap/mixins/_grid-framework.scss | 81 + dev/scss/bootstrap/mixins/_grid.scss | 69 + dev/scss/bootstrap/mixins/_hover.scss | 37 + dev/scss/bootstrap/mixins/_image.scss | 36 + dev/scss/bootstrap/mixins/_list-group.scss | 21 + dev/scss/bootstrap/mixins/_lists.scss | 7 + dev/scss/bootstrap/mixins/_nav-divider.scss | 11 + dev/scss/bootstrap/mixins/_pagination.scss | 22 + dev/scss/bootstrap/mixins/_reset-text.scss | 17 + dev/scss/bootstrap/mixins/_resize.scss | 6 + dev/scss/bootstrap/mixins/_screen-reader.scss | 34 + dev/scss/bootstrap/mixins/_size.scss | 7 + dev/scss/bootstrap/mixins/_table-row.scss | 39 + dev/scss/bootstrap/mixins/_text-emphasis.scss | 17 + dev/scss/bootstrap/mixins/_text-hide.scss | 11 + dev/scss/bootstrap/mixins/_text-truncate.scss | 8 + dev/scss/bootstrap/mixins/_transition.scss | 26 + dev/scss/bootstrap/mixins/_visibility.scss | 8 + dev/scss/bootstrap/utilities/_align.scss | 8 + dev/scss/bootstrap/utilities/_background.scss | 19 + dev/scss/bootstrap/utilities/_borders.scss | 75 + dev/scss/bootstrap/utilities/_clearfix.scss | 3 + dev/scss/bootstrap/utilities/_display.scss | 26 + dev/scss/bootstrap/utilities/_embed.scss | 39 + dev/scss/bootstrap/utilities/_flex.scss | 51 + dev/scss/bootstrap/utilities/_float.scss | 11 + .../bootstrap/utilities/_interactions.scss | 5 + dev/scss/bootstrap/utilities/_overflow.scss | 5 + dev/scss/bootstrap/utilities/_position.scss | 32 + .../bootstrap/utilities/_screenreaders.scss | 11 + dev/scss/bootstrap/utilities/_shadows.scss | 6 + dev/scss/bootstrap/utilities/_sizing.scss | 20 + dev/scss/bootstrap/utilities/_spacing.scss | 73 + .../bootstrap/utilities/_stretched-link.scss | 19 + dev/scss/bootstrap/utilities/_text.scss | 71 + dev/scss/bootstrap/utilities/_visibility.scss | 13 + dev/scss/bootstrap/vendor/_rfs.scss | 204 ++ dev/scss/wvc-main.scss | 3 + .../wvc-theme/bootstrap-orj/_bootswatch.scss | 23 + .../wvc-theme/bootstrap-orj/_variables.scss | 2 + dev/scss/wvc-theme/cerulean/_bootswatch.scss | 103 + dev/scss/wvc-theme/cerulean/_variables.scss | 57 + dev/scss/wvc-theme/cosmo/_bootswatch.scss | 39 + dev/scss/wvc-theme/cosmo/_variables.scss | 68 + dev/scss/wvc-theme/cyborg/_bootswatch.scss | 295 +++ dev/scss/wvc-theme/cyborg/_variables.scss | 184 ++ dev/scss/wvc-theme/darkly/_bootswatch.scss | 220 ++ dev/scss/wvc-theme/darkly/_variables.scss | 179 ++ dev/scss/wvc-theme/flatly/_bootswatch.scss | 251 +++ dev/scss/wvc-theme/flatly/_variables.scss | 108 + dev/scss/wvc-theme/journal/_bootswatch.scss | 73 + dev/scss/wvc-theme/journal/_variables.scss | 60 + dev/scss/wvc-theme/litera/_bootswatch.scss | 255 +++ dev/scss/wvc-theme/litera/_variables.scss | 94 + dev/scss/wvc-theme/lumen/_bootswatch.scss | 506 +++++ dev/scss/wvc-theme/lumen/_variables.scss | 90 + dev/scss/wvc-theme/lux/_bootswatch.scss | 178 ++ dev/scss/wvc-theme/lux/_variables.scss | 124 ++ dev/scss/wvc-theme/materia/_bootswatch.scss | 735 +++++++ dev/scss/wvc-theme/materia/_variables.scss | 136 ++ dev/scss/wvc-theme/minty/_bootswatch.scss | 325 +++ dev/scss/wvc-theme/minty/_variables.scss | 97 + dev/scss/wvc-theme/pulse/_bootswatch.scss | 154 ++ dev/scss/wvc-theme/pulse/_variables.scss | 100 + dev/scss/wvc-theme/sandstone/_bootswatch.scss | 235 ++ dev/scss/wvc-theme/sandstone/_variables.scss | 143 ++ dev/scss/wvc-theme/simplex/_bootswatch.scss | 134 ++ dev/scss/wvc-theme/simplex/_variables.scss | 108 + dev/scss/wvc-theme/sketchy/_bootswatch.scss | 492 +++++ dev/scss/wvc-theme/sketchy/_variables.scss | 172 ++ dev/scss/wvc-theme/slate/_bootswatch.scss | 503 +++++ dev/scss/wvc-theme/slate/_variables.scss | 176 ++ dev/scss/wvc-theme/solar/_bootswatch.scss | 215 ++ dev/scss/wvc-theme/solar/_variables.scss | 186 ++ dev/scss/wvc-theme/spacelab/_bootswatch.scss | 102 + dev/scss/wvc-theme/spacelab/_variables.scss | 63 + dev/scss/wvc-theme/superhero/_bootswatch.scss | 270 +++ dev/scss/wvc-theme/superhero/_variables.scss | 166 ++ dev/scss/wvc-theme/united/_bootswatch.scss | 26 + dev/scss/wvc-theme/united/_variables.scss | 53 + dev/scss/wvc-theme/yeti/_bootswatch.scss | 542 +++++ dev/scss/wvc-theme/yeti/_variables.scss | 114 + .../templates/add_instance_network_block.html | 33 +- .../templates/add_instance_owner_block.html | 18 +- instances/templates/add_instance_volume.html | 148 +- instances/templates/allinstances.html | 58 +- .../templates/allinstances_index_grouped.html | 140 +- .../allinstances_index_nongrouped.html | 80 +- instances/templates/bottom_bar.html | 32 +- instances/templates/create_inst_block.html | 27 +- instances/templates/edit_instance_volume.html | 120 +- instances/templates/instance.html | 1331 ++++++------ instances/templates/instance_actions.html | 62 + instances/templates/instances.html | 164 +- instances/templatetags/tags_active.py | 11 + instances/views.py | 39 +- interfaces/templates/create_iface_block.html | 82 +- interfaces/templates/interface.html | 95 +- interfaces/templates/interfaces.html | 59 +- networks/templates/add_network_qos.html | 26 +- networks/templates/create_net_block.html | 52 +- .../templates/modify_ipv4_fixed_address.html | 52 +- .../templates/modify_ipv6_fixed_address.html | 56 +- networks/templates/network.html | 633 +++--- networks/templates/networks.html | 73 +- nwfilters/templates/add_nwf_rule.html | 18 +- .../templates/create_nwfilter_block.html | 17 +- nwfilters/templates/nwfilter.html | 193 +- nwfilters/templates/nwfilters.html | 210 +- nwfilters/views.py | 2 +- secrets/templates/create_secret_block.html | 24 +- secrets/templates/secrets.html | 88 +- static/css/bootstrap.min.css | 6 - static/css/plugins/morris.css | 2 - static/css/sortable-theme-bootstrap.css | 61 +- static/css/webvirtcloud.css | 9 +- static/css/wvc-main.min.css | 6 + static/css/wvc-main.min.css.map | 97 + static/fonts/glyphicons-halflings-regular.eot | Bin 20127 -> 0 bytes static/fonts/glyphicons-halflings-regular.svg | 288 --- static/fonts/glyphicons-halflings-regular.ttf | Bin 45404 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 23424 -> 0 bytes .../fonts/glyphicons-halflings-regular.woff2 | Bin 18028 -> 0 bytes static/js/bootstrap-multiselect.js | 12 +- static/js/bootstrap.bundle.min.js | 7 + static/js/bootstrap.bundle.min.js.map | 1 + static/js/bootstrap.min.js | 6 - static/js/novnc/app/styles/lite.css | 1 - static/js/plugins/morris/morris.js | 1892 ----------------- static/js/plugins/morris/morris.min.js | 7 - static/js/plugins/morris/raphael.min.js | 11 - storages/templates/create_stg_block.html | 132 +- storages/templates/create_stg_vol_block.html | 42 +- storages/templates/storage.html | 165 +- storages/templates/storages.html | 134 +- templates/403.html | 4 +- templates/404.html | 4 +- templates/500.html | 4 +- templates/base.html | 6 +- templates/errors_block.html | 8 +- templates/messages_block.html | 8 +- templates/navbar.html | 63 +- templates/pleasewaitdialog.html | 2 +- webvirtcloud/common_tags.py | 2 +- webvirtcloud/settings.py.template | 5 +- 230 files changed, 19531 insertions(+), 5077 deletions(-) create mode 100644 .dockerignore create mode 100644 accounts/templates/accounts-list.html create mode 100644 accounts/templates/accounts.html create mode 100644 accounts/templates/create_user_block.html create mode 100644 dev/scss/bootstrap-overrides.scss create mode 100644 dev/scss/bootstrap/_alert.scss create mode 100644 dev/scss/bootstrap/_badge.scss create mode 100644 dev/scss/bootstrap/_breadcrumb.scss create mode 100644 dev/scss/bootstrap/_button-group.scss create mode 100644 dev/scss/bootstrap/_buttons.scss create mode 100644 dev/scss/bootstrap/_card.scss create mode 100644 dev/scss/bootstrap/_carousel.scss create mode 100644 dev/scss/bootstrap/_close.scss create mode 100644 dev/scss/bootstrap/_code.scss create mode 100644 dev/scss/bootstrap/_custom-forms.scss create mode 100644 dev/scss/bootstrap/_dropdown.scss create mode 100644 dev/scss/bootstrap/_forms.scss create mode 100644 dev/scss/bootstrap/_functions.scss create mode 100644 dev/scss/bootstrap/_grid.scss create mode 100644 dev/scss/bootstrap/_images.scss create mode 100644 dev/scss/bootstrap/_input-group.scss create mode 100644 dev/scss/bootstrap/_jumbotron.scss create mode 100644 dev/scss/bootstrap/_list-group.scss create mode 100644 dev/scss/bootstrap/_media.scss create mode 100644 dev/scss/bootstrap/_mixins.scss create mode 100644 dev/scss/bootstrap/_modal.scss create mode 100644 dev/scss/bootstrap/_nav.scss create mode 100644 dev/scss/bootstrap/_navbar.scss create mode 100644 dev/scss/bootstrap/_pagination.scss create mode 100644 dev/scss/bootstrap/_popover.scss create mode 100644 dev/scss/bootstrap/_print.scss create mode 100644 dev/scss/bootstrap/_progress.scss create mode 100644 dev/scss/bootstrap/_reboot.scss create mode 100644 dev/scss/bootstrap/_root.scss create mode 100644 dev/scss/bootstrap/_spinners.scss create mode 100644 dev/scss/bootstrap/_tables.scss create mode 100644 dev/scss/bootstrap/_toasts.scss create mode 100644 dev/scss/bootstrap/_tooltip.scss create mode 100644 dev/scss/bootstrap/_transitions.scss create mode 100644 dev/scss/bootstrap/_type.scss create mode 100644 dev/scss/bootstrap/_utilities.scss create mode 100644 dev/scss/bootstrap/_variables.scss create mode 100644 dev/scss/bootstrap/bootstrap-grid.scss create mode 100644 dev/scss/bootstrap/bootstrap-reboot.scss create mode 100644 dev/scss/bootstrap/bootstrap.scss create mode 100644 dev/scss/bootstrap/mixins/_alert.scss create mode 100644 dev/scss/bootstrap/mixins/_background-variant.scss create mode 100644 dev/scss/bootstrap/mixins/_badge.scss create mode 100644 dev/scss/bootstrap/mixins/_border-radius.scss create mode 100644 dev/scss/bootstrap/mixins/_box-shadow.scss create mode 100644 dev/scss/bootstrap/mixins/_breakpoints.scss create mode 100644 dev/scss/bootstrap/mixins/_buttons.scss create mode 100644 dev/scss/bootstrap/mixins/_caret.scss create mode 100644 dev/scss/bootstrap/mixins/_clearfix.scss create mode 100644 dev/scss/bootstrap/mixins/_deprecate.scss create mode 100644 dev/scss/bootstrap/mixins/_float.scss create mode 100644 dev/scss/bootstrap/mixins/_forms.scss create mode 100644 dev/scss/bootstrap/mixins/_gradients.scss create mode 100644 dev/scss/bootstrap/mixins/_grid-framework.scss create mode 100644 dev/scss/bootstrap/mixins/_grid.scss create mode 100644 dev/scss/bootstrap/mixins/_hover.scss create mode 100644 dev/scss/bootstrap/mixins/_image.scss create mode 100644 dev/scss/bootstrap/mixins/_list-group.scss create mode 100644 dev/scss/bootstrap/mixins/_lists.scss create mode 100644 dev/scss/bootstrap/mixins/_nav-divider.scss create mode 100644 dev/scss/bootstrap/mixins/_pagination.scss create mode 100644 dev/scss/bootstrap/mixins/_reset-text.scss create mode 100644 dev/scss/bootstrap/mixins/_resize.scss create mode 100644 dev/scss/bootstrap/mixins/_screen-reader.scss create mode 100644 dev/scss/bootstrap/mixins/_size.scss create mode 100644 dev/scss/bootstrap/mixins/_table-row.scss create mode 100644 dev/scss/bootstrap/mixins/_text-emphasis.scss create mode 100644 dev/scss/bootstrap/mixins/_text-hide.scss create mode 100644 dev/scss/bootstrap/mixins/_text-truncate.scss create mode 100644 dev/scss/bootstrap/mixins/_transition.scss create mode 100644 dev/scss/bootstrap/mixins/_visibility.scss create mode 100644 dev/scss/bootstrap/utilities/_align.scss create mode 100644 dev/scss/bootstrap/utilities/_background.scss create mode 100644 dev/scss/bootstrap/utilities/_borders.scss create mode 100644 dev/scss/bootstrap/utilities/_clearfix.scss create mode 100644 dev/scss/bootstrap/utilities/_display.scss create mode 100644 dev/scss/bootstrap/utilities/_embed.scss create mode 100644 dev/scss/bootstrap/utilities/_flex.scss create mode 100644 dev/scss/bootstrap/utilities/_float.scss create mode 100755 dev/scss/bootstrap/utilities/_interactions.scss create mode 100644 dev/scss/bootstrap/utilities/_overflow.scss create mode 100644 dev/scss/bootstrap/utilities/_position.scss create mode 100644 dev/scss/bootstrap/utilities/_screenreaders.scss create mode 100644 dev/scss/bootstrap/utilities/_shadows.scss create mode 100644 dev/scss/bootstrap/utilities/_sizing.scss create mode 100644 dev/scss/bootstrap/utilities/_spacing.scss create mode 100644 dev/scss/bootstrap/utilities/_stretched-link.scss create mode 100644 dev/scss/bootstrap/utilities/_text.scss create mode 100644 dev/scss/bootstrap/utilities/_visibility.scss create mode 100644 dev/scss/bootstrap/vendor/_rfs.scss create mode 100644 dev/scss/wvc-main.scss create mode 100755 dev/scss/wvc-theme/bootstrap-orj/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/bootstrap-orj/_variables.scss create mode 100755 dev/scss/wvc-theme/cerulean/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/cerulean/_variables.scss create mode 100755 dev/scss/wvc-theme/cosmo/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/cosmo/_variables.scss create mode 100755 dev/scss/wvc-theme/cyborg/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/cyborg/_variables.scss create mode 100755 dev/scss/wvc-theme/darkly/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/darkly/_variables.scss create mode 100755 dev/scss/wvc-theme/flatly/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/flatly/_variables.scss create mode 100755 dev/scss/wvc-theme/journal/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/journal/_variables.scss create mode 100755 dev/scss/wvc-theme/litera/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/litera/_variables.scss create mode 100755 dev/scss/wvc-theme/lumen/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/lumen/_variables.scss create mode 100755 dev/scss/wvc-theme/lux/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/lux/_variables.scss create mode 100755 dev/scss/wvc-theme/materia/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/materia/_variables.scss create mode 100755 dev/scss/wvc-theme/minty/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/minty/_variables.scss create mode 100755 dev/scss/wvc-theme/pulse/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/pulse/_variables.scss create mode 100755 dev/scss/wvc-theme/sandstone/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/sandstone/_variables.scss create mode 100755 dev/scss/wvc-theme/simplex/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/simplex/_variables.scss create mode 100755 dev/scss/wvc-theme/sketchy/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/sketchy/_variables.scss create mode 100755 dev/scss/wvc-theme/slate/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/slate/_variables.scss create mode 100755 dev/scss/wvc-theme/solar/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/solar/_variables.scss create mode 100755 dev/scss/wvc-theme/spacelab/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/spacelab/_variables.scss create mode 100755 dev/scss/wvc-theme/superhero/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/superhero/_variables.scss create mode 100755 dev/scss/wvc-theme/united/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/united/_variables.scss create mode 100755 dev/scss/wvc-theme/yeti/_bootswatch.scss create mode 100755 dev/scss/wvc-theme/yeti/_variables.scss create mode 100644 instances/templates/instance_actions.html create mode 100644 instances/templatetags/tags_active.py delete mode 100755 static/css/bootstrap.min.css delete mode 100755 static/css/plugins/morris.css create mode 100644 static/css/wvc-main.min.css create mode 100644 static/css/wvc-main.min.css.map delete mode 100755 static/fonts/glyphicons-halflings-regular.eot delete mode 100755 static/fonts/glyphicons-halflings-regular.svg delete mode 100755 static/fonts/glyphicons-halflings-regular.ttf delete mode 100755 static/fonts/glyphicons-halflings-regular.woff delete mode 100755 static/fonts/glyphicons-halflings-regular.woff2 create mode 100644 static/js/bootstrap.bundle.min.js create mode 100755 static/js/bootstrap.bundle.min.js.map delete mode 100755 static/js/bootstrap.min.js delete mode 100755 static/js/plugins/morris/morris.js delete mode 100755 static/js/plugins/morris/morris.min.js delete mode 100755 static/js/plugins/morris/raphael.min.js 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" %}