diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_resize_instance_help.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html similarity index 60% rename from openstack_dashboard/dashboards/project/instances/templates/instances/_resize_instance_help.html rename to openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html index 0892653603..ee5468195a 100644 --- a/openstack_dashboard/dashboards/project/instances/templates/instances/_resize_instance_help.html +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_flavors_and_quotas.html @@ -1,5 +1,8 @@ {% load i18n horizon humanize %} +{% block help_message %} +{% endblock %} +

{% trans "Flavor Details" %}

@@ -13,26 +16,26 @@
-

{% trans "Project Quotas" %}

+

{% trans "Project Limits" %}

- {% trans "Number of Instances" %} ({{ usages.instances.used|intcomma }}) -

{{ usages.instances.available|quota|intcomma }}

+ {% trans "Number of Instances" %} + {% blocktrans with used=usages.totalInstancesUsed|intcomma quota=usages.maxTotalInstances|intcomma %}

{{ used }} of {{ quota }} Used

{% endblocktrans %}
-
+
- {% trans "Number of VCPUs" %} ({{ usages.cores.used|intcomma }}) -

{{ usages.cores.available|quota|intcomma }}

+ {% trans "Number of VCPUs" %} + {% blocktrans with used=usages.totalCoresUsed|intcomma quota=usages.maxTotalCores|intcomma %}

{{ used }} of {{ quota }} Used

{% endblocktrans %}
-
+
- {% trans "Total RAM" %} ({{ usages.ram.used|intcomma }} {% trans "MB" %}) -

{{ usages.ram.available|quota:_("MB")|intcomma }}

+ {% trans "Total RAM" %} + {% blocktrans with used=usages.totalRAMUsed|intcomma quota=usages.maxTotalRAMSize|intcomma %}

{{ used }} of {{ quota }} MB Used

{% endblocktrans %}
-
+
diff --git a/openstack_dashboard/dashboards/project/instances/templates/instances/_launch_details_help.html b/openstack_dashboard/dashboards/project/instances/templates/instances/_launch_details_help.html index a2911aa5bf..b05b017fce 100644 --- a/openstack_dashboard/dashboards/project/instances/templates/instances/_launch_details_help.html +++ b/openstack_dashboard/dashboards/project/instances/templates/instances/_launch_details_help.html @@ -1,50 +1,7 @@ -{% load i18n horizon humanize %} +{% extends 'project/instances/_flavors_and_quotas.html' %} +{% load i18n %} +{% block help_message %}

{% blocktrans %}Specify the details for launching an instance.{% endblocktrans %}

{% blocktrans %}The chart below shows the resources used by this project in relation to the project's quotas.{% endblocktrans %}

- -

{% trans "Flavor Details" %}

- - - - - - - - - -
{% trans "Name" %}
{% trans "VCPUs" %}
{% trans "Root Disk" %} {% trans "GB" %}
{% trans "Ephemeral Disk" %} {% trans "GB" %}
{% trans "Total Disk" %} {% trans "GB" %}
{% trans "RAM" %} {% trans "MB" %}
- -
-

{% trans "Project Limits" %}

-
- {% trans "Number of Instances" %} - {% blocktrans with used=usages.totalInstancesUsed|intcomma quota=usages.maxTotalInstances|intcomma %}

{{ used }} of {{ quota }} Used

{% endblocktrans %} -
-
-
- -
- {% trans "Number of VCPUs" %} - {% blocktrans with used=usages.totalCoresUsed|intcomma quota=usages.maxTotalCores|intcomma %}

{{ used }} of {{ quota }} Used

{% endblocktrans %} -
-
-
- -
- {% trans "Total RAM" %} - {% blocktrans with used=usages.totalRAMUsed|intcomma quota=usages.maxTotalRAMSize|intcomma %}

{{ used }} of {{ quota }} MB Used

{% endblocktrans %} -
-
-
-
- - +{% endblock %} diff --git a/openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py b/openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py index a5742ab5b0..c0802d54ad 100644 --- a/openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py +++ b/openstack_dashboard/dashboards/project/instances/workflows/resize_instance.py @@ -46,7 +46,7 @@ class SetFlavorChoiceAction(workflows.Action): name = _("Flavor Choice") slug = 'flavor_choice' help_text_template = ("project/instances/" - "_resize_instance_help.html") + "_flavors_and_quotas.html") def clean(self): cleaned_data = super(SetFlavorChoiceAction, self).clean()