comfortable_mexican_sofa 1.5.11 → 1.6.0

data/app/assets/stylesheets/comfortable_mexican_sofa/form.css

@@ -7,7 +7,7 @@
   width: 117px;
   float: left;
   text-align: right;
-  font: 13px/19px 'Lucida Grande', 'Tahoma', serif;
+  font: 13px/19px 'Lucida Grande', 'Tahoma', sans-serif;
   text-shadow: #fff 1px 1px;
   padding: 0px 10px;
   background-color: #f1f1f1;
@@ -169,7 +169,7 @@
   padding: 3px 5px;
   background-color: #484848;
   border-radius: 3px;
-  font: 9px/14px 'Arial', serif;
+  font: 9px/14px 'Arial', sans-serif;
   text-transform: uppercase;
   color: #fff;
   margin-bottom: 3px;

data/app/assets/stylesheets/comfortable_mexican_sofa/structure.css

@@ -64,7 +64,7 @@ html, body#cms_body {
   border-radius: 3px;
   -moz-border-radius: 3px;
   margin-bottom: 10px;
-  overflow: hidden;
+  overflow: auto;
   color: #fff;
 }
 /* -- Flash Messages ----------------------------------------------------- */

data/app/assets/stylesheets/comfortable_mexican_sofa/widgets.css

@@ -8,64 +8,22 @@
 .ui-timepicker-div dl dd{ margin: -25px 10px 10px 65px; }
 .ui-timepicker-div td { font-size: 90%; }
 
