Mattias Bodlund 1 year ago
parent
commit
5caa70c7d6
7 changed files with 38 additions and 26 deletions
  1. +30
    -6
      app/assets/stylesheets/forms.css
  2. +3
    -3
      app/models/concerns/ancestry_with_sorted_url.rb
  3. +1
    -1
      app/models/node.rb
  4. +1
    -1
      app/views/admin/nodes/_form.html.erb
  5. +1
    -1
      app/views/admin/nodes/_tree.html.erb
  6. +1
    -5
      app/views/admin/nodes/_tree_node.html.erb
  7. +1
    -9
      config/locales/en.yml

+ 30
- 6
app/assets/stylesheets/forms.css View File

@ -33,10 +33,8 @@
} }
.form-header__titled { .form-header__titled {
display: flex;
align-items: center;
gap: 30px;
gap: 8px;
& .title-box { & .title-box {
flex-grow: 1; flex-grow: 1;
} }
@ -300,9 +298,31 @@
display: none; display: none;
} }
form[data-locale='da'] .i18n__input-da,
form[data-locale='en'] .i18n__input-en, form[data-locale='en'] .i18n__input-en,
form[data-locale='de'] .i18n__input-de {
form[data-locale='zh'] .i18n__input-zh,
form[data-locale='hr'] .i18n__input-hr,
form[data-locale='cs'] .i18n__input-cs,
form[data-locale='da'] .i18n__input-da,
form[data-locale='nl'] .i18n__input-nl,
form[data-locale='fi'] .i18n__input-fi,
form[data-locale='fr'] .i18n__input-fr,
form[data-locale='de'] .i18n__input-de,
form[data-locale='hu'] .i18n__input-hu,
form[data-locale='it'] .i18n__input-it,
form[data-locale='ja'] .i18n__input-ja,
form[data-locale='ko'] .i18n__input-ko,
form[data-locale='nb'] .i18n__input-nb,
form[data-locale='pl'] .i18n__input-pl,
form[data-locale='pt'] .i18n__input-pt,
form[data-locale='ro'] .i18n__input-ro,
form[data-locale='sr'] .i18n__input-sr,
form[data-locale='sk'] .i18n__input-sk,
form[data-locale='sl'] .i18n__input-sl,
form[data-locale='es'] .i18n__input-es,
form[data-locale='sv'] .i18n__input-sv,
form[data-locale='uk'] .i18n__input-uk{
display: flex; display: flex;
} }
@ -541,6 +561,10 @@ p[role="alert"] {
.i18n__from-ctrls { .i18n__from-ctrls {
display: flex; display: flex;
justify-content: space-between;
margin-top: 8px;;
gap: 4px; gap: 4px;
& label { & label {
font-size: 1.5rem; font-size: 1.5rem;


+ 3
- 3
app/models/concerns/ancestry_with_sorted_url.rb View File

@ -27,8 +27,8 @@ private
def format_slug def format_slug
I18n.available_locales.each do |l| I18n.available_locales.each do |l|
v = self.root? ? (I18n.default_locale == l ? '' : l.to_s) :
self.send("slug_#{l}").blank? ? (self.title(locale: l) || '').parameterize : self.send("slug_#{l}").parameterize
v = self.root? ? l.to_s :
self.send("slug_#{l}").blank? ? (self.title(locale: l) || '').parameterize : self.send("slug_#{l}").parameterize
self.send(:slug=, v, locale: l) self.send(:slug=, v, locale: l)
end end
@ -39,7 +39,7 @@ private
I18n.available_locales.each do |l| I18n.available_locales.each do |l|
Mobility.with_locale(l) do Mobility.with_locale(l) do
v = File.join(self.ancestors.map { |node| node.slug || '' }, self.slug || '') v = File.join(self.ancestors.map { |node| node.slug || '' }, self.slug || '')
v = File.join('', v) unless I18n.default_locale == l
#v = File.join('', v) unless I18n.default_locale == l
self.send(:url=, v, locale: l) self.send(:url=, v, locale: l)
end end
end end


+ 1
- 1
app/models/node.rb View File

@ -18,7 +18,7 @@ class Node < ApplicationRecord
:href, :href,
:page_title, :page_title,
:page_description, :page_description,
fallbacks: { en: :da, de: :en },
fallbacks: :en,
locale_accessors: I18n.available_locales locale_accessors: I18n.available_locales
NODE_TEMPLATES = %w"tmpl_article tmpl_index" NODE_TEMPLATES = %w"tmpl_article tmpl_index"


+ 1
- 1
app/views/admin/nodes/_form.html.erb View File

@ -81,7 +81,7 @@
<%= render partial: 'material/text_field_i18n', locals: { f: form, attr: :href } unless form.object.root? %> <%= render partial: 'material/text_field_i18n', locals: { f: form, attr: :href } unless form.object.root? %>
<%= render partial: 'material/tom_select_field_i18n',
<%# render partial: 'material/tom_select_field_i18n',
locals: { locals: {
f: form, f: form,
attr: :tags, attr: :tags,


+ 1
- 1
app/views/admin/nodes/_tree.html.erb View File

@ -11,7 +11,7 @@
<div class="list-header"> <div class="list-header">
<div class="cell"><%= t(:'activerecord.attributes.node.title') %></div> <div class="cell"><%= t(:'activerecord.attributes.node.title') %></div>
<div class="cell flags"></div> <div class="cell flags"></div>
<div class="cell"><%= t(:'activerecord.attributes.node.occasions') %></div>
<div class="cell"></div>
<div class="cell"><%= t(:'ui.updated') %></div> <div class="cell"><%= t(:'ui.updated') %></div>
<div class="cell actions"></div> <div class="cell actions"></div>
</div> </div>


+ 1
- 5
app/views/admin/nodes/_tree_node.html.erb View File

@ -19,11 +19,7 @@
<div class="cell date"> <div class="cell date">
<%# node_flags(node) %> <%# node_flags(node) %>
<ul>
<% node.occasions.each do |occasion| %>
<%= tag.li occasion_date(occasion) %>
<% end %>
</ul>
</div> </div>
<div class="cell"> <div class="cell">


+ 1
- 9
config/locales/en.yml View File

@ -207,14 +207,7 @@ en:
de: German de: German
templates: templates:
tmpl_index: Home page tmpl_index: Home page
tmpl_article: Page
tmpl_lists: Lists
tmpl_list: List
tmpl_exhibitions: Exhibitions
tmpl_occasions: Calendar
tmpl_poster: Poster
tmpl_story: Short story
tmpl_text: Text
tmpl_article: Page
categories: categories:
box: Box box: Box
folder: Folder folder: Folder
@ -323,7 +316,6 @@ en:
tags_de: Tags tags_de: Tags
excluded_locales: Not visible under languages excluded_locales: Not visible under languages
is_allowlist: Invert list to only visible is_allowlist: Invert list to only visible
occasions: Event
attachments: Attachments attachments: Attachments
attachment: attachment:


Loading…
Cancel
Save