diff --git a/src/servala/frontend/forms/service.py b/src/servala/frontend/forms/service.py
index 169d6ea..0c7741e 100644
--- a/src/servala/frontend/forms/service.py
+++ b/src/servala/frontend/forms/service.py
@@ -123,7 +123,7 @@ class ServiceInstanceFilterForm(forms.Form):
class ServiceInstanceDeleteForm(forms.ModelForm):
name = forms.CharField(
- label=_("Instance Name"),
+ label=_("Resource Name"),
max_length=63,
widget=forms.TextInput(attrs={"class": "form-control"}),
)
@@ -132,7 +132,7 @@ class ServiceInstanceDeleteForm(forms.ModelForm):
kwargs["initial"] = {"name": ""}
super().__init__(*args, **kwargs)
self.fields["name"].help_text = _(
- "To confirm deletion, please type the instance name: {instance_name}"
+ "To confirm deletion, please type the resource name: {instance_name}"
).format(instance_name=self.instance.name)
def clean_name(self):
@@ -140,7 +140,7 @@ class ServiceInstanceDeleteForm(forms.ModelForm):
if entered_name != self.instance.name:
raise forms.ValidationError(
_(
- "The entered name does not match the instance name. Deletion not confirmed."
+ "The entered name does not match the resource name. Deletion not confirmed."
)
)
return entered_name
diff --git a/src/servala/frontend/templates/frontend/organizations/dashboard.html b/src/servala/frontend/templates/frontend/organizations/dashboard.html
index 441d0be..9a309f1 100644
--- a/src/servala/frontend/templates/frontend/organizations/dashboard.html
+++ b/src/servala/frontend/templates/frontend/organizations/dashboard.html
@@ -96,7 +96,7 @@
|
{{ instance.name }}
+ class="fw-semibold text-decoration-none">{{ instance.display_name }}
|
diff --git a/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html b/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html
index 5c72de6..052eb64 100644
--- a/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html
+++ b/src/servala/frontend/templates/frontend/organizations/service_instance_detail.html
@@ -2,7 +2,7 @@
{% load i18n static pprint_filters %}
{% block html_title %}
{% block page_title %}
- {{ instance.name }}
+ {{ instance.display_name }}
{% endblock page_title %}
{% endblock html_title %}
{% block page_title_extra %}
@@ -39,6 +39,10 @@
+ - {% translate "Resource Name" %}
+ -
+
{{ instance.name }}
+
- {% translate "Service" %}
-
{{ instance.context.service_definition.service.name }}
diff --git a/src/servala/frontend/templates/frontend/organizations/service_instance_update.html b/src/servala/frontend/templates/frontend/organizations/service_instance_update.html
index c528474..2261477 100644
--- a/src/servala/frontend/templates/frontend/organizations/service_instance_update.html
+++ b/src/servala/frontend/templates/frontend/organizations/service_instance_update.html
@@ -5,7 +5,7 @@
{% block html_title %}
{% block page_title %}
{% block title %}
- {% blocktranslate with instance_name=instance.name organization_name=request.organization.name %}Update {{ instance_name }} in {{ organization_name }}{% endblocktranslate %}
+ {% blocktranslate with instance_name=instance.display_name organization_name=request.organization.name %}Update {{ instance_name }} in {{ organization_name }}{% endblocktranslate %}
{% endblock %}
{% endblock page_title %}
{% endblock html_title %}
diff --git a/src/servala/frontend/templates/frontend/organizations/service_instances.html b/src/servala/frontend/templates/frontend/organizations/service_instances.html
index c443e6e..e29ad88 100644
--- a/src/servala/frontend/templates/frontend/organizations/service_instances.html
+++ b/src/servala/frontend/templates/frontend/organizations/service_instances.html
@@ -23,6 +23,7 @@
| {% translate "Name" %} |
+ {% translate "Resource Name" %} |
{% translate "Service" %} |
{% translate "Service Provider" %} |
{% translate "Service Provider Zone" %} |
@@ -33,8 +34,9 @@
{% for instance in instances %}
|
- {{ instance.name }}
+ {{ instance.display_name }}
|
+ {{ instance.name }} |
{{ instance.context.service_definition.service.name }} |
{{ instance.context.service_offering.provider.name }} |
{{ instance.context.control_plane.name }} |
@@ -42,7 +44,7 @@
{% empty %}
- | {% translate "No service instances found." %} |
+ {% translate "No service instances found." %} |
{% endfor %}
|