From 2363ab8054ab5d8e7981242dc311a394e8d5ff57 Mon Sep 17 00:00:00 2001 From: Wojtek Kosior Date: Mon, 29 Aug 2022 17:05:00 +0200 Subject: [proxy] refactor we UI library and package pages templates to avoid code repetition --- .../web_ui/templates/packages/index.html.jinja | 56 ------------- .../templates/packages/index.html.jinja.license | 7 -- .../templates/packages/load_from_disk.html.jinja | 47 ----------- .../packages/load_from_disk.html.jinja.license | 7 -- .../templates/packages/show_single.html.jinja | 71 ---------------- .../packages/show_single.html.jinja.license | 7 -- .../packages/show_single_version.html.jinja | 94 ---------------------- .../show_single_version.html.jinja.license | 7 -- 8 files changed, 296 deletions(-) delete mode 100644 src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja delete mode 100644 src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja.license delete mode 100644 src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja delete mode 100644 src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja.license delete mode 100644 src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja delete mode 100644 src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja.license delete mode 100644 src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja delete mode 100644 src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja.license (limited to 'src/hydrilla/proxy/web_ui/templates/packages') diff --git a/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja deleted file mode 100644 index e2aad5d..0000000 --- a/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja +++ /dev/null @@ -1,56 +0,0 @@ -{# -Proxy web UI package list page. - -This file is part of Hydrilla&Haketilo. - -Copyright (C) 2022 Wojtek Kosior - -Dual licensed under -* GNU General Public License v3.0 or later and -* Creative Commons Attribution Share Alike 4.0 International. - -You can choose to use either of these licenses or both. - - -I, Wojtek Kosior, thereby promise not to sue for violation of this -file's licenses. Although I request that you do not make use this code -in a proprietary work, I am not going to enforce this in court. -#} -{% extends "base.html.jinja" %} -{% block title %} {{ _('web_ui.packages.title') }} {% endblock %} -{% block style %} - {{ super() }} - - {% include 'include/item_list_style.css.jinja' %} -{% endblock %} -{% block main %} -

{{ _('web_ui.packages.heading') }}

- -{% endblock %} diff --git a/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja.license b/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja.license deleted file mode 100644 index bb2e0af..0000000 --- a/src/hydrilla/proxy/web_ui/templates/packages/index.html.jinja.license +++ /dev/null @@ -1,7 +0,0 @@ -Spdx-License-Identifier: GPL-3.0-or-later OR CC-BY-SA-4.0 - -Copyright (C) 2022 Wojtek Kosior - -I, Wojtek Kosior, thereby promise not to sue for violation of this -file's licenses. Although I request that you do not make use this code -in a proprietary work, I am not going to enforce this in court. diff --git a/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja deleted file mode 100644 index a1b191e..0000000 --- a/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja +++ /dev/null @@ -1,47 +0,0 @@ -{# -Proxy web UI package loading page. - -This file is part of Hydrilla&Haketilo. - -Copyright (C) 2022 Wojtek Kosior - -Dual licensed under -* GNU General Public License v3.0 or later and -* Creative Commons Attribution Share Alike 4.0 International. - -You can choose to use either of these licenses or both. - - -I, Wojtek Kosior, thereby promise not to sue for violation of this -file's licenses. Although I request that you do not make use this code -in a proprietary work, I am not going to enforce this in court. -#} -{% extends "base.html.jinja" %} -{% block title %} {{ _('web_ui.packages.load_from_disk.title') }} {% endblock %} -{% block style %} - {{ super() }} - - input[type="file"]::-webkit-file-selector-button, - input[type="file"]::file-selector-button { - display: none; - } -{% endblock %} -{% block main %} -

{{ _('web_ui.packages.load_from_disk.heading') }}

-
-
- -
-
- -
-
- -
-
-{% endblock %} diff --git a/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja.license b/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja.license deleted file mode 100644 index bb2e0af..0000000 --- a/src/hydrilla/proxy/web_ui/templates/packages/load_from_disk.html.jinja.license +++ /dev/null @@ -1,7 +0,0 @@ -Spdx-License-Identifier: GPL-3.0-or-later OR CC-BY-SA-4.0 - -Copyright (C) 2022 Wojtek Kosior - -I, Wojtek Kosior, thereby promise not to sue for violation of this -file's licenses. Although I request that you do not make use this code -in a proprietary work, I am not going to enforce this in court. diff --git a/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja deleted file mode 100644 index 24d9a58..0000000 --- a/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja +++ /dev/null @@ -1,71 +0,0 @@ -{# -Proxy web UI package show page. - -This file is part of Hydrilla&Haketilo. - -Copyright (C) 2022 Wojtek Kosior - -Dual licensed under -* GNU General Public License v3.0 or later and -* Creative Commons Attribution Share Alike 4.0 International. - -You can choose to use either of these licenses or both. - - -I, Wojtek Kosior, thereby promise not to sue for violation of this -file's licenses. Although I request that you do not make use this code -in a proprietary work, I am not going to enforce this in court. -#} -{% extends "base.html.jinja" %} -{% block title %} {{ _('web_ui.packages.single.title') }} {% endblock %} -{% block style %} - {{ super() }} - - {% include 'include/item_list_style.css.jinja' %} -{% endblock %} -{% block main %} - {% block main_info %} -

- {{ - _('web_ui.packages.single.heading.name_{}') - .format(display_info.identifier) - }} -

- TODO: add more info... - {% endblock %} -

- {% if version_display_infos|length > 0 %} - {% block version_list_heading %} - {{ _('web_ui.packages.single.version_list_heading') }} - {% endblock %} - {% endif %} -

- -{% endblock %} diff --git a/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja.license b/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja.license deleted file mode 100644 index bb2e0af..0000000 --- a/src/hydrilla/proxy/web_ui/templates/packages/show_single.html.jinja.license +++ /dev/null @@ -1,7 +0,0 @@ -Spdx-License-Identifier: GPL-3.0-or-later OR CC-BY-SA-4.0 - -Copyright (C) 2022 Wojtek Kosior - -I, Wojtek Kosior, thereby promise not to sue for violation of this -file's licenses. Although I request that you do not make use this code -in a proprietary work, I am not going to enforce this in court. diff --git a/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja b/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja deleted file mode 100644 index 12e5416..0000000 --- a/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja +++ /dev/null @@ -1,94 +0,0 @@ -{# -Proxy web UI package version show page. - -This file is part of Hydrilla&Haketilo. - -Copyright (C) 2022 Wojtek Kosior - -Dual licensed under -* GNU General Public License v3.0 or later and -* Creative Commons Attribution Share Alike 4.0 International. - -You can choose to use either of these licenses or both. - - -I, Wojtek Kosior, thereby promise not to sue for violation of this -file's licenses. Although I request that you do not make use this code -in a proprietary work, I am not going to enforce this in court. -#} -{% extends "packages/show_single.html.jinja" %} -{% block title %} {{ _('web_ui.packages.single_version.title') }} {% endblock %} -{% block main_info %} - {% if file_installation_error is defined %} - - {% endif %} - {% if uninstall_disallowed is defined %} - - {% endif %} - {% if repo_communication_error is defined %} - - {% endif %} -

- {{ - _('web_ui.packages.single_version.heading.name_{}') - .format(display_info.info.long_name) - }} -

-
- {{ display_info.info.versioned_identifier }} -
- TODO: add more info... - {% if display_info.installed == InstalledStatus.INSTALLED %} -
- {{ _('web_ui.packages.single_version.package_is_installed') }} -
- {% - if uninstall_disallowed is not defined and - display_info.active != ActiveStatus.REQUIRED - %} -
- - -
- {% endif %} - {% elif display_info.installed == InstalledStatus.NOT_INSTALLED %} -
- {{ _('web_ui.packages.single_version.package_is_not_installed') }} -
-
- - -
- {% else %} -
- {{ _('web_ui.packages.single_version.package_install_failed') }} -
-
-
- - -
-
- - -
-
- {% endif %} -{% endblock main_info %} -{% block version_list_heading %} - {{ _('web_ui.packages.single_version.version_list_heading') }} -{% endblock %} diff --git a/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja.license b/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja.license deleted file mode 100644 index bb2e0af..0000000 --- a/src/hydrilla/proxy/web_ui/templates/packages/show_single_version.html.jinja.license +++ /dev/null @@ -1,7 +0,0 @@ -Spdx-License-Identifier: GPL-3.0-or-later OR CC-BY-SA-4.0 - -Copyright (C) 2022 Wojtek Kosior - -I, Wojtek Kosior, thereby promise not to sue for violation of this -file's licenses. Although I request that you do not make use this code -in a proprietary work, I am not going to enforce this in court. -- cgit v1.2.3