ruby_cms 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d1d3f4aadd9f1f8ad953f3babc9fbb104c2238ba411d0d24bf97bba3574684
-  data.tar.gz: 8bef2b9e212a3da28f8af8f387c648c57a5e76a1a50a29b757e49a54b2fe0e62
+  metadata.gz: cf4ff917e02707c3a9d4ed7cec086d357b3c7de708ebc58475a4b5c0276a64bd
+  data.tar.gz: be5e98bda847b6b1129210ba575fb29951f7e2ac96d53e9fcdb7cf58af7e97b6
 SHA512:
-  metadata.gz: 957a2871489bcdc0680f029b43dc7696ec3109bfff994227771c9ff29cf069f529e9d9c99fed37ca1e31eb13acc049dfe2d9c72fb2617f2ac9d755e2928accf0
-  data.tar.gz: 800a6f5e760a8d5a5a99e86d5e9d6f9ad2015664c79c2068178f10d5b6c1b59d7d88a5d40230c33577d9d44d950e9a86cfd9f124ebbd166d13a2e06eada03754
+  metadata.gz: 97f3797085020d26908c8189324fc3f157241be0aa1eecc4a7575d4a7839ea3920662ee7e9e2f6ad509c1fd7810cc291fc9c09f23630f98c4b2d208ef50dd1af
+  data.tar.gz: 7ce9c3b67c447847f407b3fa96ee3dacee1780bd14352f3da9cc310d71868cccbed42e5de0c13cd1f9a6e8edc0bfbf6c96acc0a3cad37e5c2dcbaf7db448715b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.1.0.7] - 2026-03-25
+
+- Improve some styling and fix rich text
+
 ## [0.1.0.6] - 2026-03-23
 
 - Fix visual editor content block bug

data/app/javascript/controllers/ruby_cms/locale_tabs_controller.js

@@ -8,27 +8,49 @@ export default class extends Controller {
     const panelId = tab.dataset.panelId;
     if (!panelId) return;
 
-    const hideClass = "is-hidden";
+    const hideClasses = ["hidden", "is-hidden"];
+    const panels = this.element.querySelectorAll("[data-locale-panel]");
 
-    // Hide all panels
+    // Hide all panels in this tabs component
+    panels.forEach((panel) => panel.classList.add(...hideClasses));
+
+    // Reset all tab states
     this.tabTargets.forEach((t) => {
-      const pid = t.dataset.panelId;
-      if (pid) {
-        const panel = document.getElementById(pid);
-        if (panel) panel.classList.add(hideClass);
-      }
-      t.classList.remove("is-active");
+      this.setTabState(t, false);
     });
 
     // Show selected panel
-    const panel = document.getElementById(panelId);
-    if (panel) panel.classList.remove(hideClass);
+    const panel = this.findPanel(panelId);
+    if (panel) panel.classList.remove(...hideClasses);
 
     // Highlight selected tab
-    tab.classList.add("is-active");
-    tab.setAttribute("aria-selected", "true");
-    this.tabTargets
-      .filter((t) => t !== tab)
-      .forEach((t) => t.setAttribute("aria-selected", "false"));
+    this.setTabState(tab, true);
+  }
+
+  findPanel(panelId) {
+    // Scope lookup to this component first so multiple tab groups never conflict.
+    if (window.CSS && typeof window.CSS.escape === "function") {
+      const scoped = this.element.querySelector(`#${window.CSS.escape(panelId)}`);
+      if (scoped) return scoped;
+    }
+    return document.getElementById(panelId);
+  }
+
+  setTabState(tab, isActive) {
+    const activeClasses = this.splitClasses(tab.dataset.activeClasses);
+    const inactiveClasses = this.splitClasses(tab.dataset.inactiveClasses);
+
+    // Remove both sets first, then apply the desired one.
+    tab.classList.remove(...activeClasses, ...inactiveClasses, "is-active");
+    tab.classList.add(...(isActive ? activeClasses : inactiveClasses));
+    if (isActive) tab.classList.add("is-active");
+    tab.setAttribute("aria-selected", isActive ? "true" : "false");
+  }
+
+  splitClasses(classListString) {
+    return (classListString || "")
+      .split(" ")
+      .map((klass) => klass.trim())
+      .filter(Boolean);
   }
 }

data/app/models/content_block.rb

