comfortable_mexican_sofa 1.12.11 → 2.0.0

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

@@ -1,3 +1,4 @@
 - object ||= categories
 - object.categories.each do |category|
-  .category= category.label
+  .btn.btn-sm.btn-light
+    = category.label

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

@@ -1,6 +1,7 @@
-- category ||= edit
-
-= form_for @category, :as => :category, :url => comfy_admin_cms_site_category_path(@site, category), :remote => true, :html => {:id => dom_id(category)} do |form|
-  .input-append
-    = form.text_field :label
-    %button.btn.btn-mini= t('.save')
+- url = comfy_admin_cms_site_category_path(@site, category)
+= form_for @category, as: :category, url: url, remote: true, html: {id: dom_id(category)} do |form|
+  .input-group
+    = form.text_field :label, class: "form-control form-control-sm"
+    .input-group-btn
+      %button.btn.btn-primary.btn-sm
+        = t('.save')

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

@@ -1,8 +1,11 @@
 - object = form.object
 - if (categories = @site.categories.of_type(object.class.to_s)).present?
-  = form.form_group :label => {:text => t('.label')}, :class => 'categories' do
+  = form.form_group label: {text: t('.label')}, class: "categories" do
     - categories.each do |category|
-      = hidden_field_tag "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]", 0, :id => nil
-      %label.checkbox-inline
-        = check_box_tag "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]", 1, object.categories.member?(category), :id => nil
-        = category.label
+      - name = "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]"
+      = hidden_field_tag name, 0, id: nil
+      .form-check.form-check-inline
+        %label.form-check-label
+          - name = "#{object.class.to_s.demodulize.underscore.downcase}[category_ids][#{category.id}]"
+          = check_box_tag name, 1, object.categories.member?(category), id: nil, class: 'form-check-input'
+          = category.label

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

@@ -1,25 +1,29 @@
-- type ||= index
-
 .categories-widget
-  .categories-widget-label= t('.label')
-  
-  .action-links
-    .edit= link_to t('.edit'), '#', :class => 'btn btn-default btn-xs'
-    .done= link_to t('.done'), '#', :class => 'btn btn-default btn-xs'
-  
-  .categories.read
-    .category.all{:class => params[:category].blank?? 'active' : nil}
-      = link_to t('.all'), :category => nil
+  %span.btn.btn-sm
+    %strong= t('.label')
+
+  %span.categories.read
+
+    %button.toggle-cat-edit.btn.btn-secondary.btn-sm
+      = t(".edit")
+
+    .category
+      - active_class = params[:categories].blank?? "btn-dark" : "btn-light"
+      = link_to t('.all'), {categories: nil}, class: "btn btn-sm #{active_class}"
     - @site.categories.of_type(type).each do |category|
-      = render :partial => 'comfy/admin/cms/categories/show', :object => category, :locals => { :read => true }
-  
-  .categories.editable
+      = render "comfy/admin/cms/categories/show", category: category, read: true
+
+  %span.categories.editable
     - @site.categories.of_type(type).each do |category|
-      = render :partial => 'comfy/admin/cms/categories/show', :object => category
-    
-    = form_for :category, :url => comfy_admin_cms_site_categories_path(@site), :remote => true, :html => {:id => 'new_category'} do |form|
-      = form.hidden_field :categorized_type, :value => type
+      = render "comfy/admin/cms/categories/show", category: category
+
+    - url = comfy_admin_cms_site_categories_path(@site)
+    = form_for :category, url: url, remote: true, 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.text_field :label, placeholder: t('.add_placeholder'), class: 'form-control form-control-sm'
         .input-group-btn
-          %button.btn.btn-primary.btn-xs= t('.add')
+          %button#cat-add-button.btn.btn-primary.btn-sm
+            = t(".add")
+          %button.toggle-cat-edit.btn.btn-light.btn-sm
+            = t(".done")

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

@@ -1,13 +1,14 @@
-- category ||= show
-- read ||= false
-- categories = [params[:category]].flatten.compact
-- active = categories.flatten.member?(category.label)
+- read        ||= false
+- categories  = [params[:categories]].flatten.compact
+- active      = categories.flatten.member?(category.label)
 
-.category{:class => (read && active ? 'active' : nil), :id => dom_id(category)}
+.category{id: dom_id(category)}
   - if read
