workarea-admin 3.4.45 → 3.5.0.beta.1

data/app/views/workarea/admin/catalog_categories/_cards.html.haml

@@ -11,6 +11,7 @@
             %li
               %strong= t('workarea.admin.fields.active')
               = check_box_tag 'category', 'active', model.active, disabled: true
+              = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--small svg-icon--blue') if model.active? && model.segments.any?
             %li
               %strong #{t('workarea.admin.fields.client_id')}:
               = model.client_id.presence || t('workarea.admin.cards.attributes.no_value')
@@ -38,7 +39,8 @@
 
   .grid__cell
     .card{ class: card_classes(:featured_products, local_assigns[:active]) }
-      = link_to select_featured_product_path(model.to_global_id), class: 'card__header' do
+      - link_path = model.featured_products.any? ? edit_featured_product_path(model.to_global_id) : select_featured_product_path(model.to_global_id)
+      = link_to link_path, class: 'card__header' do
         %span.card__header-text= t('workarea.admin.catalog_categories.cards.featured_products.title')
         = inline_svg 'workarea/admin/icons/featured_products.svg', class: 'card__icon'
 

data/app/views/workarea/admin/catalog_categories/edit.html.haml

@@ -32,7 +32,7 @@
           %span.property__name
             = t('workarea.admin.fields.active')
             = inline_svg('workarea/admin/i18n.svg', class: 'svg-icon svg-icon--small') if locale_options.many? && Workarea.config.localized_active_fields
-          = toggle_button_for 'category[active]', @category.active?
+          = render 'workarea/admin/shared/active_field', scope: 'category', model: @category
 
         .property
           = label_tag 'category[slug]', nil, class: 'property__name' do
@@ -60,9 +60,6 @@
             .property
               = label_tag 'category_default_sort', t('workarea.admin.fields.default_sort'), class: 'property__name'
               = select_tag 'category[default_sort]', options_for_select(@category.sort_options, selected: @category.default_sort)
-              - if @category.featured_products?
-                %span.property__note
-                  = t('workarea.admin.catalog_categories.edit.default_sort_note')
 
         .property
           = label_tag 'category_terms_facets_list', t('workarea.admin.fields.terms_facets_list'), class: 'property__name'

data/app/views/workarea/admin/catalog_categories/index.html.haml

@@ -63,6 +63,7 @@
                 = upcoming_changesets_icon_for(result)
                 = comments_icon_for(result)
                 = top_icon_for(result)
+                = segments_icon_for(result)
               %td
                 - if result.breadcrumbs.blank?
                   %em= t('workarea.admin.fields.no_taxonomy')

data/app/views/workarea/admin/catalog_product_images/edit.html.haml

@@ -25,7 +25,7 @@
           .product-images__image-group
             .product-images__image
               .product-images__image-summary
-                .product-images__image-summary-container= image_tag product_image_url(@image, :small), alt: "#{@image.option} #{t('workarea.admin.catalog_product_images.edit.image')}", class: 'product-images__image-summary-image'
+                .product-images__image-summary-container= image_tag product_image_url(@image, :small), alt: "#{@image.option} #{t('workarea.admin.catalog_product_images.edit.image')}", id: @image.option.parameterize, class: 'product-images__image-summary-image'
 
     .section
       %h2= t('workarea.admin.catalog_product_images.edit.edit_image')

data/app/views/workarea/admin/catalog_products/_cards.html.haml

@@ -14,6 +14,7 @@
             %li
               %strong= t('workarea.admin.fields.active')
               = check_box_tag 'product', 'active', model.active?, disabled: true
+              = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--small svg-icon--blue') if model.active? && model.segments.any?
             %li
               %strong= t('workarea.admin.fields.template')
               = model.template.try(:titleize)
@@ -23,9 +24,6 @@
             %li
               %strong= t('workarea.admin.fields.filters')
               = model.filters.values.flatten.join(', ').presence || t('workarea.admin.cards.attributes.no_value')
-            %li
-              %strong= t('workarea.admin.fields.digital')
-              = model.digital?.to_s.titleize
             %li
               %strong= t('workarea.admin.fields.customizations')
               = model.customizations.try(:titleize).presence || t('workarea.admin.cards.attributes.no_value')
@@ -110,7 +108,7 @@
               %p.align-center= t('workarea.admin.fields.inventory')
 
               %span.heading.heading--3.heading--no-margin.align-center
