comfy_middle_seat 3.2.0 → 4.0.0

data/app/models/comfy/cms/snippet.rb

@@ -13,8 +13,9 @@ class Comfy::Cms::Snippet < ActiveRecord::Base
   # -- Callbacks ---------------------------------------------------------------
   before_validation :assign_label
   before_create :assign_position
-  after_save    :clear_page_content_cache
-  after_destroy :clear_page_content_cache
+  after_commit :clear_page_content_cache,
+               on: %i[create update destroy],
+               if: :page_content_cache_stale?
 
   # -- Validations -------------------------------------------------------------
   validates :label,
@@ -33,7 +34,11 @@ protected
   # When snippet is changed or removed we need to blow away all page caches as
   # we don't know where it was used.
   def clear_page_content_cache
-    Comfy::Cms::Page.where(id: site.pages.pluck(:id)).update_all(content_cache: nil)
+    site.pages.update_all(content_cache: nil)
+  end
+
+  def page_content_cache_stale?
+    destroyed? || saved_changes?
   end
 
   def assign_position

data/app/models/concerns/comfy/cms/with_fragments.rb

@@ -77,7 +77,7 @@ module Comfy::Cms::WithFragments
   # duplicate tags on the layout. That's wierd (but still works).
   def fragment_nodes
     nodes
-      .grep(ComfortableMediaSurfer::Content::Tags::Fragment)
+      .grep(ComfyMiddleSeat::Content::Tags::Fragment)
       .uniq(&:identifier)
   end
 
@@ -111,7 +111,7 @@ module Comfy::Cms::WithFragments
 protected
 
   def renderer
-    ComfortableMediaSurfer::Content::Renderer.new(self)
+    ComfyMiddleSeat::Content::Renderer.new(self)
   end
 
   def nodes

data/app/views/comfy/admin/cms/categories/_index.html.haml

@@ -4,7 +4,7 @@
     .categories
       .category
         - active_class = params[:categories].blank?? "active" : nil
-        = link_to t('.all'), {categories: nil}, class: "btn btn-sm btn-light btn-block #{active_class}"
+        = link_to t('.all'), {categories: nil, q: params[:q].presence}, class: "btn btn-sm btn-light btn-block #{active_class}"
       - @site.categories.of_type(type).each do |category|
         = render "comfy/admin/cms/categories/show", category: category, read: true
     %button.toggle-cat-edit.btn.btn-secondary.btn-sm.btn-block{type: "button"}

data/app/views/comfy/admin/cms/categories/_show.html.haml

@@ -6,7 +6,7 @@
   - if read
     - active_class = active ? "active" : nil
     - categories = active ? categories.reject{|c| c == category.label} : categories << category.label
-    - url = "?#{{categories: categories}.to_query}"
+    - url = "?#{{categories: categories, q: params[:q].presence}.compact.to_query}"
     = link_to category.label, url, class: "btn btn-sm btn-light btn-block text-left text-truncate #{active_class}"
   - else
     .btn-group.d-flex

data/app/views/comfy/admin/cms/files/_file.html.haml

@@ -5,7 +5,7 @@
   .row
     .col-md-5.item
       .item-controls.d-none.d-lg-block
-        - if !params[:categories].present? && @site.files.count > 1
+        - if !params[:categories].present? && !params[:q].present? && @site.files.count > 1
           .dragger
             %i.fas.fa-bars
       .item-content

data/app/views/comfy/admin/cms/files/index.html.haml

@@ -21,10 +21,17 @@
 
   = comfy_admin_partial "comfy/admin/cms/partials/files_before"
 
+  = render "comfy/admin/cms/shared/search",
+           url: comfy_admin_cms_site_files_path(@site),
+           placeholder: t(".search_placeholder")
+
   = comfy_paginate @files
 
