kcy1 1.0

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

@@ -0,0 +1,4 @@
+- object ||= categories
+- object.categories.each do |category|
+  %span.badge.badge-primary.mr-1.mb-1
+    = category.label

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

@@ -0,0 +1,7 @@
+- url = comfy_admin_cms_site_category_path(@site, category)
+= form_with model: @category, scope: :category, url: url, html: {class: "edit-category", id: dom_id(category)} do |form|
+  .input-group
+    = form.text_field :label, class: "form-control form-control-sm", id: nil
+    .input-group-btn
+      %button.btn.btn-primary.btn-sm{aria: {label: "Update Category"}}
+        %i.fas.fa-fw.fa-check

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

@@ -0,0 +1,5 @@
+- object = form.object
+- if (categories = @site.categories.of_type(object.class.to_s)).present?
+  - options = {bootstrap: {check_inline: true, label: {text: t(".label"), class: "pt-0"}}}
+  = form.collection_check_boxes :category_ids, categories, :id, :label, options
+

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

@@ -0,0 +1,28 @@
+.box.categories-widget
+
+  .read
+    .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}"
+      - @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"}
+      = t(".edit")
+
+  .editable
+    .categories
+      - @site.categories.of_type(type).each do |category|
+        = render "comfy/admin/cms/categories/show", category: category
+
+    - url = comfy_admin_cms_site_categories_path(@site)
+    = form_with scope: :category, url: url, html: {id: "new-category"} do |form|
+      = form.hidden_field :categorized_type, value: type
+      .input-group
+        = form.text_field :label, placeholder: t('.add_placeholder'), class: 'form-control form-control-sm', id: nil
+        .input-group-btn
+          %button.btn.btn-primary.btn-sm{aria: {label: "Create Category"}}
+            %i.fas.fa-fw.fa-plus
+
+    %button.toggle-cat-edit.btn.btn-light.btn-sm.btn-block{type: "button"}
+      = t(".done")

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

@@ -0,0 +1,15 @@
+- read        ||= false
+- categories  = [params[:categories]].flatten.compact
+- active      = categories.flatten.member?(category.label)
+
+.category{id: dom_id(category)}
+  - if read
+    - active_class = active ? "active" : nil
+    - categories = active ? categories.reject{|c| c == category.label} : categories << category.label
+    - url = "?#{{categories: categories}.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
+      = link_to category.label, edit_comfy_admin_cms_site_category_path(@site, category), remote: true, class: "btn btn-sm btn-light w-100 text-left text-truncate"
+      = link_to comfy_admin_cms_site_category_path(@site, category), method: :delete, remote: true, data: {confirm: t('.are_you_sure')}, class: 'btn btn-sm btn-danger', aria: {label: "Delete Category"} do
+        %i.fas.fa-fw.fa-times

data/app/views/comfy/admin/cms/categories/create.js.erb

@@ -0,0 +1,7 @@
+$('.categories-widget .editable .categories').append(
+  '<%= escape_javascript(render "show", category: @category) %>'
+);
+$('.categories-widget .read .categories').append(
+  '<%= escape_javascript(render "show", category: @category, read: true) %>'
+);
+$('.categories-widget .editable form#new-category input[name="category[label]"]').val('');

data/app/views/comfy/admin/cms/categories/destroy.js.erb

@@ -0,0 +1,8 @@
+(() => {
+  const categoryElements = document.querySelectorAll('.categories .category#<%= dom_id(@category) %>');
+  jQuery(categoryElements).fadeOut('slow', () => {
+    for (const element of categoryElements) {
+      element.remove();
+    }
+  });
+})();

data/app/views/comfy/admin/cms/categories/edit.js.erb

@@ -0,0 +1,3 @@
+$('.editable .category#<%= dom_id(@category) %>').replaceWith(
+  '<%= escape_javascript(render "edit", category: @category ) %>'
+);

data/app/views/comfy/admin/cms/categories/update.js.erb

@@ -0,0 +1,6 @@
+$('.editable form#<%= dom_id(@category) %>').replaceWith(
+  '<%= escape_javascript(render "show", category: @category ) %>'
+);
+$('.read .category#<%= dom_id(@category) %>').replaceWith(
+  '<%= escape_javascript(render "show", category: @category, read: true) %>'
+);

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