-                = model.variant_details.keys.to_sentence
+                = model.options.keys.to_sentence
               %p.align-center= t('workarea.admin.fields.options')
 
               = link_to catalog_product_variants_path(model), class: 'card__button' do

data/app/views/workarea/admin/catalog_products/edit.html.haml

@@ -51,7 +51,8 @@
                 = inline_svg('workarea/admin/i18n.svg', class: 'svg-icon svg-icon--small') if locale_options.many? && Workarea.config.localized_active_fields
                 = link_to '#product-active-info', data: { tooltip: '' } do
                   = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_products.edit.active_info_title'))
-              = toggle_button_for 'product[active]', @product.active
+
+              = render 'workarea/admin/shared/active_field', scope: 'product', model: @product
               #product-active-info.tooltip-content
                 %p= t('workarea.admin.catalog_products.edit.active_info')
 

data/app/views/workarea/admin/catalog_products/index.html.haml

@@ -8,8 +8,9 @@
           = link_to "↑ #{t('workarea.admin.catalog.dashboard_link')}", catalog_dashboards_path, class: 'view__dashboard-button'
           %h1= t('workarea.admin.catalog_products.index.heading')
       .grid__cell.grid__cell--25
-        .align-right
-          = link_to t('workarea.admin.catalog_products.index.upload_images'), product_images_direct_uploads_path
+        - if s3?
+          .align-right
+            = link_to t('workarea.admin.catalog_products.index.upload_images'), product_images_direct_uploads_path
 
   .view__container
     .browsing-controls.browsing-controls--with-divider.browsing-controls--center{ class: ('browsing-controls--filters-displayed' unless @search.toggle_facets?) }
@@ -72,6 +73,7 @@
                 = comments_icon_for(result)
                 = top_icon_for(result)
                 = trending_icon_for(result)
+                = segments_icon_for(result)
               %td.align-center= result.id
               %td= result.template.humanize
               %td.align-center

data/app/views/workarea/admin/catalog_products/insights.html.haml

@@ -73,6 +73,7 @@
               %th= t('workarea.admin.fields.sku')
               %th.align-center= t('workarea.admin.fields.orders')
               %th.align-center= t('workarea.admin.fields.units_sold')
+              %th.align-center= t('workarea.admin.fields.units_canceled')
               %th.align-right= t('workarea.admin.fields.revenue')
           %tbody
             - @product.insights.skus.each do |sku|
@@ -80,6 +81,7 @@
                 %td= sku._id
                 %td.align-center= number_with_delimiter sku.orders
                 %td.align-center= number_with_delimiter sku.units_sold
+                %td.align-center= number_with_delimiter sku.units_canceled
                 %td.align-right= number_to_currency sku.revenue
 
     - if @product.insights.feed.any?

data/app/views/workarea/admin/catalog_variants/edit.html.haml

@@ -34,7 +34,7 @@
           %span.property__name
             = t('workarea.admin.fields.active')
             = inline_svg('workarea/admin/i18n.svg', class: 'svg-icon svg-icon--small') if locale_options.many? && Workarea.config.localized_active_fields
-          = toggle_button_for 'variant[active]', @variant.active?
+          = render 'workarea/admin/shared/active_field', scope: 'variant', model: @variant
 
         = append_partials('admin.variant_fields', variant: @variant)
 
@@ -63,6 +63,11 @@
                 .property
                   = text_field_tag 'new_details[]', nil, id: nil, class: 'text-box text-box--i18n', title: t('workarea.admin.catalog_variants.edit.options.new_attribute_value'), placeholder: t('workarea.admin.catalog_variants.edit.options.new_attribute_value_placeholder')
                   %span.property__note= t('workarea.admin.catalog_variants.edit.options.new_attribute_value_note')
+                  %span.property__note
+                    = t('workarea.admin.catalog_variants.edit.options.new_attribute_value_csv')
+                    = link_to '#csv-help', data: { tooltip: '' } do
+                      = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_variants.edit.options.learn_more'))
+                  = render 'workarea/admin/shared/csv_formatting_tooltip'
               %td.align-center -
 
       .workflow-bar

data/app/views/workarea/admin/catalog_variants/index.html.haml

@@ -31,6 +31,7 @@
             %th= t('workarea.admin.fields.sku')
             %th= t('workarea.admin.fields.display_name')
             %th= t('workarea.admin.fields.options')
