From df06e11704f4a73f0c74d2c47ebb8308665ec8f5 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 30 May 2026 22:47:29 -0500 Subject: [PATCH] fix(ui): always-visible create package form + clearer labels + org locale strings Replace toggle button with always-visible "Create New License Package" section. Added org settings locale strings for Update Streams page. Co-Authored-By: Claude Opus 4.6 (1M context) --- options/locale/locale_en-US.json | 15 +++++- templates/repo/licenses.tmpl | 88 ++++++++++++++++---------------- 2 files changed, 58 insertions(+), 45 deletions(-) diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json index d494bf81aa..6658233bf1 100644 --- a/options/locale/locale_en-US.json +++ b/options/locale/locale_en-US.json @@ -2636,7 +2636,8 @@ "repo.licenses.description": "Description", "repo.licenses.max_sites": "Max Sites", "repo.licenses.channels_help": "Comma-separated channel names (e.g. stable,release-candidate). Leave empty for all channels.", - "repo.licenses.create_package": "Create Package", + "repo.licenses.create_package": "Create License Package", + "repo.licenses.create_new_package": "Create New License Package", "repo.licenses.package_created": "License package created successfully.", "repo.licenses.generate_key": "Generate Key", "repo.licenses.key_created": "License Key Created", @@ -2787,6 +2788,18 @@ "org.form.create_org_not_allowed": "You are not allowed to create an organization.", "org.settings": "Settings", "org.settings.options": "Organization", + "org.settings.update_streams": "Licenses & Update Streams", + "org.settings.update_streams_desc": "Configure the default update streams for all repositories in this organization. Repos can override with their own settings.", + "org.settings.stream_mode": "Stream Mode", + "org.settings.stream_mode_joomla": "Standard Joomla streams (stable, release-candidate, beta, alpha, development)", + "org.settings.stream_mode_custom": "Custom streams (define your own channels and tag patterns)", + "org.settings.default_streams": "Active Streams", + "org.settings.default_streams_joomla": "These are the currently active update streams. Release tags are matched to streams by their suffix.", + "org.settings.stream_name": "Stream Name", + "org.settings.stream_suffix": "Tag Suffix", + "org.settings.custom_streams": "Custom Stream Definitions (JSON)", + "org.settings.custom_streams_help": "JSON array of stream objects. Each needs: name, suffix, description. Example: [{\"name\":\"lts\",\"suffix\":\"-lts\",\"description\":\"Long-term support\"}]", + "org.settings.update_streams_saved": "Update stream settings saved.", "org.settings.full_name": "Full Name", "org.settings.email": "Contact Email Address", "org.settings.website": "Website", diff --git a/templates/repo/licenses.tmpl b/templates/repo/licenses.tmpl index 41c8e79dd9..df23cf5d4b 100644 --- a/templates/repo/licenses.tmpl +++ b/templates/repo/licenses.tmpl @@ -20,50 +20,10 @@ {{end}} {{/* ── License Packages ── */}} -

- {{svg "octicon-key" 16}} {{ctx.Locale.Tr "repo.licenses.packages"}} - {{if .IsRepoAdmin}} - - {{ctx.Locale.Tr "repo.licenses.new_package"}} - - {{end}} +

+ {{svg "octicon-key" 16}} {{ctx.Locale.Tr "repo.licenses.packages"}}

- {{if .IsRepoAdmin}} - - {{end}} - {{if .LicensePackages}} @@ -89,7 +49,7 @@ {{$.CsrfTokenHtml}} - @@ -108,6 +68,46 @@ {{end}} + {{/* ── Create New License Package ── */}} + {{if .IsRepoAdmin}} +

+ {{svg "octicon-plus" 16}} {{ctx.Locale.Tr "repo.licenses.create_new_package"}} +

+
+
+ {{.CsrfTokenHtml}} +
+
+ + +
+
+ + +
+
+
+
+ + +

0 = {{ctx.Locale.Tr "repo.licenses.lifetime"}}

+
+
+ + +

0 = unlimited

+
+
+ + +

{{ctx.Locale.Tr "repo.licenses.channels_help"}}

+
+
+ + +
+ {{end}} + {{/* ── Issued Keys ── */}} {{if .LicenseKeys}}

@@ -148,7 +148,7 @@ {{end}} - {{/* ── Update Feed Info ── */}} + {{/* ── Update Feed URLs ── */}}

{{svg "octicon-rss" 16}} {{ctx.Locale.Tr "repo.licenses.update_feeds"}}