[proxy] make uniform use of section labels in the web UI

3 files changed, 30 insertions, 5 deletions

diff --git a/src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja b/src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja
index a1056b1..c7574f1 100644
--- a/src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/items/item_viewversion.html.jinja
@@ -35,11 +35,10 @@ code in a proprietary work, I am not going to enforce this in court.
 
   {{ super() }}
 
+  {{ label(_('web_ui.items.single_version.version_label')) }}
+
   <p>
-    {{
-      _('web_ui.items.single_version.version_{}')
-            .format(versioned_identifier_with_repo(version_display_info))
-    }}
+    {{ versioned_identifier_with_repo(version_display_info) }}
   </p>
 
   <div class="horizontal-separator"></div>
@@ -56,6 +55,8 @@ code in a proprietary work, I am not going to enforce this in court.
   %}
     <div class="horizontal-separator"></div>
 
+    {{ label(_('web_ui.items.single_version.install_uninstall_label')) }}
+
     {% set install_but_classes   = ['green-button'] %}
     {% set uninstall_but_classes = ['green-button'] %}
     {% if version_display_info.installed == InstalledStatus.FAILED_TO_INSTALL %}
@@ -67,7 +68,7 @@ code in a proprietary work, I am not going to enforce this in court.
         set uninstall_text =
             _('web_ui.items.single_version.leave_uninstalled_button')
       %}
-      <div>{% block item_install_failed_msg required %}{% endblock %}</div>
+      <p>{% block item_install_failed_msg required %}{% endblock %}</p>
     {% else %}
       {% set install_text   = _('web_ui.items.single_version.install_button') %}
       {%
@@ -81,9 +82,11 @@ code in a proprietary work, I am not going to enforce this in court.
         %}
           {% do uninstall_but_classes.append('disabled-button') %}
         {% endif %}
+        <p>{% block item_is_installed_msg required %}{% endblock %}</p>
       {% else %}
         {# version_display_info.installed == InstalledStatus.NOT_INSTALLED #}
         {% do uninstall_but_classes.append('disabled-button') %}
+        <p>{% block item_is_not_installed_msg required %}{% endblock %}</p>
       {% endif %}
     {% endif %}{# else/ version_display_info.installed == InstalledStatus.... #}
 
diff --git a/src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja b/src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja
index 13ee41a..0454391 100644
--- a/src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/items/library_viewversion.html.jinja
@@ -42,6 +42,14 @@ code in a proprietary work, I am not going to enforce this in court.
   {{ _('web_ui.items.single_version.library.install_failed') }}
 {% endblock %}
 
+{% block item_is_installed_msg %}
+  {{ _('web_ui.items.single_version.library.is_installed') }}
+{% endblock %}
+
+{% block item_is_not_installed_msg %}
+  {{ _('web_ui.items.single_version.library.is_not_installed') }}
+{% endblock %}
+
 {% block version_list_heading %}
   {{ _('web_ui.items.single_version.library.version_list_heading') }}
 {% endblock %}
@@ -53,6 +61,8 @@ code in a proprietary work, I am not going to enforce this in court.
 
   <div class="horizontal-separator"></div>
 
+  {{ label(_('web_ui.items.single_version.library.enabled_label')) }}
+
   <p>
     {% if version_display_info.active == ActiveStatus.REQUIRED %}
       {{ _('web_ui.items.single_version.library.item_required') }}
diff --git a/src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja b/src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja
index 31f5e2e..699469e 100644
--- a/src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/items/package_viewversion.html.jinja
@@ -42,6 +42,14 @@ code in a proprietary work, I am not going to enforce this in court.
   {{ _('web_ui.items.single_version.package.install_failed') }}
 {% endblock %}
 
+{% block item_is_installed_msg %}
+  {{ _('web_ui.items.single_version.package.is_installed') }}
+{% endblock %}
+
+{% block item_is_not_installed_msg %}
+  {{ _('web_ui.items.single_version.package.is_not_installed') }}
+{% endblock %}
+
 {% block version_list_heading %}
   {{ _('web_ui.items.single_version.package.version_list_heading') }}
 {% endblock %}
@@ -53,6 +61,8 @@ code in a proprietary work, I am not going to enforce this in court.
 
   <div class="horizontal-separator"></div>
 
+  {{ label(_('web_ui.items.single_version.package.enabled_label')) }}
+
   {% set enable_but_classes = ['blue-button'] %}
   {% set unenable_but_classes = ['green-button'] %}
   {% set disable_but_classes = ['red-button'] %}
@@ -96,6 +106,8 @@ code in a proprietary work, I am not going to enforce this in court.
   {% if display_info.enabled == EnabledStatus.ENABLED %}
     <div class="horizontal-separator"></div>
 
+    {{ label(_('web_ui.items.single_version.package.pinning_label')) }}
+
     {% set unpin_but_classes = ['green-button'] %}
     {% set pin_repo_but_classes = ['green-button'] %}
     {% set pin_ver_but_classes = ['green-button'] %}