+            %th= t('workarea.admin.fields.fulfillment')
             %th.align-center= t('workarea.admin.fields.inventory')
             %th.align-right= t('workarea.admin.fields.pricing')
             %th
@@ -41,6 +42,7 @@
               %td= link_to variant.sku, edit_catalog_product_variant_path(@product, variant)
               %td= variant.name
               %td= format_variant_options(variant.details)
+              %td= link_to variant.fulfillment_policy, fulfillment_sku_path(variant.sku)
               %td.align-center
                 = link_to inventory_sku_path(variant.sku) do
                   = variant.available_inventory

data/app/views/workarea/admin/catalog_variants/new.html.haml

@@ -55,6 +55,11 @@
                 .property
                   = text_field_tag 'new_details[]', nil, id: nil, class: 'text-box text-box--i18n', title: t('workarea.admin.catalog_variants.new.options.new_attribute_value'), placeholder: t('workarea.admin.catalog_variants.new.options.new_attribute_value_placeholder')
                   %span.property__note= t('workarea.admin.catalog_variants.new.options.new_attribute_value_note')
+                  %span.property__note
+                    = t('workarea.admin.catalog_variants.new.options.new_attribute_value_csv')
+                    = link_to '#csv-help', data: { tooltip: '' } do
+                      = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_variants.new.options.learn_more'))
+                  = render 'workarea/admin/shared/csv_formatting_tooltip'
               %td.align-center -
 
       .workflow-bar

data/app/views/workarea/admin/changesets/fields/_active_segment_ids.html.haml

@@ -0,0 +1,4 @@
+%p.release-changeset__content
+  %span.release-changeset__field= t('workarea.admin.fields.active_segments')
+  %span.release-changeset__old!= segment_links(old_value).join(', ')
+  %span.release-changeset__new!= segment_links(new_value).join(', ')

data/app/views/workarea/admin/comment_mailer/notify.html.haml

@@ -1,36 +1,44 @@
 %tr
   %td
-    %h1
-      = @comment.author_name
-      = t('workarea.admin.comment_mailer.notify.posted_a_comment_about')
-      = @commentable.name
+    %h1= t('workarea.admin.comment_mailer.notify.title', site: Workarea.config.site_name)
+    %p
+      - if @comment.author.present?
+        %strong= @comment.author_name
+        = t('workarea.admin.comment_mailer.notify.posted_a_comment_about')
+      - else
+        = t('workarea.admin.comment_mailer.notify.new_comment_about')
+      = link_to @commentable.name, url_for(@commentable)
 
-      %p
-        = @comment.body
-        %br
+    .comment
+      = @comment.body
+      %span.comment__author-info
         - if @comment.author.present?
           = t('workarea.admin.comment_mailer.notify.by')
           = link_to @comment.author_name, edit_user_url(@comment.author)
-      %p
+          |
         = t('workarea.admin.comment_mailer.notify.posted_at')
         = @comment.created_at.to_s(:long)
-        = link_to t('workarea.admin.comment_mailer.notify.reply_to_this_comment'), commentable_comments_url(@commentable.to_global_id)
 
-      - if @comments.any?
-        %h2= t('workarea.admin.comment_mailer.notify.discussion_history')
+    .align-center.section
+      = link_to t('workarea.admin.comment_mailer.notify.reply_to_this_comment'), commentable_comments_url(@commentable.to_global_id), class: 'button'
 
-        - @comments.each_with_index do |comment, i|
-          %p
-            = comment.body
-            %br
+    - if @comments.any?
+      %h2= t('workarea.admin.comment_mailer.notify.discussion_history')
+
+      - @comments.each_with_index do |comment, i|
+        .comment
+          = comment.body
+          %span.comment__author-info
             - if comment.author.present?
               = t('workarea.admin.comment_mailer.notify.by')
               = link_to comment.author_name, edit_user_url(comment.author)
-          %p
+              |
             = t('workarea.admin.comment_mailer.notify.posted_at')
             = comment.created_at.to_s(:long)
 
-      - if @comments.length > 5
-        %p= link_to t('workarea.admin.comment_mailer.notify.post_a_comment'), commentable_comments_url(@commentable.to_global_id)
+    - if @comments.length > 5
+      .align-center.section
+        = link_to t('workarea.admin.comment_mailer.notify.post_a_comment'), commentable_comments_url(@commentable.to_global_id), class: 'button'
 