@@ -9,26 +9,28 @@ class ContentBlock < ApplicationRecord
 
   def self.action_text_available?
     return false unless defined?(::ActionText::RichText)
-    return false unless ActiveRecord::Base.connected?
 
     ActiveRecord::Base.connection.data_source_exists?("action_text_rich_texts")
-  rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError
+  rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError,
+         ActiveRecord::StatementInvalid
     false
   end
 
   def self.active_storage_available?
     return false unless defined?(::ActiveStorage::Blob)
-    return false unless ActiveRecord::Base.connected?
 
     c = ActiveRecord::Base.connection
     c.data_source_exists?("active_storage_blobs") &&
       c.data_source_exists?("active_storage_attachments")
-  rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError
+  rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError,
+         ActiveRecord::StatementInvalid
     false
   end
 
-  has_rich_text :rich_content if action_text_available?
-  has_one_attached :image if active_storage_available?
+  # Define associations without requiring an active DB connection at boot time.
+  # In production, eager loading may happen before AR has connected.
+  has_rich_text :rich_content if defined?(::ActionText::RichText)
+  has_one_attached :image if defined?(::ActiveStorage::Blob)
 
   belongs_to :updated_by, class_name: "User", optional: true
 

data/app/views/layouts/ruby_cms/_admin_sidebar.html.erb

@@ -1,5 +1,5 @@
 <%# Admin Sidebar Navigation %>
-<aside class="w-56 flex-shrink-0 bg-[#FAF9F5] flex flex-col overflow-hidden" aria-label="Admin" data-ruby-cms--mobile-menu-target="sidebar">
+<aside class="w-46 flex-shrink-0 bg-[#FAF9F5] flex flex-col overflow-hidden" aria-label="Admin" data-ruby-cms--mobile-menu-target="sidebar">
   <div class="px-5 py-5 flex-shrink-0 bg-[#FAF9F5]">
     <div class="flex items-center gap-3" data-ruby-cms--mobile-menu-target="sidebarContent">
       <% if respond_to?(:image_tag, true) %>
@@ -94,7 +94,7 @@
               {},
               {
                 class: "absolute inset-0 w-full h-full opacity-0 cursor-pointer",
-                aria: { label: "Locale" },
+                aria: { label: t("ruby_cms.nav.locale", default: "Locale") },
                 onchange: "this.form.submit()"
               } %>
         </div>
@@ -106,16 +106,16 @@
         <svg class="w-5 h-5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
           <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 6H6a2 2 0 00-2 2v10a2 2 0 002 2h10a2 2 0 002-2v-4M14 4h6m0 0v6m0-6L10 14"></path>
         </svg>
-        <span class="flex-1 text-left">View site</span>
+        <span class="flex-1 text-left"><%= t("ruby_cms.nav.view_site", default: "View site") %></span>
       <% end %>
     <% end %>
 
     <% if respond_to?(:main_app, true) && main_app.respond_to?(:session_path) %>
-      <%= button_to main_app.session_path, method: :delete, class: "flex items-center gap-3 w-full px-3 py-2.5 text-sm font-medium text-gray-600 rounded-md bg-transparent border-0 cursor-pointer transition-colors hover:bg-blue-500 hover:text-white", data: { turbo_confirm: "Are you sure you want to logout?" } do %>
+      <%= button_to main_app.session_path, method: :delete, class: "flex items-center gap-3 w-full px-3 py-2.5 text-sm font-medium text-gray-600 rounded-md bg-transparent border-0 cursor-pointer transition-colors hover:bg-blue-500 hover:text-white", data: { turbo_confirm: t("ruby_cms.nav.logout_confirm", default: "Are you sure you want to logout?") } do %>
         <svg class="w-5 h-5 flex-shrink-0" fill="none" stroke="currentColor" viewBox="0 0 24 24">
           <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M17 16l4-4m0 0l-4-4m4 4H7m6 4v1a3 3 0 01-3 3H6a3 3 0 01-3-3V7a3 3 0 013-3h4a3 3 0 013 3v1"></path>
         </svg>
-        <span class="flex-1 text-left">Logout</span>
+        <span class="flex-1 text-left"><%= t("ruby_cms.nav.logout", default: "Logout") %></span>
       <% end %>
     <% end %>
   </div>

