diff --git a/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html b/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html index 6fdc61a..3305328 100644 --- a/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html +++ b/src/servala/frontend/templates/frontend/organizations/service_offering_detail.html @@ -9,9 +9,8 @@ {% endblock html_title %} {% partialdef control-plane-info inline=True %} {% if selected_plane and selected_plane.user_info %} -
-
-
{% translate "Service Provider Zone Information" %}
+
+
{% include "includes/control_plane_user_info.html" with control_plane=selected_plane %}
@@ -35,64 +34,97 @@ {% endpartialdef %} {% block content %}
-
-
-
-
- {% if service.logo %} - {{ service.name }} - {% endif %} -
-

{{ offering }}

- {{ offering.service.category }} + {% if not has_control_planes %} + +
+
+ -
- {% if offering.description %} -
-
-

{{ offering.description|urlize }}

-
-
- {% endif %} - {% if not has_control_planes %} -

{% translate "We currently cannot offer this service, sorry!" %}

- {% else %} +
+
+ {% else %} + +
+ +
+
+
+
{% translate "Service Provider Zone" %}
+
+
+ hx-swap="outerHTML" + class="control-plane-select-form"> {{ select_form }}
- {% endif %} - {% if has_control_planes %} +
{% partial control-plane-info %}
- {% endif %} - {% if service.external_links or offering.external_links %} -
-
-
{% translate "External Links" %}
-
- {% for link in service.external_links %} - {% include "includes/external_link.html" %} - {% endfor %} - {% for link in offering.external_links %} - {% include "includes/external_link.html" %} - {% endfor %} -
-
-
- {% endif %} +
+ +
+
+
+
{% translate "Service Information" %}
+
+
+ {% if offering.service.logo or offering.description %} +
+ {% if offering.service.logo %} +
+ {{ offering.service.name }} +
+ {% endif %} + {% if offering.description %} +
+

{{ offering.description|urlize }}

+
+ {% endif %} +
+ {% endif %} + {% if offering.service.external_links or offering.external_links %} + {% if offering.service.logo or offering.description %}
{% endif %} +
{% translate "External Links" %}
+
+ {% for link in offering.service.external_links %} + {% include "includes/external_link.html" %} + {% endfor %} + {% for link in offering.external_links %} + {% include "includes/external_link.html" %} + {% endfor %} +
+ {% else %} + {% if not offering.service.logo and not offering.description %} +

{% translate "No additional information available." %}

+ {% endif %} + {% endif %} +
+
+
+
+ {% endif %} + +
+
{% partial service-form %}
diff --git a/src/servala/frontend/templates/includes/control_plane_user_info.html b/src/servala/frontend/templates/includes/control_plane_user_info.html index 21d5cdb..a3a27f5 100644 --- a/src/servala/frontend/templates/includes/control_plane_user_info.html +++ b/src/servala/frontend/templates/includes/control_plane_user_info.html @@ -1,25 +1,26 @@ {% load i18n %} {% if control_plane.user_info %} -
- - - {% for info in control_plane.user_info %} - - - - - {% endfor %} - -
- {{ info.title }} - {% if info.help_text %} - - {% endif %} - {{ info.content }}
+
+ {% for info in control_plane.user_info %} +
+
+ + {{ info.title }} + + {% if info.help_text %} + + {% endif %} +
+
+ {{ info.content }} +
+
+ {% endfor %}
{% endif %}