-  %ul.list.sortable.cms-uploader-filelist
-    = render partial: "file", collection: @files
+  - if @files.present?
+    %ul.list.cms-uploader-filelist{class: ("sortable" unless params[:categories].present? || params[:q].present?)}
+      = render partial: "file", collection: @files
+  - else
+    .alert.alert-info= t(".no_results")
 
   = comfy_admin_partial "comfy/admin/cms/partials/files_after"
 

data/app/views/comfy/admin/cms/fragments/_form_fragments.html.haml

@@ -25,7 +25,7 @@
         .tab-content
           - frag_index = 0
 
-          - builder_opts = { builder: ComfortableMediaSurfer::FormBuilder, bootstrap: { layout: :horizontal }}
+          - builder_opts = { builder: ComfyMiddleSeat::FormBuilder, bootstrap: { layout: :horizontal }}
           = fields scope, model: record, **builder_opts do |form|
             - namespace.each_with_index do |(name, tags), index|
               .tab-pane{id: "ns-#{name}", class: index == 0 ? "active" : nil}
@@ -33,6 +33,6 @@
                   = form.fragment_field(tag, frag_index)
                   - frag_index += 1
 
-- rescue ComfortableMediaSurfer::Content::Renderer::SyntaxError, ComfortableMediaSurfer::Content::Tag::Error => e
+- rescue ComfyMiddleSeat::Content::Renderer::SyntaxError, ComfyMiddleSeat::Content::Tag::Error => e
   .alert.alert-danger
     = e

data/app/views/comfy/admin/cms/pages/_form.html.haml

@@ -9,7 +9,8 @@
   = form.select :parent_id, options, bootstrap: {custom_control: true}
 
 - if (options = ::Comfy::Cms::Layout.options_for_select(@site)).present?
-  = form.select :layout_id, options, {bootstrap: {custom_control: true}}, {data: {url: form_fragments_comfy_admin_cms_site_page_path(@site, @page.id.to_i)}, id: "fragments-toggle"}
+  - fragments_data = {url: form_fragments_comfy_admin_cms_site_page_path(@site, @page.id.to_i), loading_message: t("comfy.admin.cms.fragments.loading", default: "Loading layout content…"), error_message: t("comfy.admin.cms.fragments.load_error", default: "Layout content could not be loaded. Your current content has been kept."), discard_message: t("comfy.admin.cms.fragments.discard_confirmation", default: "Some content cannot be preserved in the selected layout. Replace it anyway?")}
+  = form.select :layout_id, options, {bootstrap: {custom_control: true}}, {data: fragments_data, id: "fragments-toggle"}
 
 = comfy_admin_partial "comfy/admin/cms/partials/page_form_inner", form: form
 

data/app/views/comfy/admin/cms/pages/_index_branch.html.haml

@@ -1,16 +1,16 @@
-- page        ||= index_branch
-- children      = @pages_by_parent[page.id]
-- siblings      = @pages_by_parent[page.parent_id]
-- has_children  = children.present?
-- has_siblings  = siblings.size > 1
-- branch_open   = (session[:cms_page_tree] || []).member?(page.id.to_s) || page.root?
-- category_view = params[:categories].present?
+- page          ||= index_branch
+- filter_view     = params[:categories].present? || params[:q].present?
+- children        = filter_view ? [] : @pages_by_parent.fetch(page.id, [])
+- siblings        = filter_view ? [] : @pages_by_parent.fetch(page.parent_id, [])
+- has_children    = children.present? || page.children_count.to_i.positive?
+- has_siblings    = siblings.size > 1
+- branch_open     = page_branch_open?(page)
 
 %li{id: dom_id(page), data: {id: page.id}}
   .row
 
     .col-md-6.item
-      - unless category_view
+      - unless filter_view
         .item-controls
           - if has_siblings
             .dragger.d-none.d-md-block