-/* -- WYMeditor ---------------------------------------------------------- */
-.wym_box {
-  background: #f1f1f1;
-  border-radius: 3px;
-  padding: 3px;
-}
-.wym_box .wym_toolbar {
-  overflow: hidden;
-  margin-bottom: 2px;
-}
-.wym_box .wym_toolbar .wym_toolbar_section li:last-child a {
-  margin-right: 10px;
-}
-.wym_box .wym_toolbar a {
-  display: block;
-  float: left;
-  margin-right: 2px;
-  height: 20px;
-  width: 20px;
-  background: #fff url(/assets/comfortable_mexican_sofa/wym_icons.png) no-repeat;
-  border: 1px solid #fff;
-  border-radius: 3px;
-  text-indent: -9999px;
-}
-.wym_box .wym_toolbar a:hover {
-  border: 1px solid #d8d8d8;
-}
-.wym_box .wym_toolbar li.wym_containers_h2 a  { background-position: -20px 0px }
-.wym_box .wym_toolbar li.wym_containers_h3 a  { background-position: -40px 0px }
-.wym_box .wym_toolbar li.wym_containers_p a   { background-position: -60px 0px }
-.wym_box .wym_toolbar li.wym_containers_pre a { background-position: -80px 0px }
-
-.wym_box .wym_toolbar li.wym_tools_strong a         { background-position: -100px 0px }
-.wym_box .wym_toolbar li.wym_tools_emphasis a       { background-position: -120px 0px }
-.wym_box .wym_toolbar li.wym_tools_ordered_list a   { background-position: -140px 0px }
-.wym_box .wym_toolbar li.wym_tools_unordered_list a { background-position: -160px 0px }
-.wym_box .wym_toolbar li.wym_tools_table a          { background-position: -180px 0px }
-.wym_box .wym_toolbar li.wym_tools_link a           { background-position: -200px 0px }
-.wym_box .wym_toolbar li.wym_tools_unlink a         { background-position: -220px 0px }
-.wym_box .wym_toolbar li.wym_tools_image a          { background-position: -240px 0px }
-.wym_box .wym_toolbar li.wym_tools_paste a          { background-position: -260px 0px }
-.wym_box .wym_toolbar li.wym_tools_html a           { background-position: -280px 0px }
-
-.wym_box .wym_toolbar li.wym_classes_align_left a    { background-position: -300px 0px }
-.wym_box .wym_toolbar li.wym_classes_align_center a  { background-position: -320px 0px }
-.wym_box .wym_toolbar li.wym_classes_align_right a   { background-position: -340px 0px }
-
-.wym_box .wym_html, 
-.wym_box .wym_iframe {
+/* -- elrte -------------------------------------------------------------- */
+.el-dialogform-content iframe {
   background: #fff;
-  border: 1px solid #d8d8d8;
 }
-.wym_box .wym_html {
-  margin-bottom: 5px;
+.el-rte .toolbar ul li.sofa_image {
+  background-position: -384px -2px
+}
+.el-rte .toolbar ul li.sofa_link {
+  background-position:-244px -29px
 }
-.wym_box iframe {
-  display: block;
-  height: 350px;
-  width: 100%;
+#cms_body .el-rte .toolbar ul li.formatblock h1,
+#cms_body .el-rte .toolbar ul li.formatblock h2 {
+  font: normal 11px 'Trebuchet MS', Verdana, Geneva, sans-serif;
   border: 0px;
+  padding: 0px;
+  margin: 0px;
+  letter-spacing: normal;
+  text-shadow: none;
 }

data/app/controllers/cms_admin/categories_controller.rb

@@ -7,7 +7,7 @@ class CmsAdmin::CategoriesController < CmsAdmin::BaseController
   end
   
   def create
-    @category = Cms::Category.create!(params[:category])
+    @category = @site.categories.create!(params[:category])
   rescue ActiveRecord::RecordInvalid
     logger.detailed_error($!)
     render :nothing => true
@@ -27,7 +27,7 @@ class CmsAdmin::CategoriesController < CmsAdmin::BaseController
 protected
   
   def load_category
-    @category = Cms::Category.find(params[:id])
+    @category = @site.categories.find(params[:id])
   rescue ActiveRecord::RecordNotFound
     render :nothing => true
   end

data/app/controllers/cms_admin/dialogs_controller.rb

@@ -0,0 +1,13 @@
+class CmsAdmin::DialogsController < CmsAdmin::BaseController
+  
+  TEMPLATES = %w(image link)
+  
+  def show
+    if template = TEMPLATES.include?(params[:type])? params[:type] : nil
+      render :template => "cms_admin/dialogs/#{template}", :layout => false
+    else
+      render :nothing => true
+    end
+  end
+  
+end

data/app/controllers/cms_admin/files_controller.rb

@@ -32,7 +32,10 @@ class CmsAdmin::FilesController < CmsAdmin::BaseController
         redirect_to :action => :edit, :id => @file
       end
       format.js do
-        io = request.env['rack.input'].clone
+        # FIX: No idea why this cannot be simulated in the test
+        io = Rails.env.test??
+          request.env['RAW_POST_DATA'].clone :
+          request.env['rack.input'].clone
         io.class.class_eval { attr_accessor :original_filename, :content_type }
         io.original_filename  = request.env['HTTP_X_FILE_NAME']
         io.content_type       = request.env['CONTENT_TYPE']

data/app/controllers/cms_admin/revisions_controller.rb

@@ -10,8 +10,8 @@ class CmsAdmin::RevisionsController < CmsAdmin::BaseController
   def show
     case @record
     when Cms::Page
-      @current_content    = @record.blocks.inject({}){|c, b| c[b.label] = b.content; c }
-      @versioned_content  = @record.blocks.inject({}){|c, b| c[b.label] = @revision.data['blocks_attributes'].detect{|r| r[:label] == b.label}.try(:[], :content); c }
+      @current_content    = @record.blocks.inject({}){|c, b| c[b.identifier] = b.content; c }
+      @versioned_content  = @record.blocks.inject({}){|c, b| c[b.identifier] = @revision.data['blocks_attributes'].detect{|r| r[:identifier] == b.identifier}.try(:[], :content); c }
     else
       @current_content    = @record.revision_fields.inject({}){|c, f| c[f] = @record.send(f); c }
       @versioned_content  = @record.revision_fields.inject({}){|c, f| c[f] = @revision.data[f]; c }

data/app/controllers/cms_content_controller.rb

@@ -65,7 +65,7 @@ protected
   end
 
   def load_cms_layout
-    @cms_layout = @cms_site.layouts.find_by_slug!(params[:layout_slug])
+    @cms_layout = @cms_site.layouts.find_by_identifier!(params[:identifier])
   rescue ActiveRecord::RecordNotFound
     render :nothing => true, :status => 404
   end

data/app/models/cms/block.rb

@@ -14,14 +14,14 @@ class Cms::Block < ActiveRecord::Base
   before_save :prepare_files
   
   # -- Validations ----------------------------------------------------------
-  validates :label,
+  validates :identifier,
     :presence   => true,
     :uniqueness => { :scope => :page_id }
     
   # -- Instance Methods -----------------------------------------------------
   # Tag object that is using this block
   def tag
-    @tag ||= page.tags(true).detect{|t| t.is_cms_block? && t.label == label}
+    @tag ||= page.tags(true).detect{|t| t.is_cms_block? && t.identifier == identifier}
   end
     
 protected

data/app/models/cms/category.rb

@@ -5,10 +5,13 @@ class Cms::Category < ActiveRecord::Base
   set_table_name :cms_categories
   
   # -- Relationships --------------------------------------------------------
+  belongs_to :site
   has_many :categorizations,
     :dependent => :destroy
     
   # -- Validations ----------------------------------------------------------
+  validates :site_id, 
+    :presence   => true
   validates :label,
     :presence   => true,
     :uniqueness => { :scope => :categorized_type }

data/app/models/cms/file.rb

@@ -14,9 +14,12 @@ 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 }
+      (f.instance.dimensions.blank?? { } : { :original => f.instance.dimensions }).merge(
+        :cms_thumb => '80x60#'
+      )
     }
   )
