locomotive_cms 0.0.1.4 → 0.0.2

data/Gemfile

@@ -9,15 +9,17 @@ gem "bson_ext", ">= 1.0.1"
 gem "mongo_ext"
 gem "mongoid", ">= 2.0.0.beta6" 
 gem "mongoid_acts_as_tree", ">= 0.1.2"
+gem "mongo_session_store", "2.0.0.pre"
 gem "warden"
-gem "devise", ">= 1.1.rc0"
-gem "haml", ">= 3.0.1"
+gem "devise", ">= 1.1.rc1"
+gem "haml", "3.0.1"
 gem "rmagick", "2.12.2"
 gem "aws"
 gem "jeweler"
 gem "mimetype-fu", :require => "mimetype_fu"
 gem "formtastic-rails3", :require => "formtastic"
 gem "carrierwave-rails3", :require => "carrierwave"
+gem "actionmailer-with-request", :require => 'actionmailer_with_request'
 
 # Development environment
 group :development do

data/app/controllers/admin/api_contents_controller.rb

@@ -0,0 +1,30 @@
+module Admin
+  class ApiContentsController < ActionController::Base
+  
+    include Locomotive::Routing::SiteDispatcher
+    
+    before_filter :require_site
+    
+    before_filter :set_content_type
+  
+    def create
+      @content = @content_type.contents.build(params[:content])
+
+      respond_to do |format|
+        if @content.save
+          format.json { render :json => { :content => @content } }
+        else
+          format.json { render :json => { :content => @content, :errors => @content.errors } }
+        end
+      end
+    end
+    
+    protected
+  
+    def set_content_type
+      @content_type = current_site.content_types.where(:slug => params[:slug]).first      
+      render :json => { :error => 'Api not enabled'} and return false unless @content_type.api_enabled
+    end
+  
+  end
+end

data/app/controllers/admin/base_controller.rb

@@ -5,7 +5,7 @@ module Admin
   
     layout 'admin/application'
   
-    before_filter :authenticate_account!
+    before_filter :authenticate_admin!
       
     before_filter :require_site
     
@@ -48,7 +48,7 @@ module Admin
     end
   
     def set_locale
-      I18n.locale = current_account.locale
+      I18n.locale = current_admin.locale
     end
   
   end

data/app/controllers/admin/content_types_controller.rb

@@ -45,7 +45,7 @@ module Admin
         flash[:error] = e.to_s
       end
 
-      redirect_to admin_content_types_url
+      redirect_to admin_pages_url
     end
       
   end

data/app/controllers/admin/custom_fields_controller.rb

@@ -0,0 +1,33 @@
+module Admin
+  class CustomFieldsController < BaseController
+   
+    layout false
+    
+    before_filter :set_content_type
+    
+    def edit
+      @field = @content_type.content_custom_fields.find(params[:id])
+      render :action => "edit_#{@field.kind.downcase}"
+    end
+    
+    def update
+      @field = @content_type.content_custom_fields.find(params[:id])
+      @field.updated_at = Time.now # forces mongoid to save the object
+      
+      params[:custom_field][:category_items_attributes].delete('-1')
+      
+      if @field.update_attributes(params[:custom_field])
+        render :json => @field.attributes
+      else
+        render :json => { :error => translate_flash_msg(:successful) }
+      end
+    end
+    
+    protected
+    
+    def set_content_type
+      @content_type = current_site.content_types.where(:slug => params[:slug]).first
+    end
+    
+  end
+end

data/app/controllers/admin/my_accounts_controller.rb

@@ -4,11 +4,11 @@ module Admin
     sections 'settings', 'account'
     
     def edit
-      @account = current_account
+      @account = current_admin
     end
     
     def update
-      @account = current_account
+      @account = current_admin
       if @account.update_attributes(params[:account])
         flash_success!      
         redirect_to edit_admin_my_account_url

data/app/controllers/admin/sites_controller.rb

@@ -11,7 +11,7 @@ module Admin
       @site = Site.new(params[:site])
 
       if @site.save
-        @site.memberships.create :account => @current_account, :admin => true
+        @site.memberships.create :account => @current_admin, :admin => true
         flash_success!
         redirect_to edit_admin_my_account_url
       else
