Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Update views
Matthew Kennedy47e1d01025d7
diff --git a/backend/app/views/spree/admin/cms_pages/_feature_form.html.erb b/backend/app/views/spree/admin/cms_pages/_feature_form.html.erbdeleted file mode 100644index a04d8e414e..0000000000--- a/backend/app/views/spree/admin/cms_pages/_feature_form.html.erb+++ /dev/null@@ -1,55 +0,0 @@-<div data-hook="admin_page_form_fields" class="row">- <div class="col-12 col-md-6">- <%= f.field_container :title, class: ['form-group'] do %>- <%= f.label :title, raw(Spree.t('admin.cms.page_title') + required_span_tag) %>- <%= f.text_field :title, class: 'form-control', required: true %>- <%= f.error_message_on :title %>- <% end %>-- <%= f.field_container :slug, class: ['form-group'] do %>- <%= f.label :slug, Spree.t('admin.pages.slug') %>- <%= f.text_field :slug, class: 'form-control' %>- <%= f.error_message_on :slug %>- <% end %>-- <%= f.field_container :meta_title, class: ['form-group'] do %>- <%= f.label :meta_title, Spree.t('admin.pages.meta_title') %>- <%= f.text_field :meta_title, class: 'form-control' %>- <%= f.error_message_on :meta_title %>- <% end %>-- <%= f.field_container :meta_description, class: ['form-group'] do %>- <%= f.label :meta_description, Spree.t('admin.pages.meta_description') %>- <%= f.text_area :meta_description, { rows: 3, class: 'form-control' } %>- <%= f.error_message_on :meta_description %>- <% end %>- </div>- <div class="col-12 col-md-6">- <%= f.field_container :kind, class: ['form-group'] do %>- <%= f.label :kind, Spree.t('admin.cms.page_type') %>- <%= f.select(:kind, @page_kinds, {include_blank: false}, class: 'select2') %>- <%= f.error_message_on :kind %>- <% end %>-- <%= f.field_container :cms_page_stores, class: ['form-group'] do %>- <%= label_tag :cms_page_stores, Spree.t(:stores) %>- <%= collection_select(:cms_page, :store_id, @stores, :id, :unique_name, {}, { class: 'select2' }) %>- <%= f.error_message_on :cms_page_stores %>- <% end %>-- <%= f.field_container :locale, class: ['form-group'] do %>- <%= f.label :locale %>- <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @cms_page.locale || I18n.locale), {}, { class: 'select2' } %>- <%= f.error_message_on :default_locale %>- <% end %>-- <%= f.field_container :visible, class: ['form-group'] do %>- <div class="custom-control custom-checkbox">- <%= f.check_box :visible, class: 'custom-control-input' %>- <%= f.label :visible, Spree.t(:visible), class: 'custom-control-label' %>- <%= f.error_message_on :visible %>- </div>- <% end %>-- </div>-</div>diff --git a/backend/app/views/spree/admin/cms_pages/_form.html.erb b/backend/app/views/spree/admin/cms_pages/_form.html.erbindex 677a386825..89a47adb32 100644--- a/backend/app/views/spree/admin/cms_pages/_form.html.erb+++ b/backend/app/views/spree/admin/cms_pages/_form.html.erb@@ -1,62 +1,91 @@-<div data-hook="admin_page_form_fields" class="row">- <div class="col-12 col-md-8">- <%= f.field_container :content, class: ['form-group'] do %>- <%= f.label :content, Spree.t(:content) %>- <%= f.text_area :content, { rows: 26, class: 'spree-rte'} %>- <%= f.error_message_on :content %>- <% end %>- </div>+<div data-hook="admin_page_form_fields">+ <div class="row">+ <div class="col-12">+ <div class="card">+ <div class="card-header">+ <h5 class="mb-0"> <%= Spree.t(:settings) %></h5>+ </div>+ <div class="card-body">++ <div class="row pb-0">+ <%= f.field_container :title, class: ['form-group col-6'] do %>+ <%= f.label :title, raw(Spree.t('admin.cms.page_title') + required_span_tag) %>+ <%= f.text_field :title, class: 'form-control', required: true %>+ <%= f.error_message_on :title %>+ <% end %>++ <%= f.field_container :kind, class: ['form-group col-6'] do %>+ <%= f.label :kind, Spree.t('admin.cms.page_type') %>+ <%= f.select(:kind, @page_kinds, {include_blank: false}, class: 'select2') %>+ <%= f.error_message_on :kind %>+ <% end %>++ <%= f.field_container :cms_page_stores, class: ['form-group col-6'] do %>+ <%= label_tag :cms_page_stores, Spree.t(:stores) %>+ <%= collection_select(:cms_page, :store_id, @stores, :id, :unique_name, {}, { class: 'select2' }) %>+ <%= f.error_message_on :cms_page_stores %>+ <% end %>++ <%= f.field_container :locale, class: ['form-group col-6'] do %>+ <%= f.label :locale %>+ <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @cms_page.locale || I18n.locale), {}, { class: 'select2' } %>+ <%= f.error_message_on :default_locale %>+ <% end %>++ <%= f.field_container :visible, class: ['form-group col-6'] do %>+ <div class="custom-control custom-checkbox">+ <%= f.check_box :visible, class: 'custom-control-input' %>+ <%= f.label :visible, Spree.t(:visible), class: 'custom-control-label' %>+ <%= f.error_message_on :visible %>+ </div>+ <% end %>- <div class="col-12 col-md-4">- <%= f.field_container :title, class: ['form-group'] do %>- <%= f.label :title, raw(Spree.t('admin.cms.page_title') + required_span_tag) %>- <%= f.text_field :title, class: 'form-control', required: true %>- <%= f.error_message_on :title %>- <% end %>-- <%= f.field_container :kind, class: ['form-group'] do %>- <%= f.label :kind, Spree.t('admin.cms.page_type') %>- <%= f.select(:kind, @page_kinds, {include_blank: false}, class: 'select2') %>- <%= f.error_message_on :kind %>- <% end %>-- <hr class="mt-5">- <%= f.field_container :cms_page_stores, class: ['form-group'] do %>- <%= label_tag :cms_page_stores, Spree.t(:stores) %>- <%= collection_select(:cms_page, :store_id, @stores, :id, :unique_name, {}, { class: 'select2' }) %>- <%= f.error_message_on :cms_page_stores %>- <% end %>- <%= f.field_container :locale, class: ['form-group'] do %>- <%= f.label :locale %>- <%= f.select :locale, options_from_collection_for_select(all_locales_options, :last, :first, @cms_page.locale || I18n.locale), {}, { class: 'select2' } %>- <%= f.error_message_on :default_locale %>- <% end %>-- <%= f.field_container :visible, class: ['form-group'] do %>- <div class="custom-control custom-checkbox">- <%= f.check_box :visible, class: 'custom-control-input' %>- <%= f.label :visible, Spree.t(:visible), class: 'custom-control-label' %>- <%= f.error_message_on :visible %>+ <div class="col-12 text-right">+ <button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#cmsSeoSettings" aria-expanded="false" aria-controls="collapseExample">+ <%= Spree.t('admin.cms.view_seo_settings') %>+ </button>+ </div>++ <div class="col-12 collapse" id="cmsSeoSettings">+ <hr class="mt-5">+ <h5 class="mt-4"><%= Spree.t('admin.cms.seo_settings') %></h5>+ <div class="row pb-0">+ <%= f.field_container :meta_title, class: ['form-group col-6'] do %>+ <%= f.label :meta_title, Spree.t('admin.pages.meta_title') %>+ <%= f.text_field :meta_title, class: 'form-control' %>+ <%= f.error_message_on :meta_title %>+ <% end %>++ <%= f.field_container :slug, class: ['form-group col-6'] do %>+ <%= f.label :slug, Spree.t('admin.pages.slug') %>+ <%= f.text_field :slug, class: 'form-control' %>+ <%= f.error_message_on :slug %>+ <% end %>++ <%= f.field_container :meta_description, class: ['form-group col-12'] do %>+ <%= f.label :meta_description, Spree.t('admin.pages.meta_description') %>+ <%= f.text_area :meta_description, { rows: 3, class: 'form-control' } %>+ <%= f.error_message_on :meta_description %>+ <% end %>+ </div>+ </div>+ </div>++ </div>+ </div></div>- <% end %>-- <h5 class="mt-4">SEO</h5>- <%= f.field_container :meta_title, class: ['form-group'] do %>- <%= f.label :meta_title, Spree.t('admin.pages.meta_title') %>- <%= f.text_field :meta_title, class: 'form-control' %>- <%= f.error_message_on :meta_title %>- <% end %>-- <%= f.field_container :meta_description, class: ['form-group'] do %>- <%= f.label :meta_description, Spree.t('admin.pages.meta_description') %>- <%= f.text_area :meta_description, { rows: 3, class: 'form-control' } %>- <%= f.error_message_on :meta_description %>- <% end %>-- <%= f.field_container :slug, class: ['form-group'] do %>- <%= f.label :slug, Spree.t('admin.pages.slug') %>- <%= f.text_field :slug, class: 'form-control' %>- <%= f.error_message_on :slug %>- <% end %>+ </div></div>++ <% if @cms_page.kind == 'Standard Page' %>+ <div class="row">+ <div class="col-12">+ <%= f.field_container :content, class: ['form-group'] do %>+ <%= f.label :content, Spree.t(:content) %>+ <%= f.text_area :content, { rows: 26, class: 'spree-rte'} %>+ <%= f.error_message_on :content %>+ <% end %>+ </div>+ </div>+ <% end %></div>diff --git a/backend/app/views/spree/admin/cms_pages/edit.html.erb b/backend/app/views/spree/admin/cms_pages/edit.html.erbindex f33dcd8e01..ffad03934f 100644--- a/backend/app/views/spree/admin/cms_pages/edit.html.erb+++ b/backend/app/views/spree/admin/cms_pages/edit.html.erb@@ -6,33 +6,16 @@<%= page_preview_link(@cms_page) %><% end %>-<% if @cms_page.kind == 'Standard Page' %>- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>- <%= form_for [:admin, @cms_page] do |f| %>- <%= render partial: 'form', locals: { f: f } %>- <div class="d-flex ">- <%= render partial: 'spree/admin/shared/edit_resource_links' %>- </div>- <% end %>-<% else %>- <div class="card">- <div class="card-header">- <h5 class="mb-0"><%= Spree.t('admin.cms.feature_page_settings') %></h5>- </div>- <div class="card-body">- <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>- <%= form_for [:admin, @cms_page] do |f| %>- <%= render partial: 'feature_form', locals: { f: f } %>- <div class="d-flex ">- <%= render partial: 'spree/admin/shared/edit_resource_links' %>- </div>- <% end %>- </div>+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %>+<%= form_for [:admin, @cms_page] do |f| %>+ <%= render partial: 'form', locals: { f: f } %>+ <div class="col-12">+ <%= render partial: 'spree/admin/shared/edit_resource_links' %></div><% end %><% unless @cms_page.kind == "Standard Page" %>- <div id="pageSectionsArea">+ <div id="pageSectionsArea" class="col-12"><div class="row mt-5"><div class="col-12"><div class="card mb-3">@@ -54,9 +37,13 @@<% end %></div><% else %>- <div class="alert alert-info no-objects-found">- <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::CmsSection)) %>- <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::CmsSection) %>+ <div class="row">+ <div class="col-12">+ <div class="alert alert-info no-objects-found m-4">+ <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::CmsSection)) %>+ <%= link_to Spree.t(:add_one), new_object_url if can?(:create, Spree::CmsSection) %>+ </div>+ </div></div><% end %></div>diff --git a/backend/app/views/spree/admin/cms_pages/new.html.erb b/backend/app/views/spree/admin/cms_pages/new.html.erbindex c52b0d1705..a414db57a7 100644--- a/backend/app/views/spree/admin/cms_pages/new.html.erb+++ b/backend/app/views/spree/admin/cms_pages/new.html.erb@@ -5,7 +5,7 @@<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_page } %><%= form_for [:admin, @cms_page] do |f| %><%= render partial: 'form', locals: { f: f } %>- <div class="d-flex">+ <div class="col-12"><%= render partial: 'spree/admin/shared/new_resource_links' %></div><% end %>diff --git a/backend/app/views/spree/admin/cms_sections/types/_featured_atricle.html.erb b/backend/app/views/spree/admin/cms_sections/types/_featured_atricle.html.erbindex 5dd4478ed0..9214b07550 100644--- a/backend/app/views/spree/admin/cms_sections/types/_featured_atricle.html.erb+++ b/backend/app/views/spree/admin/cms_sections/types/_featured_atricle.html.erb@@ -1,5 +1,5 @@<div class="row">- <div class="col-12 col-md-6">+ <div class="col-12 col-md-4"><%= f.field_container :title, class: ['form-group'] do %><%= f.label :title, Spree.t(:title) %><%= f.text_field :title, class: 'form-control' %>@@ -24,8 +24,9 @@<%= f.error_message_on :width %><% end %></div>- <div class="col-12 col-md-6">+ <div class="col-12 col-md-8"><%= f.field_container :content, class: ['form-group'] do %>+ <%= f.label :width, Spree.t('content') %><%= f.text_area :content, { rows: "20", class: 'form-control spree-rte' } %><%= f.error_message_on :content %><% end %>diff --git a/core/app/models/spree/cms_page.rb b/core/app/models/spree/cms_page.rbindex 0c170cbf4d..d514e7d388 100644--- a/core/app/models/spree/cms_page.rb+++ b/core/app/models/spree/cms_page.rb@@ -13,6 +13,8 @@ module Spreevalidates :title, presence: true+ validates :kind, uniqueness: { scope: [:store, :locale] }, if: :home_page?+scope :visible, -> { where visible: true }def seo_title@@ -25,6 +27,10 @@ module Spreeprivate+ def home_page?+ kind == 'Home Page'+ end+def create_slugself.slug = if slug.blank?title.to_urldiff --git a/core/app/models/spree/store.rb b/core/app/models/spree/store.rbindex 1c24b744df..578708224f 100644--- a/core/app/models/spree/store.rb+++ b/core/app/models/spree/store.rb@@ -7,6 +7,7 @@ module Spreehas_many :payment_methods, class_name: 'Spree::PaymentMethod'has_many :menus+ has_many :cms_pagesbelongs_to :default_country, class_name: 'Spree::Country'belongs_to :checkout_zone, class_name: 'Spree::Zone'diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex 922b8bcf66..8a547ce31e 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -534,6 +534,8 @@ en:adjustments: Adjustmentsadmin:cms:+ view_seo_settings: View SEO Settings+ seo_settings: SEO Settingsclick_create_to_load_new_link: 'Click the <b>Create</b> button below to save your new page section, and load the section settings.'click_update_to_load_new_link: 'Click the <b>Update</b> button below to load the new section settings.'settings_for: 'Available Options For %{section_kind}'diff --git a/core/lib/spree/core/controller_helpers/store.rb b/core/lib/spree/core/controller_helpers/store.rbindex c3701c8067..f99c24dba1 100644--- a/core/lib/spree/core/controller_helpers/store.rb+++ b/core/lib/spree/core/controller_helpers/store.rb@@ -8,6 +8,7 @@ module Spreehelper_method :current_storehelper_method :current_price_optionshelper_method :available_menus+ helper_method :available_pagesenddef current_store@@ -18,6 +19,10 @@ module Spree@available_menus ||= current_store.menusend+ def available_pages+ @available_pages ||= current_store.cms_pages+ end+def store_localecurrent_store.default_localeenddiff --git a/frontend/app/controllers/spree/cms_pages_controller.rb b/frontend/app/controllers/spree/cms_pages_controller.rbindex de1599a865..32307d070f 100644--- a/frontend/app/controllers/spree/cms_pages_controller.rb+++ b/frontend/app/controllers/spree/cms_pages_controller.rb@@ -9,7 +9,7 @@ module Spreeprivatedef load_cms_page- @cms_page = Spree::CmsPage.friendly.find(params[:id])+ @cms_page = available_pages.visible.friendly.find(params[:id])endendend