From 4dc0b65319ed3a2c7c78002d2323221fe8a809c8 Mon Sep 17 00:00:00 2001 From: catborise Date: Fri, 22 May 2020 01:13:39 +0300 Subject: [PATCH] bootstrap 4.5 fixations & Update strings style to f-string --- accounts/templates/profile.html | 8 +++---- create/templates/create_instance_w1.html | 4 ++-- create/templates/create_instance_w2.html | 6 ++--- .../templates/add_instance_network_block.html | 2 +- instances/templates/add_instance_volume.html | 15 ++++++------- .../templates/allinstances_index_grouped.html | 16 +++++++------- instances/templates/edit_instance_volume.html | 22 +++++++++---------- instances/templates/instance.html | 8 +++---- instances/views.py | 18 +++++++-------- networks/views.py | 12 +++++----- nwfilters/views.py | 4 ++-- templates/base.html | 2 +- 12 files changed, 58 insertions(+), 59 deletions(-) diff --git a/accounts/templates/profile.html b/accounts/templates/profile.html index cc89a54..2a78c24 100644 --- a/accounts/templates/profile.html +++ b/accounts/templates/profile.html @@ -16,7 +16,7 @@

{% trans "Edit Profile" %}

-
{% csrf_token %} + {% csrf_token %}
@@ -43,7 +43,7 @@ {% if show_profile_edit_password %}

{% trans "Edit Password" %}

-
{% csrf_token %} + {% csrf_token %}
@@ -93,7 +93,7 @@
{% endif %} - {% csrf_token %} + {% csrf_token %}
@@ -114,7 +114,7 @@ {% if request.user.is_superuser %}

{% trans "Themes" %}

-
{% csrf_token %} + {% csrf_token %}
diff --git a/create/templates/create_instance_w1.html b/create/templates/create_instance_w1.html index 4e3b53f..950671c 100644 --- a/create/templates/create_instance_w1.html +++ b/create/templates/create_instance_w1.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% load i18n %} {% load staticfiles %} -{% block title %}{% trans "Create new instance - Select Type" %}{% endblock %} +{% block title %}{% trans "Create new instanc" %} - {% trans "Select Type" %}{% endblock %} {% block content %} @@ -84,7 +84,7 @@
- {% csrf_token %} + {% csrf_token %}
diff --git a/create/templates/create_instance_w2.html b/create/templates/create_instance_w2.html index 7fe3463..18b671c 100644 --- a/create/templates/create_instance_w2.html +++ b/create/templates/create_instance_w2.html @@ -114,7 +114,7 @@
- {% if firmwares %} + {% if firmwares %}
@@ -286,7 +286,7 @@ - {% csrf_token %} + {% csrf_token %} -
    - {% for storage in storages_host %} -
  • {{ storage }}
    • - {% endfor %} -
