comfortable_mexican_sofa 1.12.11 → 2.0.0

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

@@ -0,0 +1,40 @@
+- begin
+  - nodes = record.fragment_nodes
+
+  // Grouping nodes by their namespace
+  - namespace = nodes.each_with_object({}) do |n, h|
+    - h[n.namespace] ||= []
+    - h[n.namespace] << n
+
+  #form-fragments
+    - if nodes.empty?
+      .no-tags
+        - if record.layout
+          = link_to record.layout.label, edit_comfy_admin_cms_site_layout_path(@site, record.layout)
+        = t(".no_tags").html_safe
+
+    - else
+      = fields_for :fragments, nil, builder: ComfortableMexicanSofa::FormBuilder, layout: :horizontal do |fragments|
+
+        .tabbable
+          - if namespace.size > 1
+            .row
+              .col-sm-2
+              .col-sm-10
+                %ul.nav.nav-tabs
+                  - namespace.each_with_index do |(name, tags), index|
+                    %li.nav-item
+                      - active = index == 0 ? "active" : nil
+                      - label = t("comfy.cms.content.namespace.#{name}", default: name.humanize)
+                      = link_to label, "#ns-#{name}", class: "nav-link #{active}", data: {toggle: "tab"}
+
+          .tab-content
+            - frag_index = 0
+            - namespace.each_with_index do |(name, tags), index|
+              .tab-pane{id: "ns-#{name}", class: index == 0 ? "active" : nil}
+                - tags.each do |tag|
+                  = fragments.field(record, tag, frag_index)
+                  - frag_index += 1
+
+- rescue
+  - Rails.env.production?? nil : raise

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

@@ -0,0 +1,10 @@
+.files
+  - attachments.each do |attachment|
+    - if attachment.image?
+      - variant = attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])
+      - thumb = image_tag variant, size: "200x150"
+    .btn.btn-outline-light
+      = link_to attachment.filename, attachment, {data: {toggle: "page-file-popover", content: thumb}}
+      %label.custom-control.custom-checkbox
+        = check_box_tag "#{object_name}[fragments_attributes][#{index}][file_ids_destroy][]", attachment.id, false, id: nil, class: "custom-control-input"
+        %span.custom-control-indicator

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

@@ -6,30 +6,38 @@
 - branch_open   = (session[:cms_page_tree] || []).member?(page.id.to_s) || page.root?
 - category_view = params[:category].present?
 
-%li{:id => dom_id(page)}
-  .item
-    .toggle{:class => branch_open ? 'open' : nil}
-      - if !category_view && has_children && !page.root?
-        = link_to toggle_branch_comfy_admin_cms_site_page_path(@site, page), :remote => true do
-          %span= t('.toggle')
-        
-    .icon{:class => page.is_published?? 'published' : 'draft'}
-      - if !category_view && has_siblings
-        .dragger
-          %span ⇅
-          
-    .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-default'
-      = link_to t('.edit'), edit_comfy_admin_cms_site_page_path(@site, page), :class => 'btn btn-default'
-      = link_to t('.delete'), comfy_admin_cms_site_page_path(@site, page), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-danger'
-      
-    .item-content
-      .item-title
-        = link_to page.label, edit_comfy_admin_cms_site_page_path(@site, page), :class => 'item-label'
-        = render :partial => 'comfy/admin/cms/categories/categories', :object => page
-      .item-meta
-        = link_to page.url, page.url, :target => '_blank'
-        
+%li{id: dom_id(page)}
+  .row
+
+    .col-md-8.item
+      .item-controls
+        - if !category_view && has_siblings
+          .dragger.d-none.d-lg-block
+            = fa_icon("bars")
+
+        - if !category_view && has_children && !page.root?
+          - status = branch_open ? "open" : ""
+          - url = toggle_branch_comfy_admin_cms_site_page_path(@site, page)
+          = link_to url, remote: true, title: t(".toggle"), class: "toggle #{status}" do
+            = fa_icon("plus-square", class: "expand")
+            = fa_icon("minus-square", class: "collapse")
+
+      .item-content
+        .item-title
+          - published_css_class = page.is_published? ? "published" : "draft"
+          = link_to page.label, edit_comfy_admin_cms_site_page_path(@site, page), class: published_css_class
+        .item-meta
+          = link_to page.url, page.url, target: "_blank"
+
+      .item-categories.ml-auto.d-flex.align-items-center
+        = render "comfy/admin/cms/categories/categories", object: page
+
+    .col-md-4.d-flex.align-items-center.justify-content-md-end
+      .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"
+
   - if !category_view && has_children && branch_open