@@ -0,0 +1,31 @@
+%li{data: {id: file.id}}
+  :ruby
+    file_tag  = cms_file_link_tag(file)
+    thumb_url = url_for(file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.variable?
+  .row
+    .col-md-5.item
+      .item-controls.d-none.d-lg-block
+        - if !params[:categories].present? && @site.files.count > 1
+          .dragger
+            %i.fas.fa-bars
+      .item-content
+        .item-title
+          = link_to file.label, file.attachment, target: "_blank",
+                    data: {cms_file_thumb_url: thumb_url, cms_file_link_tag: file_tag}
+        .item-meta
+          .content-type
+            = truncate(file.attachment.content_type)
+          .file-size
+            = number_to_human_size(file.attachment.byte_size)
+
+    .col-md-2.item-categories.d-flex.align-items-center
+      = render partial: "comfy/admin/cms/categories/categories", object: file
+
+    .col-md-2.d-flex.align-items-center
+      %span.file-path
+        = file_tag
+
+    .col-md-3.d-flex.align-items-center.justify-content-md-end
+      .btn-group.btn-group-sm
+        = link_to t(".edit"), edit_comfy_admin_cms_site_file_path(@site, file), class: "btn btn-outline-secondary"
+        = link_to t(".delete"), comfy_admin_cms_site_file_path(@site, file), method: :delete, remote: true, data: {confirm: t(".are_you_sure")}, class: "btn btn-danger"

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

@@ -0,0 +1,26 @@
+= comfy_admin_partial "comfy/admin/cms/partials/file_form_before", form: form
+
+= form.text_field :label
+= form.file_field :file
+
+- unless @file.new_record?
+
+  = form.form_group bootstrap: {label: {text: t('.current_file')}}do
+    - if @file.attachment.image?
+      .file-image
+        = image_tag @file.attachment
+    = link_to @file.attachment.filename, @file.attachment, target: '_blank'
+
+= form.text_area :description
+
+= render 'comfy/admin/cms/categories/form', form: form
+
+= comfy_admin_partial 'comfy/admin/cms/partials/file_form_after', form: form
+
+= form.form_actions do
+  = submit_tag t(@file.new_record? ? ".create" : ".update"), class: "btn btn-primary"
+
+  - unless @file.new_record?
+    = link_to t(".delete"), comfy_admin_cms_site_file_path(@site, @file), method: :delete, data: {confirm: t(".are_you_sure")}, class: "btn btn-danger"
+
+  = link_to t(".cancel"), comfy_admin_cms_site_files_path, class: "btn btn-link"

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

@@ -0,0 +1,3 @@
+.modal.fade.cms-files-modal{'aria-hidden' => 'true', 'data-url' => comfy_admin_cms_site_files_path(@site, layout: false), role: 'dialog', tabindex: "-1"}
+  .modal-dialog.modal-lg
+    .modal-content

data/app/views/comfy/admin/cms/files/destroy.js.erb

@@ -0,0 +1,4 @@
+(() => {
+  const listItem = document.querySelector('li[data-id="<%= @file.id %>"]');
+  jQuery(listItem).fadeOut('slow', () => listItem.remove());
+})();

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

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t(".title")
+
+= comfy_form_with model: @file, scope: :file, url: {action: :update} do |form|
+  = render form

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

@@ -0,0 +1,29 @@
+- content_for :right_column do
+  = render "comfy/admin/cms/categories/index", type: "Comfy::Cms::File"
+
+:ruby
+  cms_uploader_data = {
+    cms_uploader: {
+      url: comfy_admin_cms_site_files_path(@site, source: :plupload, categories: params[:categories]),
+      token: {name: request_forgery_protection_token, value: form_authenticity_token},
+      session: {name: Rails.application.config.session_options[:key], value: request.session_options[:id]}
+    }
+  }
+
+#cms-uploader{data: cms_uploader_data}
+  #cms-uploader-drag-drop-target
+
+  .page-header
+    = link_to t('.new_link'), new_comfy_admin_cms_site_file_path(@site), class: "btn btn-secondary float-right", id: "cms-uploader-browse"
+    %h2= t('.title')
+
+  = comfy_admin_partial "comfy/admin/cms/partials/files_before"
+
+  = comfy_paginate @files
+
+  %ul.list.sortable.cms-uploader-filelist
+    = render partial: "file", collection: @files
+
+  = comfy_admin_partial "comfy/admin/cms/partials/files_after"
+
+  = comfy_paginate @files

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

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t(".title")
+
+= comfy_form_with model: @file, scope: :file, url: {action: :create}, html: {multipart: true} do |form|
+  = render form

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

@@ -0,0 +1,23 @@
+.fragment-attachments
+  - attachments.each do |attachment|
+    :ruby
+      thumb_url = if attachment.variable?
+        url_for(attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb]))
+      end
+      filename = attachment.filename.to_s
+      truncated_filename = truncate(filename, length: 40, omission: "...#{filename.last(10)}")
+
+      link_data = {
+        cms_file_thumb_url: thumb_url,
+        cms_file_link_tag: cms_page_file_link_tag(
+          fragment_id:  fragment_id,
+          attachment:   attachment,
+          multiple:     multiple
+        )
+      }
+
+    .fragment-attachment.btn-group.btn-group-sm.mb-1
+      = link_to truncated_filename, attachment, data: link_data, class: "btn btn-light text-truncate", target: "_blank"
+      = check_box_tag "#{object_name}[fragments_attributes][#{index}][file_ids_destroy][]", attachment.id, false, id: dom_id(attachment)
+      %label.btn.btn-light{for: dom_id(attachment)}
+        %i.fas.fa-fw.fa-times

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

