comfortable_mexican_sofa 1.6.31 → 1.7.0

data/app/controllers/cms_admin/files_controller.rb

@@ -28,7 +28,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
           @file = @site.files.create!(file_params.merge(:label => label))
         end
         
-        flash[:notice] = I18n.t('cms.files.created')
+        flash[:success] = I18n.t('cms.files.created')
         redirect_to :action => :edit, :id => @file
       end
       format.js do
@@ -74,7 +74,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
   
   def update
     @file.update_attributes!(params[:file])
-    flash[:notice] = I18n.t('cms.files.updated')
+    flash[:success] = I18n.t('cms.files.updated')
     redirect_to :action => :edit, :id => @file
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
@@ -87,7 +87,7 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
     respond_to do |format|
       format.js
       format.html do
-        flash[:notice] = I18n.t('cms.files.deleted')
+        flash[:success] = I18n.t('cms.files.deleted')
         redirect_to :action => :index
       end
     end

data/app/controllers/cms_admin/layouts_controller.rb

@@ -18,7 +18,7 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController
 
   def create
     @layout.save!
-    flash[:notice] = I18n.t('cms.layouts.created')
+    flash[:success] = I18n.t('cms.layouts.created')
     redirect_to :action => :edit, :id => @layout
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
@@ -28,7 +28,7 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController
 
   def update
     @layout.update_attributes!(params[:layout])
-    flash[:notice] = I18n.t('cms.layouts.updated')
+    flash[:success] = I18n.t('cms.layouts.updated')
     redirect_to :action => :edit, :id => @layout
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
@@ -38,7 +38,7 @@ class CmsAdmin::LayoutsController < CmsAdmin::BaseController
 
   def destroy
     @layout.destroy
-    flash[:notice] = I18n.t('cms.layouts.deleted')
+    flash[:success] = I18n.t('cms.layouts.deleted')
     redirect_to :action => :index
   end
   

data/app/controllers/cms_admin/pages_controller.rb

@@ -26,7 +26,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
 
   def create
     @page.save!
-    flash[:notice] = I18n.t('cms.pages.created')
+    flash[:success] = I18n.t('cms.pages.created')
     redirect_to :action => :edit, :id => @page
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
@@ -36,7 +36,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
 
   def update
     @page.save!
-    flash[:notice] = I18n.t('cms.pages.updated')
+    flash[:success] = I18n.t('cms.pages.updated')
     redirect_to :action => :edit, :id => @page
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
@@ -46,7 +46,7 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
 
   def destroy
     @page.destroy
-    flash[:notice] = I18n.t('cms.pages.deleted')
+    flash[:success] = I18n.t('cms.pages.deleted')
     redirect_to :action => :index
   end
 

data/app/controllers/cms_admin/revisions_controller.rb

@@ -20,7 +20,7 @@ class CmsAdmin::RevisionsController < CmsAdmin::BaseController
   
   def revert
     @record.restore_from_revision(@revision)
-    flash[:notice] = I18n.t('cms.revisions.reverted')
+    flash[:success] = I18n.t('cms.revisions.reverted')
     redirect_to_record
   end
   

data/app/controllers/cms_admin/sites_controller.rb

@@ -22,7 +22,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
 
   def create
     @site.save!
-    flash[:notice] = I18n.t('cms.sites.created')
+    flash[:success] = I18n.t('cms.sites.created')
     redirect_to cms_admin_site_layouts_path(@site)
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
@@ -32,7 +32,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
 
   def update
     @site.update_attributes!(params[:site])
-    flash[:notice] = I18n.t('cms.sites.updated')
+    flash[:success] = I18n.t('cms.sites.updated')
     redirect_to :action => :edit, :id => @site
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
@@ -42,7 +42,7 @@ class CmsAdmin::SitesController < CmsAdmin::BaseController
 
   def destroy
     @site.destroy
-    flash[:notice] = I18n.t('cms.sites.deleted')
+    flash[:success] = I18n.t('cms.sites.deleted')
     redirect_to :action => :index
   end
 

