From fd1ef782f7fc85db740fcb2ac1f859725e7280c5 Mon Sep 17 00:00:00 2001 From: erdgeist Date: Thu, 30 Jul 2026 23:22:47 +0200 Subject: Provide the full i18n matrix for public/admin-preview/shared-preview urls --- app/views/nodes/show.html.erb | 100 ++++++++++++++++++++++---- config/locales/de.yml | 2 + config/locales/en.yml | 2 + public/stylesheets/admin.css | 163 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 253 insertions(+), 14 deletions(-) diff --git a/app/views/nodes/show.html.erb b/app/views/nodes/show.html.erb index a337b555..8b12e2eb 100644 --- a/app/views/nodes/show.html.erb +++ b/app/views/nodes/show.html.erb @@ -194,25 +194,97 @@
<%= t(".links") %>
-
-
- <%= t(".public") %> - <%= link_to @page.public_link, content_url(@node.unique_path) %> + <% + # Public addresses come from the head, previews from the draft, and + # those sets differ routinely -- a German head with a freshly + # translated English draft has one public address and two preview + # ones. Columns are the union; a kind with no address in a locale + # leaves that cell empty. + available = I18n.available_locales - [:root] + head_locales = (@node.head&.translated_locales || []).map(&:to_sym) & available + draft_locales = (@node.draft&.translated_locales || []).map(&:to_sym) & available + link_locales = (head_locales | draft_locales) + link_locales = [I18n.default_locale] if link_locales.empty? + link_locales = [I18n.default_locale] + (link_locales - [I18n.default_locale]).sort + locale_param = ->(locale) { locale unless locale == I18n.default_locale } + %> + +
+
+ + <% link_locales.each do |locale| %> + <%= locale.to_s.upcase %> + <% end %>
+ + <% if @node.head %> +
+ + <%= t(".public") %> + <%= link_to "/#{@node.unique_name}", content_url(@node.unique_path) %> + + + <% link_locales.each do |locale| %> + + <% if head_locales.include?(locale) %> + <%= locale.to_s.upcase %> + <%= render "nodes/link_cell", + :url => content_url(@node.unique_path, :locale => locale_param.(locale)) %> + <% end %> + + <% end %> + +
+ <% end %> + <% if @node.draft %> -
- <%= t(".admin_preview") %> - <%= link_to preview_page_path(@node.draft), preview_page_path(@node.draft) %> +
+ + <%= t(".admin_preview") %> + <%= link_to preview_page_path(@node.draft), preview_page_url(@node.draft) %> + + + <% link_locales.each do |locale| %> + + <% if draft_locales.include?(locale) %> + <%= locale.to_s.upcase %> + <%= render "nodes/link_cell", + :url => preview_page_url(@node.draft, :locale => locale_param.(locale)) %> + <% end %> + + <% end %> +
-
- <%= t(".public_preview") %> + +
+ + <%= t(".public_preview") %> + <% if @node.draft.preview_token.present? %> + <%= link_to shared_preview_path(:token => @node.draft.preview_token), + shared_preview_url(:token => @node.draft.preview_token), + target: "_blank", rel: "noopener" %> + <% end %> + <% if @node.draft.preview_token.present? %> -
- <%= link_to shared_preview_path(token: @node.draft.preview_token), shared_preview_url(token: @node.draft.preview_token), target: "_blank", rel: "noopener" %> - <%= button_to t(".revoke"), revoke_shared_preview_node_path(@node), method: :put, form: { data: { confirm: t(".confirm_revoke") }, class: 'button_to state_changing' } %> -
+ + <% link_locales.each do |locale| %> + + <% if draft_locales.include?(locale) %> + <%= locale.to_s.upcase %> + <%= render "nodes/link_cell", + :url => shared_preview_url(:token => @node.draft.preview_token, + :locale => locale_param.(locale)) %> + <% end %> + + <% end %> + + <%= button_to t(".revoke"), revoke_shared_preview_node_path(@node), method: :put, + form: { data: { confirm: t(".confirm_revoke") }, + class: 'button_to state_changing link_matrix_actions' } %> <% else %> - <%= button_to t(".create_preview_link"), generate_shared_preview_node_path(@node), method: :put, form: { class: 'button_to state_changing' } %> + + <%= button_to t(".create_preview_link"), generate_shared_preview_node_path(@node), method: :put, + form: { class: 'button_to state_changing link_matrix_actions' } %> <% end %>
<% end %> diff --git a/config/locales/de.yml b/config/locales/de.yml index 2d5e9685..521aca8b 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -404,6 +404,8 @@ de: confirm_trash: "Diese Seite und alles darunter in den Papierkorb verschieben? Alle veröffentlichten Inhalte darin gehen offline." move_to_trash: "In den Papierkorb" locked_hint: "Gesperrt — zum Bearbeiten, Veröffentlichen oder Verwerfen erst unter Personen entsperren." + visit: "besuchen" + copy_url: "URL kopieren" trash: "Papierkorb" was_at: "War unter" restore_to: "Wiederherstellen nach" diff --git a/config/locales/en.yml b/config/locales/en.yml index da8282cf..9bf51262 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -351,6 +351,8 @@ en: confirm_trash: "Move this page and everything beneath it to the Trash? All published content in it will go offline." move_to_trash: "Move to Trash" locked_hint: "Locked — see People below to unlock before editing, publishing, or discarding." + visit: "Visit" + copy_url: "Copy URL" trash: "Trash" was_at: "Was at" restore_to: "Restore to" diff --git a/public/stylesheets/admin.css b/public/stylesheets/admin.css index 1d39dd6c..c0496c6e 100644 --- a/public/stylesheets/admin.css +++ b/public/stylesheets/admin.css @@ -13,6 +13,7 @@ --handle-fill: color-mix(in srgb, CanvasText, Canvas 60%); /* #989898 as fill */ --link-underline: color-mix(in srgb, CanvasText, Canvas 69%); /* #b0b0b0 */ --text-muted: color-mix(in srgb, CanvasText, Canvas 47%); + --text-heavy: color-mix(in srgb, CanvasText, Canvas 23%); --badge-scrim: rgba(255, 255, 255, 0.85); @@ -977,6 +978,168 @@ form.button_to button[type="submit"] { box-sizing: border-box; } +/* ============================================================ + Link matrix (nodes#show) + ============================================================ + One block per link kind, each an independent grid with an identical + column template */ + +.link_matrix_head { + display: none; +} + +.link_matrix_row { + display: flex; + flex-direction: column; + margin-bottom: 1.75rem; +} + +.link_matrix_row:last-child { + margin-bottom: 0; +} + +.link_matrix_cells { + margin-top: 0.7rem; +} + +.link_matrix_row .link_matrix_actions { + margin-top: 1.25rem; +} + +.link_matrix_label { order: 0; } +.link_matrix_cells { order: 1; } +.link_matrix_actions { order: 2; } + +.link_matrix_cells { + display: flex; + flex-wrap: wrap; + gap: 0.6rem 1.5rem; +} + +.link_matrix_cell { + display: inline-flex; + align-items: center; + gap: 0.25rem; +} + +.link_matrix_label { + display: flex; + flex-direction: column; + gap: 0.1rem; + min-width: 0; +} + +.link_matrix_label a { + overflow-wrap: anywhere; +} + +.link_locale_tag { + font-size: 0.85rem; + color: var(--text-muted); +} + +.link_matrix_locale { + font-size: 0.8rem; + font-variant: all-small-caps; + letter-spacing: 0.06em; + color: var(--text); +} + +.link_icon_button { + display: inline-flex; + align-items: center; + padding: 0.3rem; + border: 1px solid var(--border); + border-radius: 2px; + background-color: var(--surface); + color: var(--text-heavy); + line-height: 1; + text-decoration: none; +} + +.link_icon_button:hover { + color: var(--on-solid); + background-color: var(--text); + border-color: var(--text); +} + +.link_icon_button svg { + width: 1.15rem; + height: 1.15rem; +} + +/* Transient "Copied!" text; empty at rest. */ +.link_icon_button .copy_button_label:not(:empty) { + margin-left: 0.35rem; + font-size: 0.85rem; +} + +@media (min-width: 1016px) { + /* ONE grid for the whole matrix, not one per row: separate grids compute + their auto columns independently, so identical templates do not align + unless every width is fixed. display: contents dissolves the row and + cell wrappers, making their children direct grid items that share the + tracks. */ + .link_matrix { + display: grid; + align-items: start; + gap: 0.75rem 1rem; + } + + /* Label sizes to its longest URL, one auto column per locale, one for + the token actions, then a spacer so the columns cluster near the + label rather than drifting to the right edge. */ + .link_matrix_1 { grid-template-columns: auto auto auto minmax(0, 1fr); } + .link_matrix_2 { grid-template-columns: auto auto auto auto minmax(0, 1fr); } + .link_matrix_3 { grid-template-columns: auto auto auto auto auto minmax(0, 1fr); } + + .link_matrix_head, + .link_matrix_row, + .link_matrix_cells { + display: contents; + } + + /* Auto-placement must follow source order once the wrappers are gone. */ + .link_matrix_label, + .link_matrix_cells, + .link_matrix_actions { + order: 0; + } + + /* Forces each row to begin a new grid row without placeholder cells. */ + .link_matrix_label { + grid-column-start: 1; + } + + /* A display: contents element cannot carry a border, so the header rule + lives on the locale labels themselves -- which marks the columns + individually and avoids a stray line under the empty label cell. */ + .link_matrix_locale { + padding-bottom: 0.25rem; + border-bottom: 1px solid var(--hairline); + } + + .link_matrix_locale, + .link_matrix_cell { + justify-self: center; + } + + /* The header sits above the first row's buttons, which are themselves + top-aligned, so it needs no extra offset -- but the locale cells do, + to line up with the URL rather than the label. */ + .link_matrix_cell { + padding-top: 0.1rem; + } + + .link_locale_tag { + display: none; + } + + .link_matrix_row .link_matrix_actions { + margin-top: 0; + } +} + /* Layout only -- the at-rest visibility (wavy underline) for these links comes from the scoped rule in Base elements above. */ .add_events, -- cgit v1.3