-    %ul.children.sortable
-      = render :partial => 'index_branch', :collection => children
+    %ul.list.children.sortable
+      = render partial: "index_branch", collection: children

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

@@ -1,9 +1,23 @@
+- content_for :right_column do
+  .box.revisions
+    = link_to t('.revision', count: @page.revisions.count), comfy_admin_cms_site_page_revisions_path(@site, @page), class: 'btn btn-info d-block'
+
+  .box.translations
+    = link_to t(".translation.create"), new_comfy_admin_cms_site_page_translation_path(@site, @page), class: "btn btn-secondary d-block mb-1"
+
+    - @page.translations.each do |translation|
+      .btn-group.btn-group-sm.d-flex.mb-1
+
+        - url = edit_comfy_admin_cms_site_page_translation_path(@site, @page, translation)
+        - name = "(#{translation.locale}) #{translation.label}"
+        - published_css_class = translation.is_published? ? "published" : "draft"
+        = link_to name, url, class: "#{published_css_class} translation btn btn-outline-light w-100"
+
+        - url = comfy_admin_cms_site_page_translation_path(@site, @page, translation)
+        = link_to t(".translation.delete"), url, method: :delete, data: {confirm: t(".translation.confirm")}, class: "btn btn-danger"
+
 .page-header
-  = link_to t('.revision', :count => @page.revisions.count), comfy_admin_cms_site_page_revisions_path(@site, @page), :class => 'btn btn-default pull-right'
   %h2= t('.title')
 
-- content_for :right_column do
-  = render 'comfy/admin/cms/sites/mirrors', :object => @page
-
-= comfy_form_for @page, :as => :page, :url => {:action => :update}, :html => {:multipart => true} do |form|
+= comfy_form_for @page, as: :page, url: {action: :update}, html: {multipart: true} do |form|
   = render form

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

@@ -0,0 +1 @@
+$('#form-fragments').replaceWith('<%= escape_javascript(render("form_fragments", record: @page)) %>');

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

@@ -1,15 +1,12 @@
 .page-header
-  = link_to t('.new_link'), new_comfy_admin_cms_site_page_path(@site), :class => 'btn btn-default pull-right'
+  = link_to t('.new_link'), new_comfy_admin_cms_site_page_path(@site), class: "btn btn-secondary pull-right"
   %h2= t('.title')
 
-- content_for :right_column do
-  = render 'comfy/admin/cms/sites/mirrors'
+= comfy_admin_partial "comfy/admin/cms/partials/pages_beforea"
 
-= render 'comfy/admin/cms/partials/pages_before'
-
-= render :partial => 'comfy/admin/cms/categories/index', :object => 'Comfy::Cms::Page'
+= render "comfy/admin/cms/categories/index", type: "Comfy::Cms::Page"
 
 %ul.list.sortable
-  = render :partial => 'index_branch', :collection => @pages
+  = render partial: "index_branch", collection: @pages
 
-= render 'comfy/admin/cms/partials/pages_after'
+= comfy_admin_partial "comfy/admin/cms/partials/pages_after"

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

@@ -1,5 +1,5 @@
 .page-header
   %h2= t('.title')
 
-= comfy_form_for @page, :as => :page, :url => {:action => :create}, :html => {:multipart => true} do |form|
+= comfy_form_for @page, as: :page, url: {action: :create}, html: {multipart: true} do |form|
   = render form

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

@@ -1,35 +1,37 @@
+- content_for :right_column do
+  .box.revisions
+    - @record.revisions.each do |revision|
+      = active_link_to l(revision.created_at, format: :short), {id: revision.id}, class: "btn btn-sm btn-outline-light d-block text-primary mb-1"
+
 .page-header
   %h2
     = t('.title')
     = @record.class.to_s.demodulize