@@ -37,8 +37,9 @@
       .btn-group.btn-group-sm
         = link_to t(".add_child_page"), new_comfy_admin_cms_site_page_path(@site, parent_id: page.id), class: "btn btn-outline-secondary"
         = link_to t(".edit"), edit_comfy_admin_cms_site_page_path(@site, page), class: "btn btn-outline-secondary"
-        = link_to t(".delete"), comfy_admin_cms_site_page_path(@site, page), method: :delete, data: {confirm: t('.are_you_sure')}, class: "btn btn-danger"
+        - unless page.root?
+          = link_to t(".delete"), comfy_admin_cms_site_page_path(@site, page), method: :delete, data: {confirm: t('.are_you_sure')}, class: "btn btn-danger"
 
-  - if !category_view && has_children && branch_open
+  - if !filter_view && has_children && branch_open
     %ul.list.children.sortable.pl-md-3
       = render partial: "index_branch", collection: children

data/app/views/comfy/admin/cms/pages/edit.html.haml

@@ -10,5 +10,7 @@
       = link_to t('.publish_children', default: 'Publish children'), publish_children_comfy_admin_cms_site_page_path(@site, @page), method: :patch, data: {confirm: t('.publish_children_confirmation', default: 'Publish all child pages?')}, class: 'btn btn-success'
       = link_to t('.unpublish_children', default: 'Unpublish children'), unpublish_children_comfy_admin_cms_site_page_path(@site, @page), method: :patch, data: {confirm: t('.unpublish_children_confirmation', default: 'Unpublish all child pages?')}, class: 'btn btn-outline-secondary'
 
-= comfy_form_with model: @page, scope: :page, url: {action: :update}, html: {multipart: true} do |form|
+- draft_data = cms_draft_form_data('site', @site.id, 'page', @page.id, record: @page)
+= comfy_form_with model: @page, scope: :page, url: {action: :update}, html: {multipart: true, data: draft_data} do |form|
+  = hidden_field_tag :cms_draft_key, draft_data[:cms_draft_key]
   = render form

data/app/views/comfy/admin/cms/pages/index.html.haml

@@ -7,7 +7,14 @@
 
 = comfy_admin_partial "comfy/admin/cms/partials/pages_before"
 
-%ul.list.sortable
-  = render partial: "index_branch", collection: @pages
+= render "comfy/admin/cms/shared/search",
+         url: comfy_admin_cms_site_pages_path(@site),
+         placeholder: t(".search_placeholder")
+
+- if @pages.present?
+  %ul.list{class: ("sortable" unless params[:categories].present? || params[:q].present?)}
+    = render partial: "index_branch", collection: @pages
+- else
+  .alert.alert-info= t(".no_results")
 
 = comfy_admin_partial "comfy/admin/cms/partials/pages_after"

data/app/views/comfy/admin/cms/pages/new.html.haml

@@ -1,5 +1,7 @@
 .page-header
   %h2= t('.title')
 
-= comfy_form_with model: @page, scope: :page, url: {action: :create}, html: {multipart: true} do |form|
+- draft_data = cms_draft_form_data('site', @site.id, 'page', 'new', 'parent', @page.parent_id || 'root', record: @page)
+= comfy_form_with model: @page, scope: :page, url: {action: :create}, html: {multipart: true, data: draft_data} do |form|
+  = hidden_field_tag :cms_draft_key, draft_data[:cms_draft_key]
   = render form

data/app/views/comfy/admin/cms/pages/toggle_branch.js.erb

@@ -2,11 +2,11 @@
 var li = document.querySelector('li#comfy_cms_page_<%=@page.id%>');
 var toggle = li.querySelector('.item .toggle');
 toggle.classList.toggle('open');