-      %p= link_to t('workarea.admin.comment_mailer.notify.unsubscribe_from_notifications', commentable_name: @commentable.name), commentable_unsubscribe_url(@commentable.to_global_id)
+    %p.align-center
+      = link_to t('workarea.admin.comment_mailer.notify.unsubscribe_from_notifications', commentable_name: @commentable.name), commentable_unsubscribe_url(@user.token, commentable_id: @commentable.to_global_id)

data/app/views/workarea/admin/comments/index.html.haml

@@ -19,10 +19,11 @@
         - @comments.each do |comment|
           %li.comments__comment
             .comments__comment-header
-              .comments__comment-avatar
-                = link_to user_path(comment.author) do
-                  = avatar_for comment.author, additional_css_class: 'avatar'
-              %h3.comments__comment-author= link_to comment.author_name, user_path(comment.author)
+              - if comment.author.present?
+                .comments__comment-avatar
+                  = link_to user_path(comment.author) do
+                    = avatar_for comment.author, additional_css_class: 'avatar'
+                %h3.comments__comment-author= link_to comment.author_name, user_path(comment.author)
               %p.comments__comment-time #{time_ago_in_words(comment.created_at)} ago
               .comments__comment-actions
                 - if comment.author == current_user
@@ -40,24 +41,29 @@
             .comments__comment-body
               %p= comment.body
 
+      .section
+        - if @commentable.subscribed_user_ids.include?(current_user.id.to_s)
+          = form_tag unsubscribe_commentable_comments_path(@commentable.to_global_id), method: :put, id: 'comment_unsubscribe_form' do
+            = button_tag t('workarea.admin.comments.index.unsubscribe'), value: 'comments_unsubscribe', class: 'button button--small'
+            %span= t('workarea.admin.comments.index.subscribe_message')
+        - else
+          = form_tag subscribe_commentable_comments_path(@commentable.to_global_id), method: :put, id: 'comment_unsubscribe_form' do
+            = button_tag t('workarea.admin.comments.index.subscribe'), value: 'comments_subscribe', class: 'button button--small'
+            %span= t('workarea.admin.comments.index.unsubscribe_message')
+
+
       .section
         .comments__new-comment
           %h2= t('workarea.admin.comments.index.new')
-
           - if @comment.errors.present?
             - @comment.errors.full_messages.each do |message|
               = render_message 'error', message
 
           = form_tag commentable_comments_path(@commentable.to_global_id), method: 'post', id: 'comment_form', data: { unsaved_changes: '' } do
-
             .property.property--required
               = label_tag 'comment[body]', t('workarea.admin.fields.body'), class: 'property__name'
-              = text_area_tag 'comment[body]', @comment.body, class: 'text-box text-box--multi-line', required: true
-
-            .property
-              = label_tag 'subscribed_user_ids', t('workarea.admin.fields.subscribed_user_ids'), class: 'property__name'
-              = select_tag 'subscribed_user_ids', nil, multiple: true,  data: { remote_select: { source: users_path(exclude_current_user: true, format: :json) } }
-              %span.property__note= t('workarea.admin.comments.index.email_authentication')
+              = text_area_tag 'comment[body]', @comment.body, class: 'text-box text-box--multi-line', required: true, data: { tribute_area: users_path(exclude_current_user: true, format: :json) }
+              %span.property__note= t('workarea.admin.comments.index.mention_note')
 
             .workflow-bar
               .grid.grid--auto.grid--right.grid--middle

data/app/views/workarea/admin/configurations/_overridden.html.haml

@@ -0,0 +1,2 @@
+#overridden-field.tooltip-content
+  %p= t('workarea.admin.configurations.show.field_overridden_message')

data/app/views/workarea/admin/configurations/show.html.haml