-  %h4
-    = @record.is_a?(::Comfy::Cms::Page) ? "#{t('.full_path')}: #{@record.full_path}" : "#{t('.slug')}: #{@record.identifier}"
 
-- content_for :right_column do
-  .box.revisions
-    - @record.revisions.each do |revision|
-      = active_link_to l(revision.created_at), :id => revision.id
 
-%table.table
-  %tr
-    %th= t('.content')
-    %th= t('.changes')
+.row.d-none.d-lg-flex
+  .col-lg-10.ml-auto
+    .row
+      .col-lg-6
+        .label= t('.previous')
+      .col-lg-6
+        .label= t('.current')
 
-  - @current_content.each do |label, content|
-    %tr
-      %th= label
-      %td.main.with-table
-        %table.table.diff
-          %tr
-            %th= t('.previous')
-            %td.main.original= @versioned_content[label]
-          %tr.hide
-            %th= t('.current')
-            %td.main.changed= content
-          %tr
-            %th= t('.current')
-            %td.main.diff
+- @current_content.each do |label, content|
+  .row.revision
+    .col-lg-2.text-lg-right.bg-light
+      .label= label
+    .col-lg-10
+      .row
+        .col-lg-6
+          .content
+            = safe_join @versioned_content[label].to_s.split("\n"), raw("<br/>")
+        .col-lg-6.diff
+          .original.d-none= @versioned_content[label]
+          .current.d-none= content
+          .content
 
-= comfy_form_for @revision, :url => {:action => :revert} do |form|
-  = form.form_group :class => 'form-actions' do
-    = form.submit t('.update'), :class => 'btn btn-primary'
+= comfy_form_for @revision, url: {action: :revert} do |form|
+  = form.form_actions do
+    = form.submit t('.update'), class: "btn btn-primary"
+    = link_to t(".cancel"), record_path(@record), class: "btn btn-link"

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

@@ -1,15 +1,13 @@
-= render 'comfy/admin/cms/partials/site_form_before', :form => form
+= comfy_admin_partial 'comfy/admin/cms/partials/site_form_before', form: form
 
-= form.text_field :label, :data => {:slugify => @site.new_record?}
-= form.text_field :identifier, :data => {:slug => true}
+= form.text_field :label, data: {slugify: @site.new_record?}
+= form.text_field :identifier, data: {slug: true}
 = form.text_field :hostname
 = form.text_field :path
 = form.select :locale, ComfortableMexicanSofa.config.locales.to_a.collect{|l| ["#{l[1]} (#{l[0]})", l[0]]}
-= form.form_group do
-  = form.check_box :is_mirrored, :label => t('.is_mirrored')
 
-= render 'comfy/admin/cms/partials/site_form_after', :form => form
+= comfy_admin_partial 'comfy/admin/cms/partials/site_form_after', form: form
 
-= form.form_group :class => 'form-actions' do
+= form.form_actions do
   = form.primary t(@site.new_record?? '.create' : '.update')
-  = link_to t('.cancel'), comfy_admin_cms_sites_path, :class => 'btn btn-link'
+  = link_to t('.cancel'), comfy_admin_cms_sites_path, class: 'btn btn-link'

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

@@ -1,5 +1,5 @@
 .page-header
   %h2= t('.title')
 
-= comfy_form_for @site, :as => :site, :url => {:action => :update} do |form|
+= comfy_form_for @site, as: :site, url: {action: :update} do |form|
   = render form

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

@@ -1,27 +1,28 @@
 .page-header
-  = link_to t('.new_link'), new_comfy_admin_cms_site_path, :class => 'btn btn-default pull-right'
+  = link_to t('.new_link'), new_comfy_admin_cms_site_path, class: "btn btn-secondary pull-right"
   %h2= t('.title')
 
-= render 'comfy/admin/cms/partials/sites_before'
+= comfy_admin_partial "comfy/admin/cms/partials/sites_before"
 
-%table.table.table-hover.table-bordered
+%ul.list
   - @sites.each do |site|