data/app/views/ruby_cms/admin/content_blocks/_form.html.erb

@@ -1,161 +1,92 @@
 <%= form_with model: @content_block,
-              url: @content_block.persisted? ? ruby_cms_admin_content_block_path(@content_block) : ruby_cms_admin_content_blocks_path,
-              method: (@content_block.persisted? ? :patch : :post),
+              url: ruby_cms_admin_content_blocks_path,
+              method: :post,
               id: "content-block-form",
               data: { turbo: false } do |f| %>
-
-  <div class="flex items-start justify-between gap-8 px-6 py-4 border-b border-gray-100">
-    <div class="grid grid-cols-2 gap-4 flex-1">
-      <div class="flex flex-col gap-1">
-        <%= f.label :key, class: "text-sm font-medium text-gray-700" %>
-        <% if @content_block.persisted? %>
-          <%= f.hidden_field :key, name: nil, value: @content_block.key %>
-          <span class="text-sm font-mono text-gray-900 py-2"><%= @content_block.key %></span>
-        <% else %>
-          <%= f.text_field :key, name: "content_block[key]", class: "h-9 rounded-md border border-gray-200 bg-white px-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-teal-200" %>
-        <% end %>
-      </div>
-
-      <% if @content_block.persisted? %>
-        <div class="flex flex-col gap-1">
-          <label class="text-sm font-medium text-gray-700"><%= t("ruby_cms.admin.content_blocks.content_type") %></label>
-          <%= select_tag "content_block[content_type]",
-                         options_for_select(::ContentBlock::CONTENT_TYPES, @content_block.content_type),
-                         class: "h-9 rounded-md border border-gray-200 bg-white px-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-teal-200" %>
-        </div>
-      <% end %>
-    </div>
-
-    <div class="flex items-center gap-2 flex-shrink-0">
-      <%= link_to "Cancel",
-                  @content_block.persisted? ? ruby_cms_admin_content_block_path(@content_block) : ruby_cms_admin_content_blocks_path,
-                  class: "inline-flex h-9 items-center justify-center rounded-md border border-gray-200 bg-white px-4 text-sm font-medium text-gray-700 shadow-sm hover:bg-gray-50 transition-colors no-underline" %>
-      <%= f.submit "Save", class: "inline-flex h-9 items-center justify-center rounded-md bg-gray-900 px-4 text-sm font-medium text-white shadow-sm hover:bg-gray-800 transition-colors cursor-pointer" %>
-    </div>
-  </div>
-
-  <% if @content_block.errors.any? %>
-    <div class="mx-6 mt-4 rounded-md border border-rose-200 bg-rose-50 p-4">
-      <ul class="list-disc pl-4 space-y-1">
-        <% @content_block.errors.full_messages.each do |msg| %>
-          <li class="text-sm text-rose-700"><%= msg %></li>
-        <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <% if @content_block.persisted? && @blocks_by_locale.present? %>
-    <%# Multi-locale layout %>
-
-    <div class="flex items-center gap-2 px-6 py-4 border-b border-gray-100">
-      <%= hidden_field_tag "content_block[published]", "0" %>
-      <%= check_box_tag "content_block[published]", "1",
-                        @blocks_by_locale.values.any?(&:published?),
-                        class: "h-4 w-4 rounded border-gray-300 text-teal-600 focus:ring-teal-200" %>
-      <label class="text-sm font-medium text-gray-700"><%= t("ruby_cms.admin.content_blocks.published") %> (all translations)</label>
-    </div>
-
-    <div class="rounded-md border border-gray-200 overflow-hidden mx-6 my-4" data-controller="ruby-cms--locale-tabs">
-      <div class="flex gap-1 p-2 bg-gray-50 border-b border-gray-200" role="tablist">
-        <% @blocks_by_locale.each_with_index do |(locale_s, _), idx| %>
-          <button type="button"
-                  role="tab"
-                  aria-selected="<%= idx == 0 %>"
-                  aria-controls="locale-panel-<%= locale_s %>"
-                  id="locale-tab-<%= locale_s %>"
-                  data-ruby-cms--locale-tabs-target="tab"
-                  data-panel-id="locale-panel-<%= locale_s %>"
-                  data-action="click->ruby-cms--locale-tabs#switchTab"
-                  class="px-3 py-1.5 rounded text-xs font-medium border-none cursor-pointer transition-colors <%= idx == 0 ? 'bg-white text-blue-600 shadow-sm ring-1 ring-gray-200' : 'bg-transparent text-gray-500 hover:bg-gray-100 hover:text-gray-900' %>">
-            <%= ruby_cms_locale_display_name(locale_s) %>
-          </button>
-        <% end %>
-      </div>
-
-      <% @blocks_by_locale.each_with_index do |(locale_s, block), idx| %>
-        <div id="locale-panel-<%= locale_s %>"
-             role="tabpanel"
-             aria-labelledby="locale-tab-<%= locale_s %>"
-             class="p-5 <%= idx > 0 ? 'hidden' : '' %>"
-             data-locale-panel>
-
-          <%= hidden_field_tag "content_block[locales][#{locale_s}][locale]", locale_s %>
-
-          <div class="grid grid-cols-2 gap-4">
-            <div class="flex flex-col gap-1">
-              <label class="text-sm font-medium text-gray-700"><%= t("ruby_cms.admin.content_blocks.title") %></label>
-              <%= text_field_tag "content_block[locales][#{locale_s}][title]",
-                                 block.title,
-                                 class: "h-9 rounded-md border border-gray-200 bg-white px-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-teal-200" %>
+  <div class="<%= RubyCms::Admin::AdminResourceCard::CARD_CLASS %>">
+    <div class="p-6 space-y-6">
+      <% if @content_block.errors.any? %>
+        <div class="rounded-lg border border-destructive/30 bg-destructive/5 p-4">
+          <div class="flex gap-3">
+            <svg class="size-5 text-destructive shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
+              <path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"/>
+            </svg>
+            <div>
+              <p class="text-sm font-medium text-destructive"><%= t("ruby_cms.admin.content_blocks.errors_title", default: "Please fix the following errors:") %></p>
+              <ul class="mt-1.5 text-sm text-destructive/80 list-disc list-inside">
+                <% @content_block.errors.full_messages.each do |message| %>
+                  <li><%= message %></li>
+                <% end %>
+              </ul>
             </div>