@@ -21,7 +21,7 @@ module Admin
     end
   
     def destroy
-      @site = current_account.sites.detect { |s| s._id == params[:id] }
+      @site = current_admin.sites.detect { |s| s._id == params[:id] }
     
       if @site != current_site
         @site.destroy

data/app/helpers/admin/accounts_helper.rb

@@ -1,7 +1,7 @@
 module Admin::AccountsHelper
   
   def admin_on?(site = current_site)
-    site.memberships.detect { |a| a.admin? && a.account == current_account }
+    site.memberships.detect { |a| a.admin? && a.account == current_admin }
   end
   
 end

data/app/helpers/admin/custom_fields_helper.rb

@@ -2,7 +2,7 @@ module Admin::CustomFieldsHelper
     
   def options_for_field_kind(selected = nil)
     # %w{String Text Boolean Email File Date}
-    options = %w{String Text}.map do |kind|
+    options = %w{String Text Category}.map do |kind|
       [t("admin.custom_fields.kind.#{kind.downcase}"), kind]
     end    
   end

data/app/models/asset.rb

@@ -1,10 +1,11 @@
 class Asset 
   
   include Mongoid::Document
-  include Mongoid::Timestamps
+  include Mongoid::Timestamps    
   
   ## Extensions ##  
   include Models::Extensions::Asset::Vignette
+  include CustomFields::ProxyClassEnabler
   
   ## fields ##
   field :name, :type => String

data/app/models/asset_collection.rb

@@ -3,8 +3,8 @@ class AssetCollection
   include Locomotive::Mongoid::Document
   
   ## fields ##
-  field :name, :type => String
-  field :slug, :type => String  
+  field :name
+  field :slug
   
   ## associations ##
   belongs_to_related :site

data/app/models/content_instance.rb

@@ -3,6 +3,9 @@ class ContentInstance
   include Mongoid::Document
   include Mongoid::Timestamps
   
+  ## extensions ##
+  include CustomFields::ProxyClassEnabler
+  
   ## fields (dynamic fields) ##
   field :_position_in_list, :type => Integer, :default => 0
   
@@ -17,6 +20,10 @@ class ContentInstance
   
   ## methods ##
   
+  def to_liquid
+    Locomotive::Liquid::Drops::Content.new(self)
+  end
+  
   protected
   
   def require_highlighted_field

data/app/models/content_type.rb

@@ -8,6 +8,7 @@ class ContentType
   field :slug
   field :order_by
   field :highlighted_field_name
+  field :api_enabled, :type => Boolean, :default => false
   
   ## associations ##
   belongs_to_related :site

data/app/models/page_part.rb

@@ -3,11 +3,11 @@ class PagePart
   include Mongoid::Document
 
   ## fields ##
-  field :name, :type => String
-  field :slug, :type => String
-  field :value, :type => String
+  field :name
+  field :slug
+  field :value
   field :disabled, :type => Boolean, :default => false
-  field :value, :type => String
+  field :value
     
   ## associations ##
   embedded_in :page, :inverse_of => :parts

data/app/models/site.rb

@@ -4,7 +4,7 @@ class Site
   
   ## fields ##
   field :name
-  field :subdomain, :type => String
+  field :subdomain
   field :domains, :type => Array, :default => []
   
   ## associations ##

data/app/models/theme_asset.rb

@@ -53,6 +53,8 @@ class ThemeAsset
   end
   
   def performing_plain_text?
+    return true if !self.new_record? && !self.image? && self.errors.empty?
+    
     !(self.performing_plain_text.blank? || self.performing_plain_text == 'false' || self.performing_plain_text == false)
   end
   

data/app/uploaders/asset_uploader.rb

@@ -35,8 +35,8 @@ class AssetUploader < CarrierWave::Uploader::Base
     self.class.content_types.each_pair do |type, rules|
       rules.each do |rule|
         case rule
-        when String then value = type if file.content_type == rule
-        when Regexp then value = type if (file.content_type =~ rule) == 0
+        when String then value = type if content_type == rule
+        when Regexp then value = type if (content_type =~ rule) == 0
         end
       end
     end

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