-    %tr
-      %td
-        .icon
-      %td.main
-        .item-title
-          = link_to site.label, comfy_admin_cms_site_pages_path(site)
-        .item-meta
-          .identifier
-            = site.identifier
-            = "(#{site.locale})"
-          .host
-            = link_to site.url, site.url, :target => '_blank'
-      %td
-        .btn-group.btn-group-sm
-          = link_to t('.select'),  comfy_admin_cms_site_pages_path(site), :class => 'btn btn-default'
-          = link_to t('.edit'), edit_comfy_admin_cms_site_path(site), :class => 'btn btn-default'
-          = link_to t('.delete'), comfy_admin_cms_site_path(site), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-danger'
-          
-= render 'comfy/admin/cms/partials/sites_after'
+    %li
+      .row
+        .col-md-8.item
+          .item-content
+            .item-title
+              = link_to site.label, comfy_admin_cms_site_pages_path(site)
+            .item-meta
+              .identifier
+                = site.identifier
+                = "(#{site.locale})"
+              .host
+              = link_to site.url, site.url, target: '_blank'
+
+        .col-md-4.d-flex.align-items-center.justify-content-md-end
+          .btn-group.btn-group-sm
+            = link_to t('.select'),  comfy_admin_cms_site_pages_path(site), class: 'btn btn-outline-secondary'
+            = link_to t('.edit'), edit_comfy_admin_cms_site_path(site), class: 'btn btn-outline-secondary'
+            = link_to t('.delete'), comfy_admin_cms_site_path(site), method: :delete, data: {confirm: t('.are_you_sure')}, class: 'btn btn-danger'
+
+= comfy_admin_partial "comfy/admin/cms/partials/sites_after"

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

@@ -1,5 +1,5 @@
 .page-header
   %h2= t('.title')
 
-= comfy_form_for @site, :as => :site, :url => {:action => :create} do |form|
+= comfy_form_for @site, as: :site, url: {action: :create} do |form|
   = render form

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

@@ -1,13 +1,13 @@
-= render 'comfy/admin/cms/partials/snippet_form_before', :form => form
+= comfy_admin_partial "comfy/admin/cms/partials/snippet_form_before", form: form
 
-= form.text_field :label, :data => {:slugify => @snippet.new_record?}
-= form.text_field :identifier, :data => {:slug => true}
-= form.text_area :content, :data => {'cms-cm-mode' => 'text/html'}
+= form.text_field :label, data: {slugify: @snippet.new_record?}
+= form.text_field :identifier, data: {slug: true}
+= form.text_area :content, data: {'cms-cm-mode' => 'text/html'}
 
-= render 'comfy/admin/cms/categories/form', :form => form
+= render 'comfy/admin/cms/categories/form', form: form
 
-= render 'comfy/admin/cms/partials/snippet_form_after', :form => form
+= comfy_admin_partial "comfy/admin/cms/partials/snippet_form_after", form: form
 
