[proxy] make it possible to create "ad hoc" packages through the web UI

1 files changed, 99 insertions, 43 deletions

diff --git a/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po b/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po
index e33c5e7..28f6791 100644
--- a/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po
+++ b/src/hydrilla/locales/en_US/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hydrilla 2.0\n"
 "Report-Msgid-Bugs-To: koszko@koszko.org\n"
-"POT-Creation-Date: 2022-09-27 13:36+0200\n"
+"POT-Creation-Date: 2022-09-28 10:27+0200\n"
 "PO-Revision-Date: 2022-02-12 00:00+0000\n"
 "Last-Translator: Wojtek Kosior <koszko@koszko.org>\n"
 "Language: en_US\n"
@@ -217,33 +217,113 @@ msgstr ""
 "This installation of Haketilo uses an SQLite version which does not "
 "support foreign key constraints."
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:71
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:101
 msgid "web_ui.base.title.haketilo_proxy"
 msgstr "Haketilo"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:241
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:275
 msgid "web_ui.base.nav.home"
 msgstr "Home"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:242
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:276
 msgid "web_ui.base.nav.rules"
 msgstr "Script blocking"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:243
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:277
 msgid "web_ui.base.nav.packages"
 msgstr "Packages"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:244
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:278
 msgid "web_ui.base.nav.libraries"
 msgstr "Libraries"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:245
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:279
 msgid "web_ui.base.nav.repos"
 msgstr "Repositories"
 
-#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:246
-msgid "web_ui.base.nav.load"
-msgstr "Import from file"
+#: src/hydrilla/proxy/web_ui/templates/base.html.jinja:280
+msgid "web_ui.base.nav.import"
+msgstr "Import"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:23
+msgid "web_ui.import.title"
+msgstr "Import items"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:41
+msgid "web_ui.import.heading"
+msgstr "Import items"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:43
+msgid "web_ui.import.heading_import_from_file"
+msgstr "From file"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:49
+msgid "web_ui.err.uploaded_file_not_zip"
+msgstr "The uploaded file is not a valid ZIP file."
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:53
+msgid "web_ui.err.invalid_uploaded_malcontent"
+msgstr "The uploaded archive does not contain valid Haketilo malcontent."
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:61
+msgid "web_ui.import.choose_zipfile_button"
+msgstr "Select file"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:68
+msgid "web_ui.import.install_from_file_button"
+msgstr "Import"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:75
+msgid "web_ui.import.heading_import_ad_hoc"
+msgstr "Ad hoc"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:78
+msgid "web_ui.err.invalid_ad_hoc_package"
+msgstr "The ad hoc package being imported contains errors."
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:84
+msgid "web_ui.import.identifier_field_label"
+msgstr "Identifier"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:86
+msgid "web_ui.err.invalid_ad_hoc_identifier"
+msgstr "Chosen identifier is not valid."
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:90
+msgid "web_ui.import.long_name_field_label"
+msgstr "Long name (optional)"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:93
+msgid "web_ui.import.version_field_label"
+msgstr "Version (optional)"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:95
+msgid "web_ui.err.invalid_ad_hoc_version"
+msgstr "Chosen version is not valid."
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:99
+msgid "web_ui.import.description_field_label"
+msgstr "Description (optional)"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:102
+msgid "web_ui.import.patterns_field_label"
+msgstr "URL patterns (each on its own line)"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:104
+msgid "web_ui.err.invalid_ad_hoc_patterns"
+msgstr "Chosen patterns are not valid."
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:108
+msgid "web_ui.import.script_text_field_label"
+msgstr "JavaScript to execute on pages that match one of the patterns"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:111
+msgid "web_ui.import.lic_text_field_label"
+msgstr "Package license text (optional)"
+
+#: src/hydrilla/proxy/web_ui/templates/import.html.jinja:116
+msgid "web_ui.import.install_ad_hoc_button"
+msgstr "Add new package"
 
 #: src/hydrilla/proxy/web_ui/templates/index.html.jinja:23
 msgid "web_ui.home.title"
@@ -454,30 +534,6 @@ msgstr ""
 "explicitly configured by the user but is going to be activated "
 "automatically."
 
-#: src/hydrilla/proxy/web_ui/templates/items/load_from_disk.html.jinja:23
-msgid "web_ui.load_from_disk.title"
-msgstr "Import from file"
-
-#: src/hydrilla/proxy/web_ui/templates/items/load_from_disk.html.jinja:41
-msgid "web_ui.load_from_disk.heading"
-msgstr "Import items from a ZIP archive"
-
-#: src/hydrilla/proxy/web_ui/templates/items/load_from_disk.html.jinja:45
-msgid "web_ui.err.uploaded_file_not_zip"
-msgstr "The uploaded file is not a valid ZIP file."
-
-#: src/hydrilla/proxy/web_ui/templates/items/load_from_disk.html.jinja:49
-msgid "web_ui.err.invalid_uploaded_malcontent"
-msgstr "The uploaded archive does not contain valid Haketilo malcontent."
-
-#: src/hydrilla/proxy/web_ui/templates/items/load_from_disk.html.jinja:57
-msgid "web_ui.load_from_disk.choose_zipfile_button"
-msgstr "Select file"
-
-#: src/hydrilla/proxy/web_ui/templates/items/load_from_disk.html.jinja:64
-msgid "web_ui.load_from_disk.install_button"
-msgstr "Import"
-
 #: src/hydrilla/proxy/web_ui/templates/items/package_view.html.jinja:23
 msgid "web_ui.items.single.package.title"
 msgstr "Package view"
@@ -676,7 +732,11 @@ msgstr "New repository"
 msgid "web_ui.repos.add.heading"
 msgstr "Configure a new repository"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:29
+#: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:28
+msgid "web_ui.repos.add.name_field_label"
+msgstr "Name"
+
+#: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:30
 #: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:67
 msgid "web_ui.err.repo_name_invalid"
 msgstr "Chosen name is not valid."
@@ -687,19 +747,15 @@ msgid "web_ui.err.repo_name_taken"
 msgstr "Chosen name is already in use."
 
 #: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:37
-msgid "web_ui.repos.add.name_field_label"
-msgstr "Name"
+msgid "web_ui.repos.add.url_field_label"
+msgstr "URL"
 
-#: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:47
+#: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:39
 #: src/hydrilla/proxy/web_ui/templates/repos/show_single.html.jinja:121
 msgid "web_ui.err.repo_url_invalid"
 msgstr "Chosen URL is not vald."
 
-#: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:51
-msgid "web_ui.repos.add.url_field_label"
-msgstr "URL"
-
-#: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:62
+#: src/hydrilla/proxy/web_ui/templates/repos/add.html.jinja:45
 msgid "web_ui.repos.add.submit_button"
 msgstr "Add repository"