@@ -1,7 +1,8 @@
 - title link_to(@collection.name.blank? ? @collection.name_was : @collection.name, '#', :rel => 'asset_collection_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :head do
-  = javascript_include_tag 'admin/asset_collections', 'admin/custom_fields'
+  = javascript_include_tag 'admin/plugins/fancybox', 'admin/asset_collections', 'admin/custom_fields'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
 
 - content_for :submenu do
   = render 'admin/shared/menu/assets'
@@ -25,6 +26,8 @@
     = f.input :name
     = f.input :slug, :required => false
     
-  = render 'admin/shared/custom_fields', :f => f, :collection_name => 'assets'
+  = render 'admin/custom_fields/index', :f => 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
+  = 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
+  
+= render 'admin/custom_fields/edit_field'

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

@@ -1,13 +1,18 @@
 - content_for :head do
-  = javascript_include_tag 'admin/custom_fields'
+  = javascript_include_tag 'admin/plugins/fancybox', 'admin/custom_fields'
+  = stylesheet_link_tag 'admin/plugins/fancybox', 'admin/box'
 
 = f.inputs :name => :information do
   = f.input :name
   = f.input :slug
   = f.input :description
   
-= render 'admin/shared/custom_fields', :f => f, :collection_name => 'contents'
+= render 'admin/custom_fields/index', :f => f, :collection_name => 'contents'
 
-= f.foldable_inputs :name => :options, :class => 'switchable' do
-  = f.input :highlighted_field_name, :as => :select, :collection => options_for_highlighted_field(f.object, 'contents'), :include_blank => false
-  = f.input :order_by, :as => :select, :collection => options_for_order_by(f.object, 'contents'), :include_blank => false
+- unless f.object.new_record?
+  = f.foldable_inputs :name => :options, :class => 'switchable' do
+    = f.input :highlighted_field_name, :as => :select, :collection => options_for_highlighted_field(f.object, 'contents'), :include_blank => false
+    = 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

@@ -13,4 +13,6 @@
 
   = render 'form', :f => form
   
-  = render 'admin/shared/form_actions', :back_url => admin_contents_url(@content_type.slug), :button_label => :update
+  = render 'admin/shared/form_actions', :back_url => admin_contents_url(@content_type.slug), :button_label => :update
+  
+= render 'admin/custom_fields/edit_field'

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

@@ -13,3 +13,5 @@
   = render 'form', :f => f
   
   = render 'admin/shared/form_actions', :back_url => admin_pages_url, :button_label => :create
+
+= render 'admin/custom_fields/edit_field'

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

@@ -1,3 +1,7 @@
+- content_for :head do
+  = javascript_include_tag '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
@@ -5,6 +9,12 @@
     - required = highlighted_field_name == field._name
   
     - if field.string?
-      = f.input field._alias.to_sym, :label => field.label, :required => required
+      = 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, :as => :text, :required => required
+      = 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')
+        

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

@@ -40,6 +40,6 @@
     %li{ :class => "item #{'last' if index == @site.memberships.size - 1}" }
       %strong= account.name
       %em= account.email
-      - if account != current_account
+      - 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

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

@@ -0,0 +1,9 @@
+.box-wrapper
+  #edit-custom-field
+    %h2= t('.title')
+
+    = form_tag '#', :class => 'formtastic' do
+      = fields_for CustomFields::Field.new, :builder => Formtastic::SemanticFormHelper.builder do |g|
+        = g.inputs :name => :information do
+          = g.input :_alias
+          = g.input :hint

data/app/views/admin/{shared/_custom_fields.html.haml → custom_fields/_index.html.haml}

@@ -10,6 +10,10 @@
           = image_tag 'admin/form/icons/drag.png'
         
         = g.hidden_field :position, :class => 'position'
+        
+        = g.hidden_field :_alias, :class => 'alias'
+        
+        = g.hidden_field :hint, :class => 'hint'
       
         = g.text_field :label
       
@@ -22,14 +26,19 @@
          
       
         %span.actions
-          = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')
+          = 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'), :child_index => '-1' do |g|   
+  = f.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'
     
       = g.hidden_field :position, :class => 'position'
+      
+      = g.hidden_field :_alias, :class => 'alias'
+      
+      = g.hidden_field :hint, :class => 'hint'
     
       = g.text_field :label, :class => 'string label void'
   
@@ -42,6 +51,7 @@
        
   
       %span.actions
-        = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')
+        = 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')
         %button{ :class => 'button light add', :type => 'button' }
-          %span= t('admin.buttons.new_item')
+          %span= t('admin.buttons.new_item')        

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

@@ -0,0 +1,43 @@
+#edit-custom-field-category
+  .inner
+    %h2= t('.title')
+
+    %p= t('.help')
+
+    = semantic_form_for @field, :as => :custom_field, :url => admin_custom_field_url(@content_type.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|  
+            %li{ :class => "item added #{'error' unless item.errors.empty?}"}
+              %span.handle
+                = image_tag 'admin/form/icons/drag.png'
+  
+              = g.hidden_field :position, :class => 'position'
+  
+              = g.text_field :name
+  
+               
+  
+              %span.actions
+                = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove', :confirm => t('admin.messages.confirm')
+  
+        = f.fields_for :category_items, @field.category_items.build, :child_index => '-1' do |g|   
+          %li{ :class => 'item template' }
+            %span.handle
+              = image_tag 'admin/form/icons/drag.png'
+  
+            = g.hidden_field :position, :class => 'position'
+  
+            = g.text_field :name, :class => 'string name'
+  
+             
+  
+            %span.actions
+              = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove', :confirm => t('admin.messages.confirm')
+              %button{ :class => 'button light add', :type => 'button' }
+                %span= t('admin.buttons.new_item')
+              
+  .popup-actions
+    %p
+      %button.button.light{ :type => 'button' }
+        %span= t('admin.shared.form_actions.update')

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

@@ -6,7 +6,7 @@
   
   = f.input :title
   
-  = f.input :layout_id, :as => :select, :collection => current_site.layouts.all, :input_html => { :data_url => admin_layout_page_parts_url('_id_to_replace_') }
+  = f.input :layout_id, :as => :select, :collection => current_site.layouts.all.to_a, :input_html => { :data_url => admin_layout_page_parts_url('_id_to_replace_') }
   
   - if not @page.index? and not @page.not_found?
     = f.input :parent_id, :as => :select, :collection => parent_pages_options, :include_blank => false

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

@@ -1,6 +1,6 @@
 - title t('.title')
 
-= semantic_form_for(resource, :as => resource_name, :url => password_path, :html => { :method => :put }) do |f|
+= semantic_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
 
   = f.hidden_field :reset_password_token
 
@@ -12,7 +12,7 @@
       = f.input :password_confirmation, :label => t('.password_confirmation'), :required => false
   
     %p.link
-      = link_to t('.link'), new_account_session_path
+      = link_to t('.link'), new_admin_session_path
         
   .footer
     = login_button_tag t('admin.buttons.change_password')

data/app/views/admin/passwords/new.html.haml

@@ -1,6 +1,6 @@
 - title t('.title')
 
-= semantic_form_for(resource, :as => resource_name, :url => password_path) do |f|
+= semantic_form_for(resource, :as => resource_name, :url => password_path(resource_name)) do |f|
   
   = f.hidden_field :reset_password_token
   
@@ -11,7 +11,7 @@
       = f.input :email, :label => t('.email'), :required => false
     
     %p.link
-      = link_to t('.link'), new_account_session_path
+      = link_to t('.link'), new_admin_session_path
         
   .footer
     = login_button_tag t('admin.buttons.send_password')

data/app/views/admin/sessions/new.html.haml

@@ -9,7 +9,7 @@
       = f.input :password, :label => t('.password'), :required => false
 
     %p.link
-      = link_to t('.link'), new_password_path
+      = link_to t('.link'), new_admin_password_path
         
   .footer
     = login_button_tag t('admin.buttons.login')

data/app/views/admin/shared/_head.html.haml

@@ -10,7 +10,7 @@
   
 = stylesheet_link_tag 'admin/layout', 'admin/plugins/toggle', 'admin/menu', 'admin/buttons', 'admin/formtastic', 'admin/formtastic_changes', 'admin/application', :media => 'screen', :cache => Rails.env.production?
 
-= javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/application', :cache => Rails.env.production?
+= javascript_include_tag 'admin/jquery', 'admin/jquery.ui', 'admin/rails', 'admin/utils', 'admin/plugins/toggle', 'admin/plugins/growl', 'admin/plugins/cookie', 'admin/application', :cache => Rails.env.production?
 
 %script{ :type => 'text/javascript' }
   = find_and_preserve(growl_message)

data/app/views/admin/shared/_header.html.haml

@@ -1,8 +1,8 @@
 %h1= link_to current_site.name, '#'
 
 #global-actions-bar
-  = t('.welcome', :name => link_to(current_account.name, edit_admin_my_account_url))
+  = t('.welcome', :name => link_to(current_admin.name, edit_admin_my_account_url))
   %span= '|'
   = link_to t('.see'), main_site_url
   %span= '|'
-  = link_to t('.logout'), destroy_account_session_url, :confirm => t('admin.messages.confirm')
+  = link_to t('.logout'), destroy_admin_session_url, :confirm => t('admin.messages.confirm')

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

@@ -24,7 +24,7 @@
       %span.actions
         = link_to image_tag('admin/form/icons/trash.png'), '#', :class => 'remove first', :confirm => t('admin.messages.confirm')
         
-  %li.item.new
+  %li.item.template
     %em
       http://
     = text_field_tag 'label', t('formtastic.hints.site.domain_name'), :class => 'string label void'

data/app/views/admin/theme_assets/images.html.haml

@@ -6,10 +6,10 @@
   
   - if @image_assets.empty?
     %p.no-items= t('.no_items')
-  - else
-    %ul.assets
-      = render 'asset', :asset => current_site.theme_assets.build, :edit => false
-      
-      = render :partial => 'asset', :collection => @image_assets, :locals => { :per_row => 3, :edit => false }
-      
-      %li.clear
+
+  %ul.assets
+    = render 'asset', :asset => current_site.theme_assets.build, :edit => false
+    
+    = render :partial => 'asset', :collection => @image_assets, :locals => { :per_row => 3, :edit => false }
+    
+    %li.clear

data/app/views/devise/mailer/reset_password_instructions.html.haml

@@ -5,7 +5,7 @@
 %p
   Someone has requested a link to change your password, and you can do this through the link below.
 %p
-  = link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
+  = link_to 'Change my password', edit_admin_password_url(@resource, :reset_password_token => @resource.reset_password_token)
 %p
   If you didn't request this, please ignore this email.
 %p

data/config/application.rb

@@ -40,10 +40,11 @@ module Locomotive
     #   g.template_engine :erb
     #   g.test_framework  :test_unit, :fixture => true
     # end
+    
+    # Configure the default encoding used in templates for Ruby 1.9.
+    config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters << :password    
-    
-    config.secret_token = '968a457262807c64e3ed5609882e17a774b917f5bcf2d308bd37eac4ba4d416d5692e6b13d77523fddb94c1dd603f160db8492b86b5e0203240bf339fe2aeae4'
+    config.filter_parameters << :password
   end
 end

data/config/boot.rb

@@ -1,17 +1,6 @@
-# Use Bundler (preferred)
-begin
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  require 'rubygems'
+require 'rubygems'
+# Set up gems listed in the Gemfile.
+if File.exist?(File.expand_path('../../Gemfile', __FILE__))
   require 'bundler'
   Bundler.setup
-
-  # To use 2.x style vendor/rails and RubyGems
-  #
-  # vendor_rails = File.expand_path('../../vendor/rails', __FILE__)
-  # if File.exist?(vendor_rails)
-  #   Dir["#{vendor_rails}/*/lib"].each { |path| $:.unshift(path) }
-  # end
-  #
-  # require 'rubygems'
 end

data/config/initializers/locomotive.rb

@@ -4,4 +4,5 @@ require File.dirname(__FILE__) + '/../../lib/core_ext.rb'
 Locomotive.configure do |config|
   config.default_domain = 'example.com'
   config.lastest_items_nb = 5
+  config.enable_logs = true
 end