-
-            <div class="flex flex-col gap-1">
-              <label class="text-sm font-medium text-gray-700"><%= t("ruby_cms.admin.content_blocks.content") %></label>
-              <%= text_area_tag "content_block[locales][#{locale_s}][content]",
-                                block.content,
-                                rows: 5,
-                                class: "rounded-md border border-gray-200 bg-white px-3 py-2 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-teal-200 resize-y" %>
-            </div>
-
-            <% if ::ContentBlock.respond_to?(:action_text_available?) && ::ContentBlock.action_text_available? && block.persisted? && block.respond_to?(:rich_content) %>
-              <div class="col-span-2 flex flex-col gap-1">
-                <label class="text-sm font-medium text-gray-700"><%= t("ruby_cms.admin.content_blocks.rich_content") %></label>
-                <%= rich_text_area_tag "content_block[locales][#{locale_s}][rich_content]",
-                                       block.rich_content.present? ? block.rich_content.to_s : "",
-                                       class: "rounded-md border border-gray-200 bg-white text-sm shadow-sm focus:outline-none" %>
-              </div>
-            <% end %>
           </div>
         </div>
       <% end %>
-    </div>
-
-  <% else %>
-    <%# Single-locale (new block) %>
-
-    <div class="grid grid-cols-2 gap-4 p-6">
-      <div class="flex flex-col gap-1">
-        <%= f.label :locale, class: "text-sm font-medium text-gray-700" %>
-        <%= f.select :locale,
-                     I18n.available_locales.map { |l| [ruby_cms_locale_display_name(l), l.to_s] },
-                     { include_blank: t("ruby_cms.admin.content_blocks.select_locale") },
-                     class: "h-9 rounded-md border border-gray-200 bg-white px-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-teal-200",
-                     name: "content_block[locale]" %>
-      </div>
 
-      <div class="flex flex-col gap-1">
-        <%= f.label :title, class: "text-sm font-medium text-gray-700" %>
-        <%= f.text_field :title, class: "h-9 rounded-md border border-gray-200 bg-white px-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-teal-200" %>
-      </div>
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-6">
+        <div>
+          <%= f.label :key, class: RubyCms::Admin::AdminResourceCard::LABEL_CLASS %>
+          <%= f.text_field :key,
+              class: RubyCms::Admin::AdminResourceCard::INPUT_CLASS,
+              placeholder: "homepage_hero_title",
+              name: "content_block[key]" %>
+        </div>
 