-<% if session[:cms_page_tree].member?(@page.id.to_s) %>
+<% if @branch_open %>
   if(!li.querySelector('ul.children')) {
   var childrenList = document.createElement('ul');
   childrenList.className = 'children sortable pl-md-3';
-  childrenList.innerHTML = '<%= escape_javascript(render partial: "index_branch", collection: @page.children) %>';
+  childrenList.innerHTML = '<%= escape_javascript(render partial: "index_branch", collection: @pages_by_parent.fetch(@page.id, [])) %>';
   li.appendChild(childrenList);
   CMS.sortableList.dispose();
   CMS.sortableList.init();

data/app/views/comfy/admin/cms/revisions/show.html.haml

@@ -1,20 +1,36 @@
+- selected_timestamp = l(@revision.created_at, format: "%Y-%m-%d %H:%M:%S %Z")
+
 - content_for :right_column do
   .box.revisions
     - @record.revisions.order(created_at: :desc).each do |revision|
-      = active_link_to l(revision.created_at, format: :short), { id: revision.id }, class: "btn btn-sm btn-light d-block text-primary mb-1"
+      - timestamp = l(revision.created_at, format: "%Y-%m-%d %H:%M:%S %Z")
+      - label = t('.revision_link', default: 'Revision #%{id} — snapshot replaced at %{timestamp}', id: revision.id, timestamp: timestamp)
+      = active_link_to label, {id: revision.id}, class: "btn btn-sm btn-light d-block text-primary text-left mb-1"
 
 .page-header
   %h2
-    = t('.title')
+    = t('.title', default: 'Revisions for')
     = @record.class.to_s.demodulize
 
+.revision-summary
+  %h3.h5= t('.selected_revision', default: 'Selected revision #%{id}', id: @revision.id)
+  %p.mb-2
+    = t('.snapshot_explanation', default: 'This snapshot contains the content that was replaced at %{timestamp}. The comparison shows how the currently saved content differs from that snapshot.', timestamp: selected_timestamp)
+  .revision-legend{aria: {label: t('.legend', default: 'Change legend')}}
+    %span.revision-legend-item
+      %span.revision-legend-swatch.added{aria: {hidden: true}}
+      = t('.added', default: 'Added since snapshot')
+    %span.revision-legend-item
+      %span.revision-legend-swatch.removed{aria: {hidden: true}}
+      = t('.removed', default: 'Removed since snapshot')
+
 .row.d-none.d-lg-flex
   .col-lg-10.ml-auto
     .row
       .col-lg-6
-        .label= t('.previous')
+        .label= t('.selected_snapshot', default: 'Selected snapshot')
       .col-lg-6
-        .label= t('.current')
+        .label= t('.current_content', default: 'Current saved content (changes highlighted)')
 
 - @current_content.each do |label, content|
   .row.revision
@@ -30,7 +46,9 @@
           .current.d-none= content
           .content
 
-= comfy_form_with model: @revision, url: { action: :revert } do |form|
+= comfy_form_with model: @revision, url: {action: :revert} do |form|
   = form.form_actions do
-    = submit_tag t(".update"), class: "btn btn-primary"
-    = link_to t(".cancel"), record_path, class: "btn btn-link"
+    = submit_tag t('.update', default: 'Restore selected snapshot'), class: 'btn btn-primary'
+    - if preview_path
+      = link_to t('.preview', default: 'Preview selected snapshot'), preview_path, class: 'btn btn-info', target: 'comfy-cms-revision-preview', rel: 'noopener'
+    = link_to t('.cancel', default: 'Cancel'), record_path, class: 'btn btn-link'

data/app/views/comfy/admin/cms/shared/_search.html.haml

@@ -0,0 +1,9 @@
+= form_tag url, method: :get, class: "mb-3", role: "search" do
+  - Array(params[:categories]).each do |category|
+    = hidden_field_tag "categories[]", category
+  .input-group
+    = search_field_tag :q, params[:q], class: "form-control", placeholder: placeholder, aria: {label: placeholder}
+    .input-group-append
+      = submit_tag t("comfy.admin.cms.search.submit"), name: nil, class: "btn btn-primary"
+      - if params[:q].present?
+        = link_to t("comfy.admin.cms.search.clear"), url_for(q: nil, categories: params[:categories]), class: "btn btn-outline-secondary"

data/app/views/comfy/admin/cms/sites/_form.html.haml

@@ -5,7 +5,7 @@
 = form.text_field :hostname
 = form.text_field :path
 
-- locales = ComfortableMediaSurfer.config.locales.to_a.collect{|l| ["#{l[1]} (#{l[0]})", l[0]]}
+- locales = ComfyMiddleSeat.config.locales.to_a.collect{|l| ["#{l[1]} (#{l[0]})", l[0]]}
 = form.select :locale, locales, bootstrap: {custom_control: true}
 
 = comfy_admin_partial "comfy/admin/cms/partials/site_form_after", form: form

data/app/views/comfy/admin/cms/translations/_form.html.haml

@@ -5,7 +5,8 @@
 = form.text_field :label
 
 - if (options = ::Comfy::Cms::Layout.options_for_select(@site)).present?
-  = form.select :layout_id, options, {}, {data: {url: form_fragments_comfy_admin_cms_site_page_translation_path(@site, @page, @translation.id.to_i)}, id: "fragments-toggle"}
+  - fragments_data = {url: form_fragments_comfy_admin_cms_site_page_translation_path(@site, @page, @translation.id.to_i), loading_message: t("comfy.admin.cms.fragments.loading", default: "Loading layout content…"), error_message: t("comfy.admin.cms.fragments.load_error", default: "Layout content could not be loaded. Your current content has been kept."), discard_message: t("comfy.admin.cms.fragments.discard_confirmation", default: "Some content cannot be preserved in the selected layout. Replace it anyway?")}
+  = form.select :layout_id, options, {}, {data: fragments_data, id: "fragments-toggle"}
 
 #form-fragments-container
   = render "comfy/admin/cms/fragments/form_fragments", record: @translation, scope: :translation

data/app/views/comfy/admin/cms/translations/edit.html.haml

@@ -6,5 +6,7 @@
 .page-header
   %h2= t('.title')
 
-= comfy_form_with model: @translation, scope: :translation, url: {action: :update}, html: {multipart: true} do |form|
+- draft_data = cms_draft_form_data('site', @site.id, 'page', @page.id, 'translation', @translation.id, record: @translation)
+= comfy_form_with model: @translation, scope: :translation, url: {action: :update}, html: {multipart: true, data: draft_data} do |form|
+  = hidden_field_tag :cms_draft_key, draft_data[:cms_draft_key]
   = render form

data/app/views/comfy/admin/cms/translations/new.html.haml

@@ -1,5 +1,7 @@
 .page-header
   %h2= t(".title")
 
-= comfy_form_with model: @translation, scope: :translation, url: {action: :create}, html: {multipart: true} do |form|
+- draft_data = cms_draft_form_data('site', @site.id, 'page', @page.id, 'translation', 'new', record: @translation)
+= comfy_form_with model: @translation, scope: :translation, url: {action: :create}, html: {multipart: true, data: draft_data} do |form|
+  = hidden_field_tag :cms_draft_key, draft_data[:cms_draft_key]
   = render form

data/app/views/layouts/comfy/admin/cms/_flash.html.haml

@@ -1,4 +1,4 @@
-- flash.each do |type, message|
+- flash.to_hash.except('cms_saved_draft_key').each do |type, message|
   .alert{:class => "alert-#{type}"}
     %button.close{:type => 'button', :class => "close", :data => {:dismiss => 'alert'}} ×
     = message

data/app/views/layouts/comfy/admin/cms/_head.html.haml

@@ -1,11 +1,13 @@
 %head
-  %title= ComfortableMediaSurfer.config.cms_title
+  %title= ComfyMiddleSeat.config.cms_title
 
   %meta{"http-equiv" => "Content-type", content: "text/html; charset=utf-8"}
   %meta{charset: "utf-8"}
   %meta{name: "viewport", content: "width=device-width, initial-scale=1, shrink-to-fit=no"}
 
   = csrf_meta_tag
+  - if flash[:cms_saved_draft_key].present?
+    %meta{name: "cms-saved-draft-key", content: flash[:cms_saved_draft_key]}
 
   - if @site && @site.persisted?
     %meta{name: "cms-file-upload-path", content: comfy_admin_cms_site_files_path(@site)}

data/app/views/layouts/comfy/admin/cms/_left.html.haml

@@ -35,8 +35,8 @@
 = comfy_admin_partial "comfy/admin/cms/partials/navigation_after"
 
 .left-footer
-  = link_to 'ComfortableMediaSurfer', 'https://github.com/shakacode/comfortable-media-surfer', target: '_blank'
-  %span.version= ComfortableMediaSurfer::VERSION
+  = link_to 'ComfyMiddleSeat', 'https://github.com/avonderluft/comfy-middle-seat', target: '_blank'
+  %span.version= ComfyMiddleSeat::VERSION
   %br
   = link_to 'Rails', 'https://rubyonrails.org', target: '_blank'
   %span.version= Rails::version

data/comfy_middle_seat.gemspec

@@ -1,19 +1,24 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift File.expand_path('lib', __dir__)
-require 'comfortable_media_surfer/version'
+require 'comfy_middle_seat/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'comfy_middle_seat'
-  spec.version       = ComfortableMediaSurfer::VERSION
+  spec.version       = ComfyMiddleSeat::VERSION
   spec.authors       = ['Oleg Khabarov', 'Andrew vonderLuft']
   spec.email         = ['wonder@hey.com']
-  spec.homepage      = 'https://github.com/avonderluft/comfortable-media-surfer'
+  spec.homepage      = 'https://github.com/avonderluft/comfy-middle-seat'
   spec.summary       = 'Rails 7.2+ CMS Engine'
-  spec.description   = 'Comfy Middle Seat is a Rails 7.2+ CMS Engine forked from ComfortableMediaSurfer'
+  spec.description   = 'Comfy Middle Seat is a Rails 7.2+ CMS engine.'
   spec.license       = 'MIT'
 
-  spec.post_install_message = 'Please run rake comfy:compile_assets to compile assets.'
+  spec.post_install_message = <<~MESSAGE
+    Please run rake comfy:compile_assets to compile assets.
+    Upgrading from comfortable_media_surfer? Run bundle exec comfy-middle-seat-upgrade --dry-run first.
+  MESSAGE
+  spec.bindir = 'exe'
+  spec.executables = ['comfy-middle-seat-upgrade']
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|doc)/})

