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 Admin UI for pages and sections.
Matthew Kennedy99d5c845fcbe
diff --git a/backend/app/assets/javascripts/spree/backend/cms/live_preview.es6 b/backend/app/assets/javascripts/spree/backend/cms/live_preview.es6index d1a885d728..730e67a211 100644--- a/backend/app/assets/javascripts/spree/backend/cms/live_preview.es6+++ b/backend/app/assets/javascripts/spree/backend/cms/live_preview.es6@@ -19,10 +19,16 @@ document.addEventListener('DOMContentLoaded', function() {const cmsSectionEditorFullScreen = document.getElementById('cmsSectionEditorFullScreen')cmsSectionEditorFullScreen.addEventListener('click', function(event) {- if (event.target.getAttribute('aria-pressed') === 'true') {+ if (this.getAttribute('aria-pressed') === 'true') {document.body.classList.remove('cmsSectionFullScreenMode')} else {document.body.classList.add('cmsSectionFullScreenMode')}})++ const queryString = window.location.search;+ const urlParams = new URLSearchParams(queryString);+ const fullScreenMode = urlParams.get('section_editor_full_screen_mode')++ if (fullScreenMode) cmsSectionEditorFullScreen.click()})diff --git a/backend/app/assets/javascripts/spree/backend/cms/page.es6 b/backend/app/assets/javascripts/spree/backend/cms/page.es6index 3ea64b7df0..8fc85b08ef 100644--- a/backend/app/assets/javascripts/spree/backend/cms/page.es6+++ b/backend/app/assets/javascripts/spree/backend/cms/page.es6@@ -4,6 +4,10 @@ document.addEventListener('DOMContentLoaded', function() {if (pageTypeSelector) { updateCmsPageType() }+ $(pageTypeSelector).on('change', function() {+ updateCmsPageType()+ });+if (el) {Sortable.create(el, {handle: '.move-handle',@@ -17,32 +21,6 @@ document.addEventListener('DOMContentLoaded', function() {}})}-- $(pageTypeSelector).on('change', function() {- updateCmsPageType()- });-- function updateCmsPageType () {- const slugField = document.getElementById('noHomePage')- const updatePageType = document.getElementById('updatePageType')- const existingType = updatePageType.dataset.pageType-- if (!slugField) return-- const selectedLinkType = $('#cms_page_type').val()-- if (selectedLinkType === existingType) {- updatePageType.classList.add('d-none')- } else {- updatePageType.classList.remove('d-none')- }-- if (selectedLinkType === 'Spree::Cms::Pages::Homepage') {- slugField.classList.add('d-none')- } else {- slugField.classList.remove('d-none')- }- }})function reloadPreview () {@@ -79,3 +57,29 @@ function handleMenuItemMoveError () {// eslint-disable-next-line no-undefshow_flash('error', Spree.translations.move_could_not_be_saved)}++function updateCmsPageType () {+ const slugField = document.getElementById('cms_page_slug')+ const updatePageType = document.getElementById('updatePageType')++ if (!slugField) return++ const selectedLinkType = $('#cms_page_type').val()++ if (selectedLinkType === 'Spree::Cms::Pages::Homepage') {+ slugField.disabled = true+ } else {+ slugField.disabled = false+ }++ if (!updatePageType) return++ const existingType = updatePageType.dataset.pageType++ if (selectedLinkType === existingType) {+ updatePageType.classList.add('d-none')+ } else {+ updatePageType.classList.remove('d-none')+ }+}+diff --git a/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss b/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scssindex 6df9de34fe..09f4be64b0 100644--- a/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss+++ b/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss@@ -1,3 +1,44 @@+#standardPage {+ .sp-pb-0 {+ padding-bottom: 0 !important;+ }++ .sp-card {+ border-bottom: 0;+ border-radius: 5px 5px 0 0;+ }+}++[aria-expanded="false"] {+ span.more {+ display: inline;+ }+ span.less {+ display: none;+ }+}++[aria-expanded="true"] {+ span.more {+ display: none;+ }+ span.less {+ display: inline;+ }+}++button#cmsSectionEditorFullScreen {+ span.exit {+ display: none;+ }++ &.active {+ span.exit {+ display: inline;+ }+ }+}+#cmsPagesectionsArea {overflow-x: hidden;overflow-y: scroll;diff --git a/backend/app/views/spree/admin/cms_pages/_form.html.erb b/backend/app/views/spree/admin/cms_pages/_form.html.erbindex 3eed64e169..ae6e8c4328 100644--- a/backend/app/views/spree/admin/cms_pages/_form.html.erb+++ b/backend/app/views/spree/admin/cms_pages/_form.html.erb@@ -1,116 +1,118 @@-<div data-hook="admin_page_form_fields">- <div class="row">+<div id="<% if @cms_page.type == 'Spree::Cms::Pages::StandardPage' %>standardPage<% end %>" data-hook="admin_page_form_fields">+ <div class="row sp-pb-0"><div class="col-12">- <div class="card">- <div class="card-header">- <h5 class="mb-0"> <%= Spree.t(:settings) %></h5>+ <div class="card sp-card">+ <div class="card-header col-12">+ <div class="row pb-0">+ <div class="col d-flex justify-content-start">+ <h5 class="mb-0"> <%= Spree.t(:settings) %></h5>+ </div>+ <%= f.field_container :visible, class: ['form-group pb-0 mb-0 mr-3'] do %>+ <div class="custom-control custom-switch">+ <%= f.check_box :visible, class: 'custom-control-input' %>+ <%= f.label :visible, Spree.t('admin.cms.visible'), class: 'custom-control-label' %>+ <%= f.error_message_on :visible %>+ </div>+ <% end %>+ </div></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.name') + required_span_tag) %>+ <%= f.text_field :title, class: 'form-control', required: true %>+ <%= f.error_message_on :title %>+ <% end %>- <div class="row"><%= f.field_container :type, class: ['form-group col-12 col-md-6'] do %><%= f.label :type, Spree.t('admin.cms.page_type') %><%= f.select(:type, spree_humanize_dropdown_values('Spree::CmsPage', {const: 'TYPES'}), {include_blank: false}, class: 'select2') %><%= f.error_message_on :type %><% end %>- <div class="col-12 col-md-6 mt-3">- <div id="updatePageType" data-page-type="<%= @cms_page.type %>" class="alert alert-info d-none">- <% if %w[new create].include? controller.action_name %>- <% button_type = Spree.t('create') %>- <% else %>+ <% unless %w[new create].include? controller.action_name %>+ <div class="col-12 mt-3">+ <div id="updatePageType" data-page-type="<%= @cms_page.type %>" class="alert alert-info d-none"><% button_type = Spree.t('update') %>- <% end %>- <%= raw Spree.t('admin.cms.click_button_to_change_page_type', button_type: button_type) %>+ <%= raw Spree.t('admin.cms.click_button_to_change_page_type', button_type: button_type) %>+ </div></div>- </div>- <div class="col-12"><hr></div>- </div>-- <div class="row pb-0">- <%= f.field_container :title, class: ['form-group col-6'] do %>- <%= f.label :title, raw(Spree.t('admin.cms.title') + required_span_tag) %>- <%= f.text_field :title, class: 'form-control', required: true %>- <%= f.error_message_on :title %><% end %>+ </div>- <%= 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 %>+ <div class="<% unless %w[new create].include? controller.action_name %>collapse<% end %>" id="cmsSeoSettings">+ <div class="row pb-0">+ <div class="col-12"><hr></div>+ <%= 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 :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 :slug, class: ['form-group col-6'] do %>- <div id="noHomePage">- <%= f.label :slug, Spree.t('slug') %>- <%= f.text_field :slug, class: 'form-control' %>- <%= f.error_message_on :slug %>- </div>- <% end %>+ <%= f.field_container :meta_title, class: ['form-group col-6'] do %>+ <%= f.label :meta_title, Spree.t('admin.cms.meta_title') %>+ <%= f.text_field :meta_title, class: 'form-control' %>+ <%= f.error_message_on :meta_title %>+ <% 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('admin.cms.visible'), class: 'custom-control-label' %>- <%= f.error_message_on :visible %>- </div>- <% end %>+ <%= f.field_container :slug, class: ['form-group col-6'] do %>+ <div id="noHomePage">+ <%= f.label :slug, Spree.t('slug') %>+ <%= f.text_field :slug, class: 'form-control' %>+ <%= f.error_message_on :slug %>+ </div>+ <% end %>- <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>+ <%= f.field_container :meta_description, class: ['form-group col-12'] do %>+ <%= f.label :meta_description, Spree.t('admin.cms.meta_description') %>+ <%= f.text_area :meta_description, { rows: 3, class: 'form-control' } %>+ <%= f.error_message_on :meta_description %>+ <% end %></div>+ </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-12'] do %>- <%= f.label :meta_title, Spree.t('admin.cms.meta_title') %>- <%= f.text_field :meta_title, class: 'form-control' %>- <%= f.error_message_on :meta_title %>- <% end %>+ <% unless %w[new create].include? controller.action_name %>+ <div class="row pb-0">+ <div class="col-6">+ <%= render partial: 'spree/admin/shared/edit_resource_links' %>+ </div>- <%= f.field_container :meta_description, class: ['form-group col-12'] do %>- <%= f.label :meta_description, Spree.t('admin.cms.meta_description') %>- <%= f.text_area :meta_description, { rows: 3, class: 'form-control' } %>- <%= f.error_message_on :meta_description %>- <% end %>- </div>+ <div class="col-6 text-right">+ <button class="btn btn-primary" type="button" data-toggle="collapse" data-target="#cmsSeoSettings" aria-expanded="false" aria-controls="collapseExample">+ <%= raw Spree.t('admin.cms.more_page_settings') %>+ </button></div></div>+ <% end %>- </div>+ <% if %w[new create].include? controller.action_name %>+ <div class="row pb-0">+ <div class="col-6">+ <%= render partial: 'spree/admin/shared/new_resource_links' %>+ </div>+ </div>+ <% end %></div></div></div></div>+</div>- <div class="row mb-4">+<% if @cms_page.type == 'Spree::Cms::Pages::StandardPage' %>+ <div class="row"><div class="col-12">- <% if %w[new create].include? controller.action_name %>- <%= render partial: 'spree/admin/shared/new_resource_links' %>- <% else %>- <%= render partial: 'spree/admin/shared/edit_resource_links' %>+ <%= f.field_container :content, class: ['form-group'] do %>+ <%= f.text_area :content, { rows: 26, class: 'spree-rte'} %>+ <%= f.error_message_on :content %><% end %></div></div>-- <% if @cms_page.type == 'Spree::Cms::Pages::StandardPage' %>- <div class="row">- <div class="col-12">- <%= f.field_container :content, class: ['form-group'] do %>- <%= f.text_area :content, { rows: 26, class: 'spree-rte'} %>- <%= f.error_message_on :content %>- <% end %>- </div>- </div>- <% end %>-</div>+<% end %>diff --git a/backend/app/views/spree/admin/cms_pages/edit.html.erb b/backend/app/views/spree/admin/cms_pages/edit.html.erbindex fac0dfba28..96c42507e1 100644--- a/backend/app/views/spree/admin/cms_pages/edit.html.erb+++ b/backend/app/views/spree/admin/cms_pages/edit.html.erb@@ -12,9 +12,10 @@<% end %><% if @cms_page.sections? %>+<div class="row"><div id="pageSectionsArea" class="col-12">- <hr class="mt-5 hide-on-full-screen-mode">+ <hr class="mt-4 hide-on-full-screen-mode"><div class="row"><div class="col d-flex justify-content-start"><%= button_link_to Spree.t('admin.cms.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>@@ -33,7 +34,7 @@</div><div class="ml-2">- <button id="cmsSectionEditorFullScreen" type="button" class="btn btn-outline-primary no-wrap" data-toggle="button" autocomplete="off">Full Screen Mode</button>+ <button id="cmsSectionEditorFullScreen" type="button" class="btn btn-outline-primary no-wrap" data-toggle="button" autocomplete="off"><%= raw Spree.t('admin.cms.full_screen_mode') %></button></div></div></div>@@ -71,4 +72,5 @@</div></div>+</div><% end %>diff --git a/backend/app/views/spree/admin/cms_sections/edit.html.erb b/backend/app/views/spree/admin/cms_sections/edit.html.erbindex b47d8777aa..a9e1c140e5 100644--- a/backend/app/views/spree/admin/cms_sections/edit.html.erb+++ b/backend/app/views/spree/admin/cms_sections/edit.html.erb@@ -3,6 +3,14 @@<%= link_to @cms_page.title, spree.edit_admin_cms_page_path(@cms_page) %> / <%= @cms_section.name %><% end %>+<% content_for :page_actions do %>+<%= button_link_to(+ Spree.t('admin.cms.back_to_full_screen_mode'),+ spree.edit_admin_cms_page_path(@cms_page) + '?section_editor_full_screen_mode=true',+ class: 'btn-outline-secondary', icon: 'view.svg', id: 'admin_preview_product'+ ) %>+<% end %>+<%= render partial: 'spree/admin/shared/error_messages', locals: { target: @cms_section } %><%= form_for [:admin, @cms_page, @cms_section], as: :cms_section, url: spree.admin_cms_page_cms_section_path(@cms_page, @cms_section) do |f| %>diff --git a/core/config/locales/en.yml b/core/config/locales/en.ymlindex e9a6c00021..0571b09384 100644--- a/core/config/locales/en.yml+++ b/core/config/locales/en.yml@@ -564,11 +564,12 @@ en:meta_title: Meta Titlemeta_description: Meta Descriptionpreview_page: Preview Page+ full_screen_mode: '<span class="exit">Exit </span>Full Screen Mode'hero:aspect_ratio: Please use an image with the aspext ratio of 12:5 (2400px x 1000px)select_page_type: Select a page typeclick_button_to_change_page_type: Click the <b>%{button_type}</b> button to load the options for this page type.- view_seo_settings: View SEO Settings+ more_page_settings: '<span class="more">More</span><span class="less">Less</span> Page Settings'seo_settings: SEO Settingsno_sections_found_please_add_one: Add your first section to this page by clicking the + Add New Section button above.click_create_to_load_new_link: 'Click the <b>Create</b> button below to save your new page section, and load the section settings.'diff --git a/frontend/app/views/spree/home/index.html.erb b/frontend/app/views/spree/home/index.html.erbindex b2b6072f7f..1afebc446e 100644--- a/frontend/app/views/spree/home/index.html.erb+++ b/frontend/app/views/spree/home/index.html.erb@@ -3,8 +3,6 @@<% if @homepage %><div class="container"><div id="featurePageContent" class="row">--<% @homepage.cms_sections.each do |section| %><%= build_section(section) %><% end %>@@ -26,4 +24,5 @@</div></div><% end %>+<%= render "spree/shared/cms/pages/edit_mode", edit_mode: @edit_mode %>