@@ -0,0 +1,49 @@
+- @page_title = t('workarea.admin.configurations.show.title')
+
+.view
+  .view__header
+    .grid.grid--middle.grid--center
+      .grid__cell.grid__cell--50
+        .view__heading
+          = link_to "↑ #{t('workarea.admin.configurations.show.dashboard_link')}", settings_dashboards_path, class: 'view__dashboard-button'
+          %h1.heading--no-margin= t('workarea.admin.configurations.show.title')
+          %p= t('workarea.admin.configurations.show.description')
+
+
+  .view__container.view__container--narrow{ data: { jump_to_menu: '' } }
+    = form_tag configuration_path, method: :patch do
+      - @configuration.definition.fieldsets.each do |fieldset|
+        - next if fieldset.fields.none?
+
+        .box.box--rounded
+          - unless fieldset.id == :application
+            .box__head
+              %h2.box__heading{ data: { jump_to_menu_heading: 1 }, id: fieldset.name.systemize  }= fieldset.name
+          .box__body.box__body--pad-top
+            - fieldset.fields.each do |field|
+              .box__section
+                .grid.grid--huge
+                  .grid__cell.grid__cell--50
+                    %strong
+                      - if field.overridden?
+                        = link_to '#overridden-field', data: { tooltip: '' } do
+                          = inline_svg('workarea/admin/icons/alert.svg', class: 'svg-icon svg-icon--small svg-icon--red', title: t('workarea.admin.configurations.show.field_overridden'))
+                      = field.name
+                    - if field.description.present?
+                      %br
+                      = field.description
+                  .grid__cell.grid__cell--50
+                    - if field.values.present?
+                      = render 'workarea/admin/configurations/types/select', field: field, value: @configuration.send(field.key)
+                    - elsif field.encrypted?
+                      = render 'workarea/admin/configurations/types/encrypted', field: field, value: @configuration.send(field.key)
+                    - else
+                      = render "workarea/admin/configurations/types/#{field.type}", field: field, value: @configuration.send(field.key)
+
+
+      .workflow-bar
+        .grid.grid--auto.grid--right.grid--middle
+          .grid__cell= button_tag t('workarea.admin.configurations.show.save'), value: 'save_configuration', class: 'workflow-bar__button workflow-bar__button--update'
+
+    = render 'workarea/admin/shared/csv_formatting_tooltip'
+    = render 'workarea/admin/configurations/overridden'

data/app/views/workarea/admin/configurations/types/_array.html.haml

@@ -0,0 +1,3 @@
+= text_field_tag "configuration[#{field.key}]", value.join(','), class: 'text-box text-box--wide', required: !field.allow_blank?
+= link_to '#csv-help', data: { tooltip: '' } do
+  = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_products.edit.filters.learn_more'))

data/app/views/workarea/admin/configurations/types/_boolean.html.haml

@@ -0,0 +1 @@
+= toggle_button_for("configuration[#{field.key}]", value)

data/app/views/workarea/admin/configurations/types/_duration.html.haml

@@ -0,0 +1,2 @@
+= number_field_tag "configuration[#{field.key}][]", value.parts.values.first, id: nil, class: 'text-box text-box--small', step: 1, required: !field.allow_blank?
+= select_tag "configuration[#{field.key}][]", options_for_select(duration_field_options, value.parts.keys.first.to_s), id: nil

data/app/views/workarea/admin/configurations/types/_encrypted.html.haml

@@ -0,0 +1 @@
+.property= password_field_tag "configuration[#{field.key}]", value, class: 'text-box', required: !field.allow_blank?

data/app/views/workarea/admin/configurations/types/_float.html.haml

@@ -0,0 +1 @@
+= text_field_tag "configuration[#{field.key}]", value, class: 'text-box', step: 0.01, required: !field.allow_blank?

data/app/views/workarea/admin/configurations/types/_hash.html.haml

@@ -0,0 +1,17 @@
+- field_name = "configuration[#{field.key}]"
+
+%table
+  %tbody
+    - value.each do |name, value|
+      %tr
+        %td= name
+        %td
+          = hidden_field_tag "#{field_name}[]", name, id: nil
+          = text_field_tag "#{field_name}[]", hash_editing_value(value), id: nil, class: 'text-box text-box--i18n', placeholder: value
+    %tr{ data: { cloneable_row: '' } }
+      %td
+        .property
+          = text_field_tag "#{field_name}[]", nil, id: nil, class: 'text-box text-box--i18n', title: "New #{field.name} Name", placeholder: "Name"
+      %td
+        .property
+          = text_field_tag "#{field_name}[]", nil, id: nil, class: 'text-box text-box--i18n', title: "New #{field.name} Value", placeholder: "Value"

data/app/views/workarea/admin/configurations/types/_integer.html.haml