@@ -0,0 +1,38 @@
+- begin
+  - nodes = record.fragment_nodes
+  - namespace = nodes.group_by(&:namespace)
+
+  #form-fragments
+    - if nodes.empty?
+      .alert.alert-warning
+        - if record.layout
+          = link_to record.layout.label, edit_comfy_admin_cms_site_layout_path(@site, record.layout)
+        = t(".no_tags").html_safe
+
+    - else
+      .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
+
+          - builder_opts = { builder: ComfortableMexicanSofa::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}
+                - tags.each do |tag|
+                  = form.fragment_field(tag, frag_index)
+                  - frag_index += 1
+
+- rescue ComfortableMexicanSofa::Content::Renderer::SyntaxError, ComfortableMexicanSofa::Content::Tag::Error => e
+  .alert.alert-danger
+    = e

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

@@ -0,0 +1,20 @@
+= comfy_admin_partial "comfy/admin/cms/partials/layout_form_before", form: form
+
+= form.text_field :label, data: {slugify: @layout.new_record?}
+= form.text_field :identifier, data: {slug: true}
+
+- if (options = Comfy::Cms::Layout.options_for_select(@site, @layout)).present?
+  = form.select :parent_id, [["---- #{t('.select_parent_layout')} ----", nil]] + options, bootstrap: {custom_control: true}
+
+- if (options = Comfy::Cms::Layout.app_layouts_for_select(lookup_context.view_paths)).present?
+  = form.select :app_layout, [["---- #{t('.select_app_layout')} ----", nil]] + options, bootstrap: {custom_control: true}
+
+= form.text_area :content, data: {'cms-cm-mode' => 'text/html'}
+= form.text_area :css, data: {'cms-cm-mode' => 'css'}
+= form.text_area :js, data: {'cms-cm-mode' => 'javascript'}
+
+= comfy_admin_partial "comfy/admin/cms/partials/layout_form_after", form: form
+
+= form.form_actions do
+  = submit_tag t(@layout.new_record? ? ".create" : ".update"), class: "btn btn-primary"
+  = link_to t('.cancel'), comfy_admin_cms_site_layouts_path, class: "btn btn-link"

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

@@ -0,0 +1,26 @@
+- layout      ||= index_branch
+- has_siblings  = layout.siblings.select{|l| l.site_id == @site.id}.size > 0
+
+%li{data: {id: layout.id}}
+  .row
+    .col-md-8.item
+      .item-controls.d-none.d-md-block
+        - if has_siblings
+          .dragger
+            %i.fas.fa-bars
+
+      .item-content
+        .item-title
+          = link_to layout.label, edit_comfy_admin_cms_site_layout_path(@site, layout)
+        .item-meta
+          = layout.identifier
+
+    .col-md-4.d-flex.align-items-center.justify-content-md-end
+      .btn-group.btn-group-sm
+        = link_to t('.add_child_layout'), new_comfy_admin_cms_site_layout_path(@site, parent_id: layout.id), class: "btn btn-outline-secondary"
+        = link_to t('.edit'), edit_comfy_admin_cms_site_layout_path(@site, layout), class: "btn btn-outline-secondary"
+        = link_to t('.delete'), comfy_admin_cms_site_layout_path(@site, layout), method: :delete, data: {confirm: t('.are_you_sure')}, class: "btn btn-danger"
+
+  - if layout.children.present?
+    %ul.list.children.sortable.pl-md-3
+      = render partial: "index_branch", collection: layout.children.order(:position)

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