+    - active_class = active ? "btn-dark" : "btn-light"
     - categories = active ? categories.reject{|c| c == category.label} : categories << category.label
-    = link_to category.label, "?#{{:category => categories}.to_param}"
+    = link_to category.label, {categories: categories}, class: "btn btn-sm #{active_class}"
   - else
-    = link_to category.label, edit_comfy_admin_cms_site_category_path(@site, category), :remote => true
-    = link_to comfy_admin_cms_site_category_path(@site, category), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
-      %i.glyphicon.glyphicon-remove-circle
+    .btn-group
+      = link_to category.label, edit_comfy_admin_cms_site_category_path(@site, category), remote: true, class: "btn btn-sm btn-light"
+      = 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' do
+        = fa_icon "times"

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

@@ -1,7 +1,7 @@
 $('.categories-widget .categories.editable form#new_category').before(
-  '<%= escape_javascript(render :partial => "show", :object => @category ) %>'
+  '<%= escape_javascript(render "show", category: @category) %>'
 );
 $('.categories-widget .categories.read').append(
-  '<%= escape_javascript(render :partial => "show", :object => @category, :locals => { :read => true }) %>'
+  '<%= escape_javascript(render "show", category: @category, read: true) %>'
 );
 $('.categories-widget .categories.editable form#new_category input#category_label').val('');

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

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

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

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

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

@@ -1,26 +1,32 @@
-%tr{:id => dom_id(file)}
-  %td
-    - if file.is_image?
-      - icon_style = "background: url('#{file.file.url(:cms_thumb)}') no-repeat center"
-    .icon{:style => icon_style}
-      - if !params[:category].present? && @site.files.count > 1
-        .dragger
-          %span ⇅
-  %td.main
-    .item-title
-      = link_to file.label, edit_comfy_admin_cms_site_file_path(@site, file)
-      = render :partial => 'comfy/admin/cms/categories/categories', :object => file
-    .item-meta
-      %input.file-path{:type => 'text', :value => file.file.url, :readonly => 'readonly'}
+%li{id: dom_id(file)}
+  .row
+    .col-md-7.item
+      .item-controls.d-none.d-lg-block
+        - if !params[:categories].present? && @site.files.count > 1
+          .dragger
+            = fa_icon("bars")
+      .item-content
+        .item-title
+          - if file.attachment.image?
+            - variant = file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])
+            - thumb = image_tag variant, size: "200x150"
+          = link_to file.attachment, target: "_blank", data: {toggle: "page-file-popover", content: thumb} do
+            = file.label
 
-      = link_to file.file.url, :title => file.file_file_name, :target => '_blank' do
-        %span.glyphicon.glyphicon-link
-  %td
-    .content-type
-      = truncate(file.file_content_type)
-    .file-size
-      = number_to_human_size(file.file_file_size)
-  %td
-    .btn-group.btn-group-sm
-      = link_to t('.edit'), edit_comfy_admin_cms_site_file_path(@site, file), :class => 'btn btn-default'
-      = 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'
+        .item-meta
+          .content-type
+            = truncate(file.attachment.content_type)
+          .file-size
+            = number_to_human_size(file.attachment.byte_size)
+
+      .item-categories.d-flex.align-items-center.ml-auto
+        = render partial: "comfy/admin/cms/categories/categories", object: file
+
+    .col-md-2.d-flex.align-items-center
+      - file_tag = "{{cms:file_link #{file.id} }}"
+      %input.file-path{type: "text", value: file_tag, readonly: "readonly"}
+
+    .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

@@ -1,23 +1,27 @@
-= render 'comfy/admin/cms/partials/file_form_before', :form => form
+= comfy_admin_partial "comfy/admin/cms/partials/file_form_before", form: form
 
 = form.text_field :label
 = form.file_field :file
 
+// TODO replace with form_group when it's fixed: https://github.com/bootstrap-ruby/rails-bootstrap-forms/issues/353
 - unless @file.new_record?
-  = form.form_group t('.current_file') do
-    - if @file.is_image?
-      .file-image
-        = image_tag @file.file.url
-    = link_to @file.file.url, @file.file.url, :target => '_blank'
+  .form-group.row
+    .col-sm-2.text-lg-right
+      = t('.current_file')
+    .col-sm-10
+      - 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
+= render 'comfy/admin/cms/categories/form', form: form
 
