locomotive_cms 0.0.2.5 → 0.0.2.6

data/app/controllers/admin/asset_collections_controller.rb

@@ -60,7 +60,7 @@ module Admin
     protected 
   
     def set_collections
-      @collections = current_site.asset_collections
+      @collections = current_site.asset_collections.order_by([[:name, :asc]])
     end
   end
 end

data/app/controllers/admin/contents_controller.rb

@@ -6,7 +6,7 @@ module Admin
     before_filter :set_content_type    
   
     def index
-      @contents = @content_type.ordered_contents
+      @contents = @content_type.list_or_group_contents
     end
   
     def new

data/app/controllers/admin/current_sites_controller.rb

@@ -21,11 +21,10 @@ module Admin
     protected
     
     def new_host_if_subdomain_changed
-      host_from_site = "#{@site.subdomain}.#{Locomotive.config.default_domain}"
-      if request.host == host_from_site
+      if @site.domains.include?(request.host)
         {}
       else
-        { :host => "#{host_from_site}:#{request.port}" }
+        { :host => "#{@site.subdomain}.#{Locomotive.config.default_domain}:#{request.port}" }
       end
     end
   

data/app/controllers/admin/custom_fields_controller.rb

@@ -3,15 +3,15 @@ module Admin
    
     layout false
     
-    before_filter :set_content_type
+    before_filter :set_parent_and_fields
     
     def edit
-      @field = @content_type.content_custom_fields.find(params[:id])
+      @field = @fields.find(params[:id])
       render :action => "edit_#{@field.kind.downcase}"
     end
     
     def update
-      @field = @content_type.content_custom_fields.find(params[:id])
+      @field = @fields.find(params[:id])
       @field.updated_at = Time.now # forces mongoid to save the object
       
       params[:custom_field][:category_items_attributes].delete('-1')
@@ -25,8 +25,14 @@ module Admin
     
     protected
     
-    def set_content_type
-      @content_type = current_site.content_types.where(:slug => params[:slug]).first
+    def set_parent_and_fields
+      if params[:parent] == 'asset_collection'
+        @parent = current_site.asset_collections.where(:slug => params[:slug]).first
+        @fields = @parent.asset_custom_fields        
+      else
+        @parent = current_site.content_types.where(:slug => params[:slug]).first
+        @fields = @parent.content_custom_fields
+      end
     end
     
   end

data/app/controllers/admin/layouts_controller.rb

@@ -4,7 +4,7 @@ module Admin
     sections 'settings'
   
     def index
-      @layouts = current_site.layouts
+      @layouts = current_site.layouts.order_by([[:name, :asc]])
     end
     
     def new
@@ -22,6 +22,7 @@ module Admin
         flash_success!
         redirect_to edit_admin_layout_url(@layout)
       else
+        logger.debug "===> #{@layout.errors.inspect}"
         flash_error!
         render :action => 'new'
       end

data/app/controllers/admin/sites_controller.rb

@@ -32,17 +32,6 @@ module Admin
     
       redirect_to edit_admin_my_account_url
     end
-    
-    protected
-    
-    def new_host_if_subdomain_changed
-      host_from_site = "#{@site.subdomain}.#{Locomotive.config.default_domain}"
-      if request.host == host_from_site
-        {}
-      else
-        { :host => "#{host_from_site}:#{request.port}" }
-      end
-    end
   
   end
 end

data/app/controllers/admin/snippets_controller.rb

@@ -4,7 +4,7 @@ module Admin
     sections 'settings'
   
     def index
-      @snippets = current_site.snippets
+      @snippets = current_site.snippets.order_by([[:name, :asc]])
     end
   
     def new

data/app/controllers/application_controller.rb

@@ -1,3 +1,3 @@
-class ApplicationController < ActionController::Base
+class ApplicationController < ActionController::Base  
   protect_from_forgery
 end

data/app/helpers/admin/custom_fields_helper.rb

@@ -1,8 +1,7 @@
 module Admin::CustomFieldsHelper
     
   def options_for_field_kind(selected = nil)
-    # %w{String Text Boolean Email File Date}
-    options = %w{String Text Category}.map do |kind|
+    options = %w{String Text Category Boolean}.map do |kind|
       [t("admin.custom_fields.kind.#{kind.downcase}"), kind]
     end    
   end
@@ -21,4 +20,17 @@ module Admin::CustomFieldsHelper
     collection.map { |field| [field.label, field._name] }
   end
   
+  def options_for_group_by_field(content_type, collection_name)
+    custom_fields_collection_name = "ordered_#{collection_name.singularize}_custom_fields".to_sym
+    collection = content_type.send(custom_fields_collection_name)
+    collection.delete_if { |f| not f.category? }
+    collection.map { |field| [field.label, field._name] }
+  end
+  
+  def options_for_text_formatting
+    options = %w{none html}.map do |option|
+      [t("admin.custom_fields.text_formatting.#{option}"), option]
+    end
+  end
+  
 end

data/app/helpers/admin/pages_helper.rb

@@ -20,4 +20,14 @@ module Admin::PagesHelper
     list
   end
   
+  def options_for_page_cache_expiration
+    [
+      [t('.expiration.never'), 0],
+      [t('.expiration.hour'), 1.hour],
+      [t('.expiration.day'), 1.day],
+      [t('.expiration.week'), 1.week],
+      [t('.expiration.month'), 1.month]
+    ]
+  end
+  
 end

data/app/models/asset_collection.rb

@@ -50,7 +50,7 @@ class AssetCollection
       self.assets.find(asset_id).position = index
     end
     
-    self.assets.each do |asset|
+    self.assets.clone.each do |asset|
       if !@assets_order.split(',').include?(asset._id)
         self.assets.delete(asset) 
         asset.send(:delete)

data/app/models/content_instance.rb

@@ -15,6 +15,9 @@ class ContentInstance
   ## associations ##
   embedded_in :content_type, :inverse_of => :contents
   
+  ## callbacks ##
+  before_create :add_to_list_bottom
+  
   ## named scopes ##
   named_scope :latest_updated, :order_by => [[:updated_at, :desc]], :limit => Locomotive.config.lastest_items_nb
   
@@ -26,6 +29,11 @@ class ContentInstance
   
   protected
   
+  def add_to_list_bottom
+    Rails.logger.debug "add_to_list_bottom"
+    self._position_in_list = self.content_type.contents.size
+  end
+  
   def require_highlighted_field
     _alias = self.content_type.highlighted_field._alias.to_sym
     if self.send(_alias).blank?

data/app/models/content_type.rb

@@ -8,6 +8,7 @@ class ContentType
   field :slug
   field :order_by
   field :highlighted_field_name
+  field :group_by_field_name
   field :api_enabled, :type => Boolean, :default => false
   
   ## associations ##
@@ -28,6 +29,26 @@ class ContentType
   
   ## methods ##
   
+  def groupable?
+    self.group_by_field && group_by_field.category?
+  end
+  
+  def list_or_group_contents
+    if self.groupable?
+      groups = self.contents.klass.send(:"group_by_#{self.group_by_field._alias}", :ordered_contents)
+
+      # look for items with no category or unknown ones
+      items_without_category = self.contents.find_all { |c| !self.group_by_field.category_ids.include?(c.send(self.group_by_field_name)) }
+      if not items_without_category.empty?
+        groups << { :name => nil, :items => items_without_category }
+      else
+        groups
+      end
+    else
+      self.ordered_contents
+    end
+  end
+  
   def ordered_contents(conditions = {})
     column = self.order_by.to_sym
     
@@ -49,6 +70,10 @@ class ContentType
     self.content_custom_fields.detect { |f| f._name == self.highlighted_field_name }
   end
   
+  def group_by_field
+    @group_by_field ||= self.content_custom_fields.detect { |f| f._name == self.group_by_field_name }
+  end
+  
   protected
   
   def set_default_values

data/app/models/page.rb

@@ -12,8 +12,7 @@ class Page
   field :slug
   field :fullpath
   field :published, :type => Boolean, :default => false
-  field :keywords
-  field :description
+  field :cache_expires_in, :type => Integer, :default => 0
   
   ## associations ##
   belongs_to_related :site
@@ -36,6 +35,7 @@ class Page
   named_scope :not_found, :where => { :slug => '404', :depth => 0, :published => true }
   
   ## behaviours ##
+  # liquid_methods :title, :fullpath
   liquify_template :joined_parts
   
   ## methods ##
@@ -65,6 +65,10 @@ class Page
   def url
     "http://#{self.site.domains.first}/#{self.fullpath}.html"
   end
+  
+  def to_liquid(options = {})
+    Locomotive::Liquid::Drops::Page.new(self)
+  end
     
   protected
   

data/app/models/site.rb

@@ -6,6 +6,8 @@ class Site
   field :name
   field :subdomain
   field :domains, :type => Array, :default => []
+  field :meta_keywords
+  field :meta_description
   
   ## associations ##
   has_many_related :pages
@@ -33,7 +35,7 @@ class Site
   named_scope :match_domain_with_exclusion_of, lambda { |domain, site| { :where => { :domains => domain, :_id.ne => site.id } } }
     
   ## behaviours ##
-  liquid_methods :name
+  liquid_methods :name, :meta_keywords, :meta_description
   
   ## methods ##
 

data/app/views/admin/asset_collections/edit.html.haml

@@ -26,7 +26,7 @@
     = f.input :name
     = f.input :slug, :required => false
     
-  = render 'admin/custom_fields/index', :f => f, :collection_name => 'assets'
+  = render 'admin/custom_fields/index', :form => f, :collection_name => 'assets'
     
   = render 'admin/shared/form_actions', :delete_button => link_to(content_tag(:span, t('.destroy')), admin_asset_collection_url(@collection), :confirm => t('admin.messages.confirm'), :method => :delete, :class => 'button small remove'), :button_label => :update
   

data/app/views/admin/assets/_form.html.haml

@@ -1,14 +1,13 @@
+- content_for :head do
+  = javascript_include_tag 'admin/plugins/tiny_mce/tinymce', 'admin/plugins/json2', 'admin/plugins/fancybox', 'admin/custom_fields/category', 'admin/assets'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
+
 = f.inputs :name => :information do
   = f.input :name
   = f.input :source
 
 - unless @asset.custom_fields.empty?
-  = f.inputs :name => :other_fields do
-    - @asset.custom_fields.each do |field|
-      - if field.string?
-        = f.input field._alias.to_sym, :label => field.label
-      - elsif field.text?
-        = f.input field._alias.to_sym, :label => field.label, :as => :text
+  = render 'admin/custom_fields/custom_form', :form => f, :title => :other_fields, :parent => @collection
 
 - if @asset.image? && @asset.valid?
   = f.foldable_inputs :name => "#{t('formtastic.titles.preview')} #{image_dimensions_and_size(@asset)}", :class => 'preview' do

data/app/views/admin/content_types/_form.html.haml

@@ -7,12 +7,16 @@
   = f.input :slug
   = f.input :description
   
-= render 'admin/custom_fields/index', :f => f, :collection_name => 'contents'
+= render 'admin/custom_fields/index', :form => f, :collection_name => 'contents'
 
 - unless f.object.new_record?
-  = f.foldable_inputs :name => :options, :class => 'switchable' do
+  = f.foldable_inputs :name => :presentation, :class => 'switchable' do
     = f.input :highlighted_field_name, :as => :select, :collection => options_for_highlighted_field(f.object, 'contents'), :include_blank => false
+    = f.input :group_by_field_name, :as => :select, :collection => options_for_group_by_field(f.object, 'contents')
+
+  = f.foldable_inputs :name => :options, :class => 'switchable' do
     = f.input :order_by, :as => :select, :collection => options_for_order_by(f.object, 'contents'), :include_blank => false
     = f.custom_input :api_enabled, :css => 'toggle' do
       = f.check_box :api_enabled
+      
   

data/app/views/admin/content_types/edit.html.haml

@@ -9,9 +9,9 @@
 
 %p= t('.help')
 
-= semantic_form_for @content_type, :url => admin_content_type_url(@content_type) do |form|
+= semantic_form_for @content_type, :url => admin_content_type_url(@content_type) do |f|
 
-  = render 'form', :f => form
+  = render 'form', :f => f
   
   = render 'admin/shared/form_actions', :back_url => admin_contents_url(@content_type.slug), :button_label => :update
   

data/app/views/admin/contents/_form.html.haml

@@ -1,20 +1,5 @@
 - content_for :head do
-  = javascript_include_tag 'admin/plugins/json2', 'admin/plugins/fancybox', 'admin/custom_fields/category', 'admin/contents'
+  = javascript_include_tag 'admin/plugins/tiny_mce/tinymce', 'admin/plugins/json2', 'admin/plugins/fancybox', 'admin/custom_fields/category', 'admin/contents'
   = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
 
-- highlighted_field_name = @content.content_type.highlighted_field_name
-
-= f.inputs :name => :other_fields do
-  - @content.custom_fields.each do |field|
-    - required = highlighted_field_name == field._name
-  
-    - if field.string?
-      = f.input field._alias.to_sym, :label => field.label, :hint => field.hint, :required => required
-    - elsif field.text?
-      = f.input field._alias.to_sym, :label => field.label, :hint => field.hint, :as => :text, :required => required
-    - elsif field.category?
-      = f.custom_input field._alias.to_sym, :label => field.label, :hint => field.hint, :css => 'toggle' do
-        = f.select field._name.to_sym, field.ordered_category_items.collect { |item| [item.name, item.id] }
-        %button.button.light.edit-categories-link{ :type => 'button', :'data-url' =>  edit_admin_custom_field_path(@content_type.slug, field) }
-          %span= t('.edit_categories')
-        
+= render 'admin/custom_fields/custom_form', :form => f, :title => :attributes, :parent => @content_type

data/app/views/admin/contents/_list.html.haml

@@ -0,0 +1,16 @@
+- if contents.empty?
+  %p.no-items= t('.no_items', :url => new_admin_content_url(@content_type.slug))
+- else
+  - puts contents.inspect
+  %ul{ :id => 'contents-list', :class => "list #{'sortable' if @content_type.order_by == '_position_in_list'}" }
+    - contents.each do |content|
+      %li.content{ :id => "content-#{content._id}" }
+        %em
+        %strong
+          = link_to content.send(@content_type.highlighted_field_name), edit_admin_content_path(@content_type.slug, content)
+        .more
+          %span
+            = t('admin.contents.index.updated_at')
+          = l content.updated_at, :format => :short rescue 'n/a'
+          
+          = link_to image_tag('admin/list/icons/trash.png'), admin_content_path(@content_type.slug, content), :class => 'remove', :confirm => t('admin.messages.confirm'), :method => :delete

data/app/views/admin/contents/index.html.haml

@@ -13,21 +13,13 @@
 - if @content_type.description.present? 
   %p= @content_type.description
 
-- if @contents.empty?
-  %p.no-items= t('.no_items', :url => new_admin_content_url(@content_type.slug))
+- if @content_type.groupable?
+  - @contents.each do |group|  
+    %h3= group[:name] || t('.category_noname')
+    = render 'list', :contents => group[:items]  
+    %br
 - else
-  %ul{ :id => 'contents-list', :class => "list #{'sortable' if @content_type.order_by == '_position_in_list'}" }
-    - @contents.each do |content|
-      %li.content{ :id => "content-#{content._id}" }
-        %em
-        %strong
-          = link_to content.send(@content_type.highlighted_field_name), edit_admin_content_path(@content_type.slug, content)
-        .more
-          %span
-            = t('admin.contents.index.updated_at')
-          = l content.updated_at, :format => :short rescue 'n/a'
-          
-          = link_to image_tag('admin/list/icons/trash.png'), admin_content_path(@content_type.slug, content), :class => 'remove', :confirm => t('admin.messages.confirm'), :method => :delete
+  = render 'list', :contents => @contents
         
 = form_tag sort_admin_contents_path(@content_type.slug), :method => :put, :class => 'formtastic' do
   = hidden_field_tag :order

data/app/views/admin/current_sites/_form.html.haml

@@ -3,6 +3,11 @@
 
 = f.foldable_inputs :name => :information, :style => "#{'display: none' unless @site.new_record?}" do
   = f.input :name, :required => false
+  
+= f.foldable_inputs :name => :meta do
+
+  = f.input :meta_keywords
+  = f.input :meta_description
 
 = f.foldable_inputs :name => :access_points, :class => 'editable-list off' do
   
@@ -42,4 +47,4 @@
       %em= account.email
       - if account != current_admin
         %span.actions
-          = link_to image_tag('admin/form/icons/trash.png'), admin_membership_url(membership), :class => 'remove first', :confirm => t('admin.messages.confirm'), :method => :delete
+          = link_to image_tag('admin/form/icons/trash.png'), admin_membership_url(membership), :class => 'remove first', :confirm => t('admin.messages.confirm'), :method => :delete        

data/app/views/admin/custom_fields/_custom_form.html.haml

@@ -0,0 +1,18 @@
+- highlighted_field_name = parent.highlighted_field_name rescue ''
+
+= form.inputs :name => title || :attributes do
+  - form.object.custom_fields.each do |field|
+    - required = highlighted_field_name == field._name
+  
+    - if field.string?
+      = form.input field._alias.to_sym, :label => field.label, :hint => field.hint, :required => required
+    - elsif field.text?
+      = form.input field._alias.to_sym, :label => field.label, :hint => field.hint, :as => :text, :required => required, :input_html => { :class => field.text_formatting }
+    - elsif field.category?
+      = form.custom_input field._alias.to_sym, :label => field.label, :hint => field.hint, :css => 'toggle' do
+        = form.select field._name.to_sym, field.ordered_category_items.collect { |item| [item.name, item.id] }
+        %button.button.light.edit-categories-link{ :type => 'button', :'data-url' => edit_admin_custom_field_path(parent.model_name.underscore, parent.slug, field) }
+          %span= t('.edit_categories')
+    - elsif field.boolean?
+      = form.custom_input field._alias.to_sym, :label => field.label, :hint => field.hint, :css => 'toggle' do
+        = form.check_box field._alias.to_sym