From b47ec2e8f9ba3b6334d898ac782a4b8d0591a071 Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 11 Aug 2023 09:40:38 +0300 Subject: [PATCH] bootstrap icon conversion fixes --- .gitignore | 1 + accounts/templates/account.html | 2 +- accounts/templates/profile.html | 2 +- admin/templates/admin/group_list.html | 2 +- admin/templates/admin/user_form.html | 3 ++- admin/templates/admin/user_list.html | 12 +++++----- computes/templates/computes/form.html | 5 ++-- computes/templates/computes/instances.html | 21 +++++++++------- computes/templates/computes/list.html | 6 ++--- computes/templates/create_comp_block.html | 2 +- .../allinstances_index_nongrouped.html | 8 +++---- instances/templates/create_inst_block.html | 2 +- instances/templates/instance.html | 12 ++++++---- instances/templates/instance_actions.html | 18 +++++++------- nwfilters/templates/nwfilter.html | 2 +- .../icon_cache/arrow-down_None_None_None.svg | 8 +++++++ .../icon_cache/arrow-left_None_None_None.svg | 8 +++++++ .../icon_cache/arrow-right_None_None_None.svg | 8 +++++++ static/icon_cache/arrow-up_None_None_None.svg | 8 +++++++ .../arrows-angle-expand_2em_None_None.svg | 8 +++++++ .../bar-chart-line_2em_None_None.svg | 8 +++++++ static/icon_cache/broadcast_1em_None_None.svg | 8 +++++++ static/icon_cache/camera_2em_None_None.svg | 11 +++++++++ .../icon_cache/card-list_None_None_None.svg | 11 +++++++++ .../icon_cache/caret-down_None_None_None.svg | 8 +++++++ .../check-circle-fill_None_None_None.svg | 8 +++++++ .../icon_cache/chevron-up_None_None_None.svg | 8 +++++++ .../icon_cache/dash-circle_None_None_None.svg | 11 +++++++++ .../icon_cache/device-hdd_None_None_None.svg | 14 +++++++++++ static/icon_cache/eject_None_None_None.svg | 8 +++++++ .../exclamation-triangle_None_None_None.svg | 11 +++++++++ static/icon_cache/eye-fill_None_None_None.svg | 11 +++++++++ static/icon_cache/eye_None_None_None.svg | 11 +++++++++ static/icon_cache/files_None_None_None.svg | 8 +++++++ static/icon_cache/filter_None_None_None.svg | 8 +++++++ .../gear-wide-connected_2em_None_None.svg | 8 +++++++ .../gear-wide-connected_None_None_None.svg | 8 +++++++ .../icon_cache/hdd-network_None_None_None.svg | 11 +++++++++ .../icon_cache/info-circle_None_None_None.svg | 11 +++++++++ static/icon_cache/info_None_None_None.svg | 8 +++++++ static/icon_cache/key_None_None_None.svg | 11 +++++++++ static/icon_cache/laptop_None_None_None.svg | 8 +++++++ static/icon_cache/lock_2em_None_None.svg | 8 +++++++ .../icon_cache/pause-fill_None_None_None.svg | 8 +++++++ .../pc-display-horizontal_None_None_None.svg | 8 +++++++ .../icon_cache/pc-display_None_None_None.svg | 8 +++++++ .../icon_cache/pencil-fill_None_None_None.svg | 8 +++++++ .../pencil-square_None_None_None.svg | 11 +++++++++ .../icon_cache/people-fill_None_None_None.svg | 8 +++++++ .../icon_cache/person-plus_None_None_None.svg | 11 +++++++++ .../person-square_None_None_None.svg | 11 +++++++++ .../person-vcard_None_None_None.svg | 11 +++++++++ .../icon_cache/play-fill_None_None_None.svg | 8 +++++++ .../plus-circle-fill_None_None_None.svg | 8 +++++++ static/icon_cache/plus_None_None_None.svg | 8 +++++++ static/icon_cache/power_2em_None_None.svg | 11 +++++++++ static/icon_cache/power_None_None_None.svg | 11 +++++++++ static/icon_cache/qr-code_None_None_None.svg | 20 ++++++++++++++++ static/icon_cache/repeat_None_None_None.svg | 8 +++++++ static/icon_cache/server_None_None_None.svg | 14 +++++++++++ .../icon_cache/trash-fill_None_None_None.svg | 8 +++++++ static/icon_cache/trash_2em_None_None.svg | 11 +++++++++ static/icon_cache/trash_None_None_None.svg | 11 +++++++++ static/icon_cache/wifi_None_None_None.svg | 11 +++++++++ .../wrench-adjustable_None_None_None.svg | 11 +++++++++ .../x-circle-fill_None_None_None.svg | 8 +++++++ .../x-square-fill_None_None_None.svg | 8 +++++++ storages/templates/create_stg_block.html | 2 +- storages/templates/create_stg_vol_block.html | 4 ++-- templates/base.html | 1 - templates/common/confirm_delete.html | 6 +++-- templates/navbar.html | 8 +++---- .../templates/create_secret_block.html | 2 +- webvirtcloud/settings.py.template | 24 ++++++------------- 74 files changed, 569 insertions(+), 73 deletions(-) create mode 100644 static/icon_cache/arrow-down_None_None_None.svg create mode 100644 static/icon_cache/arrow-left_None_None_None.svg create mode 100644 static/icon_cache/arrow-right_None_None_None.svg create mode 100644 static/icon_cache/arrow-up_None_None_None.svg create mode 100644 static/icon_cache/arrows-angle-expand_2em_None_None.svg create mode 100644 static/icon_cache/bar-chart-line_2em_None_None.svg create mode 100644 static/icon_cache/broadcast_1em_None_None.svg create mode 100644 static/icon_cache/camera_2em_None_None.svg create mode 100644 static/icon_cache/card-list_None_None_None.svg create mode 100644 static/icon_cache/caret-down_None_None_None.svg create mode 100644 static/icon_cache/check-circle-fill_None_None_None.svg create mode 100644 static/icon_cache/chevron-up_None_None_None.svg create mode 100644 static/icon_cache/dash-circle_None_None_None.svg create mode 100644 static/icon_cache/device-hdd_None_None_None.svg create mode 100644 static/icon_cache/eject_None_None_None.svg create mode 100644 static/icon_cache/exclamation-triangle_None_None_None.svg create mode 100644 static/icon_cache/eye-fill_None_None_None.svg create mode 100644 static/icon_cache/eye_None_None_None.svg create mode 100644 static/icon_cache/files_None_None_None.svg create mode 100644 static/icon_cache/filter_None_None_None.svg create mode 100644 static/icon_cache/gear-wide-connected_2em_None_None.svg create mode 100644 static/icon_cache/gear-wide-connected_None_None_None.svg create mode 100644 static/icon_cache/hdd-network_None_None_None.svg create mode 100644 static/icon_cache/info-circle_None_None_None.svg create mode 100644 static/icon_cache/info_None_None_None.svg create mode 100644 static/icon_cache/key_None_None_None.svg create mode 100644 static/icon_cache/laptop_None_None_None.svg create mode 100644 static/icon_cache/lock_2em_None_None.svg create mode 100644 static/icon_cache/pause-fill_None_None_None.svg create mode 100644 static/icon_cache/pc-display-horizontal_None_None_None.svg create mode 100644 static/icon_cache/pc-display_None_None_None.svg create mode 100644 static/icon_cache/pencil-fill_None_None_None.svg create mode 100644 static/icon_cache/pencil-square_None_None_None.svg create mode 100644 static/icon_cache/people-fill_None_None_None.svg create mode 100644 static/icon_cache/person-plus_None_None_None.svg create mode 100644 static/icon_cache/person-square_None_None_None.svg create mode 100644 static/icon_cache/person-vcard_None_None_None.svg create mode 100644 static/icon_cache/play-fill_None_None_None.svg create mode 100644 static/icon_cache/plus-circle-fill_None_None_None.svg create mode 100644 static/icon_cache/plus_None_None_None.svg create mode 100644 static/icon_cache/power_2em_None_None.svg create mode 100644 static/icon_cache/power_None_None_None.svg create mode 100644 static/icon_cache/qr-code_None_None_None.svg create mode 100644 static/icon_cache/repeat_None_None_None.svg create mode 100644 static/icon_cache/server_None_None_None.svg create mode 100644 static/icon_cache/trash-fill_None_None_None.svg create mode 100644 static/icon_cache/trash_2em_None_None.svg create mode 100644 static/icon_cache/trash_None_None_None.svg create mode 100644 static/icon_cache/wifi_None_None_None.svg create mode 100644 static/icon_cache/wrench-adjustable_None_None_None.svg create mode 100644 static/icon_cache/x-circle-fill_None_None_None.svg create mode 100644 static/icon_cache/x-square-fill_None_None_None.svg diff --git a/.gitignore b/.gitignore index 82f321e..8860fff 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ webvirtcloud/settings.py .coverage htmlcov *.log +templates/webvirtcloud.code-workspace diff --git a/accounts/templates/account.html b/accounts/templates/account.html index b38b769..3dc7768 100644 --- a/accounts/templates/account.html +++ b/accounts/templates/account.html @@ -17,7 +17,7 @@ {% bs_icon 'pencil' %} - {% bs_icon 'plus' %} + {% bs_icon 'plus-circle-fill' %} {% endblock page_heading_extra %} diff --git a/accounts/templates/profile.html b/accounts/templates/profile.html index 33a1d3e..6e1cd5b 100644 --- a/accounts/templates/profile.html +++ b/accounts/templates/profile.html @@ -73,7 +73,7 @@ {% bootstrap_form ssh_key_form layout='horizontal' %}
diff --git a/admin/templates/admin/group_list.html b/admin/templates/admin/group_list.html index 4fdca6a..3b9c95c 100644 --- a/admin/templates/admin/group_list.html +++ b/admin/templates/admin/group_list.html @@ -7,7 +7,7 @@
- {% bs_icon 'plus' %} + {% bs_icon 'plus-circle-fill' %} {% include 'search_block.html' %}