data/config/application.rb

@@ -8,7 +8,7 @@ require 'rails/all'
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
 
-module ComfortableMediaSurfer
+module ComfyMiddleSeat
   class Application < Rails::Application
     # Ensuring that ActiveStorage routes are loaded before Comfy's globbing
     # route. Without this file serving routes are inaccessible.
@@ -32,7 +32,8 @@ module ComfortableMediaSurfer
       # not contain `.rb` files, or that should not be reloaded or eager loaded.
       # Common ones are `templates`, `generators`, or `middleware`, for example.
       config.add_autoload_paths_to_load_path = false
-      config.autoload_lib(ignore: %w[generators])
+      # These gem entrypoints are explicitly required and retain the ComfyMiddleSeat namespace.
+      config.autoload_lib(ignore: %w[generators comfy_middle_seat.rb comfy_middle_seat])
     end
 
     # Making sure we don't load our dev routes as part of the engine

data/config/cms_routes.rb

@@ -2,7 +2,7 @@
 
 # We can't have this in config/routes.rb as they will get pulled in into parent
 # application automatically. We want user to manually place them.
-ComfortableMediaSurfer::Application.routes.draw do
+ComfyMiddleSeat::Application.routes.draw do
   comfy_route :cms_admin
   comfy_route :cms
 end

