From b2055032cb914fd160270971dd1da46f8c7c838d Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Sat, 8 Oct 2022 19:07:12 +0200 Subject: [proxy] remove TODOs from library and package pages and make package page display enable/disable/forget buttons --- .../web_ui/templates/items/item_view.html.jinja | 14 ++++ .../templates/items/item_viewversion.html.jinja | 16 +--- .../web_ui/templates/items/library_view.html.jinja | 4 - .../web_ui/templates/items/package_view.html.jinja | 87 +++++++++++++++++++++- .../templates/items/package_viewversion.html.jinja | 6 +- 5 files changed, 106 insertions(+), 21 deletions(-) (limited to 'src/hydrilla/proxy/web_ui/templates') diff --git a/src/hydrilla/proxy/web_ui/templates/items/item_view.html.jinja b/src/hydrilla/proxy/web_ui/templates/items/item_view.html.jinja index 5f8b102..e517f3b 100644 --- a/src/hydrilla/proxy/web_ui/templates/items/item_view.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/items/item_view.html.jinja @@ -39,6 +39,20 @@ code in a proprietary work, I am not going to enforce this in court. {% endblock %} {% block main %} + {% block top_errors %} + {% if file_installation_error is defined %} + {{ error_note(_('web_ui.err.file_installation_error')) }} + {% endif %} + + {% if impossible_situation_error is defined %} + {{ error_note(_('web_ui.err.impossible_situation_error')) }} + {% endif %} + + {% if repo_communication_error is defined %} + {{ error_note(_('web_ui.err.repo_communication_error')) }} + {% endif %} + {% endblock top_errors %} + {% block main_info %}

{% block heading required %}{% endblock %}

{% endblock %} 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 0d2ed57..3d1a2cb 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 @@ -64,23 +64,13 @@ code in a proprietary work, I am not going to enforce this in court. } {% endblock %} -{% block main_info %} - {% if file_installation_error is defined %} - {{ error_note(_('web_ui.err.file_installation_error')) }} - {% endif %} - - {% if uninstall_disallowed is defined %} - {{ error_note(_('web_ui.err.uninstall_disallowed')) }} - {% endif %} - - {% if repo_communication_error is defined %} - {{ error_note(_('web_ui.err.repo_communication_error')) }} - {% endif %} - +{% block top_errors %} {% if not version_display_info.info.compatible %} {{ error_note(_('web_ui.err.item_not_compatible')) }} {% endif %} +{% endblock %} +{% block main_info %} {{ super() }} {{ label(_('web_ui.items.single_version.identifier_label')) }} diff --git a/src/hydrilla/proxy/web_ui/templates/items/library_view.html.jinja b/src/hydrilla/proxy/web_ui/templates/items/library_view.html.jinja index 76f63f3..f33b5b7 100644 --- a/src/hydrilla/proxy/web_ui/templates/items/library_view.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/items/library_view.html.jinja @@ -31,10 +31,6 @@ code in a proprietary work, I am not going to enforce this in court. {% block main_info %} {{ super() }} - -

- TODO: add more info... -