data/app/controllers/cms_admin/snippets_controller.rb

@@ -18,7 +18,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
 
   def create
     @snippet.save!
-    flash[:notice] = I18n.t('cms.snippets.created')
+    flash[:success] = I18n.t('cms.snippets.created')
     redirect_to :action => :edit, :id => @snippet
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
@@ -28,7 +28,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
 
   def update
     @snippet.update_attributes!(params[:snippet])
-    flash[:notice] = I18n.t('cms.snippets.updated')
+    flash[:success] = I18n.t('cms.snippets.updated')
     redirect_to :action => :edit, :id => @snippet
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
@@ -38,7 +38,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
 
   def destroy
     @snippet.destroy
-    flash[:notice] = I18n.t('cms.snippets.deleted')
+    flash[:success] = I18n.t('cms.snippets.deleted')
     redirect_to :action => :index
   end
   

data/app/models/cms/file.rb

@@ -22,9 +22,11 @@ class Cms::File < ActiveRecord::Base
   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|
-      (f.instance.dimensions.blank?? { } : { :original => f.instance.dimensions }).merge(
-        :cms_thumb => '80x60#'
-      ).merge(ComfortableMexicanSofa.config.upload_file_options[:styles] || {})
+      if f.respond_to?(:instance) && f.instance.respond_to?(:dimensions)
+        (f.instance.dimensions.blank?? { } : { :original => f.instance.dimensions }).merge(
+          :cms_thumb => '80x60#'
+        )
+      end
     }
   )
   before_post_process :is_image?

data/app/models/cms/page.rb

@@ -1,16 +1,5 @@
 # encoding: utf-8
 
-class ColumnLimitValidator < ActiveModel::EachValidator
-  # Ensuring that slug and full path are not longer than what database
-  # can store. We want to avoid magical invisible truncation
-  def validate_each(record, attribute, value)
-    column_limit = record.class.columns_hash[attribute.to_s].limit
-    if value.to_s.length > column_limit
-      record.errors.add(attribute, :too_long, :count => column_limit)
-    end
-  end
-end
-
 class Cms::Page < ActiveRecord::Base
   
   ComfortableMexicanSofa.establish_connection(self)
@@ -66,9 +55,7 @@ class Cms::Page < ActiveRecord::Base
     :presence   => true
   validate :validate_target_page
   validate :validate_format_of_unescaped_slug
-  validates :slug, :full_path,
-    :column_limit => true
-
+  
   # -- Scopes ---------------------------------------------------------------
   default_scope order('cms_pages.position')
   scope :published, where(:is_published => true)

data/app/models/cms/site.rb

@@ -50,7 +50,7 @@ class Cms::Site < ActiveRecord::Base
     Cms::Site.find_all_by_hostname(real_host_from_aliases(host)).each do |site|
       if site.path.blank?
         cms_site = site
-      elsif "#{path.to_s.split('?')[0]}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
+      elsif "#{path}/".match /^\/#{Regexp.escape(site.path.to_s)}\//
         cms_site = site
         break
       end
@@ -78,7 +78,7 @@ protected
   end
 
   def assign_identifier
-    self.identifier = self.identifier.blank?? self.hostname.try(:idify) : self.identifier
+    self.identifier = self.identifier.blank?? self.hostname.try(:slugify) : self.identifier
   end
   
   def assign_hostname

data/app/views/cms_admin/categories/_categories.html.haml

@@ -0,0 +1,3 @@
+- object ||= categories
+- object.categories.each do |category|
+  .category= category.label

data/app/views/cms_admin/categories/_edit.html.haml

@@ -0,0 +1,6 @@
+- category ||= edit
+
+= form_for @category, :as => :category, :url => cms_admin_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')

data/app/views/cms_admin/categories/_form.html.haml

@@ -0,0 +1,8 @@
+- object = form.object
+- if (categories = @site.categories.of_type(object.class.to_s)).present?
+  = form.element t('.label'), nil, :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

data/app/views/cms_admin/categories/_index.html.haml