-      <div class="flex flex-col gap-1">
-        <%= f.label :content_type, class: "text-sm font-medium text-gray-700" %>
-        <%= f.select :content_type, ::ContentBlock::CONTENT_TYPES, {}, class: "h-9 rounded-md border border-gray-200 bg-white px-3 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-teal-200" %>
-      </div>
+        <div>
+          <%= f.label :locale, class: RubyCms::Admin::AdminResourceCard::LABEL_CLASS %>
+          <%= f.select :locale,
+              I18n.available_locales.map { |l| [ruby_cms_locale_display_name(l), l.to_s] },
+              { include_blank: t("ruby_cms.admin.content_blocks.select_locale", default: "Select locale") },
+              class: RubyCms::Admin::AdminResourceCard::INPUT_CLASS,
+              name: "content_block[locale]" %>
+        </div>
 
-      <div class="col-span-2 flex flex-col gap-1">
-        <%= f.label :content, class: "text-sm font-medium text-gray-700" %>
-        <%= f.text_area :content, rows: 5, class: "rounded-md border border-gray-200 bg-white px-3 py-2 text-sm shadow-sm focus:outline-none focus:ring-2 focus:ring-teal-200 resize-y" %>
-      </div>
+        <div>
+          <%= f.label :title, class: RubyCms::Admin::AdminResourceCard::LABEL_CLASS %>
+          <%= f.text_field :title, class: RubyCms::Admin::AdminResourceCard::INPUT_CLASS %>
+        </div>
 
-      <% if ::ContentBlock.respond_to?(:action_text_available?) && ::ContentBlock.action_text_available? %>
-        <div class="col-span-2 flex flex-col gap-1">
-          <%= f.label :rich_content, class: "text-sm font-medium text-gray-700" %>
-          <%= f.rich_text_area :rich_content, class: "rounded-md border border-gray-200 bg-white text-sm shadow-sm focus:outline-none" %>
+        <div>
+          <%= f.label :content_type, class: RubyCms::Admin::AdminResourceCard::LABEL_CLASS %>
+          <%= f.select :content_type, ::ContentBlock::CONTENT_TYPES, {}, class: RubyCms::Admin::AdminResourceCard::INPUT_CLASS %>
         </div>
-      <% else %>
-        <div class="col-span-2 rounded-md border border-gray-200 bg-gray-50 p-4">
-          <p class="text-sm text-gray-500">
-            Rich text requires Action Text. Run:
-            <code class="font-mono text-xs bg-gray-100 px-1 rounded">bin/rails action_text:install</code> and <code class="font-mono text-xs bg-gray-100 px-1 rounded">bin/rails db:migrate</code>
-          </p>
+
+        <div class="sm:col-span-2">
+          <%= f.label :content, class: RubyCms::Admin::AdminResourceCard::LABEL_CLASS %>
+          <%= f.text_area :content,
+              rows: 5,
+              class: "#{RubyCms::Admin::AdminResourceCard::INPUT_CLASS} resize-y" %>
         </div>
-      <% end %>
 
-      <div class="col-span-2 flex items-center gap-2">
-        <%= f.check_box :published, class: "h-4 w-4 rounded border-gray-300 text-teal-600 focus:ring-teal-200" %>
-        <%= f.label :published, class: "text-sm font-medium text-gray-700" %>
+        <% if ::ContentBlock.respond_to?(:action_text_available?) && ::ContentBlock.action_text_available? %>
+          <div class="sm:col-span-2">
+            <%= f.label :rich_content, class: RubyCms::Admin::AdminResourceCard::LABEL_CLASS %>
+            <%= f.rich_text_area :rich_content, class: "rounded-lg border border-border bg-background text-sm shadow-sm focus:outline-none" %>
+          </div>
+        <% else %>
+          <div class="sm:col-span-2 rounded-lg border border-border/60 bg-muted/30 p-4">
+            <p class="text-sm text-muted-foreground">
+              Rich text requires Action Text. Run:
+              <code class="font-mono text-xs bg-muted px-1.5 py-0.5 rounded">bin/rails action_text:install</code>
+              and
+              <code class="font-mono text-xs bg-muted px-1.5 py-0.5 rounded">bin/rails db:migrate</code>.
+            </p>
+          </div>
+        <% end %>
       </div>