{% endblock %} {% block version_list_heading %} diff --git a/src/hydrilla/proxy/web_ui/templates/items/package_view.html.jinja b/src/hydrilla/proxy/web_ui/templates/items/package_view.html.jinja index d0bc1c8..d5ba2a0 100644 --- a/src/hydrilla/proxy/web_ui/templates/items/package_view.html.jinja +++ b/src/hydrilla/proxy/web_ui/templates/items/package_view.html.jinja @@ -32,9 +32,94 @@ code in a proprietary work, I am not going to enforce this in court. {% block main_info %} {{ super() }} + {# + The labels and buttons below are similar to those in single package versions + view but not similar enough for us to be able to refactor common code. + #} + + {{ label(_('web_ui.items.single.package.enabled_label')) }} + + {% set enable_but_classes = ['blue-button'] %} + {% set unenable_but_classes = ['green-button'] %} + {% set disable_but_classes = ['red-button'] %} + + {% set unenable_text = _('web_ui.items.unenable_button') %} + {% set disable_text = _('web_ui.items.disable_button') %} + {% set enable_text = _('web_ui.items.enable_button') %} +

- TODO: add more info... + {% if display_info.enabled == EnabledStatus.NO_MARK %} + {% do unenable_but_classes.append('disabled-button') %} + {{ _('web_ui.items.single.package.item_not_enabled') }} + {% elif display_info.enabled == EnabledStatus.DISABLED %} + {% do disable_but_classes.append('disabled-button') %} + {{ _('web_ui.items.single.package.item_disabled') }} + {% else %} + {# display_info.enabled == EnabledStatus.ENABLED #} + {% do enable_but_classes.append('disabled-button') %} + {{ _('web_ui.items.single.package.item_enabled') }} + {% endif %}

+ + {{ + button_row([ + (disable_but_classes, disable_text, {'action': 'disable_item'}), + (unenable_but_classes, unenable_text, {'action': 'unenable_item'}), + (enable_but_classes, enable_text, {'action': 'enable_item'}) + ]) + }} + + {% if display_info.enabled == EnabledStatus.ENABLED %} +
+ + {{ label(_('web_ui.items.single.package.pinning_label')) }} + + {% set unpin_but_classes = ['green-button'] %} + {% set pin_repo_but_classes = ['green-button'] %} + {% set pin_ver_but_classes = ['green-button'] %} + + {% set unpin_text = _('web_ui.items.single.package.unpin_button') %} + + {% if display_info.active_version.is_local %} + {% + set pin_repo_text = + _('web_ui.items.single.package.pin_local_repo_button') + %} + {% else %} + {% set pin_repo_text = _('web_ui.items.single.package.pin_repo_button') %} + {% endif %} + + {% set pin_ver_text = _('web_ui.items.single.package.pin_ver_button') %} + +

+ {% if display_info.frozen == FrozenStatus.NOT_FROZEN %} + {% do unpin_but_classes.append('disabled-button') %} + {{ _('web_ui.items.single.package.not_pinned') }} + {% elif display_info.frozen == FrozenStatus.REPOSITORY %} + {% do pin_repo_but_classes.append('disabled-button') %} + {% if display_info.active_version.is_local %} + {{ _('web_ui.items.single.package.pinned_repo_local') }} + {% else %} + {{ + _('web_ui.items.single.package.pinned_repo_{}') + .format(display_info.active_version.info.repo) + }} + {% endif %} + {% else %} + {# display_info.frozen == FrozenStatus.EXACT_VERSION #} + {% do pin_ver_but_classes.append('disabled-button') %} + {{ _('web_ui.items.single.package.pinned_ver') }} + {% endif %} +

+ + {{ + button_row([ + (unpin_but_classes, unpin_text, {'action': 'unfreeze_item'}), + (pin_repo_but_classes, pin_repo_text, {'action': 'freeze_to_repo'}), + (pin_ver_but_classes, pin_ver_text, {'action': 'freeze_to_version'}) + ]) + }} + {% endif %}{# display_info.enabled == EnabledStatus.ENABLED #} {% endblock %} {% block version_list_heading %} 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 fa7c954..fe816ab 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 @@ -114,9 +114,9 @@ code in a proprietary work, I am not going to enforce this in court. {% do enable_but_classes.append('disabled-button') %} {% endif %} - {% set unenable_text = _('web_ui.items.single_version.unenable_button') %} - {% set disable_text = _('web_ui.items.single_version.disable_button') %} - {% set enable_text = _('web_ui.items.single_version.enable_button') %} + {% set unenable_text = _('web_ui.items.unenable_button') %} + {% set disable_text = _('web_ui.items.disable_button') %} + {% set enable_text = _('web_ui.items.enable_button') %}

{% if display_info.enabled == EnabledStatus.NO_MARK %} -- cgit v1.2.3