[proxy] make some (possibly confusing) web UI parts only display to advanced users

1 files changed, 15 insertions, 23 deletions

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 04caf8c..31f5e2e 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
@@ -38,22 +38,6 @@ code in a proprietary work, I am not going to enforce this in court.
   {% endif %}
 {% endblock %}
 
-{% block item_required_msg %}
-  {{ _('web_ui.items.single_version.package.item_required') }}
-{% endblock %}
-
-{% block item_auto_activated_msg %}
-  {{ _('web_ui.items.single_version.package.item_auto_activated') }}
-{% endblock %}
-
-{% block item_not_activated_msg %}
-  {{ _('web_ui.items.single_version.package.item_not_activated') }}
-{% endblock %}
-
-{% block item_will_be_asked_about_msg %}
-  {{ _('web_ui.items.single_version.package.item_will_be_asked_about') }}
-{% endblock %}
-
 {% block item_install_failed_msg %}
   {{ _('web_ui.items.single_version.package.install_failed') }}
 {% endblock %}
@@ -80,14 +64,24 @@ code in a proprietary work, I am not going to enforce this in court.
   <p>
     {% if display_info.enabled == EnabledStatus.NO_MARK %}
       {% do unenable_but_classes.append('disabled-button') %}
-      {{ _('web_ui.items.single_version.item_not_marked') }}
+      {%
+        if version_display_info.active == ActiveStatus.NOT_ACTIVE or
+           settings.mapping_use_mode == MappingUseMode.WHEN_ENABLED
+      %}
+        {{ _('web_ui.items.single_version.package.item_not_activated') }}
+      {% elif settings.mapping_use_mode == MappingUseMode.QUESTION %}
+        {{ _('web_ui.items.single_version.package.item_will_be_asked_about') }}
+      {% else %}
+        {# settings.mapping_use_mode == MappingUseMode.AUTO #}
+        {{ _('web_ui.items.single_version.package.item_auto_activated') }}
+      {% endif %}
     {% elif display_info.enabled == EnabledStatus.DISABLED %}
       {% do disable_but_classes.append('disabled-button') %}
-      {{ _('web_ui.items.single_version.item_disabled') }}
+      {{ _('web_ui.items.single_version.package.item_disabled') }}
     {% else %}
       {# display_info.enabled == EnabledStatus.ENABLED #}
       {% do enable_but_classes.append('disabled-button') %}
-      {{ _('web_ui.items.single_version.item_enabled') }}
+      {{ _('web_ui.items.single_version.package.item_enabled') }}
     {% endif %}
   </p>
 
@@ -99,9 +93,9 @@ code in a proprietary work, I am not going to enforce this in court.
     ])
   }}
 
-  <div class="horizontal-separator"></div>
-
   {% if display_info.enabled == EnabledStatus.ENABLED %}
+    <div class="horizontal-separator"></div>
+
     {% set unpin_but_classes = ['green-button'] %}
     {% set pin_repo_but_classes = ['green-button'] %}
     {% set pin_ver_but_classes = ['green-button'] %}
@@ -191,7 +185,5 @@ code in a proprietary work, I am not going to enforce this in court.
           (pin_ver_but_classes,  pin_ver_text,  {'action': 'freeze_to_version'})
       ])
     }}
-
-    <div class="horizontal-separator"></div>
   {% endif %}{# display_info.enabled == EnabledStatus.ENABLED #}
 {% endblock main_info_bulk %}