From c1488eee52310191fce7cd35fcdbd12cd3b6d28a Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 1 Oct 2021 09:48:09 +0300 Subject: [PATCH 1/2] navbars position is changed to stick-top --- console/templates/console-base.html | 2 +- static/js/novnc/app/styles/base.css | 2 +- static/js/novnc/app/styles/lite.css | 3 ++- templates/navbar.html | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/console/templates/console-base.html b/console/templates/console-base.html index 4d6e3d7e..11e38fd4 100644 --- a/console/templates/console-base.html +++ b/console/templates/console-base.html @@ -35,7 +35,7 @@
-
{% if computes_count != 1 %} - + {% else %} {% endif %} diff --git a/storages/templates/storage.html b/storages/templates/storage.html index 4840785b..b9f1af8d 100644 --- a/storages/templates/storage.html +++ b/storages/templates/storage.html @@ -11,6 +11,7 @@ {% block page_heading_extra %}{% include 'create_stg_vol_block.html' %}{% endblock page_heading_extra %} {% block content %} + {% include 'pleasewaitdialog.html' %}
@@ -152,7 +153,7 @@
{% trans "Clone image" %} {{ v
- +
@@ -190,7 +191,6 @@
{% trans "Clone image" %} {{ v {% endif %} - {% include 'pleasewaitdialog.html' %} {% endblock %} {% block script %} diff --git a/storages/views.py b/storages/views.py index 19342379..0c48ab64 100644 --- a/storages/views.py +++ b/storages/views.py @@ -171,7 +171,7 @@ def handle_uploaded_file(path, f_name): name = conn.clone_volume(data["image"], data["name"], format, meta_prealloc) messages.success( request, - _("%(image)s image cloned as %(clone)s successfully") % {"image": data["image"], "name": name}, + _("%(image)s image cloned as %(name)s successfully") % {"image": data["image"], "name": name}, ) return HttpResponseRedirect(request.get_full_path()) except libvirtError as lib_err: diff --git a/templates/pleasewaitdialog.html b/templates/pleasewaitdialog.html index 84b0d6ed..2d514713 100644 --- a/templates/pleasewaitdialog.html +++ b/templates/pleasewaitdialog.html @@ -1,6 +1,6 @@ {% load i18n %} -