data/config/environment.rb

@@ -4,4 +4,4 @@
 require_relative 'application'
 
 # Initialize the rails application
-ComfortableMediaSurfer::Application.initialize!
+ComfyMiddleSeat::Application.initialize!

data/config/environments/development.rb

@@ -2,7 +2,7 @@
 
 require 'active_support/core_ext/integer/time'
 
-defined?(ComfortableMediaSurfer::Application) && ComfortableMediaSurfer::Application.configure do
+defined?(ComfyMiddleSeat::Application) && ComfyMiddleSeat::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # In the development environment your application's code is reloaded any time

data/config/environments/production.rb

@@ -2,7 +2,7 @@
 
 require 'active_support/core_ext/integer/time'
 
-defined?(ComfortableMediaSurfer::Application) && ComfortableMediaSurfer::Application.configure do
+defined?(ComfyMiddleSeat::Application) && ComfyMiddleSeat::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   # Code is not reloaded between requests.

data/config/environments/test.rb

@@ -7,7 +7,7 @@ require 'active_support/core_ext/integer/time'
 # your test database is "scratch space" for the test suite and is wiped
 # and recreated between test runs. Don't rely on the data there!
 
-defined?(ComfortableMediaSurfer::Application) && ComfortableMediaSurfer::Application.configure do
+defined?(ComfyMiddleSeat::Application) && ComfyMiddleSeat::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
   config.active_job.queue_adapter = :test # added for Rails 7.1