@@ -0,0 +1,9 @@
+- content_for :right_column do
+  - link = comfy_admin_cms_site_layout_revisions_path(@site, @layout)
+  = render "comfy/admin/cms/revisions/sidebar", record: @layout, link: link
+
+.page-header
+  %h2= t('.title')
+
+= comfy_form_with model: @layout, scope: :layout, url: {action: :update} do |form|
+  = render form

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

@@ -0,0 +1,10 @@
+.page-header
+  = link_to t('.new_link'), new_comfy_admin_cms_site_layout_path(@site), class: "btn btn-secondary float-right"
+  %h2= t('.title')
+
+= comfy_admin_partial "comfy/admin/cms/partials/layouts_before"
+
+%ul.list.sortable
+  = render partial: "index_branch", collection: @layouts
+
+= comfy_admin_partial "comfy/admin/cms/partials/layouts_after"

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

@@ -0,0 +1,5 @@
+.page-header
+  %h2= t(".title")
+
+= comfy_form_with model: @layout, scope: :layout, url: {action: :create} do |form|
+  = render form

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

@@ -0,0 +1,31 @@
+= comfy_admin_partial "comfy/admin/cms/partials/page_form_before", form: form
+
+= form.text_field :label, data: { slugify: @page.new_record? }
+
+- if @page.parent.present?
+  = form.text_field :slug, data: { slug: true }, prepend: @page.parent.full_path
+
+- if (options = ::Comfy::Cms::Page.options_for_select(site: @site, current_page: @page, exclude_self: true)).present?
+  = 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"}
+
+= comfy_admin_partial "comfy/admin/cms/partials/page_form_inner", form: form
+
+#form-fragments-container
+  = render "comfy/admin/cms/fragments/form_fragments", record: @page, scope: :page
+
+= render "comfy/admin/cms/categories/form", form: form
+
+- if (options = ::Comfy::Cms::Page.options_for_select(site: @site, current_page: @page)).present?
+  = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options, bootstrap: {custom_control: true}
+
+= form.check_box :is_published
+
+= comfy_admin_partial "comfy/admin/cms/partials/page_form_after", form: form
+
+= form.form_actions do
+  = submit_tag t(".preview"), name: "preview", formtarget: "comfy-cms-preview", id: nil, class: "btn btn-secondary", data: {disable_with: false}
+  = submit_tag t(@page.new_record?? ".create" : ".update"), class: "btn btn-primary ml-sm-1", data: {disable_with: false}
+  = link_to t(".cancel"), comfy_admin_cms_site_pages_path, class: "btn btn-link"

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

@@ -0,0 +1,44 @@
+- 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?
+
+%li{id: dom_id(page), data: {id: page.id}}
+  .row
+
+    .col-md-6.item
+      - unless category_view
+        .item-controls
+          - if has_siblings
+            .dragger.d-none.d-md-block
+              %i.fas.fa-bars
+
+          - if 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
+              %i.fas.fa-plus-square.expand
+              %i.fas.fa-minus-square.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"
+
+    .col-md-2.item-categories.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.list.children.sortable.pl-md-3
+      = render partial: "index_branch", collection: children

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

@@ -0,0 +1,10 @@
+- content_for :right_column do
+  - link = comfy_admin_cms_site_page_revisions_path(@site, @page)
+  = render "comfy/admin/cms/revisions/sidebar", record: @page, link: link
+  = render "comfy/admin/cms/translations/sidebar"
+
+.page-header
+  %h2= t('.title')
+
+= comfy_form_with model: @page, scope: :page, url: {action: :update}, html: {multipart: true} do |form|
+  = render form