comfortable_mexican_sofa 1.12.2 → 1.12.3

data/app/controllers/comfy/cms/content_controller.rb

@@ -1,9 +1,6 @@
 class Comfy::Cms::ContentController < Comfy::Cms::BaseController
 
-  # Respond with HTML by default so that requests with 'Accept: */*' get a web page (e.g. Facebook)
-  respond_to :html, :json
-
-  # Authentication module must have #authenticate method
+  # Authentication module must have `authenticate` method
   include ComfortableMexicanSofa.config.public_auth.to_s.constantize
 
   before_action :load_fixtures
@@ -17,8 +14,9 @@ class Comfy::Cms::ContentController < Comfy::Cms::BaseController
     if @cms_page.target_page.present?
       redirect_to @cms_page.target_page.url
     else
-      respond_with(@cms_page) do |format|
-        format.html { render_html }
+      respond_to do |format|
+        format.html { render_page }
+        format.json { render :json => @cms_page }
       end
     end
   end
@@ -29,32 +27,40 @@ class Comfy::Cms::ContentController < Comfy::Cms::BaseController
 
 protected
 
-  def render_html(status = 200)
+  def render_page(status = 200)
     if @cms_layout = @cms_page.layout
       app_layout = (@cms_layout.app_layout.blank? || request.xhr?) ? false : @cms_layout.app_layout
-      render :inline => @cms_page.content_cache, :layout => app_layout, :status => status, :content_type => 'text/html'
+      render  :inline       => @cms_page.content_cache,
+              :layout       => app_layout,
+              :status       => status,
+              :content_type => mime_type
     else
       render :text => I18n.t('comfy.cms.content.layout_not_found'), :status => 404
     end
   end
 
+  # it's possible to control mimetype of a page by creating a `mime_type` field
+  def mime_type
+    mime_block = @cms_page.blocks.find_by_identifier(:mime_type)
+    mime_block && mime_block.content || 'text/html'
+  end
+
   def load_fixtures
     return unless ComfortableMexicanSofa.config.enable_fixtures
     ComfortableMexicanSofa::Fixture::Importer.new(@cms_site.identifier).import!
   end
-  
+
   def load_cms_page
     @cms_page = @cms_site.pages.published.find_by_full_path!("/#{params[:cms_path]}")
-  end    
+  end
 
   def page_not_found
     @cms_page = @cms_site.pages.published.find_by_full_path!('/404')
 
-    respond_with @cms_page do |format|
-      format.html { render_html(404) }
+    respond_to do |format|
+      format.html { render_page(404) }
     end
-
   rescue ActiveRecord::RecordNotFound
     raise ActionController::RoutingError.new("Page Not Found at: \"#{params[:cms_path]}\"")
   end
-end
+end

data/app/models/comfy/cms/file.rb

@@ -1,12 +1,12 @@
 class Comfy::Cms::File < ActiveRecord::Base
   self.table_name = 'comfy_cms_files'
-  
+
   IMAGE_MIMETYPES = %w(gif jpeg pjpeg png tiff).collect{|subtype| "image/#{subtype}"}
-  
+
   cms_is_categorized
-  
+
   attr_accessor :dimensions
-  
+
   has_attached_file :file, ComfortableMexicanSofa.config.upload_file_options.merge(
     # dimensions accessor needs to be set before file assignment for this to work
     :styles => lambda { |f|
@@ -18,51 +18,52 @@ class Comfy::Cms::File < ActiveRecord::Base
     }
   )
   before_post_process :is_image?
-  
+
   # -- Relationships --------------------------------------------------------
   belongs_to :site
   belongs_to :block
-  
+
   # -- Validations ----------------------------------------------------------
   validates :site_id,
     :presence   => true
   validates_attachment_presence :file
   do_not_validate_attachment_file_type :file
-  
+
   validates :file_file_name,
     :uniqueness => {:scope => [:site_id, :block_id]}
-  
+
   # -- Callbacks ------------------------------------------------------------
   before_save   :assign_label
   before_create :assign_position
   after_save    :reload_blockable_cache
   after_destroy :reload_blockable_cache
-  
+
   # -- Scopes ---------------------------------------------------------------
   scope :not_page_file, -> { where(:block_id => nil)}
   scope :images,        -> { where(:file_content_type => IMAGE_MIMETYPES) }
   scope :not_images,    -> { where('file_content_type NOT IN (?)', IMAGE_MIMETYPES) }
-  
+
   # -- Instance Methods -----------------------------------------------------
   def is_image?
     IMAGE_MIMETYPES.include?(file_content_type)
   end
-  
+
+
 protected
-  
+
   def assign_label
     self.label = self.label.blank?? self.file_file_name.gsub(/\.[^\.]*?$/, '').titleize : self.label
   end