+
+      <label class="inline-flex items-center gap-3 cursor-pointer">
+        <%= f.check_box :published, class: "size-4 rounded border-border text-primary focus:ring-primary/30 cursor-pointer" %>
+        <span class="text-sm font-medium text-foreground"><%= t("ruby_cms.admin.content_blocks.published", default: "Published") %></span>
+      </label>
     </div>
-  <% end %>
+
+    <div class="<%= RubyCms::Admin::AdminResourceCard::ACTIONS_CLASS %>">
+      <%= link_to t("ruby_cms.admin.common.cancel", default: "Cancel"),
+          ruby_cms_admin_content_blocks_path,
+          class: RubyCms::Admin::AdminResourceCard::CANCEL_CLASS %>
+      <%= f.submit t("ruby_cms.admin.content_blocks.create", default: "Save"),
+          class: RubyCms::Admin::AdminResourceCard::SUBMIT_CLASS %>
+    </div>
+  </div>
 <% end %>

data/app/views/ruby_cms/admin/content_blocks/new.html.erb

@@ -1,5 +1,10 @@
-<h1 class="text-2xl font-semibold text-gray-900 mb-4">New content block</h1>
+<%= render RubyCms::Admin::AdminPageHeader.new(
+  title: t("ruby_cms.admin.content_blocks.new_title", default: "New content block"),
+  breadcrumbs: [
+    { label: t("ruby_cms.admin.nav.admin", default: "Admin"), url: ruby_cms_admin_root_path },
+    { label: t("ruby_cms.admin.nav.content_blocks", default: "Content Blocks"), url: ruby_cms_admin_content_blocks_path },
+    { label: t("ruby_cms.admin.content_blocks.new_title", default: "New content block") }
+  ]
+) %>
 
 <%= render "form" %>
-
-<p class="mt-4"><%= link_to "Back", ruby_cms_admin_content_blocks_path, class: "text-blue-600 hover:text-blue-800" %></p>

data/app/views/ruby_cms/admin/content_blocks/show.html.erb

@@ -78,28 +78,33 @@
 
         <%# ── Locale Tabs ── %>
         <% if @blocks_by_locale.present? %>
+          <% active_locale = @blocks_by_locale.key?(@content_block.locale.to_s) ? @content_block.locale.to_s : @blocks_by_locale.keys.first %>
           <div class="rounded-xl border border-border/60 overflow-hidden" data-controller="ruby-cms--locale-tabs">
             <div class="flex gap-1 p-2 bg-muted/30 border-b border-border/60" role="tablist">
-              <% @blocks_by_locale.each_with_index do |(locale_s, _), idx| %>
+              <% @blocks_by_locale.each do |locale_s, _| %>
+                <% selected = locale_s == active_locale %>
                 <button type="button"
                         role="tab"
-                        aria-selected="<%= idx == 0 %>"
+                        aria-selected="<%= selected %>"
                         aria-controls="locale-panel-<%= locale_s %>"
                         id="locale-tab-<%= locale_s %>"
                         data-ruby-cms--locale-tabs-target="tab"
                         data-panel-id="locale-panel-<%= locale_s %>"
+                        data-active-classes="bg-background text-primary shadow-sm ring-1 ring-border/60"
+                        data-inactive-classes="bg-transparent text-muted-foreground hover:bg-muted hover:text-foreground"
                         data-action="click->ruby-cms--locale-tabs#switchTab"
-                        class="px-3 py-1.5 rounded-md text-xs font-medium border-none cursor-pointer transition-colors <%= idx == 0 ? 'bg-background text-primary shadow-sm ring-1 ring-border/60' : 'bg-transparent text-muted-foreground hover:bg-muted hover:text-foreground' %>">
+                        class="px-3 py-1.5 rounded-md text-xs font-medium border-none cursor-pointer transition-colors <%= selected ? 'bg-background text-primary shadow-sm ring-1 ring-border/60' : 'bg-transparent text-muted-foreground hover:bg-muted hover:text-foreground' %>">
                   <%= ruby_cms_locale_display_name(locale_s) %>
                 </button>
               <% end %>
             </div>
 