{% trans "Groups" %}

diff --git a/admin/templates/admin/user_form.html b/admin/templates/admin/user_form.html index 319ffb7..47d6b2c 100644 --- a/admin/templates/admin/user_form.html +++ b/admin/templates/admin/user_form.html @@ -16,7 +16,8 @@ {% bootstrap_form attributes_form layout='horizontal' %}
- {% bs_icon 'x' %} {% trans "Cancel" %} + + {% bs_icon 'x-square-fill' %} {% trans "Cancel" %} diff --git a/admin/templates/admin/user_list.html b/admin/templates/admin/user_list.html index 52e76e1..2e0518b 100644 --- a/admin/templates/admin/user_list.html +++ b/admin/templates/admin/user_list.html @@ -10,7 +10,7 @@ {% block page_heading_extra %} - {% bs_icon 'plus' %} + {% bs_icon 'plus-circle-fill' %} {% include 'search_block.html' %} {% endblock page_heading_extra %} @@ -55,14 +55,14 @@ {% if can_clone %}{% bs_icon 'check' %}{% endif %} diff --git a/computes/templates/computes/form.html b/computes/templates/computes/form.html index 0a45b3a..d867ab4 100644 --- a/computes/templates/computes/form.html +++ b/computes/templates/computes/form.html @@ -18,9 +18,10 @@ {% bootstrap_form form layout='horizontal' %}
- {% bs_icon 'x' %} {% trans "Cancel" %} + + {% bs_icon 'x-square-fill' %} {% trans "Cancel" %}
diff --git a/computes/templates/computes/instances.html b/computes/templates/computes/instances.html index 85faa1e..8a41bc9 100644 --- a/computes/templates/computes/instances.html +++ b/computes/templates/computes/instances.html @@ -11,7 +11,7 @@ {% block page_heading_extra %} - {% bs_icon 'plus' %} + {% bs_icon 'plus-circle-fill' %} {% if instances %} {% include 'search_block.html' %} @@ -64,7 +64,7 @@ {% trans 'User' %} {% trans 'Status' %} {% trans 'VCPU' %} - {% trans 'Memory' %} + {% trans 'Memory' %} {% trans 'Actions' %} @@ -87,15 +87,18 @@ - {% if instance.proxy.instance.info.0 == 1 %}{% trans "Active" %}{% endif %} - {% if instance.proxy.instance.info.0 == 5 %}{% trans "Off" %}{% endif %} - {% if instance.proxy.instance.info.0 == 3 %}{% trans "Suspended" %}{% endif %} + {% if instance.proxy.instance.info.0 == 1 %} + {% trans "Active" %} + {% endif %} + {% if instance.proxy.instance.info.0 == 5 %} + {% trans "Off" %} + {% endif %} + {% if instance.proxy.instance.info.0 == 3 %} + {% trans "Suspended" %} + {% endif %} {{ instance.proxy.instance.info.3 }} - {% widthratio instance.proxy.instance.info.1 1024 1 %} MiB +