@@ -0,0 +1,24 @@
+- type ||= index
+
+.categories-widget
+  .categories-widget-label= t('.label')
+  
+  .action-links
+    .edit= link_to t('.edit'), '#', :class => 'btn btn-mini'
+    .done= link_to t('.done'), '#', :class => 'btn btn-mini'
+  
+  .categories.read
+    .category.all{:class => params[:category].blank?? 'active' : nil}
+      = link_to t('.all'), :category => nil
+    - @site.categories.of_type(type).each do |category|
+      = render :partial => 'cms_admin/categories/show', :object => category, :locals => { :read => true }
+  
+  .categories.editable
+    - @site.categories.of_type(type).each do |category|
+      = render :partial => 'cms_admin/categories/show', :object => category
+    
+    = form_for :category, :url => cms_admin_site_categories_path(@site), :remote => true, :html => {:id => 'new_category'} do |form|
+      = form.hidden_field :categorized_type, :value => type
+      .input-append
+        = form.text_field :label, :placeholder => 'Add Category'
+        %button.btn.btn-mini= t('.add')

data/app/views/cms_admin/categories/_show.html.haml

@@ -0,0 +1,13 @@
+- category ||= show
+- read ||= false
+- categories = [params[:category]].flatten.compact
+- active = categories.flatten.member?(category.label)
+
+.category{:class => (read && active ? 'active' : nil), :id => dom_id(category)}
+  - if read
+    - categories = active ? categories.reject{|c| c == category.label} : categories << category.label
+    = link_to category.label, "?#{{:category => categories}.to_param}"
+  - else
+    = link_to category.label, edit_cms_admin_site_category_path(@site, category), :remote => true
+    = link_to cms_admin_site_category_path(@site, category), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
+      %i.icon-remove-circle

data/app/views/cms_admin/categories/create.js.erb

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

data/app/views/cms_admin/categories/update.js.erb

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

data/app/views/cms_admin/files/_file.html.haml

@@ -0,0 +1,14 @@
+.file{:class => "#{dom_id(file)} #{file.is_image?? 'image' : nil}"}
+  .file-name
+    
+    = link_to cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :data => {:confirm => t('.are_you_sure')}, :class => 'delete' do
+      %i.icon-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}
+      .file-type= file.file_content_type
+      .file-size= number_to_human_size(file.file_file_size, :locale => :en)

data/app/views/cms_admin/files/_form.html.haml

