diff --git a/app/assets/stylesheets/forms.css b/app/assets/stylesheets/forms.css index 744c184..d63dfca 100644 --- a/app/assets/stylesheets/forms.css +++ b/app/assets/stylesheets/forms.css @@ -33,10 +33,8 @@ } .form-header__titled { - display: flex; - align-items: center; - gap: 30px; - + gap: 8px; + & .title-box { flex-grow: 1; } @@ -300,9 +298,31 @@ display: none; } -form[data-locale='da'] .i18n__input-da, + + 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; } @@ -541,6 +561,10 @@ p[role="alert"] { .i18n__from-ctrls { display: flex; + justify-content: space-between; + + margin-top: 8px;; + gap: 4px; & label { font-size: 1.5rem; diff --git a/app/models/concerns/ancestry_with_sorted_url.rb b/app/models/concerns/ancestry_with_sorted_url.rb index 6b342f6..a6f2dbd 100644 --- a/app/models/concerns/ancestry_with_sorted_url.rb +++ b/app/models/concerns/ancestry_with_sorted_url.rb @@ -27,8 +27,8 @@ private def format_slug 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) end @@ -39,7 +39,7 @@ private I18n.available_locales.each do |l| Mobility.with_locale(l) do 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) end end diff --git a/app/models/node.rb b/app/models/node.rb index 0a3cfca..26d79ab 100644 --- a/app/models/node.rb +++ b/app/models/node.rb @@ -18,7 +18,7 @@ class Node < ApplicationRecord :href, :page_title, :page_description, - fallbacks: { en: :da, de: :en }, + fallbacks: :en, locale_accessors: I18n.available_locales NODE_TEMPLATES = %w"tmpl_article tmpl_index" diff --git a/app/views/admin/nodes/_form.html.erb b/app/views/admin/nodes/_form.html.erb index 2b4bb76..e39b3cf 100644 --- a/app/views/admin/nodes/_form.html.erb +++ b/app/views/admin/nodes/_form.html.erb @@ -81,7 +81,7 @@ <%= 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: { f: form, attr: :tags, diff --git a/app/views/admin/nodes/_tree.html.erb b/app/views/admin/nodes/_tree.html.erb index d559c94..fc6e76e 100644 --- a/app/views/admin/nodes/_tree.html.erb +++ b/app/views/admin/nodes/_tree.html.erb @@ -11,7 +11,7 @@