diff --git a/appsettings/migrations/0023_remove_bottom_bar.py b/appsettings/migrations/0023_remove_bottom_bar.py new file mode 100644 index 00000000..aae52186 --- /dev/null +++ b/appsettings/migrations/0023_remove_bottom_bar.py @@ -0,0 +1,18 @@ +from django.db import migrations + + +def remove_bottom_bar(apps, schema_editor): + """A VM's page shows its host's links above it, always, as the host's + pages do: the setting for the bar at the bottom goes.""" + AppSettings = apps.get_model("appsettings", "AppSettings") + AppSettings.objects.using(schema_editor.connection.alias).filter(key="VIEW_INSTANCE_DETAIL_BOTTOM_BAR").delete() + + +class Migration(migrations.Migration): + dependencies = [ + ("appsettings", "0022_cpu_mode_choices"), + ] + + operations = [ + migrations.RunPython(remove_bottom_bar, migrations.RunPython.noop), + ] diff --git a/appsettings/tests/test_migrations.py b/appsettings/tests/test_migrations.py index 30f0829f..c2325d21 100644 --- a/appsettings/tests/test_migrations.py +++ b/appsettings/tests/test_migrations.py @@ -95,10 +95,13 @@ descriptions = importlib.import_module("appsettings.migrations.0021_setting_desc class DescriptionsTestCase(TestCase): def test_every_setting_says_what_it_does_within_its_column(self): limit = AppSettings._meta.get_field("description").max_length + removed = {"VIEW_INSTANCE_DETAIL_BOTTOM_BAR"} # by 0023 for key, text in descriptions.DESCRIPTIONS.items(): with self.subTest(key=key): self.assertLessEqual(len(text), limit) - self.assertEqual(AppSettings.objects.get(key=key).description, text) + if key not in removed: + self.assertEqual(AppSettings.objects.get(key=key).description, text) + self.assertFalse(AppSettings.objects.filter(key__in=removed).exists()) cpu_mode = importlib.import_module("appsettings.migrations.0022_cpu_mode_choices") diff --git a/appsettings/views.py b/appsettings/views.py index e676e2ec..fcd62f07 100644 --- a/appsettings/views.py +++ b/appsettings/views.py @@ -46,8 +46,7 @@ GROUPS = [ (_("Snapshots and jobs"), ["SNAPSHOT_FREE_SPACE_PERCENT", "SNAPSHOT_FREE_SPACE_MIN_GIB", "WORKER_CONCURRENCY", "JOB_RETENTION_DAYS"]), (_("Login"), ["LOGIN_FAILURE_LIMIT", "LOGIN_LOCKOUT_MINUTES"]), - (_("Lists and pages"), ["VIEW_INSTANCES_LIST_STYLE", "VIEW_INSTANCE_DETAIL_BOTTOM_BAR", "VM_DRBD_STATUS", - "LOGS_PER_PAGE"]), + (_("Lists and pages"), ["VIEW_INSTANCES_LIST_STYLE", "VM_DRBD_STATUS", "LOGS_PER_PAGE"]), ] diff --git a/instances/templates/add_instance_network_block.html b/instances/templates/add_instance_network_block.html index 560320cc..72bf2a8f 100644 --- a/instances/templates/add_instance_network_block.html +++ b/instances/templates/add_instance_network_block.html @@ -1,7 +1,7 @@ {% load i18n %} {% load bootstrap_icons %} {% if request.user.is_superuser %} - diff --git a/instances/templates/add_instance_owner_block.html b/instances/templates/add_instance_owner_block.html index b26f1a52..b26a4bfc 100644 --- a/instances/templates/add_instance_owner_block.html +++ b/instances/templates/add_instance_owner_block.html @@ -1,7 +1,7 @@ {% load i18n %} {% load bootstrap_icons %} {% if request.user.is_superuser %} - + diff --git a/instances/templates/add_instance_volume.html b/instances/templates/add_instance_volume.html index 762bc5b7..6b13c17e 100644 --- a/instances/templates/add_instance_volume.html +++ b/instances/templates/add_instance_volume.html @@ -1,7 +1,7 @@ {% load i18n %} {% load bootstrap_icons %} {% if request.user.is_superuser %} - + @@ -93,7 +93,7 @@
- +
@@ -147,7 +147,7 @@
- +
diff --git a/instances/templates/bottom_bar.html b/instances/templates/bottom_bar.html deleted file mode 100644 index c2945340..00000000 --- a/instances/templates/bottom_bar.html +++ /dev/null @@ -1,28 +0,0 @@ -{% load i18n %} -{% load bootstrap_icons %} - diff --git a/instances/templates/instance.html b/instances/templates/instance.html index 615bf795..f44ddd83 100644 --- a/instances/templates/instance.html +++ b/instances/templates/instance.html @@ -7,115 +7,92 @@ {% block title %}{% trans "Instance" %} - {{ instance.name }}{% endblock %} -{% block page_heading %} -{{ instance.name }}{% if instance.title %} ({{ instance.title }}){% endif %} -{% endblock page_heading %} +{% block page_header %}{% endblock page_header %}{# the card below has the heading #} {% block content %} {% include 'pleasewaitdialog.html' %} -
-
- {% vm_state instance.status as state %} - {{ state.0 }} - | - +
+
+
+
+

{{ instance.name }}

+ {% vm_state instance.status as state %} + {{ state.0 }} +
+ {% if instance.title %}

{{ instance.title }}

{% endif %} + {% include 'instances/host_link.html' %} +
+
{% if instance.guest_agent_ready %} - class="badge bg-success" - title="{% trans "Guest Agent Enabled & Connected" %}" - {% else %} - class="badge bg-warning" - title="{% trans "Guest Agent Enabled but not Connected" %}" + {% endif %} + {% bs_icon 'arrow-clockwise' %} {% trans "Refresh" %} +
+
+
+ {% if not instance.guest_agent %} + {% bs_icon 'dash-circle' %} {% trans "Guest agent off" %} + {% elif instance.guest_agent_ready %} + {% bs_icon 'check-circle' %} {% trans "Guest agent connected" %} {% else %} - class="badge bg-danger" - title="{% trans "Guest Agent Not Enabled & Not Connected" %}" - {% endif %}>{% bs_icon 'broadcast' size='1em' %} - - | - {% if instance.snapshots %} - {% bs_icon 'camera'%} - | - {% endif %} - {% if instance.cur_vcpu %} - {{ instance.cur_vcpu }} {% trans "VCPU" %} - {% else %} - {{ instance.vcpu }} {% trans "VCPU" %} - {% endif %} - | - {{ instance.cur_memory }} {% trans "MB" %} {% trans "RAM" %} - | - {% for disk in instance.disks %} - {{ disk.size|filesizeformat }} {% trans "Disk" %} | - {% endfor %} - {% for net in instance.networks %} - {% for ipv4 in net.ipv4 %} - {{ ipv4 }} | - {% endfor %} - {% endfor %} - {% if instance.guest_agent_ready %} - - {% bs_icon 'info-circle' %} - - {% endif %} - - {% bs_icon 'repeat'%} - + {% bs_icon 'exclamation-circle' %} {% trans "Guest agent not connected" %} + {% endif %} + {% bs_icon 'camera' %} {% blocktrans count counter=instance.snapshots|length %}{{ counter }} snapshot{% plural %}{{ counter }} snapshots{% endblocktrans %} +
+
+
+
{% trans "CPU" %}
+
{% firstof instance.cur_vcpu instance.vcpu %} {% trans "of" %} {{ instance.vcpu }} {% trans "vCPU" %}
+
+
+
{% trans "Memory" %}
+
{{ instance.cur_memory }} {% trans "MB" %}
+
+
+
{% trans "Disks" %}
+
{% for disk in instance.disks %}{{ disk.dev }} {{ disk.size|filesizeformat }}{% if not forloop.last %} · {% endif %}{% empty %}{% trans "None" %}{% endfor %}
+
+
+
{% trans "IPv4" %}
+
{{ ipv4_addresses|join:", "|default:"—" }}
+
+
-
-
+
+ +
+
- -
{% include 'instances/power_tab.html' %} @@ -128,10 +105,6 @@
- {% if app_settings.VIEW_INSTANCE_DETAIL_BOTTOM_BAR == 'True' %} - {% include 'bottom_bar.html' %} - {% endif %} - {% endblock %} {% block script %} diff --git a/instances/templates/instances/access_tab.html b/instances/templates/instances/access_tab.html index 76e7a191..1169c82e 100644 --- a/instances/templates/instances/access_tab.html +++ b/instances/templates/instances/access_tab.html @@ -1,7 +1,9 @@ {% load i18n %} -
+
-
    +
    +
    +
      {% endif %}
    +
    -
    -
    +
    +

    {% blocktrans with type=instance.console_type|upper %} This action opens a new window with a {{ type }} connection to the console of the instance.{% endblocktrans %}

    {% if not can_open_console %} @@ -39,17 +42,17 @@ {% else %} {% if instance.status == 1 %} {# one window per VM: opening it again reloads it #} - {% else %} - + {% endif %} {% endif %}
    {% if app_settings.SHOW_ACCESS_ROOT_PASSWORD == 'True' and can_change %} -
    +

    {% trans "Shut the VM down, or run it with its QEMU guest agent, and enter a new root password." %}

    @@ -61,18 +64,18 @@
    {% if instance.status == 5 or instance.status == 1 and instance.guest_agent_ready %} - {% else %} + class="btn btn-primary float-end disabled">{% trans "Reset Root Password" %} {% endif %}
    {% endif %} {% if app_settings.SHOW_ACCESS_SSH_KEYS == 'True' and can_change %} -
    +

    {% trans "Shut the VM down, or run it with its QEMU guest agent, and choose your public key. The key is added to root's keys." %}

    @@ -91,27 +94,28 @@
    {% if instance.status == 5 or instance.status == 1 and instance.guest_agent_ready %} - {% else %} - + {% endif %}
    {% endif %} {% if instance.status == 1 and can_open_console %} -
    +

    {% trans "This action opens a remote viewer with a connection to the console of the instance." %}

    - {% trans "VDI" %} + {% trans "VDI" %}

    {% trans "To download console.vv file for virt-viewer." %}

    - {% trans "Get console.vv" %} + {% trans "Get console.vv" %}
    {% endif %}
    +
    diff --git a/instances/templates/instances/destroy_instance_form.html b/instances/templates/instances/destroy_instance_form.html index 0594c5ba..0997a48c 100644 --- a/instances/templates/instances/destroy_instance_form.html +++ b/instances/templates/instances/destroy_instance_form.html @@ -26,7 +26,7 @@
{% endif %} - diff --git a/instances/templates/instances/destroy_tab.html b/instances/templates/instances/destroy_tab.html index f2f5d06f..cd97ea26 100644 --- a/instances/templates/instances/destroy_tab.html +++ b/instances/templates/instances/destroy_tab.html @@ -1,23 +1,27 @@ {% load i18n %} -
+
-
    +
    +
    + +
    -
    -
    +
    +

    {% trans 'This action starts remove instance process' %}

    {% if can_delete %} - {% trans "Destroy" %} + {% trans "Destroy" %} {% else %} - + {% endif %}
    +
    \ No newline at end of file diff --git a/instances/templates/instances/edit_instance_volume.html b/instances/templates/instances/edit_instance_volume.html index d4aff411..3b94e7d1 100644 --- a/instances/templates/instances/edit_instance_volume.html +++ b/instances/templates/instances/edit_instance_volume.html @@ -109,7 +109,7 @@
    - +
    diff --git a/instances/templates/instances/host_link.html b/instances/templates/instances/host_link.html new file mode 100644 index 00000000..ecf42d0d --- /dev/null +++ b/instances/templates/instances/host_link.html @@ -0,0 +1,11 @@ +{% load i18n %} +{# where the VM is: its host and the host's VM list (host pages are for administrators); its owner's VM list otherwise #} + diff --git a/instances/templates/instances/info_tab.html b/instances/templates/instances/info_tab.html index 9f6eac4f..60e7580a 100644 --- a/instances/templates/instances/info_tab.html +++ b/instances/templates/instances/info_tab.html @@ -1,5 +1,5 @@ {% load i18n %} -
    +

    {% trans "Guest Info" %}

    diff --git a/instances/templates/instances/power_tab.html b/instances/templates/instances/power_tab.html index f03d4281..5171006a 100644 --- a/instances/templates/instances/power_tab.html +++ b/instances/templates/instances/power_tab.html @@ -4,7 +4,9 @@

    {% trans "Only the owners of this instance and administrators can change its power state." %}

    {% else %} -
      +
      +
      +
        {% if instance.status == 1 or instance.status == 2 %} {% endif %}
      +
      -
      +
      {% if instance.status == 1 or instance.status == 2 %} -
      +

      {% trans "This action sends an ACPI shutdown signal to the instance." %}

      {% csrf_token %} - +
      -
      +

      {% trans "This action forcibly powers off and start the instance and may cause data corruption." %}

      {% csrf_token %} - +
      -
      +

      {% trans "This action forcibly powers off the instance and may cause data corruption." %}

      {% csrf_token %} - +
      {% if request.user.is_superuser %} -
      +

      {% trans "This action suspends the instance." %}

      {% csrf_token %} - +
      @@ -96,25 +99,25 @@ {% endif %} {% if instance.status == 3 %} {% if request.user.is_superuser %} -
      +

      {% trans "This action restore the instance after suspend." %}

      {% csrf_token %} - +
      -
      +

      {% trans "This action forcibly powers off the instance and may cause data corruption." %}

      {% csrf_token %} - +
      {% else %} -
      +

      {% trans "Administrator blocked your instance." %}

      {% csrf_token %} - +
      @@ -122,30 +125,31 @@ {% endif %} {% if instance.status == 4 or instance.status == 6 or instance.status == 7 %} {# shutting down, crashed or suspended by the guest: a forced power off ends it, then it can be started #} -
      +

      {% trans "This action forcibly powers off the instance and may cause data corruption." %}

      {% csrf_token %} - +
      {% endif %} {% if instance.status == 5 %} -
      +

      {% trans "Click on Power On button to start this instance." %}

      {% csrf_token %} {% if instance.is_template %}

      {% trans "Template instance cannot be started." %}

      - + {% else %} - + {% endif %}
      {% endif %}
      +
      {% endif %}
      diff --git a/instances/templates/instances/resize_tab.html b/instances/templates/instances/resize_tab.html index b3d25fe1..34c9dcca 100644 --- a/instances/templates/instances/resize_tab.html +++ b/instances/templates/instances/resize_tab.html @@ -1,7 +1,9 @@ {% load i18n %} -
      +
      -
        +
        +
        +
        +
        -
        -
        +
        +
        {% if can_change %} {% if instance.status == 5 or not instance.vcpus %}
        {% csrf_token %} @@ -47,9 +50,9 @@
        {% if instance.status == 5 %} - + {% else %} - + {% endif %}
        @@ -63,7 +66,7 @@
        {% if vcpu.enabled == 'yes' and vcpu.hotpluggable == "yes" %} - + {% elif vcpu.enabled == 'yes' and vcpu.hotpluggable == "no" %} {% else %} @@ -78,11 +81,11 @@ {% endif %} {% else %} {% trans "You don't have permission for resizing instance" %} - + {% endif %}
        -
        +
        {% if can_change %}
        {% csrf_token %} @@ -120,15 +123,15 @@ {% endif %}
        - + {% else %} {% trans "You don't have permission for resizing instance" %} - + {% endif %}
        -
        +
        {% if can_change %}
        {% csrf_token %} @@ -152,16 +155,17 @@
        {% endfor %} {% if instance.status == 1 or instance.status == 3 or instance.status == 5 %} - + {% else %} - + {% endif %} {% else %} {% trans "You don't have permission for resizing instance" %} - + {% endif %}
        +
        diff --git a/instances/templates/instances/settings_tab.html b/instances/templates/instances/settings_tab.html index 118e5012..961c84d0 100644 --- a/instances/templates/instances/settings_tab.html +++ b/instances/templates/instances/settings_tab.html @@ -2,9 +2,11 @@ {% load django_bootstrap5 %} {% load bootstrap_icons %} {% load operations %} -
        +
        -
          +
          +
          +
            {% if instance.guest_agent_ready %} {% endif %}
          +
          {% if instance.status != 5 %} -

          {% trans "While the VM runs, most settings here apply at its next start." %}

          +

          {% trans "While the VM runs, most settings here apply at its next start." %}

          {% endif %} -
          +
          {% if instance.guest_agent_ready %} {% include 'instances/info_tab.html' %} {% endif %} {% if request.user.is_superuser %} -
          +

          {% trans 'Autostart' %}

          {% trans "Autostart your instance when host server is power on " %}

          {% if instance.autostart == 0 %}
          {% csrf_token %} - +
          {% else %}
          {% csrf_token %} @@ -111,7 +114,7 @@

          {% trans "Enable Boot Menu for your instance when it starts up " %} {% if instance.config_bootmenu == 0 %} {% csrf_token %} - +

          {% else %}
          {% csrf_token %} @@ -159,18 +162,18 @@
          - +
          {% endif %}
          -
          +
          {% csrf_token %}

          {% trans "Instance Media" %} - + {% else %} - + {% endif %} {% if instance.status == 5 %} +

          {% endif %} @@ -353,7 +356,7 @@
          -
          +
          {% trans "Add a network device" %} {% include 'add_instance_network_block.html' %} @@ -471,7 +474,7 @@
          - +
          @@ -596,7 +599,7 @@
          {% if show_hostdevs %} -
          +

          {% trans "Devices of the host given to the VM. The VM starts only on a host that has them; it is not migrated while it has them, and its clones get none." %}

          {% if request.user.is_superuser %} {# the add forms come when the tab opens: their choices scan every VM of the host #} @@ -685,7 +688,7 @@ {% endif %}
          {% endif %} -
          +

          {% trans "For migration both host servers must have equal settings and OS type" %}

          {% csrf_token %}{% submission_key %} @@ -762,14 +765,14 @@
          {% if computes_count != 1 %} - + {% else %} - + {% endif %}
          -
          +
          {% if instance.status != 5 %}

          {% trans "This is the definition for the VM's next start; a saved change applies then." %}

          {% endif %} @@ -778,7 +781,7 @@
          - @@ -798,13 +801,13 @@
          - +
          -
          +
          {% trans "Instance owners" %} @@ -831,7 +834,7 @@
          {% endif %} {% if can_manage_console %} -
          +
          {% csrf_token %} {% if instance.status != 5 %} @@ -842,9 +845,9 @@ {% bootstrap_form console_form layout='horizontal' %}
          {% if instance.status != 5 %} - + {% else %} - + {% endif %}
          @@ -852,7 +855,7 @@
          {% endif %} {% if can_clone %} -
          +

          {% trans "Create a clone" %}

          {% if usb_hostdevs or pci_hostdevs or other_hostdevs %}

          {% trans "The clone gets none of the VM's host devices: one VM holds a device of the host." %}

          {% endif %}
          {% csrf_token %}{% submission_key %} @@ -862,7 +865,7 @@
          -
          @@ -889,9 +892,9 @@
          - -
          @@ -940,16 +943,16 @@
          {% if instance.status == 1 or instance.status == 3 or instance.status == 5 %} - + {% else %} - + {% endif %}
          {% endif %} {% if can_change %} -
          +

          {% trans "To set instance template name description, shutdown the instance." %}

          {% csrf_token %}
          @@ -978,9 +981,9 @@
          {% if instance.status == 5 %} - + {% else %} - + {% endif %}
          @@ -999,9 +1002,9 @@ {% endfor %} {% if instance.status == 5 %} - + {% else %} - + {% endif %}
          @@ -1019,9 +1022,9 @@ {% if instance.status == 5 %} - + {% else %} - + {% endif %}
          @@ -1047,7 +1050,7 @@ - +
        @@ -1057,4 +1060,5 @@
        {% endif %}
      +
      diff --git a/instances/templates/instances/snapshots_tab.html b/instances/templates/instances/snapshots_tab.html index 2e29990f..46e28f68 100755 --- a/instances/templates/instances/snapshots_tab.html +++ b/instances/templates/instances/snapshots_tab.html @@ -3,10 +3,12 @@ {% get_current_timezone as TIME_ZONE %} {% load bootstrap_icons %} {% load operations %} -
      +
      {% with busy=instance.snapshot_jobs held=instance.held_by_job %} -
        +
        +
        +
        +
        -
        +
        {% if busy %}
        {% trans "A disk job is running on this VM; snapshot actions are unavailable until it ends." %}
        {% endif %} -
        +
        {% if instance.status != 5 %}

        {% trans "With running machine, internal snapshots may take more than an hour, depending on how much memory has on your instance and how large the disk is." %}

        {% trans "The VM is paused while its memory is saved." %}

        @@ -44,15 +47,15 @@ | {% if instance.external_snapshots or busy or held %} - + {% else %} - + {% endif %}
        -
        +

        {% trans "Create an external snapshot. Each disk keeps its state in a new file next to it." %}

        {% csrf_token %}{% submission_key %} @@ -61,9 +64,9 @@ | {% if instance.internal_snapshots or busy or held %} - + {% else %} - + {% endif %}
        @@ -83,7 +86,7 @@
        -
        +
        {% if instance.internal_snapshots or instance.external_snapshots %}

        {% trans "Choose a snapshot for restore/delete" %}

        {% if instance.internal_snapshots %} @@ -188,5 +191,6 @@ {% endif %}
        +
        {% endwith %}
        diff --git a/instances/templates/instances/stats_tab.html b/instances/templates/instances/stats_tab.html index 84f3606d..75184047 100644 --- a/instances/templates/instances/stats_tab.html +++ b/instances/templates/instances/stats_tab.html @@ -1,8 +1,10 @@ {% load i18n %} {% load bootstrap_icons %} -
        +
        -
          +
          +
          +
          +
          -
          -
          -
          +
          +
          +
          {% bs_icon 'arrow-right' %} {% trans "CPU Usage" %} @@ -27,7 +30,7 @@
          -
          +
          {% bs_icon 'arrow-right' %} {% trans "Memory Usage" %} @@ -38,7 +41,7 @@
          {% for net in instance.networks %} -
          +
          {% bs_icon 'arrow-right' %} {% trans "Bandwidth Device" %}: eth{{ forloop.counter0 }} @@ -50,7 +53,7 @@
          {% endfor %} {% for disk in instance.disks %} -
          +
          {% bs_icon 'arrow-right' %} {% trans "Disk I/O device" %}: {{ disk.dev }} @@ -63,7 +66,7 @@ {% endfor %}
          -
          +
          @@ -84,6 +87,7 @@
          +