-            <% @blocks_by_locale.each_with_index do |(locale_s, block), idx| %>
+            <% @blocks_by_locale.each do |locale_s, block| %>
+              <% selected = locale_s == active_locale %>
               <div id="locale-panel-<%= locale_s %>"
                    role="tabpanel"
                    aria-labelledby="locale-tab-<%= locale_s %>"
-                   class="p-5 <%= idx > 0 ? 'hidden' : '' %>"
+                   class="p-5 <%= selected ? '' : 'hidden' %>"
                    data-locale-panel>
 
                 <%= hidden_field_tag "content_block[locales][#{locale_s}][locale]", locale_s %>
@@ -204,8 +209,8 @@
             <div class="space-y-3">
               <% @blocks_by_locale.each do |locale_s, block| %>
                 <% next if block.title.blank? && block.content_body.blank? %>
-                <div class="rounded-lg border border-border/60 bg-muted/30 p-3">
-                  <span class="inline-flex items-center rounded-md bg-background px-1.5 py-0.5 text-[10px] font-medium text-muted-foreground ring-1 ring-border/60 mb-2"><%= ruby_cms_locale_display_name(locale_s) %></span>
+                <div class="py-1">
+                  <span class="text-[10px] font-semibold uppercase tracking-wide text-muted-foreground"><%= ruby_cms_locale_display_name(locale_s) %></span>
                   <% if block.title.present? %>
                     <p class="text-xs font-medium text-foreground"><%= block.title %></p>
                   <% end %>

data/config/locales/en.yml

@@ -14,7 +14,20 @@ en:
 
   ruby_cms:
     nav:
+      locale: "Locale"
       settings: "Settings"
+      view_site: "View site"
+      logout: "Logout"
+      logout_confirm: "Are you sure you want to logout?"
+      items:
+        dashboard: "Dashboard"
+        visual_editor: "Visual editor"
+        content_blocks: "Content blocks"
+        analytics: "Analytics"
+        permissions: "Permissions"
+        visitor_errors: "Visitor errors"
+        users: "Users"
+        settings: "Settings"
     admin:
       breadcrumb:
         admin: "Admin"

data/config/locales/nl.yml

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+nl:
+  ruby_cms:
+    nav:
+      locale: "Taal"
+      settings: "Instellingen"
+      view_site: "Bekijk site"
+      logout: "Uitloggen"
+      logout_confirm: "Weet je zeker dat je wilt uitloggen?"
+      items:
+        dashboard: "Dashboard"
+        visual_editor: "Visuele editor"
+        content_blocks: "Contentblokken"
+        analytics: "Analytics"
+        permissions: "Rechten"
+        visitor_errors: "Bezoekersfouten"
+        users: "Gebruikers"
+        settings: "Instellingen"
+    admin:
+      breadcrumb:
+        admin: "Beheer"
+      base:
+        authentication_required: "Authenticatie vereist."
+        not_authorized: "Niet geautoriseerd."
+      locales:
+        en: "Engels"
+        nl: "Nederlands"
+        de: "Duits"
+        fr: "Frans"
+        es: "Spaans"
+      content_blocks:
+        created: "Contentblok aangemaakt."
+        updated: "Contentblok bijgewerkt."
+        deleted: "Contentblok verwijderd."
+        select_locale: "Selecteer taal"
+        content_type: "Inhoudstype"
+        title: "Titel"
+        content: "Inhoud"
+        rich_content: "Rich content"
+        published: "Gepubliceerd"

data/lib/generators/ruby_cms/install_generator.rb

@@ -260,11 +260,17 @@ module RubyCms
       def install_action_text
         migrate_dir = Rails.root.join("db/migrate")
         return unless migrate_dir.directory?
-        return if action_text_already_installed?(migrate_dir)
 
-        say "ℹ Task action_text: Installing Action Text for rich text/image content blocks.", :cyan
-        run "bin/rails action_text:install"
-        say "✓ Task action_text: Installed Action Text", :green
+        if action_text_already_installed?(migrate_dir)
+          say "ℹ Task action_text: Existing Action Text setup detected. Skipping action_text:install.",
+              :cyan
+        else
+          say "ℹ Task action_text: Installing Action Text for rich text/image content blocks.", :cyan
+          run "bin/rails action_text:install"
+          say "✓ Task action_text: Installed Action Text", :green
+        end
+
+        configure_action_text_assets
       rescue StandardError => e
         say "⚠ Task action_text: Could not install: #{e.message}. Rich text will be disabled.",
             :yellow
