comfortable_mexican_sofa 1.3.8 → 1.4.0

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

@@ -1,4 +1,5 @@
 /* -- Dialog Box --------------------------------------------------------- */
+/*
 .ui-dialog {
   border: 1px solid #252525;
   border-radius: 5px;
@@ -32,7 +33,7 @@ a.ui-dialog-titlebar-close {
   top: 4px;
   right: 4px;
 }
-
+*/
 /* -- WYMeditor ---------------------------------------------------------- */
 .wym_box {
   background: #f1f1f1;

data/app/controllers/cms_admin/categories_controller.rb

@@ -0,0 +1,33 @@
+class CmsAdmin::CategoriesController < CmsAdmin::BaseController
+  
+  before_filter :load_category,  :only => [:edit, :update, :destroy]
+  
+  def edit
+    render
+  end
+  
+  def create
+    @category = Cms::Category.create!(params[:category])
+  rescue
+    render :nothing => true
+  end
+  
+  def update
+    @category.update_attributes!(params[:category])
+  rescue
+    render :nothing => true
+  end
+  
+  def destroy
+    @category.destroy
+  end
+  
+protected
+  
+  def load_category
+    @category = Cms::Category.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    render :nothing => true
+  end
+  
+end

data/app/controllers/cms_admin/files_controller.rb

@@ -0,0 +1,82 @@
+class CmsAdmin::FilesController < CmsAdmin::BaseController
+  
+  skip_before_filter :load_fixtures
+  
+  before_filter :load_file, :only => [:edit, :update, :destroy]
+  
+  def index
+    return redirect_to :action => :new if @site.files.count == 0
+    @files = @site.files.for_category(params[:category]).all(:order => 'cms_files.label')
+  end
+  
+  def new
+    @file = @site.files.new
+  end
+  
+  def create
+    respond_to do |format|
+      format.html do
+        @file = @site.files.new
+        file_array  = params[:file][:file] || [nil]
+        label       = params[:file][:label]
+        
+        file_array.each_with_index do |file, i|
+          file_params = params[:file].merge(:file => file)
+          if file_array.size > 1 && file_params[:label].present?
+            label = file_params[:label] + " #{i + 1}"
+          end
+          @file = @site.files.create!(file_params.merge(:label => label))
+        end
+        
+        flash[:notice] = I18n.t('cms.files.created')
+        redirect_to :action => :edit, :id => @file
+      end
+      format.js do
+        io = 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']
+        @file = @site.files.create!(:file => io)
+      end
+    end
+  rescue ActiveRecord::RecordInvalid
+    respond_to do |format|
+      format.html do
+        flash.now[:error] = I18n.t('cms.files.creation_failure')
+        render :action => :new
+      end
+      format.js do
+        render :nothing => true
+      end
+    end
+  end
+  
+  def update
+    @file.update_attributes!(params[:file])
+    flash[:notice] = I18n.t('cms.files.updated')
+    redirect_to :action => :edit, :id => @file
+  rescue ActiveRecord::RecordInvalid
+    flash.now[:error] = I18n.t('cms.files.update_failure')
+    render :action => :edit
+  end
+  
+  def destroy
+    @file.destroy
+    respond_to do |format|
+      format.js
+      format.html do
+        flash[:notice] = I18n.t('cms.files.deleted')
+        redirect_to :action => :index
+      end
+    end
+  end
+  
+protected
+  
+  def load_file
+    @file = @site.files.find(params[:id])
+  rescue ActiveRecord::RecordNotFound
+    flash[:error] = I18n.t('cms.files.not_found')
+    redirect_to :action => :index
+  end
+end

data/app/controllers/cms_admin/pages_controller.rb

@@ -4,11 +4,15 @@ class CmsAdmin::PagesController < CmsAdmin::BaseController
   before_filter :build_cms_page,    :only => [:new, :create]
   before_filter :load_cms_page,     :only => [:edit, :update, :destroy]
   before_filter :preview_cms_page,  :only => [:create, :update]
-  before_filter :build_upload_file, :only => [:new, :edit]
+  before_filter :build_file,        :only => [:new, :edit]
 
   def index
     return redirect_to :action => :new if @site.pages.count == 0
-    @pages = [@site.pages.root].compact
+    if params[:category].present?
+      @pages = @site.pages.for_category(params[:category]).all(:order => 'label')
+    else
+      @pages = [@site.pages.root].compact
+    end
   end
 
   def new
@@ -81,8 +85,8 @@ protected
     @page.layout ||= (@page.parent && @page.parent.layout || @site.layouts.first)
   end
 
-  def build_upload_file
-    @upload = Cms::Upload.new
+  def build_file
+    @file = Cms::File.new
   end
 
   def load_cms_page

data/app/controllers/cms_admin/snippets_controller.rb

@@ -5,7 +5,7 @@ class CmsAdmin::SnippetsController < CmsAdmin::BaseController
 
   def index
     return redirect_to :action => :new if @site.snippets.count == 0
-    @snippets = @site.snippets.all(:order => 'label')
+    @snippets = @site.snippets.for_category(params[:category]).all(:order => 'label')
   end
 
   def new

data/app/models/cms/categorization.rb

@@ -0,0 +1,17 @@
+class Cms::Categorization < ActiveRecord::Base
+  
+  set_table_name :cms_categorizations
+  
+  # -- Relationships --------------------------------------------------------
+  belongs_to :category
+  belongs_to :categorized,
+    :polymorphic => true
+    
+  # -- Validations ----------------------------------------------------------
+  validates :categorized_type, :categorized_id,
+    :presence   => true
+  validates :category_id,
+    :presence   => true,
+    :uniqueness => { :scope => [:categorized_type, :categorized_id] }
+  
+end

data/app/models/cms/category.rb

@@ -0,0 +1,22 @@
+class Cms::Category < ActiveRecord::Base
+  
+  set_table_name :cms_categories
+  
+  # -- Relationships --------------------------------------------------------
+  has_many :categorizations,
+    :dependent => :destroy
+    
+  # -- Validations ----------------------------------------------------------
+  validates :label,
+    :presence   => true,
+    :uniqueness => { :scope => :categorized_type }
+  validates :categorized_type,
+    :presence   => true
+    
+  # -- Scopes ---------------------------------------------------------------
+  default_scope order(:label)
+  scope :of_type, lambda { |type|
+    where(:categorized_type => type)
+  }
+  
+end

data/app/models/cms/{upload.rb → file.rb}

@@ -1,7 +1,9 @@
-class Cms::Upload < ActiveRecord::Base
+class Cms::File < ActiveRecord::Base
+  
+  set_table_name :cms_files
+  
+  cms_is_categorized
   
-  set_table_name :cms_uploads
-
   # -- AR Extensions --------------------------------------------------------
   has_attached_file :file, ComfortableMexicanSofa.config.upload_file_options
   
@@ -12,4 +14,16 @@ class Cms::Upload < ActiveRecord::Base
   validates :site_id, :presence => true
   validates_attachment_presence :file
   
+  validates_uniqueness_of :file_file_name,
+    :scope => :site_id
+  
+  # -- Callbacks ------------------------------------------------------------
+  before_save :assign_label
+  
+protected
+  
+  def assign_label
+    self.label = self.label.blank?? self.file_file_name.gsub(/\.[^\.]*?$/, '').titleize : self.label
+  end
+  
 end

data/app/models/cms/page.rb

@@ -3,6 +3,7 @@ class Cms::Page < ActiveRecord::Base
   set_table_name :cms_pages
   
   cms_acts_as_tree :counter_cache => :children_count
+  cms_is_categorized
   cms_is_mirrored
   cms_has_revisions_for :blocks_attributes
   

data/app/models/cms/site.rb

@@ -6,7 +6,7 @@ class Cms::Site < ActiveRecord::Base
   has_many :layouts,  :dependent => :destroy
   has_many :pages,    :dependent => :destroy
   has_many :snippets, :dependent => :destroy
-  has_many :uploads,  :dependent => :destroy
+  has_many :files,    :dependent => :destroy
   
   # -- Callbacks ------------------------------------------------------------
   before_validation :assign_label

data/app/models/cms/snippet.rb

@@ -1,6 +1,8 @@
 class Cms::Snippet < ActiveRecord::Base
   
   set_table_name :cms_snippets
+  
+  cms_is_categorized
   cms_is_mirrored
   cms_has_revisions_for :content
   

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

@@ -0,0 +1,6 @@
+<% object ||= categories %>
+<% object.categories.each do |category| %>
+  <span class='category'>
+    <%= category.label %>
+  </span>
+<% end %>

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

@@ -0,0 +1,7 @@
+<% category ||= edit %>
+<div class='category edit' id='<%= dom_id(category) %>'>
+  <%= form_for @category, :as => :category, :url => cms_admin_site_category_path(@site, category), :remote => true do |form| %>
+    <%= form.text_field :label %>
+    <%= form.submit t('.save') %>
+  <% end %>
+</div>

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

@@ -0,0 +1,12 @@
+<% object = form.object %>
+<% if (categories = Cms::Category.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 %>
+      <label>
+        <%= check_box_tag "#{object.class.to_s.demodulize.downcase}[category_ids][#{category.id}]", 1, object.categories.member?(category), :id => nil %>
+        <%= category.label %>
+      </label>
+    <% end %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,31 @@
+<% type ||= index %>
+
+<div class='categories_widget'>
+  
+  <div class='label'><%= t('.label') %></div>
+  
+  <%= link_to t('.edit'), '#', :class => 'action_link edit', 'data-state' => 'edit' %>
+  <%= link_to t('.done'), '#', :class => 'action_link done', 'data-state' => 'done', :style => 'display:none' %>
+  
+  <div class='categories read'>
+    <div class='category all <%= (params[:category].blank?? 'active' : nil ) %>'>
+      <%= link_to t('.all'), :category => nil %>
+    </div>
+    <% Cms::Category.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| %>
+      <%= render :partial => 'cms_admin/categories/show', :object => category %>
+    <% end %>
+    <div class='category new'>
+      <%= form_for :category, :url => cms_admin_site_categories_path(@site), :remote => true do |form| %>
+        <%= form.hidden_field :categorized_type, :value => type %>
+        <%= form.text_field :label %>
+        <%= form.submit t('.add') %>
+      <% end %>
+    </div>
+  </div>
+</div>

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

@@ -0,0 +1,16 @@
+<% 
+  category ||= show
+  read ||= false
+  categories = [params[:category]].flatten.compact
+  active = categories.flatten.member?(category.label)
+%>
+
+<div class='category <%= 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 'x', cms_admin_site_category_path(@site, category), :method => :delete, :remote => true, :confirm => t('.are_you_sure'), :class => 'delete' %>
+  <% end %>
+</div>

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

@@ -0,0 +1,7 @@
+$('.categories_widget .categories.editable .category.new').before(
+  '<%= escape_javascript(render :partial => "show", :object => @category ) %>'
+);
+$('.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('');

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

@@ -0,0 +1,3 @@
+$('.categories .category#<%= dom_id(@category) %>').fadeOut('slow', function(){
+  $(this).remove()
+})

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

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

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

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

data/app/views/cms_admin/{uploads → files}/_file.html.erb

@@ -6,5 +6,5 @@
       end 
   %>
   <%= link_to file_name, file.file.url, :target => '_blank', :class => 'filename' %>
-  <%= link_to span_tag('x'), cms_admin_site_upload_path(@site, file), :method => :delete, :remote => true, :class => 'delete' %>
+  <%= link_to span_tag('x'), cms_admin_site_file_path(@site, file), :method => :delete, :remote => true, :class => 'delete' %>
 </div>

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

@@ -0,0 +1,15 @@
+<%= form.text_field :label %>
+<% if @file.new_record? %>
+  <%= form.file_field :file, :multiple => true %>
+<% else %>
+  <%= form.simple_field 'File', nil do %>
+    <%= link_to @file.file.url, @file.file.url, :target => '_blank' %>
+  <% end %>
+<% end %>
+<%= form.text_area :description %>
+
+<%= render :partial => 'cms_admin/categories/form', :object => form %>
+
+<%= form.simple_field nil, nil, :class => 'submit_element' do %>
+  <%= form.submit t(@file.new_record?? '.create' : '.update'), :disable_builder => true %>
+<% end %>

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

@@ -0,0 +1,13 @@
+<div id='file_uploads' class='box'>
+  
+  <%= form_for :file, :url => cms_admin_site_files_path(@site) do |form| %>
+    <a id='uploader_button' href='#' class='big button'><%= t('.button') %></a>
+    <%= form.file_field :file, :multiple => true %>
+  <% end %>
+  
+  <div id='uploaded_files'>
+    <% Cms::File.order('label').all.each do |file| %>
+      <%= render :partial => 'cms_admin/files/file', :object => file %>
+    <% end %>
+  </div>
+</div>

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

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

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

@@ -0,0 +1,3 @@
+$(".file#<%= dom_id(@file) %>").fadeOut('slow', function(){
+  $(this).remove()
+})

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

@@ -0,0 +1,5 @@
+<h1><%= t('.title')%></h1>
+
+<%= cms_form_for @file, :as => :file, :url => {:action => :update} do |form| %>
+  <%= render :partial => 'form', :object => form %>
+<% end %>

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

@@ -0,0 +1,25 @@
+<%= link_to span_tag(t('.new_link')), new_cms_admin_site_file_path(@site), :class => 'big button' %>
+<h1><%= t('.title')%></h1>
+
+<%= render :partial => 'cms_admin/categories/index', :object => 'Cms::File' %>
+
+<ul class='list'>
+  <% @files.each do |file| %>
+    <li id='<%= dom_id(file) %>'>
+      <div class='item'>
+        <div class='icon'></div>
+        <div class='action_links'>
+          <%= link_to t('.edit'), edit_cms_admin_site_file_path(@site, file) %>
+          <%= link_to t('.delete'), cms_admin_site_file_path(@site, file), :method => :delete, :confirm => t('.are_you_sure') %>
+        </div>
+        <div class='label'>
+          <%= link_to file.label, edit_cms_admin_site_file_path(@site, file) %>
+          <%= render :partial => '/cms_admin/categories/categories', :object => file %>
+          <div class='sublabel'>
+            <%= link_to file.file_file_name, file.file.url, :target => '_blank' %>
+          </div>
+        </div>
+      </div>
+    </li>
+  <% end %>
+</ul>