+  before_post_process :is_image?
   
   # -- Relationships --------------------------------------------------------
   belongs_to :site
@@ -36,6 +39,11 @@ class Cms::File < ActiveRecord::Base
   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

data/app/models/cms/layout.rb

@@ -23,7 +23,7 @@ class Cms::Layout < ActiveRecord::Base
     :presence   => true
   validates :label,
     :presence   => true
-  validates :slug,
+  validates :identifier,
     :presence   => true,
     :uniqueness => { :scope => :site_id },
     :format     => { :with => /^\w[a-z0-9_-]*$/i }
@@ -73,7 +73,7 @@ class Cms::Layout < ActiveRecord::Base
 protected
   
   def assign_label
-    self.label = self.label.blank?? self.slug.try(:titleize) : self.label
+    self.label = self.label.blank?? self.identifier.try(:titleize) : self.label
   end
   
   def assign_position

data/app/models/cms/page.rb

@@ -70,22 +70,24 @@ class Cms::Page < ActiveRecord::Base
   def blocks_attributes(was = false)
     self.blocks.collect do |block|
       block_attr = {}
-      block_attr[:label]    = block.label
-      block_attr[:content]  = was ? block.content_was : block.content
+      block_attr[:identifier] = block.identifier
+      block_attr[:content]    = was ? block.content_was : block.content
       block_attr
     end
   end
   
   # Array of block hashes in the following format:
   #   [
-  #     { :label => 'block_1', :content => 'block content' },
-  #     { :label => 'block_2', :content => 'block content' }
+  #     { :identifier => 'block_1', :content => 'block content' },
+  #     { :identifier => 'block_2', :content => 'block content' }
   #   ]
   def blocks_attributes=(block_hashes = [])
     block_hashes = block_hashes.values if block_hashes.is_a?(Hash)
     block_hashes.each do |block_hash|
       block_hash.symbolize_keys! unless block_hash.is_a?(HashWithIndifferentAccess)
-      block = self.blocks.detect{|b| b.label == block_hash[:label]} || self.blocks.build(:label => block_hash[:label])
+      block = 
+        self.blocks.detect{|b| b.identifier == block_hash[:identifier]} || 
+        self.blocks.build(:identifier => block_hash[:identifier])
       block.content = block_hash[:content]
       self.blocks_attributes_changed = self.blocks_attributes_changed || block.content_changed?
     end

data/app/models/cms/site.rb

@@ -5,16 +5,21 @@ class Cms::Site < ActiveRecord::Base
   set_table_name :cms_sites
   
   # -- Relationships --------------------------------------------------------
-  has_many :layouts,  :dependent => :destroy
-  has_many :pages,    :dependent => :destroy
-  has_many :snippets, :dependent => :destroy
-  has_many :files,    :dependent => :destroy
+  has_many :layouts,    :dependent => :destroy
+  has_many :pages,      :dependent => :destroy
+  has_many :snippets,   :dependent => :destroy
+  has_many :files,      :dependent => :destroy
+  has_many :categories, :dependent => :destroy
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_label
   before_save :clean_path
   
   # -- Validations ----------------------------------------------------------
+  validates :identifier,
+    :presence   => true,
+    :uniqueness => true,
+    :format     => { :with => /^\w[a-z0-9_-]*$/i }
   validates :label,
     :presence   => true
   validates :hostname,
@@ -44,7 +49,7 @@ class Cms::Site < ActiveRecord::Base
 protected
   
   def assign_label
-    self.label = self.label.blank?? self.hostname : self.label
+    self.label = self.label.blank?? self.identifier.try(:titleize) : self.label
   end
   
   def clean_path

data/app/models/cms/snippet.rb

@@ -22,7 +22,7 @@ class Cms::Snippet < ActiveRecord::Base
     :presence   => true
   validates :label,
     :presence   => true
-  validates :slug,
+  validates :identifier,
     :presence   => true,
     :uniqueness => { :scope => :site_id },
     :format     => { :with => /^\w[a-z0-9_-]*$/i }
@@ -33,14 +33,16 @@ class Cms::Snippet < ActiveRecord::Base
 protected
   
   def assign_label
-    self.label = self.label.blank?? self.slug.try(:titleize) : self.label
+    self.label = self.label.blank?? self.identifier.try(:titleize) : self.label
   end
   
   # Note: This might be slow. We have no idea where the snippet is used, so
   # gotta reload every single page. Kinda sucks, but might be ok unless there
   # are hundreds of pages.
   def clear_cached_page_content