- + +
+ {% for storage in storages_host %} + {{ storage }} + {% endfor %} +
+
diff --git a/instances/templates/allinstances_index_grouped.html b/instances/templates/allinstances_index_grouped.html index a93c7d1..9b4b503 100644 --- a/instances/templates/allinstances_index_grouped.html +++ b/instances/templates/allinstances_index_grouped.html @@ -2,18 +2,18 @@ - + - + {% for host, insts in all_host_vms.items %} - + @@ -23,9 +23,9 @@ @@ -74,14 +74,14 @@ function hide_all_host_instances() { all_host_rows = rows.filter('[host]'); all_host_rows.toggle(); $('span[id^=collapse_host_instances_]').toggleClass("fa-chevron-down").toggleClass("fa-chevron-up"); - $('span[id^=inst_count_badge_]').toggleClass("hidden"); + $('span[id^=inst_count_badge_]').toggleClass("d-none"); } function hide_host_instances(host) { var rows = $('table tr'); host_rows = rows.filter("[host='"+host+"']"); host_rows.toggle(); $("span[id='collapse_host_instances_"+host+"']").toggleClass("fa-chevron-down").toggleClass("fa-chevron-up"); - $("span[id='inst_count_badge_"+host+"']").toggleClass("hidden"); + $("span[id='inst_count_badge_"+host+"']").toggleClass("d-none"); } {% endblock %} diff --git a/instances/templates/edit_instance_volume.html b/instances/templates/edit_instance_volume.html index ca93e69..008b312 100644 --- a/instances/templates/edit_instance_volume.html +++ b/instances/templates/edit_instance_volume.html @@ -14,20 +14,20 @@
-
    -
  • +
    -
    +
    @@ -36,19 +36,19 @@
    -
    - +
    +
    -
    - +
    +
    -
    +
    @@ -73,7 +73,7 @@
    -
    +
    diff --git a/instances/templates/instance.html b/instances/templates/instance.html index 6c642d1..905f066 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -313,8 +313,8 @@ {% trans 'Toggle Dropdown' %}
    - {% trans "Console - Lite" %} - {% trans "Console - Full" %} + {% trans "Console" %} - {% trans "Lite" %} + {% trans "Console" %} - {% trans "Full" %}
    {% else %} @@ -328,7 +328,7 @@ {% csrf_token %}
    - +
    {% ifequal status 5 %} @@ -1205,7 +1205,7 @@

    {% trans "If you need to edit xml please Power Off the instance" %}

    - {% csrf_token %} + {% csrf_token %}
    diff --git a/instances/views.py b/instances/views.py index 556b8ec..304d95a 100644 --- a/instances/views.py +++ b/instances/views.py @@ -834,7 +834,7 @@ def instance(request, compute_id, vname): if status == 'False': conn.remove_guest_agent() - msg = _("Set Quest Agent {}".format(status)) + msg = _(f"Set Quest Agent {status}") addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#options') @@ -906,7 +906,7 @@ def instance(request, compute_id, vname): state = request.POST.get('set_link_state') state = 'down' if state == 'up' else 'up' conn.set_link_state(mac_address, state) - msg = _("Set Link State: {}".format(state)) + msg = _(f"Set Link State: {state}") addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#network') @@ -922,11 +922,11 @@ def instance(request, compute_id, vname): try: conn.set_qos(mac, qos_dir, average, peak, burst) if conn.get_status() == 5: - messages.success(request, "{} QoS is set".format(qos_dir.capitalize())) + messages.success(request, _(f"{qos_dir.capitalize()} QoS is set")) else: messages.success(request, - "{} QoS is set. Network XML is changed.".format(qos_dir.capitalize()) + - "Stop and start network to activate new config") + _(f"{qos_dir.capitalize()} QoS is set. Network XML is changed.") + + _("Stop and start network to activate new config")) except libvirtError as le: messages.error(request, le) @@ -937,10 +937,10 @@ def instance(request, compute_id, vname): conn.unset_qos(mac, qos_dir) if conn.get_status() == 5: - messages.success(request, "{} QoS is deleted".format(qos_dir.capitalize())) + messages.success(request, _(f"{qos_dir.capitalize()} QoS is deleted")) else: messages.success(request, - "{} QoS is deleted. Network XML is changed. ".format(qos_dir.capitalize()) + + f"{qos_dir.capitalize()} QoS is deleted. Network XML is changed. " + "Stop and start network to activate new config.") return HttpResponseRedirect(request.get_full_path() + '#network') @@ -958,7 +958,7 @@ def instance(request, compute_id, vname): else: add_user_inst = UserInstance(instance=instance, user_id=user_id) add_user_inst.save() - msg = _("Added owner %d" % user_id) + msg = _(f"Added owner {user_id}") addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#users') @@ -966,7 +966,7 @@ def instance(request, compute_id, vname): userinstance_id = int(request.POST.get('userinstance', '')) userinstance = UserInstance.objects.get(pk=userinstance_id) userinstance.delete() - msg = _("Deleted owner %d" % userinstance_id) + msg = _(f"Deleted owner {userinstance_id}") addlogmsg(request.user.username, instance.name, msg) return HttpResponseRedirect(request.get_full_path() + '#users') diff --git a/networks/views.py b/networks/views.py index 38556cb..32bb82a 100644 --- a/networks/views.py +++ b/networks/views.py @@ -162,7 +162,7 @@ def network(request, compute_id, pool): try: ret_val = conn.modify_fixed_address(name, address, mac_duid, family) - messages.success(request, _("{} Fixed Address Operation Completed.").format(family.upper())) + messages.success(request, _(f"{family.upper()} Fixed Address Operation Completed.")) return HttpResponseRedirect(request.get_full_path()) except libvirtError as lib_err: error_messages.append(lib_err) @@ -172,7 +172,7 @@ def network(request, compute_id, pool): ip = request.POST.get('address', '') family = request.POST.get('family', 'ipv4') conn.delete_fixed_address(ip, family) - messages.success(request, _("{} Fixed Address is Deleted.").format(family.upper())) + messages.success(request, _(f"{family.upper()} Fixed Address is Deleted.")) return HttpResponseRedirect(request.get_full_path()) if 'modify_dhcp_range' in request.POST: range_start = request.POST.get('range_start', '') @@ -180,7 +180,7 @@ def network(request, compute_id, pool): family = request.POST.get('family', 'ipv4') try: conn.modify_dhcp_range(range_start, range_end, family) - messages.success(request, _("{} DHCP Range is Changed.").format(family.upper())) + messages.success(request, _(f"{family.upper()} DHCP Range is Changed.")) return HttpResponseRedirect(request.get_full_path()) except libvirtError as lib_err: error_messages.append(lib_err) @@ -203,7 +203,7 @@ def network(request, compute_id, pool): try: conn.set_qos(qos_dir, average, peak, burst) if conn.is_active(): - messages.success(request, _("{} QoS is set. Network XML is changed.").format(qos_dir.capitalize()) + + messages.success(request, _(f"{qos_dir.capitalize()} QoS is set. Network XML is changed.") + _("Stop and start network to activate new config")) else: messages.success(request, _("{} QoS is set").format(qos_dir.capitalize())) @@ -215,10 +215,10 @@ def network(request, compute_id, pool): conn.unset_qos(qos_dir) if conn.is_active(): - messages.success(request, _("{} QoS is deleted. Network XML is changed. ").format(qos_dir.capitalize()) + + messages.success(request, _(f"{qos_dir.capitalize()} QoS is deleted. Network XML is changed. ") + _("Stop and start network to activate new config.")) else: - messages.success(request, _("{} QoS is deleted").format(qos_dir.capitalize())) + messages.success(request, _(f"{qos_dir.capitalize()} QoS is deleted")) return HttpResponseRedirect(request.get_full_path()) conn.close() diff --git a/nwfilters/views.py b/nwfilters/views.py index 8b1fd09..9f2a29b 100644 --- a/nwfilters/views.py +++ b/nwfilters/views.py @@ -61,7 +61,7 @@ def nwfilters(request, compute_id): if 'del_nwfilter' in request.POST: name = request.POST.get('nwfiltername', '') - msg = _("Deleting NWFilter: %s" % name) + msg = _(f"Deleting NWFilter: {name}") in_use = False nwfilter = conn.get_nwfilter(name) @@ -73,7 +73,7 @@ def nwfilters(request, compute_id): if name in dom_filterrefs: in_use = True - msg = _("NWFilter is in use by %s. Cannot be deleted." % inst) + msg = _(f"NWFilter is in use by {inst}. Cannot be deleted.") error_messages.append(msg) addlogmsg(request.user.username, compute.hostname, msg) i_conn.close() diff --git a/templates/base.html b/templates/base.html index fb7c55c..4ec1797 100644 --- a/templates/base.html +++ b/templates/base.html @@ -4,7 +4,7 @@ - +
## {% trans "Name" %}
{% trans "Description" %}		 {% trans "User"%} {% trans "Status" %} {% trans "VCPU" %} {% trans "Memory" %}{% trans "Actions & Mem Usage" %}{% trans "Actions" %} & {% trans "Mem Usage" %}
- {% ifequal host.2 1 %}{% trans "Active" %}{% endifequal %} - {% ifequal host.2 2 %}{% trans "Not Active" %}{% endifequal %} - {% ifequal host.2 3 %}{% trans "Connection Failed" %}{% endifequal %} + {% ifequal host.2 1 %}{% trans "Active" %}{% endifequal %} + {% ifequal host.2 2 %}{% trans "Not Active" %}{% endifequal %} + {% ifequal host.2 3 %}{% trans "Connection Failed" %}{% endifequal %} {{ host.3 }} {{ host.4|filesizeformat }}