@@ -0,0 +1 @@
+= number_field_tag "configuration[#{field.key}]", value, class: 'text-box text-box--small', step: 1, required: !field.allow_blank?

data/app/views/workarea/admin/configurations/types/_select.html.haml

@@ -0,0 +1 @@
+= select_tag "configuration[#{field.key}]", options_for_select(field.values, value), include_blank: field.allow_blank?

data/app/views/workarea/admin/configurations/types/_string.html.haml

@@ -0,0 +1 @@
+= text_field_tag "configuration[#{field.key}]", value, class: 'text-box', required: !field.allow_blank?

data/app/views/workarea/admin/configurations/types/_symbol.html.haml

@@ -0,0 +1 @@
+= text_field_tag "configuration[#{field.key}]", value, class: 'text-box', required: !field.allow_blank?

data/app/views/workarea/admin/content/_edit.html.haml

@@ -7,7 +7,7 @@
       .grid.grid--middle
         .grid__cell.grid__cell--50
           - if content.show_areas?
-            %span #{t('workarea.admin.content.edit.current_area')}:
+            %span= content.name
             = inline_svg('workarea/admin/icons/navigate_next.svg', class: 'svg-icon svg-icon--small svg-icon--white')
             = form_tag request.path, method: 'get', class: 'content-editor__area-select-form' do
               = select_tag 'area_id', options_for_select(content.area_options, content.current_area), data: { form_submitting_control: '' }
@@ -41,6 +41,7 @@
           = link_to inline_svg('workarea/admin/icons/add_circle.svg', class: 'content-block__add-icon svg-icon svg-icon--extra-large svg-icon--green', title: t('workarea.admin.content.edit.add_block_above')), content_area_blocks_path(content, content.current_area, position: block.position, return_to: params.to_h), class: 'content-block__add-button content-block__add-button--top', data: { add_content_block_button: '' }
           .content-block__iframe-placeholder
           = link_to inline_svg('workarea/admin/icons/add_circle.svg', class: 'content-block__add-icon svg-icon svg-icon--extra-large svg-icon--green', title: t('workarea.admin.content.edit.add_block_below')), content_area_blocks_path(content, content.current_area, position: block.position + 1, return_to: params.to_h), class: 'content-block__add-button content-block__add-button--bottom', data: { add_content_block_button: '' }
+
           .content-block__floating-actions
             - unless block.new_record?
               .content-block__action
@@ -73,3 +74,9 @@
                 = inline_svg("workarea/admin/icons/grip.svg", title: t('workarea.admin.actions.drag'), class: 'content-block-list__icon content-block-list__icon--move')
                 = content_block_icon(block.icon, title: block.name, class: 'content-block-list__icon')
                 %span.content-block-list__name= block.name
+
+                - if block.segments.any?
+                  = link_to "##{dom_id(block, :segments_tooltip)}", data: { tooltip: { interactive: true } }, class: 'content-block-list__segments' do
+                    = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--small svg-icon--blue')
+                  .tooltip-content{ id: dom_id(block, :segments_tooltip) }
+                    %span= t('workarea.admin.content.edit.active_for_html', segments: block.segments.map(&:name).to_sentence)

data/app/views/workarea/admin/content/_form.html.haml

@@ -27,14 +27,20 @@
 
     .tabs__panel
       %h2.tabs__heading= t('workarea.admin.content.form.display')
-      %span.heading.heading--4= t('workarea.admin.content.form.hide_for')
-
-      - Workarea.config.storefront_break_points.each_key do |breakpoint|
+      .section
+        %span.heading.heading--4= t('workarea.admin.content.form.segments')
         .property