-    site.pages.all.each{ |page| page.save }
+    site.pages.all.each do |p|
+      Cms::Page.where(:id => p.id).update_all(:content => p.content(true))
+    end
   end
   
   def assign_position

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

@@ -1,5 +1,5 @@
 <% object = form.object %>
-<% if (categories = Cms::Category.of_type(object.class.to_s)).present? %>
+<% if (categories = @site.categories.of_type(object.class.to_s)).present? %>
   <%= form.simple_field t('.label'), nil, :class => 'categories' do %>
     <% categories.each do |category| %>
       <%= hidden_field_tag "#{object.class.to_s.demodulize.downcase}[category_ids][#{category.id}]", 0, :id => nil %>

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

@@ -11,13 +11,13 @@
     <div class='category all <%= (params[:category].blank?? 'active' : nil ) %>'>
       <%= link_to t('.all'), :category => nil %>
     </div>
-    <% Cms::Category.of_type(type).each do |category| %>
+    <% @site.categories.of_type(type).each do |category| %>
       <%= render :partial => 'cms_admin/categories/show', :object => category, :locals => { :read => true } %>
     <% end %>
   </div>
   
   <div class='categories editable' style='display:none'>
-    <% Cms::Category.of_type(type).each do |category| %>
+    <% @site.categories.of_type(type).each do |category| %>
       <%= render :partial => 'cms_admin/categories/show', :object => category %>
     <% end %>
     <div class='category new'>

data/app/views/cms_admin/dialogs/image.html.erb

@@ -0,0 +1,7 @@
+<form class='image_url'>
+  <label for='image_url'> URL </label>
+  <input type='text' name='image_url' id='image_url'/>
+  <input type='submit' value='<%= t('.insert') %>'/>
+</form>
+
+<%= render :partial => 'cms_admin/files/index', :locals => {:type => 'image' } %>

data/app/views/cms_admin/dialogs/link.html.erb

@@ -0,0 +1,5 @@
+<form class='link_url'>
+  <label for='link_url'> URL </label>
+  <input type='text' name='link_url' id='link_url'/>
+  <input type='submit' value='<%= t('.create') %>'/>
+</form>

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

@@ -1,10 +1,18 @@
-<div class='file <%= dom_id(file) %>'>
-  <%  file_name = file.file_file_name 
-      file_ext  = file.file_file_name.split('.').last
-      if (file_name.size - file_ext.size) > 30
-        file_name = file_name.truncate(30) + file_ext
-      end 
-  %>
-  <%= link_to file_name, file.file.url, :target => '_blank', :class => 'filename' %>
-  <%= link_to span_tag('x'), cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' %>
+<div class='file <%= dom_id(file) %> <%= file.is_image?? 'image' : nil %>'>
+  
+  <div class='file_name'>
+    <%= link_to file.file_file_name, file.file.url, :target => '_blank', :class => 'filename' %>
+    <%= link_to span_tag('x'), cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' %>
+  </div>
+  
+  <div class='file_info' data-url='<%= file.file.url %>'>
+    <div class='thumb'>
+      <%= image_tag file.file.url(:cms_thumb) if file.is_image? %>
+    </div>
+    <div class='details'>
+      <input type='text' value='<%= file.file.url %>'/>
+      <div class='file_type'><%= file.file_content_type %></div>
+      <div class='file_size'><%= number_to_human_size(file.file_file_size) %></div>
+    </div>
+  </div>
 </div>

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

@@ -1,26 +1,16 @@
-<div id='file_uploads' class='box'>
+<% type ||= nil %>
+<% files_scope = (type == 'image') ? @site.files.images : @site.files %>
+
+<div class='box file_uploads'>
   
   <%= form_for :file, :url => cms_admin_site_files_path(@site), :html => {:multipart => true} do |form| %>
     <a id='uploader_button' href='#' class='big button'><%= t('.button') %></a>
-    <%= form.file_field :file, :multiple => true %>
+    <%= form.file_field :file, :multiple => true, :id => false %>
   <% end %>
   
-  <div id='uploaded_files'>
-    <% if (images = Cms::File.images.order(:label)).present? %>
-      <div class='section images'>
-        <h3>Images</h3>
-        <% images.each do |file| %>
-          <%= render :partial => 'cms_admin/files/file', :object => file %>
-        <% end %>
-      </div>
-    <% end %>
-    <% if (images = Cms::File.not_images.order(:label)).present? %>
-      <div class='section other'>
-        <h3>Files</h3>
-        <% images.each do |file| %>
-          <%= render :partial => 'cms_admin/files/file', :object => file %>
-        <% end %>
-      </div>
+  <div class='uploaded_files'>
+    <% files_scope.order(:label).each do |file| %>
+      <%= render :partial => 'cms_admin/files/file', :object => file %>
     <% end %>
   </div>
 </div>