-  
+
   def assign_position
     max = Comfy::Cms::File.maximum(:position)
     self.position = max ? max + 1 : 0
   end
-  
+
   def reload_blockable_cache
     return unless self.block
     b = self.block.blockable
     b.class.name.constantize.where(:id => b.id).update_all(:content_cache => nil)
   end
-  
+
 end

data/app/models/comfy/cms/page.rb

@@ -68,7 +68,8 @@ class Comfy::Cms::Page < ActiveRecord::Base
   
   # Full url for a page
   def url
-    "//" + "#{self.site.hostname}/#{self.site.path}/#{self.full_path}".squeeze("/")
+    public_cms_path = ComfortableMexicanSofa.config.public_cms_path || '/'
+    "//" + "#{self.site.hostname}/#{public_cms_path}/#{self.site.path}/#{self.full_path}".squeeze("/")
   end
   
 protected

data/app/models/comfy/cms/site.rb

@@ -49,6 +49,11 @@ class Comfy::Cms::Site < ActiveRecord::Base
   end
 
   # -- Instance Methods -----------------------------------------------------
+  def url
+    public_cms_path = ComfortableMexicanSofa.config.public_cms_path || '/'
+    "//" + "#{self.hostname}/#{public_cms_path}/#{self.path}".squeeze("/")
+  end
+  
   # When removing entire site, let's not destroy content from other sites
   # Since before_destroy doesn't really work, this does the trick
   def destroy

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

@@ -1,13 +1,26 @@
-.file{:class => "#{dom_id(file)} #{file.is_image?? 'image' : nil}"}
-  .file-name
-    = link_to comfy_admin_cms_site_file_path(@site, file), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
-      %i.glyphicon.glyphicon-remove-circle
-    = link_to file.file_file_name, file.file.url, :target => '_blank', :class => 'filename'
-  
-  .file-info{:data => {:url => file.file.url}}
-    .thumb
-      = image_tag file.file.url(:cms_thumb) if file.is_image?
-    .details
-      %input{:type => 'text', :value => file.file.url, :readonly => 'readonly'}
-      .file-type= file.file_content_type
-      .file-size= number_to_human_size(file.file_file_size, :locale => :en)
+%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'}
+
+      = 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, :locale => :en)
+  %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'

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

@@ -1,20 +1,23 @@
-= render 'comfy/admin/cms/partials/file_form_before', :object => form
+= render 'comfy/admin/cms/partials/file_form_before', :form => form
 
 = form.text_field :label
-= form.file_field :file, :multiple => @file.new_record?
+= form.file_field :file
 
 - unless @file.new_record?
   = form.form_group t('.current_file') do
     - if @file.is_image?
-      .file-image= image_tag @file.file.url 
+      .file-image
+        = image_tag @file.file.url
     = link_to @file.file.url, @file.file.url, :target => '_blank'
 
 = form.text_area :description
 
-= render :partial => 'comfy/admin/cms/categories/form', :object => form
+= render 'comfy/admin/cms/categories/form', :form => form
 
-= render 'comfy/admin/cms/partials/file_form_after', :object => form
+= render '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'
+  - 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,4 @@
+.modal.fade.cms-files-modal{'aria-hidden' => 'true', 'data-iframe-src' => comfy_admin_cms_site_files_path(@site), :role => 'dialog', :tabindex => "-1"}
+  .modal-dialog.modal-lg
+    .modal-content
+      %iframe{:src => ''}

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

@@ -0,0 +1 @@
+$("<%= escape_javascript(render :partial => 'file', :object => @file) %>").appendTo(".cms-uploader-filelist");

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

@@ -1,2 +1,2 @@
-$(".file.<%= dom_id(@file) %>").fadeOut 'slow', ->
-  $(this).remove()
+$("#<%= dom_id(@file) %>").fadeOut 'slow', ->
+  $(this).remove()

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