@@ -0,0 +1,13 @@
+= form.text_field :label
+= form.file_field :file, :multiple => @file.new_record?
+
+- unless @file.new_record?
+  = form.element t('.current_file'), nil do
+    = link_to @file.file.url, @file.file.url, :target => '_blank'
+
+= form.text_area :description
+
+= render :partial => 'cms_admin/categories/form', :object => form
+
+.form-actions
+  = form.submit t(@file.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/cms_admin/files/_index.html.haml

@@ -0,0 +1,12 @@
+- type ||= nil
+- files_scope = (type == 'image') ? @site.files.images : @site.files
+
+.box.file-uploader
+  = form_for :file, :url => cms_admin_site_files_path(@site), :html => {:multipart => true} do |form|
+    %span.btn.btn-file
+      = t('.button')
+      = form.file_field :file, :multiple => true, :id => nil
+  
+  .uploaded-files
+    - files_scope.order(:label).each do |file|
+      = render :partial => 'cms_admin/files/file', :object => file

data/app/views/cms_admin/files/_page_form.html.haml

@@ -0,0 +1,9 @@
+- block ||= page_form
+
+- if (files = block.files).present?
+  .files
+    - files.each do |file|
+      .file{:class => dom_id(file)}
+        = link_to file.file_file_name, file.file.url, :target => '_blank'
+        = link_to cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' do
+          %i.icon-remove-circle

data/app/views/cms_admin/files/create.js.erb

@@ -1,3 +1,3 @@
-$('.uploaded_files').prepend(
+$('.uploaded-files').prepend(
   '<%= escape_javascript(render :partial => "file", :object => @file ) %>'
 );

data/app/views/cms_admin/files/edit.html.haml

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

data/app/views/cms_admin/files/index.html.haml

@@ -0,0 +1,26 @@
+.page-header
+  = link_to t('.new_link'), new_cms_admin_site_file_path(@site), :class => 'btn pull-right'
+  %h2= t('.title')
+
+= render :partial => 'cms_admin/categories/index', :object => 'Cms::File'
+
+%table.table.table-hover.table-bordered
+  %tbody.sortable
+    - @files.each do |file|
+      %tr{:id => dom_id(file)}
+        %td
+          .icon
+            - if !params[:category].present? && @site.files.count > 1
+              .dragger
+                %span ⇅
+        %td.main
+          .item-title
+            = link_to file.label, edit_cms_admin_site_file_path(@site, file)
+            = render :partial => '/cms_admin/categories/categories', :object => file
+          .item-meta
+            = link_to file.file_file_name, file.file.url, :target => '_blank'
+            
+        %td
+          .btn-group
+            = link_to t('.edit'), edit_cms_admin_site_file_path(@site, file), :class => 'btn btn-small'
+            = link_to t('.delete'), cms_admin_site_file_path(@site, file), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'

data/app/views/cms_admin/files/new.html.haml

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

data/app/views/cms_admin/layouts/_form.html.haml

@@ -0,0 +1,17 @@
+- content_for :right_column do
+  = render :partial => 'cms_admin/files/index'
+
+= form.text_field :label, :data => {:slugify => @layout.new_record?}
+= form.text_field :identifier, :data => {:slug => true}
+- if (options = Cms::Layout.options_for_select(@site, @layout)).present?
+  = form.select :parent_id, [["---- #{t('.select_parent_layout')} ----", nil]] + options
+
+- if (options = Cms::Layout.app_layouts_for_select).present?
+  = form.select :app_layout, [["---- #{t('.select_app_layout')} ----", nil]] + options
+
+= form.text_area :content, :data => {:cm_mode => 'text/html'}
+= form.text_area :css, :data => {:cm_mode => 'css'}
+= form.text_area :js, :data => {:cm_mode => 'javascript'}
+
+.form-actions
+  = form.submit t(@layout.new_record?? '.create' : '.update'), :class => 'btn btn-primary'

data/app/views/cms_admin/layouts/_index_branch.html.haml

@@ -0,0 +1,23 @@
+- 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
+      = link_to t('.add_child_layout'), new_cms_admin_site_layout_path(@site, :parent_id => layout.id), :class => 'btn btn-small'
+      = link_to t('.edit'), edit_cms_admin_site_layout_path(@site, layout), :class => 'btn btn-small'
+      = link_to t('.delete'), cms_admin_site_layout_path(@site, layout), :method => :delete, :data => {:confirm => t('.are_you_sure')}, :class => 'btn btn-small btn-danger'
+    
+    .item-content
+      .item-title
+        = link_to layout.label, edit_cms_admin_site_layout_path(@site, layout)
+      .item-meta
+        = layout.identifier
+
+  - if layout.children.present?
+    %ul= render :partial => 'index_branch', :collection => layout.children

data/app/views/cms_admin/layouts/edit.html.haml

@@ -0,0 +1,9 @@
+.page-header
+  = link_to pluralize(@layout.revisions.count, t('.revision')), cms_admin_site_layout_revisions_path(@site, @layout), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors', :object => @layout
+
+= comfy_form_for @layout, :as => :layout, :url => {:action => :update} do |form|
+  = render form

data/app/views/cms_admin/layouts/index.html.haml

@@ -0,0 +1,9 @@
+.page-header
+  = link_to t('.new_link'), new_cms_admin_site_layout_path(@site), :class => 'btn pull-right'
+  %h2= t('.title')
+
+- content_for :right_column do
+  = render :partial => 'cms_admin/sites/mirrors'
+
+%ul.list.sortable
+  = render :partial => 'index_branch', :collection => @layouts