{% widthratio instance.proxy.instance.info.1 1024 1 %} MiB

{% include 'instance_actions.html' %} diff --git a/computes/templates/computes/list.html b/computes/templates/computes/list.html index 54813d5..1a59d50 100644 --- a/computes/templates/computes/list.html +++ b/computes/templates/computes/list.html @@ -45,12 +45,12 @@ diff --git a/computes/templates/create_comp_block.html b/computes/templates/create_comp_block.html index 53ab131..3d1b6b0 100644 --- a/computes/templates/create_comp_block.html +++ b/computes/templates/create_comp_block.html @@ -7,5 +7,5 @@ {% trans "SSH" %} {% trans "TLS" %} {% trans "Local" %} - {% bs_icon "plus" %} + {% bs_icon "plus-circle-fill" %}
diff --git a/instances/templates/allinstances_index_nongrouped.html b/instances/templates/allinstances_index_nongrouped.html index a836fa7..c5b06b6 100644 --- a/instances/templates/allinstances_index_nongrouped.html +++ b/instances/templates/allinstances_index_nongrouped.html @@ -31,10 +31,10 @@ {{ instance.compute.name }}
{% if instance.userinstance_set.all.count > 0 %} - {{ instance.userinstance_set.all.0.user }} - {% if instance.userinstance_set.all.count > 1 %} - (+{{ instance.userinstance_set.all.count|add:"-1" }}) - {% endif %} + {{ instance.userinstance_set.all.0.user }} + {% if instance.userinstance_set.all.count > 1 %} + (+{{ instance.userinstance_set.all.count|add:"-1" }}) + {% endif %} {% endif %} diff --git a/instances/templates/create_inst_block.html b/instances/templates/create_inst_block.html index 4179b9c..4c018fd 100644 --- a/instances/templates/create_inst_block.html +++ b/instances/templates/create_inst_block.html @@ -1,7 +1,7 @@ {% load i18n %} {% load bootstrap_icons %} - + diff --git a/instances/templates/instance.html b/instances/templates/instance.html index 780407f..7d1ae8e 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -23,7 +23,8 @@ {% trans "Suspend" %} {% endif %} | - {% bs_icon 'plug' %} + {% endif %}>{% bs_icon 'broadcast' size='1em' %} + | {% if instance.snapshots %} {% bs_icon 'camera'%} @@ -57,11 +59,11 @@ {% endfor %} {% endfor %} {% if instance.guest_agent_ready %} - - {% bs_icon 'info-circle'%} + + {% bs_icon 'info-circle' %} {% endif %} - + {% bs_icon 'repeat'%}
diff --git a/instances/templates/instance_actions.html b/instances/templates/instance_actions.html index afe9b3b..ebd4ac2 100644 --- a/instances/templates/instance_actions.html +++ b/instances/templates/instance_actions.html @@ -8,38 +8,38 @@ {% else %} - {% bs_icon 'play' %} + {% bs_icon 'play-fill' %} {% endif %} - {% bs_icon 'pause' %} + {% bs_icon 'pause-fill' %} {% bs_icon 'power' %} {% bs_icon 'repeat' %} {% endif %} {% if instance.proxy.instance.info.0 == 3 %} - {% bs_icon 'play' %} + {% bs_icon 'play-fill' %} - {% bs_icon 'pause' %} + {% bs_icon 'pause-fill' %} {% bs_icon 'power' %} {% bs_icon 'repeat' %} {% endif %} {% if instance.proxy.instance.info.0 == 1 %} - {% bs_icon 'play' %} + {% bs_icon 'play-fill' %} {% bs_icon 'pause' %} + title="{% trans "Suspend" %}">{% bs_icon 'pause-fill' %} {% bs_icon 'power' %} {% bs_icon 'repeat' %} {% endif %} diff --git a/nwfilters/templates/nwfilter.html b/nwfilters/templates/nwfilter.html index 6b05954..6c83617 100644 --- a/nwfilters/templates/nwfilter.html +++ b/nwfilters/templates/nwfilter.html @@ -77,7 +77,7 @@ {% endfor %} diff --git a/static/icon_cache/arrow-down_None_None_None.svg b/static/icon_cache/arrow-down_None_None_None.svg new file mode 100644 index 0000000..0fb1593 --- /dev/null +++ b/static/icon_cache/arrow-down_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/arrow-left_None_None_None.svg b/static/icon_cache/arrow-left_None_None_None.svg new file mode 100644 index 0000000..23e892e --- /dev/null +++ b/static/icon_cache/arrow-left_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/arrow-right_None_None_None.svg b/static/icon_cache/arrow-right_None_None_None.svg new file mode 100644 index 0000000..fe59703 --- /dev/null +++ b/static/icon_cache/arrow-right_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/arrow-up_None_None_None.svg b/static/icon_cache/arrow-up_None_None_None.svg new file mode 100644 index 0000000..bbeb03d --- /dev/null +++ b/static/icon_cache/arrow-up_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/arrows-angle-expand_2em_None_None.svg b/static/icon_cache/arrows-angle-expand_2em_None_None.svg new file mode 100644 index 0000000..890606a --- /dev/null +++ b/static/icon_cache/arrows-angle-expand_2em_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/bar-chart-line_2em_None_None.svg b/static/icon_cache/bar-chart-line_2em_None_None.svg new file mode 100644 index 0000000..60ddfdb --- /dev/null +++ b/static/icon_cache/bar-chart-line_2em_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/broadcast_1em_None_None.svg b/static/icon_cache/broadcast_1em_None_None.svg new file mode 100644 index 0000000..9f600cd --- /dev/null +++ b/static/icon_cache/broadcast_1em_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/camera_2em_None_None.svg b/static/icon_cache/camera_2em_None_None.svg new file mode 100644 index 0000000..83e1c45 --- /dev/null +++ b/static/icon_cache/camera_2em_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/card-list_None_None_None.svg b/static/icon_cache/card-list_None_None_None.svg new file mode 100644 index 0000000..112c34f --- /dev/null +++ b/static/icon_cache/card-list_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/caret-down_None_None_None.svg b/static/icon_cache/caret-down_None_None_None.svg new file mode 100644 index 0000000..6164603 --- /dev/null +++ b/static/icon_cache/caret-down_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/check-circle-fill_None_None_None.svg b/static/icon_cache/check-circle-fill_None_None_None.svg new file mode 100644 index 0000000..857ee1b --- /dev/null +++ b/static/icon_cache/check-circle-fill_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/chevron-up_None_None_None.svg b/static/icon_cache/chevron-up_None_None_None.svg new file mode 100644 index 0000000..33dc946 --- /dev/null +++ b/static/icon_cache/chevron-up_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/dash-circle_None_None_None.svg b/static/icon_cache/dash-circle_None_None_None.svg new file mode 100644 index 0000000..4f8d220 --- /dev/null +++ b/static/icon_cache/dash-circle_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/device-hdd_None_None_None.svg b/static/icon_cache/device-hdd_None_None_None.svg new file mode 100644 index 0000000..58a82e2 --- /dev/null +++ b/static/icon_cache/device-hdd_None_None_None.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/static/icon_cache/eject_None_None_None.svg b/static/icon_cache/eject_None_None_None.svg new file mode 100644 index 0000000..7bc449f --- /dev/null +++ b/static/icon_cache/eject_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/exclamation-triangle_None_None_None.svg b/static/icon_cache/exclamation-triangle_None_None_None.svg new file mode 100644 index 0000000..dd7d052 --- /dev/null +++ b/static/icon_cache/exclamation-triangle_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/eye-fill_None_None_None.svg b/static/icon_cache/eye-fill_None_None_None.svg new file mode 100644 index 0000000..b697052 --- /dev/null +++ b/static/icon_cache/eye-fill_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/eye_None_None_None.svg b/static/icon_cache/eye_None_None_None.svg new file mode 100644 index 0000000..dd8e700 --- /dev/null +++ b/static/icon_cache/eye_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/files_None_None_None.svg b/static/icon_cache/files_None_None_None.svg new file mode 100644 index 0000000..cf4ada8 --- /dev/null +++ b/static/icon_cache/files_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/filter_None_None_None.svg b/static/icon_cache/filter_None_None_None.svg new file mode 100644 index 0000000..92bbd88 --- /dev/null +++ b/static/icon_cache/filter_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/gear-wide-connected_2em_None_None.svg b/static/icon_cache/gear-wide-connected_2em_None_None.svg new file mode 100644 index 0000000..8772361 --- /dev/null +++ b/static/icon_cache/gear-wide-connected_2em_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/gear-wide-connected_None_None_None.svg b/static/icon_cache/gear-wide-connected_None_None_None.svg new file mode 100644 index 0000000..b69b429 --- /dev/null +++ b/static/icon_cache/gear-wide-connected_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/hdd-network_None_None_None.svg b/static/icon_cache/hdd-network_None_None_None.svg new file mode 100644 index 0000000..4351394 --- /dev/null +++ b/static/icon_cache/hdd-network_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/info-circle_None_None_None.svg b/static/icon_cache/info-circle_None_None_None.svg new file mode 100644 index 0000000..d45ad1c --- /dev/null +++ b/static/icon_cache/info-circle_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/info_None_None_None.svg b/static/icon_cache/info_None_None_None.svg new file mode 100644 index 0000000..c525f61 --- /dev/null +++ b/static/icon_cache/info_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/key_None_None_None.svg b/static/icon_cache/key_None_None_None.svg new file mode 100644 index 0000000..3ffcc5c --- /dev/null +++ b/static/icon_cache/key_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/laptop_None_None_None.svg b/static/icon_cache/laptop_None_None_None.svg new file mode 100644 index 0000000..0ca8c70 --- /dev/null +++ b/static/icon_cache/laptop_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/lock_2em_None_None.svg b/static/icon_cache/lock_2em_None_None.svg new file mode 100644 index 0000000..557da1a --- /dev/null +++ b/static/icon_cache/lock_2em_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/pause-fill_None_None_None.svg b/static/icon_cache/pause-fill_None_None_None.svg new file mode 100644 index 0000000..f02ffac --- /dev/null +++ b/static/icon_cache/pause-fill_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/pc-display-horizontal_None_None_None.svg b/static/icon_cache/pc-display-horizontal_None_None_None.svg new file mode 100644 index 0000000..d13f51a --- /dev/null +++ b/static/icon_cache/pc-display-horizontal_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/pc-display_None_None_None.svg b/static/icon_cache/pc-display_None_None_None.svg new file mode 100644 index 0000000..8e6938e --- /dev/null +++ b/static/icon_cache/pc-display_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/pencil-fill_None_None_None.svg b/static/icon_cache/pencil-fill_None_None_None.svg new file mode 100644 index 0000000..7e1abbc --- /dev/null +++ b/static/icon_cache/pencil-fill_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/pencil-square_None_None_None.svg b/static/icon_cache/pencil-square_None_None_None.svg new file mode 100644 index 0000000..c30e821 --- /dev/null +++ b/static/icon_cache/pencil-square_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/people-fill_None_None_None.svg b/static/icon_cache/people-fill_None_None_None.svg new file mode 100644 index 0000000..9e325ae --- /dev/null +++ b/static/icon_cache/people-fill_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/person-plus_None_None_None.svg b/static/icon_cache/person-plus_None_None_None.svg new file mode 100644 index 0000000..377a8e7 --- /dev/null +++ b/static/icon_cache/person-plus_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/person-square_None_None_None.svg b/static/icon_cache/person-square_None_None_None.svg new file mode 100644 index 0000000..94b161e --- /dev/null +++ b/static/icon_cache/person-square_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/person-vcard_None_None_None.svg b/static/icon_cache/person-vcard_None_None_None.svg new file mode 100644 index 0000000..4635336 --- /dev/null +++ b/static/icon_cache/person-vcard_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/play-fill_None_None_None.svg b/static/icon_cache/play-fill_None_None_None.svg new file mode 100644 index 0000000..9aad694 --- /dev/null +++ b/static/icon_cache/play-fill_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/plus-circle-fill_None_None_None.svg b/static/icon_cache/plus-circle-fill_None_None_None.svg new file mode 100644 index 0000000..48eead9 --- /dev/null +++ b/static/icon_cache/plus-circle-fill_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/plus_None_None_None.svg b/static/icon_cache/plus_None_None_None.svg new file mode 100644 index 0000000..eb07af0 --- /dev/null +++ b/static/icon_cache/plus_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/power_2em_None_None.svg b/static/icon_cache/power_2em_None_None.svg new file mode 100644 index 0000000..39dc042 --- /dev/null +++ b/static/icon_cache/power_2em_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/power_None_None_None.svg b/static/icon_cache/power_None_None_None.svg new file mode 100644 index 0000000..3873e3f --- /dev/null +++ b/static/icon_cache/power_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/qr-code_None_None_None.svg b/static/icon_cache/qr-code_None_None_None.svg new file mode 100644 index 0000000..783bc3b --- /dev/null +++ b/static/icon_cache/qr-code_None_None_None.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/static/icon_cache/repeat_None_None_None.svg b/static/icon_cache/repeat_None_None_None.svg new file mode 100644 index 0000000..1e8ec26 --- /dev/null +++ b/static/icon_cache/repeat_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/server_None_None_None.svg b/static/icon_cache/server_None_None_None.svg new file mode 100644 index 0000000..0d6de58 --- /dev/null +++ b/static/icon_cache/server_None_None_None.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/static/icon_cache/trash-fill_None_None_None.svg b/static/icon_cache/trash-fill_None_None_None.svg new file mode 100644 index 0000000..adc4933 --- /dev/null +++ b/static/icon_cache/trash-fill_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/trash_2em_None_None.svg b/static/icon_cache/trash_2em_None_None.svg new file mode 100644 index 0000000..4605034 --- /dev/null +++ b/static/icon_cache/trash_2em_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/trash_None_None_None.svg b/static/icon_cache/trash_None_None_None.svg new file mode 100644 index 0000000..f8e7e62 --- /dev/null +++ b/static/icon_cache/trash_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/wifi_None_None_None.svg b/static/icon_cache/wifi_None_None_None.svg new file mode 100644 index 0000000..5240dd6 --- /dev/null +++ b/static/icon_cache/wifi_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/wrench-adjustable_None_None_None.svg b/static/icon_cache/wrench-adjustable_None_None_None.svg new file mode 100644 index 0000000..655b6ff --- /dev/null +++ b/static/icon_cache/wrench-adjustable_None_None_None.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/static/icon_cache/x-circle-fill_None_None_None.svg b/static/icon_cache/x-circle-fill_None_None_None.svg new file mode 100644 index 0000000..1975b76 --- /dev/null +++ b/static/icon_cache/x-circle-fill_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/static/icon_cache/x-square-fill_None_None_None.svg b/static/icon_cache/x-square-fill_None_None_None.svg new file mode 100644 index 0000000..f7a25c7 --- /dev/null +++ b/static/icon_cache/x-square-fill_None_None_None.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/storages/templates/create_stg_block.html b/storages/templates/create_stg_block.html index 9d8cc44..0f90390 100644 --- a/storages/templates/create_stg_block.html +++ b/storages/templates/create_stg_block.html @@ -2,7 +2,7 @@ {% load bootstrap_icons %} {% if request.user.is_superuser %} - + diff --git a/storages/templates/create_stg_vol_block.html b/storages/templates/create_stg_vol_block.html index 403a7de..8da885e 100644 --- a/storages/templates/create_stg_vol_block.html +++ b/storages/templates/create_stg_vol_block.html @@ -5,7 +5,7 @@ {% if state != 0 %} {% if pool == "iso" %} - + @@ -36,7 +36,7 @@ {% else %} - + diff --git a/templates/base.html b/templates/base.html index a5e8d22..9c0a8c7 100644 --- a/templates/base.html +++ b/templates/base.html @@ -21,7 +21,6 @@ {% block style %}{% endblock %} - diff --git a/templates/common/confirm_delete.html b/templates/common/confirm_delete.html index 843af8a..ce917ae 100644 --- a/templates/common/confirm_delete.html +++ b/templates/common/confirm_delete.html @@ -16,9 +16,11 @@ {%trans "Are you sure you want to delete" %} "{{ object }}"?
- {% bs_icon 'x' %} {% trans "Cancel" %} + + {% bs_icon 'x-circle-fill' %} {% trans "Cancel" %} +
diff --git a/templates/navbar.html b/templates/navbar.html index a854a65..72f3892 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -11,11 +11,11 @@