@@ -380,6 +386,63 @@ module RubyCms
         rescue ActiveRecord::ConnectionNotEstablished, ActiveRecord::NoDatabaseError
           false
         end
+
+        def configure_action_text_assets
+          add_action_text_importmap_pins
+          add_action_text_imports_to_admin_entrypoint
+        end
+
+        def add_action_text_importmap_pins
+          importmap_path = Rails.root.join("config/importmap.rb")
+          return unless File.exist?(importmap_path)
+
+          content = File.read(importmap_path)
+          lines_to_add = []
+          lines_to_add << %(pin "trix") unless content.include?('pin "trix"')
+          unless content.include?('pin "@rails/actiontext"')
+            lines_to_add << %(pin "@rails/actiontext", to: "actiontext.esm.js")
+          end
+          return if lines_to_add.empty?
+
+          inject_into_file importmap_path.to_s, before: /^end/ do
+            "\n  # RubyCMS rich text (Action Text + Trix)\n  #{lines_to_add.join("\n  ")}\n"
+          end
+          say "✓ Task action_text/importmap: Added trix/actiontext pins to importmap.rb.", :green
+        rescue StandardError => e
+          say "⚠ Task action_text/importmap: Could not add pins: #{e.message}. " \
+              "Add pins for trix and @rails/actiontext manually.",
+              :yellow
+        end
+
+        def add_action_text_imports_to_admin_entrypoint
+          admin_js_path = Rails.root.join("app/javascript/admin.js")
+          content = File.exist?(admin_js_path) ? File.read(admin_js_path) : ""
+
+          lines_to_add = []
+          lines_to_add << %(import "trix") unless content.include?('import "trix"') || content.include?("import 'trix'")
+          unless content.include?('import "@rails/actiontext"') ||
+                 content.include?("import '@rails/actiontext'")
+            lines_to_add << %(import "@rails/actiontext")
+          end
+          return if lines_to_add.empty?
+
+          if File.exist?(admin_js_path)
+            append_to_file admin_js_path.to_s, "\n#{lines_to_add.join("\n")}\n"
+            say "✓ Task action_text/js: Added Action Text imports to app/javascript/admin.js.", :green
+          else
+            content = <<~JS
+              // RubyCMS admin entrypoint
+              import "trix"
+              import "@rails/actiontext"
+            JS
+            File.write(admin_js_path, content)
+            say "✓ Task action_text/js: Created app/javascript/admin.js with Action Text imports.", :green
+          end
+        rescue StandardError => e
+          say "⚠ Task action_text/js: Could not update admin.js: #{e.message}. " \
+              "Import trix and @rails/actiontext manually.",
+              :yellow
+        end
       end
 
       def install_tailwind

data/lib/ruby_cms/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyCms
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/lib/ruby_cms.rb

@@ -100,7 +100,7 @@ module RubyCms
     list = nav_registry
            .select {|item| nav_entry_visible?(item, view_context:, user:) }
            .sort_by {|item| nav_sort_tuple(item) }
-    apply_nav_order(list)
+    localize_nav_labels(apply_nav_order(list))
   rescue StandardError => e
     Rails.logger.error("[RubyCMS] Error filtering navigation: #{e.message}") if defined?(Rails.logger)
     nav_registry
@@ -131,6 +131,13 @@ module RubyCms
       [priority, item[:order] || 1000, item[:label].to_s]
     end
 
+    def localize_nav_labels(list)
+      list.map do |item|
+        translated = I18n.t("ruby_cms.nav.items.#{item[:key]}", default: item[:label].to_s)
+        item.merge(label: translated)
+      end
+    end
+
     def nav_section_priority(section)
       section.to_s == NAV_SECTION_MAIN ? 0 : 2
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Codebyjob
@@ -174,6 +174,7 @@ files:
 - config/database.yml
 - config/importmap.rb
 - config/locales/en.yml
+- config/locales/nl.yml
 - config/routes.rb
 - db/migrate/20260125000001_create_ruby_cms_permissions.rb
 - db/migrate/20260125000002_create_ruby_cms_user_permissions.rb