diff options
author | Wojtek Kosior <koszko@koszko.org> | 2022-08-31 15:55:58 +0200 |
---|---|---|
committer | Wojtek Kosior <koszko@koszko.org> | 2022-09-28 12:54:55 +0200 |
commit | 55f8688c851d4f5f32a35fd804f31ad2f355be37 (patch) | |
tree | 889e08f4fab92fed51cfea1ab02db1500404e785 /src/hydrilla/proxy/web_ui/templates/items | |
parent | f0044a21ea7bbabb633057804e83df884196012b (diff) | |
download | haketilo-hydrilla-55f8688c851d4f5f32a35fd804f31ad2f355be37.tar.gz haketilo-hydrilla-55f8688c851d4f5f32a35fd804f31ad2f355be37.zip |
[proxy] improve styling of items' "install" and "uninstall" buttons in the web UI
Diffstat (limited to 'src/hydrilla/proxy/web_ui/templates/items')
3 files changed, 47 insertions, 48 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 b4d12c2..151a8b3 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 @@ -41,43 +41,54 @@ in a proprietary work, I am not going to enforce this in court. <div class="item-identifier"> {{ display_info.info.versioned_identifier }} </div> - {% if display_info.installed == InstalledStatus.INSTALLED %} - <div>{% block item_is_installed_msg %}{% endblock %}</div> + + {% block main_info_bulk %} + TODO: add more info... + {% endblock %} + + {% set install_but_classes = ['green-button', 'button-bordering-left'] %} + {% set uninstall_but_classes = ['green-button', 'button-bordering-right'] %} + {% if display_info.installed == InstalledStatus.FAILED_TO_INSTALL %} {% - if uninstall_disallowed is not defined and - display_info.active != ActiveStatus.REQUIRED + set install_text = + _('web_ui.items.single_version.retry_install_button') + %} + {% + set uninstall_text = + _('web_ui.items.single_version.leave_uninstalled_button') %} - <form method="POST"> - <input name="action" value="uninstall_item_version" type="hidden"> - <button class="green-button"> - {{ _('web_ui.items.single_version.uninstall_button') }} - </button> - </form> - {% endif %} - {% elif display_info.installed == InstalledStatus.NOT_INSTALLED %} - <div>{% block item_is_not_installed_msg %}{% endblock %}</div> - <form method="POST"> - <input name="action" value="install_item_version" type="hidden"> - <button class="green-button"> - {{ _('web_ui.items.single_version.install_button') }} - </button> - </form> - {% else %} <div>{% block item_install_failed_msg %}{% endblock %}</div> - <div> - <form method="POST" class="inline-form"> - <input name="action" value="install_item_version" type="hidden"> - <button class="green-button"> - {{ _('web_ui.items.single_version.retry_install_button') }} - </button> - </form> - <form method="POST" class="inline-form"> - <input name="action" value="uninstall_item_version" type="hidden"> - <button class="green-button"> - {{ _('web_ui.items.single_version.leave_uninstalled_button') }} - </button> - </form> - </div> - {% endif %} - TODO: add more info... + {% else %} + {% set install_text = _('web_ui.items.single_version.install_button') %} + {% set uninstall_text = _('web_ui.items.single_version.uninstall_button') %} + {% if display_info.installed == InstalledStatus.INSTALLED %} + {% do install_but_classes.append('disabled-button') %} + {% + if uninstall_disallowed is defined or + display_info.active == ActiveStatus.REQUIRED + %} + {% do uninstall_but_classes.append('disabled-button') %} + {% endif %} + {% else %} + {# display_info.installed == InstalledStatus.NOT_INSTALLED #} + {% do uninstall_but_classes.append('disabled-button') %} + {% endif %} + {% endif %}{# else/ display_info.installed == InstalledStatus.FAILED_TO_I...#} + <div class="button-row"> + {% + for classes, text, action in [ + (uninstall_but_classes, uninstall_text, 'uninstall_item_version'), + (install_but_classes, install_text, 'install_item_version') + ] + %} + {% if 'disabled-button' in classes %} + <button class="{{ classes|join(' ') }}">{{ text }}</button> + {% else %} + <form method="POST" class="inline-form"> + <input name="action" value="{{ action }}" type="hidden"> + <button class="{{ classes|join(' ') }}">{{ text }}</button> + </form> + {% endif %} + {% endfor %} + </div> {% endblock main_info %} 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 a087a95..2176646 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 @@ -28,12 +28,6 @@ in a proprietary work, I am not going to enforce this in court. .format(display_info.info.long_name) }} {% endblock %} -{% block item_is_installed_msg %} -{{ _('web_ui.items.single_version.library.is_installed') }} -{% endblock %} -{% block item_is_not_nstalled_msg %} - {{ _('web_ui.items.single_version.library.is_not_installed') }} -{% endblock %} {% block item_install_failed_msg %} {{ _('web_ui.items.single_version.library.install_failed') }} {% endblock %} 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 4224d4b..6671747 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 @@ -28,12 +28,6 @@ in a proprietary work, I am not going to enforce this in court. .format(display_info.info.long_name) }} {% endblock %} -{% block item_is_installed_msg %} -{{ _('web_ui.items.single_version.package.is_installed') }} -{% endblock %} -{% block item_is_not_nstalled_msg %} - {{ _('web_ui.items.single_version.package.is_not_installed') }} -{% endblock %} {% block item_install_failed_msg %} {{ _('web_ui.items.single_version.package.install_failed') }} {% endblock %} |