-          = hidden_field_tag 'block[hidden_breakpoints][]', '', id: nil
-          = check_box_tag 'block[hidden_breakpoints][]', breakpoint.to_s, block.hidden_breakpoints.include?(breakpoint.to_s), id: dom_id(block, "hidden_breakpoint_#{breakpoint.to_s}")
-          = label_tag dom_id(block, "hidden_breakpoint_#{breakpoint.to_s}"), nil, class: 'property__name' do
-            #{breakpoint.to_s.titleize} #{t('workarea.admin.content.form.devices')}
+          = label_tag 'block_active_segment_ids', t('workarea.admin.content.form.exclusive_segments'), class: 'property__name'
+          = select_tag 'block[active_segment_ids]', options_from_collection_for_select(segments, :id, :name, block.active_segment_ids), multiple: true, data: { select: { placeholder: t('workarea.admin.shared.active_field.select_segments'), allowClear: true } }, id: nil
+
+      .section
+        %span.heading.heading--4= t('workarea.admin.content.form.hide_for')
+        - Workarea.config.storefront_break_points.each_key do |breakpoint|
+          .property
+            = hidden_field_tag 'block[hidden_breakpoints][]', '', id: nil
+            = check_box_tag 'block[hidden_breakpoints][]', breakpoint.to_s, block.hidden_breakpoints.include?(breakpoint.to_s), id: dom_id(block, "hidden_breakpoint_#{breakpoint.to_s}")
+            = label_tag dom_id(block, "hidden_breakpoint_#{breakpoint.to_s}"), nil, class: 'property__name' do
+              #{breakpoint.to_s.titleize} #{t('workarea.admin.content.form.devices')}
 
 .content-editor__form-actions
   .grid.grid--auto.grid--center.grid--middle

data/app/views/workarea/admin/content/advanced.html.haml

@@ -20,26 +20,34 @@
 
       .property
         %span.property__name= t('workarea.admin.fields.automate_metadata')
-        = toggle_button_for 'content[automate_metadata]', @content.automate_metadata?, title_true: t('workarea.admin.content.advanced.automate'), title_false: t('workarea.admin.content.advanced.do_not_automate') do
+        = toggle_button_for 'content[automate_metadata]', @content.automate_metadata?, title_true: t('workarea.admin.content.advanced.automate'), title_false: t('workarea.admin.content.advanced.do_not_automate'), data: { toggle_button: '' } do
           = link_to '#automation-help', data: { tooltip: '' } do
             = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.content.advanced.learn_more'))
-        %span#automation-help.tooltip-content= t('workarea.admin.content.advanced.automation_help_content')
+          %span#automation-help.tooltip-content= t('workarea.admin.content.advanced.automation_help_content')
 
-      .property
-        = label_tag 'content_browser_title', t('workarea.admin.fields.browser_title'), class: 'property__name'
-        = text_field_tag 'content[browser_title]', @content.browser_title, class: 'text-box text-box--i18n', placeholder: t('workarea.admin.content.advanced.browser_title_placeholder')
-        %span.property__note= t('workarea.admin.content.advanced.browser_title_note')
+          .toggle-button__more.toggle-button__more--below{ data: { toggle_button_positive_element: '' } }
+            %span.toggle-button__note= t('workarea.admin.content.advanced.automation_note_content')
+          .toggle-button__more.toggle-button__more--below{ data: { toggle_button_negative_element: '' } }
+            .property
+              = label_tag 'content_browser_title', t('workarea.admin.fields.browser_title'), class: 'property__name'
+              = text_field_tag 'content[browser_title]', @content.browser_title, class: 'text-box text-box--i18n', placeholder: t('workarea.admin.content.advanced.browser_title_placeholder')
+              %span.property__note= t('workarea.admin.content.advanced.browser_title_note')
 
-      .property
-        = label_tag 'content_meta_description', t('workarea.admin.fields.meta_description'), class: 'property__name'
-        = text_field_tag 'content[meta_description]', @content.meta_description, class: 'text-box text-box--i18n'
-        %span.property__note= t('workarea.admin.content.advanced.metadata_description_note')
+            .property
+              = label_tag 'content_meta_description', t('workarea.admin.fields.meta_description'), class: 'property__name'
+              = text_field_tag 'content[meta_description]', @content.meta_description, class: 'text-box text-box--i18n'
+              %span.property__note= t('workarea.admin.content.advanced.metadata_description_note')
 
       .property
         = label_tag 'content_css', t('workarea.admin.fields.css'), class: 'property__name'
         = text_area_tag 'content[css]', @content.css, class: 'text-box text-box--code text-box--multi-line'
         %span.property__note= t('workarea.admin.content.advanced.css_note')
 
+      .property
+        = label_tag 'content_head_content', t('workarea.admin.fields.head_content'), class: 'property__name'
+        = text_area_tag 'content[head_content]', @content.head_content, class: 'text-box text-box--code text-box--multi-line'
+        %span.property__note= t('workarea.admin.content.advanced.head_content_note')
+
       .property
         = label_tag 'content_javascript', t('workarea.admin.fields.javascript'), class: 'property__name'
         = text_area_tag 'content[javascript]', @content.javascript, class: 'text-box text-box--code text-box--multi-line'