@@ -1,31 +1,33 @@
-.page-header
-  = link_to t('.new_link'), new_comfy_admin_cms_site_file_path(@site), :class => 'btn btn-default pull-right'
-  %h2= t('.title')
-  
-= render 'comfy/admin/cms/partials/files_before'
-
-= render :partial => 'comfy/admin/cms/categories/index', :object => 'Comfy::Cms::File'
-
-%table.table.table-hover.table-bordered
-  %tbody.sortable
-    - @files.each do |file|
-      %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
-            = link_to file.file_file_name, file.file.url, :target => '_blank'
-        %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, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-danger'
-
-= render 'comfy/admin/cms/partials/files_after'
+- 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'
+    %h2= t('.title')
+
+  = render 'comfy/admin/cms/partials/files_before'
+
+  = render :partial => 'comfy/admin/cms/categories/index', :object => 'Comfy::Cms::File'
+
+  = paginate @files, :theme => 'comfy'
+
+  %table.table.table-hover.table-bordered
+    %tbody.sortable.cms-uploader-filelist
+      = render :partial => 'file', :collection => @files
+
+  = render 'comfy/admin/cms/partials/files_after'
+
+  = paginate @files, :theme => 'comfy'
+
+:javascript
+  $(function(){
+    window.CMS.uploader($("#cms-uploader"), {
+      url: '#{comfy_admin_cms_site_files_path(@site)}',
+      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/layouts/_form.html.haml

@@ -1,7 +1,4 @@
-- content_for :right_column do
-  = render 'comfy/admin/cms/files/index'
-  
-= render :partial => 'comfy/admin/cms/partials/layout_form_before', :object => form
+= render '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}
@@ -15,7 +12,7 @@
 = form.text_area :css, :data => {'cms-cm-mode' => 'css'}
 = form.text_area :js, :data => {'cms-cm-mode' => 'javascript'}
 
-= render :partial => 'comfy/admin/cms/partials/layout_form_after', :object => form
+= render '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'

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

@@ -4,9 +4,8 @@
       %input{:type => 'checkbox'}
       = ::Comfy::Cms::Page.human_attribute_name(:is_published)
     %button.btn.btn-sm.btn-primary.pull-right
-  = render 'comfy/admin/cms/files/index'
 
-= render 'comfy/admin/cms/partials/page_form_before', :object => form
+= render 'comfy/admin/cms/partials/page_form_before', :form => form
 
 = form.text_field :label, :data => {:slugify => @page.new_record?}
 
@@ -17,25 +16,25 @@
 
 - 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)
-  
+
 - if (options = ::Comfy::Cms::Page.options_for_select(@site, @page)).present?
   = form.select :parent_id, options
 
 - 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', :object => form
+= render 'comfy/admin/cms/partials/page_form_inner', :form => form
 
-= render :partial => 'comfy/admin/cms/categories/form', :object => form
+= render 'comfy/admin/cms/categories/form', :form => form
 
-= render :partial => 'form_blocks'
+= render 'form_blocks'
 
 = form.form_group :is_published do
   = form.check_box :is_published, :label => t('.is_published')
 
-= render 'comfy/admin/cms/partials/page_form_after', :object => form
+= render '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'
   = 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'
+  = link_to t('.cancel'), comfy_admin_cms_site_pages_path, :class => 'btn btn-link'

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

@@ -1,6 +1,6 @@
 - namespace = { }
 - cms_object = @page || cms_object
-- tags = cms_object.tags(true).select{|t| t.is_cms_block?}.uniq{|t| t.identifier} 
+- tags = cms_object.tags(true).select{|t| t.is_cms_block?}.uniq{|t| t.identifier}
 - tags.each do |tag|
   - namespace[tag.namespace || 'default'] ||= []
   - namespace[tag.namespace || 'default'] << tag
@@ -10,10 +10,10 @@
     .no-tags
       = link_to cms_object.layout.label, edit_comfy_admin_cms_site_layout_path(@site, cms_object.layout)
       = t('.no_tags').html_safe
-  
+
   - else
     = fields_for :blocks, nil, :builder => ComfortableMexicanSofa::FormBuilder, :layout => :horizontal do |cms_blocks|
-      
+
       .tabbable
         - if namespace.size > 1
           %ul.nav.nav-tabs

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

@@ -1,4 +1,4 @@
-= render 'comfy/admin/cms/partials/site_form_before', :object => form
+= render '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}
@@ -8,7 +8,7 @@
 = form.form_group do
   = form.check_box :is_mirrored, :label => t('.is_mirrored')
 
-= render 'comfy/admin/cms/partials/site_form_after', :object => form
+= render 'comfy/admin/cms/partials/site_form_after', :form => form
 
 = form.form_group :class => 'form-actions' do
   = form.primary t(@site.new_record?? '.create' : '.update')

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

@@ -17,8 +17,7 @@
             = site.identifier
             = "(#{site.locale})"
           .host
-            - host = "http://#{site.hostname}/#{site.path}"
-            = link_to host, host, :target => '_blank'
+            = 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'

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

@@ -1,16 +1,13 @@
-- content_for :right_column do
-  = render 'comfy/admin/cms/files/index'
-
-= render :partial => 'comfy/admin/cms/partials/snippet_form_before', :object => form
+= render '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-rich-text' => true}
+= form.text_area :content, :data => {'cms-cm-mode' => 'text/html'}
 
-= render :partial => 'comfy/admin/cms/categories/form', :object => form
+= render 'comfy/admin/cms/categories/form', :form => form
 
-= render :partial => 'comfy/admin/cms/partials/snippet_form_after', :object => form
+= render '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'
+  = link_to t('.cancel'), comfy_admin_cms_site_snippets_path, :class => 'btn btn-link'