-= render 'comfy/admin/cms/partials/file_form_after', :form => form
+= comfy_admin_partial 'comfy/admin/cms/partials/file_form_after', form: form
 
-= form.form_group :class => 'form-actions' do
-  = form.submit t(@file.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
+= form.form_actions do
+  = form.submit 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'
+    = 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/edit.html.haml

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

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

@@ -1,33 +1,31 @@
-- content_for :right_column do
-  = render 'comfy/admin/cms/sites/mirrors'
-
 #cms-uploader
   #cms-uploader-drag-drop-target
+
   .page-header
-    = link_to t('.new_link'), new_comfy_admin_cms_site_file_path(@site), :class => 'btn btn-default pull-right', id: 'cms-uploader-browse'
+    = link_to t('.new_link'), new_comfy_admin_cms_site_file_path(@site), class: "btn btn-secondary pull-right", id: "cms-uploader-browse"
     %h2= t('.title')
 
-  = render 'comfy/admin/cms/partials/files_before'
+  = comfy_admin_partial "comfy/admin/cms/partials/files_before"
 
-  = render :partial => 'comfy/admin/cms/categories/index', :object => 'Comfy::Cms::File'
+  = render "comfy/admin/cms/categories/index", type: "Comfy::Cms::File"
 
   = comfy_paginate @files
 
-  %table.table.table-hover.table-bordered
-    %tbody.sortable.cms-uploader-filelist
-      = render :partial => 'file', :collection => @files
+  %ul.list.sortable.cms-uploader-filelist
+    = render partial: "file", collection: @files
 
-  = render 'comfy/admin/cms/partials/files_after'
+  = comfy_admin_partial "comfy/admin/cms/partials/files_after"
 
   = comfy_paginate @files
 
-:javascript
-  $(function(){
-    window.CMS.uploader($("#cms-uploader"), {
-      url: '#{comfy_admin_cms_site_files_path(@site, :source => :plupload, :category => params[:category])}',
-      multipart_params: {
-        '#{request_forgery_protection_token}': '#{form_authenticity_token}',
-        '#{Rails.application.config.session_options[:key]}': '#{request.session_options[:id]}'
-      }
+- content_for :javascript do
+  :javascript
+    $(function(){
+      window.CMS.uploader($("#cms-uploader"), {
+        url: '#{comfy_admin_cms_site_files_path(@site, source: :plupload, category: params[:category])}',
+        multipart_params: {
+          '#{request_forgery_protection_token}': '#{form_authenticity_token}',
+          '#{Rails.application.config.session_options[:key]}': '#{request.session_options[:id]}'
+        }
+      });
     });
-  });

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

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

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

@@ -1,19 +1,19 @@
-= render 'comfy/admin/cms/partials/layout_form_before', :form => form
+= 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}
+= 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
 
 - if (options = Comfy::Cms::Layout.app_layouts_for_select(lookup_context.view_paths)).present?
   = form.select :app_layout, [["---- #{t('.select_app_layout')} ----", nil]] + options
 
-= 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'}
+= 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'}
 
-= render 'comfy/admin/cms/partials/layout_form_after', :form => form
+= comfy_admin_partial 'comfy/admin/cms/partials/layout_form_after', form: form
 
-= form.form_group :class => 'form-actions' do
-  = form.submit t(@layout.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
-  = link_to t('.cancel'), comfy_admin_cms_site_layouts_path, :class => 'btn btn-link'
+= form.form_actions do
+  = form.submit 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

@@ -1,24 +1,26 @@
 - layout      ||= index_branch
 - has_siblings  = layout.siblings.select{|l| l.site_id == @site.id}.size > 0
 
-%li{:id => dom_id(layout)}
-  .item
-    .icon
-      - if !params[:category].present? && has_siblings
-        .dragger
-          %span ⇅
-          
-    .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-default'
-      = link_to t('.edit'), edit_comfy_admin_cms_site_layout_path(@site, layout), :class => 'btn btn-default'
-      = link_to t('.delete'), comfy_admin_cms_site_layout_path(@site, layout), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-danger'
-    
-    .item-content
-      .item-title
-        = link_to layout.label, edit_comfy_admin_cms_site_layout_path(@site, layout)
-      .item-meta
-        = layout.identifier
+%li{id: dom_id(layout)}
+  .row
+    .col-md-8.item
+      .item-controls.d-none.d-lg-block
+        - if has_siblings
+          .dragger
+            = fa_icon("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.children.sortable
-      = render :partial => 'index_branch', :collection => layout.children
+    %ul.list.children.sortable
+      = render partial: "index_branch", collection: layout.children.order(:position)

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

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

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

@@ -1,13 +1,10 @@
 .page-header
-  = link_to t('.new_link'), new_comfy_admin_cms_site_layout_path(@site), :class => 'btn btn-default pull-right'
+  = link_to t('.new_link'), new_comfy_admin_cms_site_layout_path(@site), class: "btn btn-secondary pull-right"
   %h2= t('.title')
 
-- content_for :right_column do
-  = render 'comfy/admin/cms/sites/mirrors'
-
-= render 'comfy/admin/cms/partials/layouts_before'
+= comfy_admin_partial "comfy/admin/cms/partials/layouts_before"
 
 %ul.list.sortable
-  = render :partial => 'index_branch', :collection => @layouts
+  = render partial: "index_branch", collection: @layouts
 
-= render 'comfy/admin/cms/partials/layouts_after'
+= comfy_admin_partial "comfy/admin/cms/partials/layouts_after"

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

@@ -1,19 +1,12 @@
-- content_for :right_column do
-  #form-save.box
-    %label.checkbox-inline
-      %input{:type => 'checkbox'}
-      = ::Comfy::Cms::Page.human_attribute_name(:is_published)
-    %button.btn.btn-sm.btn-primary.pull-right
+= comfy_admin_partial "comfy/admin/cms/partials/page_form_before", form: form
 
-= render 'comfy/admin/cms/partials/page_form_before', :form => form
-
-= form.text_field :label, :data => {:slugify => @page.new_record?}
+= 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
+  = form.text_field :slug, data: { slug: true }, prepend: @page.parent.full_path
 
 - if (options = ::Comfy::Cms::Layout.options_for_select(@site)).present?
-  = form.select :layout_id, options, {}, 'data-url' => form_blocks_comfy_admin_cms_site_page_path(@site, @page.id.to_i)
+  = form.select :layout_id, options, {}, {data: {url: form_fragments_comfy_admin_cms_site_page_path(@site, @page.id.to_i)}, id: "fragments-toggle"}
 
 - if (options = ::Comfy::Cms::Page.options_for_select(@site, @page)).present?
   = form.select :parent_id, options
@@ -21,18 +14,19 @@
 - if (options = ::Comfy::Cms::Page.options_for_select(@site, @page, nil, 0, false)).present?
   = form.select :target_page_id, [["---- #{t('.select_target_page')} ----", nil]] + options
 
-= render 'comfy/admin/cms/partials/page_form_inner', :form => form
+= comfy_admin_partial "comfy/admin/cms/partials/page_form_inner", form: form
 
-= render 'comfy/admin/cms/categories/form', :form => form
+= render "form_fragments", form: form, record: @page
 
-= render 'form_blocks'
+= render "comfy/admin/cms/categories/form", form: form
 
-= form.form_group :is_published do
-  = form.check_box :is_published, :label => t('.is_published')
+.row
+  .col-sm-10.ml-auto
+    = form.check_box :is_published
 
-= render 'comfy/admin/cms/partials/page_form_after', :form => form
+= comfy_admin_partial "comfy/admin/cms/partials/page_form_after", form: form
 
-= form.form_group :class => 'form-actions' do
-  = form.submit t('.preview'), :name => 'preview', :id => nil, :class => 'btn btn-default', :data => { :disable_with => false }
-  = form.submit t(@page.new_record?? '.create' : '.update'), :class => 'btn btn-primary'
-  = link_to t('.cancel'), comfy_admin_cms_site_pages_path, :class => 'btn btn-link'
+= form.form_actions do
+  = form.submit t(".preview"), name: "preview", id: nil, class: "btn btn-secondary", data: {disable_with: false}
+  = form.submit t(@page.new_record?? ".create" : ".update"), class: "btn btn-primary", data: {disable_with: false}
+  = link_to t(".cancel"), comfy_admin_cms_site_pages_path, class: "btn btn-link"