data/app/views/workarea/admin/content_assets/_cards.html.haml

@@ -11,6 +11,9 @@
             %li
               %strong= t('workarea.admin.fields.file_name')
               = link_to model.file_name, model.url, target: '_blank', rel: 'noopener'
+            %li
+              %strong= t('workarea.admin.fields.alt_text')
+              = model.alt_text
             %li
               %strong= t('workarea.admin.fields.type')
               = model.type.titleize

data/app/views/workarea/admin/content_assets/_summary.html.haml

@@ -1,7 +1,7 @@
 = link_to content_asset_path(model), class: 'summary', data: { asset: { id: model.id.to_s, name: model.name, url: model.url } } do
   .summary__image-container
     - if model.image?
-      = image_tag model.file.process(:medium).url, alt: model.name, class: 'summary__image'
+      = image_tag model.file.process(:medium).url, alt: model.name, class: 'summary__image', title: model.alt_text
   %span.summary__name= model.name
   .summary__info-container
     .summary__info= local_time_ago(model.updated_at)

data/app/views/workarea/admin/content_assets/edit.html.haml

@@ -33,6 +33,12 @@
             .property
               = label_tag 'asset[file]', t('workarea.admin.fields.file'), class: 'property__name'
               = file_field_tag 'asset[file]'
+
+            .property
+              = label_tag 'asset[alt_text]', t('workarea.admin.fields.alt_text'), class: 'property__name'
+              = text_field_tag 'asset[alt_text]', @asset.alt_text, class: 'text-box'
+              %span.property__note= t('workarea.admin.content_assets.edit.alt_text_note')
+
             .property
               = label_tag 'asset_type', t('workarea.admin.content_assets.edit.type_label'), class: 'property__name'
               = @asset.type.titleize

data/app/views/workarea/admin/content_assets/index.html.haml

@@ -10,8 +10,7 @@
           %p= t('workarea.admin.content_assets.index.description')
 
   .view__container
-
-    - if Workarea::Configuration::S3.configured?
+    - if s3?
       .direct-upload{ data: { direct_upload: { type: 'asset' }.to_json, unsaved_changes: '' } }
         .direct-upload__content
           .direct-upload__heading= t('workarea.admin.direct_uploads.drop_files_here')
@@ -55,6 +54,7 @@
                 = label_tag 'select_all', t('workarea.admin.bulk_actions.select_all'), class: 'checkbox__label'
             %th= t('workarea.admin.fields.image')
             %th= t('workarea.admin.fields.name')
+            %th= t('workarea.admin.fields.alt_text')
             %th= t('workarea.admin.fields.file_name')
             %th= t('workarea.admin.fields.type')
             %th.align-center= t('workarea.admin.fields.dimensions')
@@ -77,6 +77,11 @@
                 = upcoming_changesets_icon_for(result)
                 = comments_icon_for(result)
                 = favicon_icon_for(result)
+              %td
+                - if result.image? && result.alt_text.present?
+                  %span{ title: result.alt_text }= result.alt_text.truncate(30)
+                - else
+                  \-
               %td= result.file_name
               %td= result.type
               %td.align-center

data/app/views/workarea/admin/content_assets/new.html.haml

@@ -22,9 +22,16 @@
           = label_tag 'asset_name', t('workarea.admin.fields.name'), class: 'property__name'
           = text_field_tag 'asset[name]', @asset.name, class: 'text-box'
 
-        .property
-          = label_tag 'asset[file]', t('workarea.admin.fields.file'), class: 'property__name'
-          = file_field_tag 'asset[file]', required: true
+        .grid
+          .grid__cell.grid__cell--50-at-medium
+            .property
+              = label_tag 'asset[file]', t('workarea.admin.fields.file'), class: 'property__name'
+              = file_field_tag 'asset[file]', required: true
+          .grid__cell.grid__cell--50-at-medium
+            .property
+              = label_tag 'asset[alt_text]', t('workarea.admin.fields.alt_text'), class: 'property__name'
+              = text_field_tag 'asset[alt_text]', @asset.alt_text, class: 'text-box'
+              %span.property__note= t('workarea.admin.content_assets.new.alt_text_note')
 
         .property
           = label_tag 'asset_tag_list', t('workarea.admin.fields.tags'), class: 'property__name'