data/config/initializers/{comfortable_media_surfer.rb → comfy_middle_seat.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-ComfortableMediaSurfer.configure do |config|
+ComfyMiddleSeat.configure do |config|
   # Title of the admin area
   #   config.cms_title = 'Comfy CMS Engine'
 
@@ -88,10 +88,10 @@ ComfortableMediaSurfer.configure do |config|
   #   }
 end
 
-# Default credentials for ComfortableMediaSurfer::AccessControl::AdminAuthentication
+# Default credentials for ComfyMiddleSeat::AccessControl::AdminAuthentication
 # YOU REALLY WANT TO CHANGE THIS BEFORE PUTTING YOUR SITE LIVE
-ComfortableMediaSurfer::AccessControl::AdminAuthentication.username = 'user'
-ComfortableMediaSurfer::AccessControl::AdminAuthentication.password = 'pass'
+ComfyMiddleSeat::AccessControl::AdminAuthentication.username = 'user'
+ComfyMiddleSeat::AccessControl::AdminAuthentication.password = 'pass'
 
 # Uncomment this module and `config.admin_auth` above to use custom admin authentication
 # module ComfyAdminAuthentication

data/config/locales/ar.yml

@@ -64,6 +64,13 @@ ar:
           snippets: مقتطفات
           files: ملفات
 
+        forms:
+          unsaved_changes: لديك تغييرات غير محفوظة. هل أنت متأكد أنك تريد مغادرة هذه الصفحة؟
+
+        search:
+          submit: بحث
+          clear: مسح
+
         sites:
           created: موقع جديد تم انشاءه
           creation_failure: فشل في إنشاء الموقع
@@ -129,6 +136,8 @@ ar:
           index:
             title: الصفحات
             new_link: إنشاء صفحة جديدة
+            search_placeholder: البحث في الصفحات حسب العنوان أو الاسم المختصر أو المسار أو المحتوى
+            no_results: لم يتم العثور على صفحات.
           index_branch:
             toggle: تبديل
             add_child_page: أضف صفحة فرعية
@@ -152,6 +161,9 @@ ar:
             choose_link: اختر الصفحة...
 
         fragments:
+          loading: جارٍ تحميل محتوى التخطيط…
+          load_error: تعذر تحميل محتوى التخطيط. تم الاحتفاظ بالمحتوى الحالي.
+          discard_confirmation: لا يمكن الاحتفاظ ببعض المحتوى في التخطيط المحدد. هل تريد استبداله على أي حال؟
           form_fragments:
             no_tags: |-
               لا يحتوي التخطيط على علامات محتوى محددة.<br/>
@@ -235,6 +247,8 @@ ar:
             title: ملفات
             new_link: رفع ملف جديد
             button: رفع الملفات
+            search_placeholder: البحث في الملفات حسب العنوان أو الوصف أو اسم الملف
+            no_results: لم يتم العثور على ملفات.
           new:
             title: ملف جديد
           edit:

data/config/locales/ca.yml

@@ -64,6 +64,13 @@ ca:
           snippets: Fragments
           files: Arxius
 
+        forms:
+          unsaved_changes: Teniu canvis sense desar. Esteu segur que voleu sortir d'aquesta pàgina?
+
+        search:
+          submit: Cerca
+          clear: Neteja
+
         sites:
           created: S'ha creat el lloc
           creation_failure: El lloc no s'ha pogut ser crear
@@ -129,6 +136,8 @@ ca:
           index:
             title: Pàgines
             new_link: Crea una nova pàgina
+            search_placeholder: Cerca pàgines per nom, slug, ruta o contingut
+            no_results: No s'ha trobat cap pàgina.
           index_branch:
             toggle: Canvia
             add_child_page: Afegeix una pàgina filla
@@ -152,6 +161,9 @@ ca:
             choose_link: Sel·leccioneu una pàgina…
 
         fragments:
+          loading: S'està carregant el contingut del disseny…
+          load_error: No s'ha pogut carregar el contingut del disseny. S'ha conservat el contingut actual.
+          discard_confirmation: Part del contingut no es pot conservar en el disseny seleccionat. Voleu substituir-lo igualment?
           form_fragments:
             no_tags: |-
               La plantilla no té etiquetes de contingut definides.<br/>
@@ -235,6 +247,8 @@ ca:
             title: Arxius
             new_link: Puja un nou arxiu
             button: Carrega els arxius
+            search_placeholder: Cerca arxius per nom, descripció o nom de fitxer
+            no_results: No s'ha trobat cap arxiu.
           new:
             title: Nou arxiu
           edit:

data/config/locales/cs.yml

@@ -64,6 +64,13 @@ cs:
           snippets: Úryvky
           files: Soubory
 
+        forms:
+          unsaved_changes: Máte neuložené změny. Opravdu chcete tuto stránku opustit?
+
+        search:
+          submit: Hledat
+          clear: Vymazat
+
         sites:
           created: Web vytvořen
           creation_failure: Nepodařilo se vytvořit web
@@ -129,6 +136,8 @@ cs:
           index:
             title: Stránky
             new_link: Vytvořit novou stránku
+            search_placeholder: Hledat stránky podle popisu, části URL, cesty nebo obsahu
+            no_results: Nebyly nalezeny žádné stránky.
           index_branch:
             toggle: Přepnout
             add_child_page: Přidat podstránku
@@ -152,6 +161,9 @@ cs:
             choose_link: Select page...
 
         fragments:
+          loading: Načítání obsahu rozložení…
+          load_error: Obsah rozložení se nepodařilo načíst. Váš aktuální obsah byl zachován.
+          discard_confirmation: Některý obsah nelze ve vybraném rozložení zachovat. Přesto ho nahradit?
           form_fragments:
             no_tags: |-
               Rozložení nedefinuje žádné obsahové značky.<br/>
@@ -235,6 +247,8 @@ cs:
             title: Soubory
             new_link: Nahrát nový soubor
             button: Nahrát soubory
+            search_placeholder: Hledat soubory podle názvu, popisu nebo názvu souboru
+            no_results: Nebyly nalezeny žádné soubory.
           new:
             title: Nový soubor
           edit: