locomotive_cms 0.0.2.5 → 0.0.2.6

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

@@ -4,6 +4,7 @@
 
     = form_tag '#', :class => 'formtastic' do
       = fields_for CustomFields::Field.new, :builder => Formtastic::SemanticFormHelper.builder do |g|
-        = g.inputs :name => :information do
+        = g.inputs :name => :attributes do
           = g.input :_alias
-          = g.input :hint
+          = g.input :hint
+          = g.input :text_formatting, :as => 'select', :collection => options_for_text_formatting, :include_blank => false

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

@@ -1,11 +1,11 @@
 - collection_name = "#{collection_name.singularize}_custom_fields"
-- custom_fields = f.object.send(collection_name.to_sym)
-- ordered_custom_fields = f.object.send(:"ordered_#{collection_name}")
+- custom_fields = form.object.send(collection_name.to_sym)
+- ordered_custom_fields = form.object.send(:"ordered_#{collection_name}")
 
-= f.foldable_inputs :name => :custom_fields, :class => 'editable-list fields' do
+= form.foldable_inputs :name => :custom_fields, :class => 'editable-list fields' do
   - ordered_custom_fields.each do |field|
-    = f.fields_for collection_name.to_sym, field, :child_index => field._index do |g|  
-      %li{ :class => "item added #{'new' if f.object.new_record?} #{'error' unless field.errors.empty?}"}
+    = form.fields_for collection_name.to_sym, field, :child_index => field._index do |g|  
+      %li{ :class => "item added #{'new' if form.object.new_record?} #{'error' unless field.errors.empty?}"}
         %span.handle
           = image_tag 'admin/form/icons/drag.png'
         
@@ -14,6 +14,8 @@
         = g.hidden_field :_alias, :class => 'alias'
         
         = g.hidden_field :hint, :class => 'hint'
+        
+        = g.hidden_field :text_formatting, :class => 'text-formatting'
       
         = g.text_field :label, :class => 'label'
       
@@ -29,7 +31,7 @@
           = link_to image_tag('admin/form/pen.png'), '#edit-custom-field', :class => 'edit first'
           = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove', :confirm => t('admin.messages.confirm')
     
-  = f.fields_for collection_name.to_sym, custom_fields.build(:label => 'field name', :_alias => ''), :child_index => '-1' do |g|   
+  = form.fields_for collection_name.to_sym, custom_fields.build(:label => 'field name', :_alias => ''), :child_index => '-1' do |g|   
     %li{ :class => 'item template' }
       %span.handle
         = image_tag 'admin/form/icons/drag.png'
@@ -39,6 +41,8 @@
       = g.hidden_field :_alias, :class => 'alias'
       
       = g.hidden_field :hint, :class => 'hint'
+      
+      = g.hidden_field :text_formatting, :class => 'text-formatting'
     
       = g.text_field :label, :class => 'string label void'
   

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

@@ -4,7 +4,7 @@
 
     %p= t('.help')
 
-    = semantic_form_for @field, :as => :custom_field, :url => admin_custom_field_url(@content_type.slug, @field) do |f|
+    = semantic_form_for @field, :as => :custom_field, :url => admin_custom_field_url(@parent.model_name.underscore, @parent.slug, @field) do |f|
       = f.foldable_inputs :name => t('.collection_label'), :class => 'editable-list off' do
         - @field.ordered_category_items.each do |item|
           = f.fields_for :category_items, item, :child_index => item._index do |g|  

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

@@ -2,7 +2,7 @@
   = f.input :name
   
 = f.inputs :name => :code do
-  = f.custom_input :value, :css => 'full', :with_label => false do
+  = f.custom_input :value, :css => 'code full', :with_label => false do
     %code{ :class => 'html' }
       = f.text_area :value
       

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

@@ -16,10 +16,7 @@
   = f.custom_input :published, :css => 'toggle' do
     = f.check_box :published
     
-= f.foldable_inputs :name => :meta do
-
-  = f.input :keywords
-  = f.input :description
+  = f.input :cache_expires_in, :as => :select, :collection => options_for_page_cache_expiration, :include_blank => false
   
 #page-parts
   .nav

data/app/views/admin/shared/menu/_contents.html.haml

@@ -7,7 +7,7 @@
       %ul
         - current_site.pages.latest_updated.each do |page|
           %li
-            = link_to truncate(page.title, :length => 30), edit_admin_page_url(page)
+            = link_to truncate(page.title, :length => 25), edit_admin_page_url(page)
             %span= time_ago_in_words(page.updated_at)
 
   - current_site.content_types.each do |content_type|

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

@@ -32,4 +32,4 @@
     %span.actions
       = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')
       %button{ :class => 'button light add', :type => 'button' }
-        %span= t('admin.buttons.new_item')
+        %span= t('admin.buttons.new_item')

data/config/locales/admin_ui_en.yml

@@ -39,12 +39,18 @@ en:
         string: Simple Input
         text: Text
         category: Select
+        boolean: Checkbox
+      text_formatting:
+        none: None
+        html: HTML
       edit_field:
         title: Edit field
       edit_category:
         title: Edit options
         help: Manage the list of options for your select box.
         collection_label: List of options
+      custom_form:
+        edit_categories: Edit options
         
     sessions:
       new:
@@ -84,8 +90,16 @@ en:
         successful_create: "Page was successfully created."
         successful_update: "Page was successfully updated."
         successful_destroy: "Page was successfully deleted."
+        successful_sort: "Pages were successfully sorted."
         failed_create: "Page was not created."
         failed_update: "Page was not updated."
+      form:
+        expiration:
+          never: Never
+          hour: 1 hour
+          day: 1 day
+          week: 1 week
+          month: 1 month
         
     layouts:
       index:
@@ -264,16 +278,16 @@ en:
         edit: edit model
         destroy: remove model
         download: download items
-        new: new item
-        no_items: "There are no items for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
+        new: new item        
+        category_noname: "No name"
         lastest_items: "Lastest items"
         updated_at: "Updated at"
+      list:
+        no_items: "There are no items for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
       new:
         title: '{{type}} &mdash; new item' 
       edit:
         title: '{{type}} &mdash; editing item'
-      form:
-        edit_categories: Edit options
       messages:
         successful_create: "Content was successfully created."
         successful_update: "Content was successfully updated."
@@ -284,7 +298,7 @@ en:
   formtastic:
     titles:
       information: General information
-      meta: Meta
+      meta: SEO Metadata
       code: Code
       credentials: Credentials
       language: Language
@@ -297,6 +311,8 @@ en:
       options: Advanced options
       custom_fields: Custom fields
       other_fields: Other information
+      presentation: Presentation
+      attributes: Attributes
     labels:
       theme_asset:
         new:
@@ -311,6 +327,8 @@ en:
       page:
         keywords: "Meta keywords used within the head tag of the page. They are separeted by an empty space. Required for SEO." 
         description: "Meta description used within the head tag of the page. Required for SEO." 
+        published: "Only authenticated accounts can view unpublished pages."
+        cache_expires_in: "Cache the page for better performance. Pressing shift-reload in the browser will regenerate the page."
       snippet:
         slug: "You need to know it in order to insert the snippet inside a page or a layout"
       site:
@@ -319,4 +337,8 @@ en:
         slug: "You do not need to add the extension file (.css or .js)"
         edit:
           source: "You can replace it by a file of the same extension"
+      custom_fields:
+        field:
+          _alias: "Property available in liquid templates"
+          hint: "Text displayed in the model form just below the field"
       

data/config/routes.rb

@@ -36,17 +36,17 @@ Rails.application.routes.draw do |map|
     
     resources :asset_collections
 
-    resources :assets, :path => "asset_collections/:collection_id/assets" 
+    resources :assets, :path => 'asset_collections/:collection_id/assets' 
     
     resources :content_types
     
-    resources :contents, :path => "content_types/:slug/contents" do
+    resources :contents, :path => 'content_types/:slug/contents' do
       put :sort, :on => :collection
     end
     
-    resources :api_contents, :path => "api/:slug/contents", :controller => 'api_contents', :only => [:create]
+    resources :api_contents, :path => 'api/:slug/contents', :controller => 'api_contents', :only => [:create]
     
-    resources :custom_fields, :path => "content_types/:slug/fields"
+    resources :custom_fields, :path => 'custom/:parent/:slug/fields'
   end
   
   # magic urls

data/lib/locomotive.rb

@@ -32,10 +32,9 @@ module Locomotive
     
     ActionMailer::Base.default_url_options[:host] = self.config.default_domain + (Rails.env.development? ? ':3000' : '')
 
-    # cookies stored in mongodb
+    # cookies stored in mongodb (mongoid_store)
     Rails.application.config.session_store :mongoid_store, {
-      :key => Locomotive.config.cookie_key,
-      :domain => ".#{Locomotive.config.default_domain}"
+      :key => Locomotive.config.cookie_key
     }
     
     # Heroku support

data/lib/locomotive/liquid/drops/base.rb

@@ -4,6 +4,8 @@ module Locomotive
     module Drops  
       class Base < ::Liquid::Drop
         
+        @@forbidden_attributes = %w{_id _version _index}
+        
         class_inheritable_reader :liquid_attributes
         write_inheritable_attribute :liquid_attributes, []
         attr_reader :source

data/lib/locomotive/liquid/drops/content.rb

@@ -2,9 +2,7 @@ module Locomotive
   module Liquid    
     module Drops  
       class Content < Base
-    
-        @@forbidden_attributes = %w{_id _version _index}
-    
+        
         def before_method(meth)
           return '' if @source.nil?
       

data/lib/locomotive/liquid/drops/contents.rb

@@ -32,6 +32,7 @@ module Locomotive
     
         def each(&block)
           @collection ||= @content_type.ordered_contents(@context['with_scope'])
+          @collection.each(&block)
         end
     
         def paginate(options = {})
@@ -53,7 +54,11 @@ module Locomotive
         
         def before_method(meth)
           klass = @content_type.contents.klass # delegate to the proxy class
-          klass.send(meth)
+          if (meth.to_s =~ /^group_by_.+$/) == 0
+            klass.send(meth, :ordered_contents)
+          else
+            klass.send(meth)
+          end
         end
       end
     end    

data/lib/locomotive/liquid/drops/page.rb

@@ -0,0 +1,19 @@
+module Locomotive  
+  module Liquid    
+    module Drops    
+      class Page < Base
+        
+        liquid_attributes << :title
+        
+        def children
+          @children ||= liquify(*@source.children)
+        end
+        
+        def fullpath
+          @fullpath ||= @source.fullpath
+        end
+        
+      end
+    end
+  end
+end

data/lib/locomotive/patches.rb

@@ -1,2 +1 @@
-# load patches for devise, ...etc
-require 'locomotive/devise/sessions_controller'
+# load patches here 

data/lib/locomotive/render.rb

@@ -8,13 +8,13 @@ module Locomotive
       protected
       
       def render_locomotive_page
-        page = locomotive_page
+        @page = locomotive_page
         
-        redirect_to application_root_url and return if page.nil?
+        redirect_to application_root_url and return if @page.nil?
         
-        output = page.render(locomotive_context)
+        output = @page.render(locomotive_context)
         
-        prepare_and_set_response(output)
+        prepare_and_set_response(output, @page.cache_expires_in || 0)
       end
             
       def locomotive_page
@@ -35,6 +35,7 @@ module Locomotive
       def locomotive_context
         assigns = {
           'site'              => current_site,
+          'page'              => @page,
           'asset_collections' => Locomotive::Liquid::Drops::AssetCollections.new(current_site),
           'stylesheets'       => Locomotive::Liquid::Drops::Stylesheets.new(current_site),
           'javascripts'       => Locomotive::Liquid::Drops::Javascripts.new(current_site),
@@ -42,13 +43,14 @@ module Locomotive
           'current_page'      => self.params[:page]
         }
         
-        registers = { :controller => self, :site => current_site }
+        registers = { :controller => self, :site => current_site, :page => @page }
           
         ::Liquid::Context.new(assigns, registers)
       end
       
-      def prepare_and_set_response(output)
-        response.headers["Content-Type"] = 'text/html; charset=utf-8'
+      def prepare_and_set_response(output, cache_expiration = 0)
+        response.headers['Cache-Control'] = "public, max-age=#{cache_expiration}" if cache_expiration > 0
+        response.headers['Content-Type'] = 'text/html; charset=utf-8'
         render :text => output, :layout => false, :status => :ok
       end      
       

data/lib/locomotive/routing/default_constraint.rb

@@ -1,16 +1,11 @@
 module Locomotive
-  
   module Routing
-  
     class DefaultConstraint
    
       def self.matches?(request)
         domain, subdomain = domain_and_subdomain(request)
         subdomain = 'www' if subdomain.blank?
         
-        # puts "domain = #{domain} / #{Locomotive.config.default_domain.inspect}"
-        # puts "subdomain = #{subdomain} / #{Locomotive.config.reserved_subdomains.inspect}"
-        
         domain == Locomotive.config.default_domain && Locomotive.config.reserved_subdomains.include?(subdomain)
       end
       
@@ -38,8 +33,7 @@ module Locomotive
         parts = request.host.split('.')
         parts[0..-(tld_length+2)]
       end
-    end
-    
-  end
-  
+      
+    end    
+  end  
 end

data/lib/locomotive/routing/site_dispatcher.rb

@@ -1,17 +1,13 @@
 module Locomotive
-  
-  module Routing
-  
+  module Routing  
     module SiteDispatcher
     
-      def self.included(base)
-        base.class_eval do
-          include Locomotive::Routing::SiteDispatcher::InstanceMethods
+      extend ActiveSupport::Concern
+    
+      included do
+        before_filter :fetch_site
         
-          before_filter :fetch_site
-          
-          helper_method :current_site
-        end
+        helper_method :current_site
       end
 
       module InstanceMethods
@@ -42,8 +38,6 @@ module Locomotive
         
       end
     
-    end
-  
-  end
-  
+    end  
+  end  
 end

data/public/javascripts/admin/application.js

@@ -43,6 +43,17 @@ var addCodeMirrorEditor = function(type, el, parser) {
 	CodeMirrorEditors.push({ 'el': el, 'editor': editor });
 }
 
+/* ___ tinyMCE ___ */
+
+var TinyMceDefaultSettings = {
+	script_url : '/javascripts/admin/plugins/tiny_mce/tiny_mce.js',
+	theme : 'advanced',
+	skin : 'locomotive',
+	theme_advanced_buttons1 : 'code,|,bold,italic,|,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,formatselect,fontselect,fontsizeselect',
+	theme_advanced_buttons2 : '',
+	theme_advanced_buttons3 : ''
+};
+
 /* ___ global ___ */
 
 $(document).ready(function() {
@@ -61,8 +72,8 @@ $(document).ready(function() {
 		$('#submenu > ul > li.' + css).addClass('on');
 	
 	// form
-	$('.formtastic li input, .formtastic li textarea').focus(function() {
-		$('.formtastic li.error p.inline-errors').fadeOut(200);
+	$('.formtastic li input, .formtastic li textarea, .formtastic li code').focus(function() {		
+		$('.formtastic li.error:not(.code) p.inline-errors').fadeOut(200);
 		if ($(this).parent().hasClass('error')) {
 			$(this).nextAll('p.inline-errors').show();
 		}				

data/public/javascripts/admin/asset_collections.js

@@ -47,4 +47,5 @@ $(document).ready(function() {
 		e.preventDefault();
 		e.stopPropagation();
 	});
+
 });

data/public/javascripts/admin/assets.js

@@ -0,0 +1,5 @@
+$(document).ready(function() {
+	
+	$('textarea.html').tinymce(TinyMceDefaultSettings);
+	
+});