-= form.form_group :class => 'form-actions' do
-  = form.submit t(@snippet.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
-  = link_to t('.cancel'), comfy_admin_cms_site_snippets_path, :class => 'btn btn-link'
+= form.form_actions do
+  = form.submit t(@snippet.new_record?? '.create' : '.update'), class: "btn btn-primary"
+  = link_to t('.cancel'), comfy_admin_cms_site_snippets_path, class: "btn btn-link"

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

@@ -1,9 +1,10 @@
+- content_for :right_column do
+  .box.revisions
+    = link_to comfy_admin_cms_site_snippet_revisions_path(@site, @snippet), class: "btn btn-info d-block" do
+      = t('.revision', count: @snippet.revisions.count)
+
 .page-header
-  = link_to t('.revision', :count => @snippet.revisions.count), comfy_admin_cms_site_snippet_revisions_path(@site, @snippet), :class => 'btn btn-default pull-right'
   %h2= t('.title')
 
-- content_for :right_column do
-  = render 'comfy/admin/cms/sites/mirrors', :object => @snippet
-
-= comfy_form_for @snippet, :as => :snippet, :url => {:action => :update} do |form|
+= comfy_form_for @snippet, as: :snippet, url: {action: :update} do |form|
   = render form

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

@@ -1,32 +1,32 @@
 .page-header
-  = link_to t('.new_link'), new_comfy_admin_cms_site_snippet_path(@site), :class => 'btn btn-default pull-right'
+  = link_to t('.new_link'), new_comfy_admin_cms_site_snippet_path(@site), class: "btn btn-secondary pull-right"
   %h2= t('.title')
 
-- content_for :right_column do
-  = render 'comfy/admin/cms/sites/mirrors'
+= comfy_admin_partial "comfy/admin/cms/partials/snippets_before"
 
-= render 'comfy/admin/cms/partials/snippets_before'
+= render "comfy/admin/cms/categories/index", type: "Comfy::Cms::Snippet"
 
-= render :partial => 'comfy/admin/cms/categories/index', :object => 'Comfy::Cms::Snippet'
-
-%table.table.table-hover.table-bordered
-  %tbody.sortable
-    - @snippets.each do |snippet|
-      %tr{:id => dom_id(snippet)}
-        %td
-          .icon
-            - if !params[:category].present? && @site.snippets.count > 1
+%ul.list.sortable
+  - @snippets.each do |snippet|
+    %li{id: dom_id(snippet)}
+      .row
+        .col-md-8.item
+          .item-controls.d-none.d-lg-block
+            - if !params[:categories].present? && @site.snippets.count > 1
               .dragger
-                %span ⇅
-        %td.main
-          .item-title
-            = link_to snippet.label, edit_comfy_admin_cms_site_snippet_path(@site, snippet)
-            = render :partial => 'comfy/admin/cms/categories/categories', :object => snippet
-          .item-meta
-            = snippet.identifier
-        %td
+                = fa_icon("bars")
+          .item-content
+            .item-title
+              = link_to snippet.label, edit_comfy_admin_cms_site_snippet_path(@site, snippet)
+            .item-meta
+              = snippet.identifier
+
+          .item-categories.ml-auto.d-flex.align-items-center
+            = render "comfy/admin/cms/categories/categories", object: snippet
+
+        .col-md-4.d-flex.align-items-center.justify-content-md-end
           .btn-group.btn-group-sm
-            = link_to t('.edit'), edit_comfy_admin_cms_site_snippet_path(@site, snippet), :class => 'btn btn-default'
-            = link_to t('.delete'), comfy_admin_cms_site_snippet_path(@site, snippet), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-danger'
-            
-= render 'comfy/admin/cms/partials/snippets_after'
+            = link_to t('.edit'), edit_comfy_admin_cms_site_snippet_path(@site, snippet), class: 'btn btn-outline-secondary'
+            = link_to t('.delete'), comfy_admin_cms_site_snippet_path(@site, snippet), method: :delete, data: {confirm: t('.are_you_sure')}, class: 'btn btn-danger'
+
+= comfy_admin_partial "comfy/admin/cms/partials/snippets_after"

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

@@ -1,5 +1,5 @@
 .page-header
   %h2= t('.title')
 
-= comfy_form_for @snippet, :as => :snippet, :url => {:action => :create} do |form|
+= comfy_form_for @snippet, as: :snippet, url: {action: :create} do |form|
   = render form

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

@@ -0,0 +1,21 @@
+//= render 'comfy/admin/cms/partials/translation_form_before', form: form
+
+= form.select :locale, translation_select_options
+
+= 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"}
+
+= render "comfy/admin/cms/pages/form_fragments", record: @translation
+
+.row
+  .col-sm-10.ml-auto
+    = form.check_box :is_published
+
+//= render 'comfy/admin/cms/partials/translation_form_after', form: form
+
+= form.form_actions do
+  = form.submit t(".preview"), name: "preview", id: nil, class: "btn btn-secondary", data: {disable_with: false}
+  = form.submit t(@translation.new_record?? ".create" : ".update"), class: "btn btn-primary", data: {disable_with: false}
+  = link_to t(".cancel"), edit_comfy_admin_cms_site_page_path(@site, @page), class: "btn btn-link"