locomotive_cms 0.0.2.9 → 0.0.3.1

data/app/models/page_part.rb

@@ -11,10 +11,7 @@ class PagePart
     
   ## associations ##
   embedded_in :page, :inverse_of => :parts
-  
-  ## callbacks ##
-  # before_validate  { |p| p.slug ||= p.name.slugify if p.name.present? }  
-  
+    
   ## validations ##
   validates_presence_of :name, :slug
   

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

@@ -1,5 +1,5 @@
 %li{ :id => "asset-#{asset.id}", :class => "asset #{'last' if (asset_counter + 1) % 6 == 0}"}
-  %h4= link_to truncate(asset.name, :length => 22), edit_admin_asset_path(@collection, asset)
+  %h4= link_to truncate(asset.name, :length => 22), edit_admin_asset_path(@asset_collection, asset)
   .image
     .inside
       = vignette_tag(asset)

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

@@ -1,4 +1,4 @@
-- title link_to(@collection.name.blank? ? @collection.name_was : @collection.name, '#', :rel => 'asset_collection_name', :title => t('.ask_for_name'), :class => 'editable')
+- title link_to(@asset_collection.name.blank? ? @asset_collection.name_was : @asset_collection.name, '#', :rel => 'asset_collection_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :head do
   = javascript_include_tag 'admin/plugins/fancybox', 'admin/asset_collections', 'admin/custom_fields'
@@ -10,16 +10,16 @@
 %p= t('.help')
 
 - content_for :buttons do
-  = admin_button_tag :add_asset, new_admin_asset_url(@collection), :class => 'add'
+  = admin_button_tag :add_asset, new_admin_asset_url(@asset_collection), :class => 'new'
   
-%p.no-items{ :style => "#{'display: none' unless @collection.assets.empty? }" }
-  = t('.no_items', :url => new_admin_asset_url(@collection))
+%p.no-items{ :style => "#{'display: none' unless @asset_collection.assets.empty? }" }
+  = t('.no_items', :url => new_admin_asset_url(@asset_collection))
     
 %ul#assets.assets.sortable
-  = render :partial => 'asset', :collection => @collection.ordered_assets
+  = render :partial => 'asset', :collection => @asset_collection.ordered_assets
   %li.clear
   
-= semantic_form_for @collection, :url => admin_asset_collection_url(@collection), :html => { :multipart => true } do |f|
+= semantic_form_for @asset_collection, :url => admin_asset_collection_url(@asset_collection), :html => { :multipart => true } do |f|
   = f.hidden_field :assets_order
   
   = f.foldable_inputs :name => :options do
@@ -28,6 +28,6 @@
     
   = 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
+  = render 'admin/shared/form_actions', :delete_button => link_to(content_tag(:em, escape_once(' ')) + t('.destroy'), admin_asset_collection_url(@asset_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/asset_collections/new.html.haml

@@ -8,7 +8,7 @@
 
 %p= t('.help')
 
-= semantic_form_for @collection, :url => admin_asset_collections_url do |f|
+= semantic_form_for @asset_collection, :url => admin_asset_collections_url do |f|
 
   = f.inputs :name => :information do
     = f.input :name

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

@@ -7,7 +7,7 @@
   = f.input :source
 
 - unless @asset.custom_fields.empty?
-  = render 'admin/custom_fields/custom_form', :form => f, :title => :other_fields, :parent => @collection
+  = render 'admin/custom_fields/custom_form', :form => f, :title => :other_fields, :parent => @asset_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/assets/edit.html.haml

@@ -4,12 +4,12 @@
   = render 'admin/shared/menu/assets'
 
 - content_for :buttons do
-  = admin_button_tag t('admin.asset_collections.edit.add_asset'), new_admin_asset_url(@collection), :class => 'add'
+  = admin_button_tag t('admin.asset_collections.edit.add_asset'), new_admin_asset_url(@asset_collection), :class => 'new'
 
 %p= t('.help')
 
-= semantic_form_for @asset, :url => admin_asset_url(@collection, @asset), :html => { :multipart => true } do |form|
+= semantic_form_for @asset, :url => admin_asset_url(@asset_collection, @asset), :html => { :multipart => true, :class => 'save-with-shortcut' } do |form|
 
   = render 'form', :f => form
 
-  = render 'admin/shared/form_actions', :back_url => edit_admin_asset_collection_url(@collection), :button_label => :update
+  = render 'admin/shared/form_actions', :back_url => edit_admin_asset_collection_url(@asset_collection), :button_label => :update

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

@@ -5,8 +5,8 @@
 
 %p= t('.help')
 
-= semantic_form_for @asset, :url => admin_assets_url(@collection), :html => { :multipart => true } do |form|
+= semantic_form_for @asset, :url => admin_assets_url(@asset_collection), :html => { :multipart => true } do |form|
 
   = render 'form', :f => form
   
-  = render 'admin/shared/form_actions', :back_url => edit_admin_asset_collection_url(@collection), :button_label => :create
+  = render 'admin/shared/form_actions', :back_url => edit_admin_asset_collection_url(@asset_collection), :button_label => :create

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

@@ -5,7 +5,7 @@
 
 - content_for :buttons do
   = admin_button_tag :show_items, admin_contents_url(@content_type.slug), :class => 'show'
-  = admin_button_tag :new_item, new_admin_content_url(@content_type.slug), :class => 'show'
+  = admin_button_tag :new_item, new_admin_content_url(@content_type.slug), :class => 'new'
 
 %p= t('.help')
 

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

@@ -9,7 +9,7 @@
 
 %p= @content_type.description
 
-= semantic_form_for @content, :url => admin_content_url(@content_type.slug, @content), :html => { :multipart => true } do |form|
+= semantic_form_for @content, :as => :content, :url => admin_content_url(@content_type.slug, @content), :html => { :multipart => true, :class => 'save-with-shortcut' } do |form|
 
   = render 'form', :f => form
 

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

@@ -24,4 +24,4 @@
 = form_tag sort_admin_contents_path(@content_type.slug), :method => :put, :class => 'formtastic' do
   = hidden_field_tag :order
 
-  = render 'admin/shared/form_actions', :delete_button => link_to(content_tag(:span, t('.destroy')), admin_content_type_url(@content_type), :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(:em, escape_once(' ')) + t('.destroy'), admin_content_type_url(@content_type), :confirm => t('admin.messages.confirm'), :method => :delete, :class => 'button small remove'), :button_label => :update

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

@@ -8,7 +8,7 @@
   
 %p= @content_type.description
 
-= semantic_form_for @content, :url => admin_contents_url(@content_type.slug), :html => { :multipart => true } do |form|
+= semantic_form_for @content, :as => :content, :url => admin_contents_url(@content_type.slug), :html => { :multipart => true } do |form|
 
   = render 'form', :f => form
   

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

@@ -1,14 +1,14 @@
-- title link_to(@site.name.blank? ? @site.name_was : @site.name, '#', :rel => 'site_name', :title => t('.ask_for_name'), :class => 'editable')
+- title link_to(@site.name.blank? ? @site.name_was : @site.name, '#', :rel => 'current_site_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
-  = admin_button_tag t('.new_membership'), new_admin_membership_url, :class => 'add'
+  = admin_button_tag t('.new_membership'), new_admin_membership_url, :class => 'new'
 
 %p= t('.help')
 
-= semantic_form_for @site, :url => admin_current_site_url do |f|
+= semantic_form_for @site, :as => :current_site, :url => admin_current_site_url, :html => { :class => 'save-with-shortcut' } do |f|
 
   = render 'form', :f => f
       

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

@@ -7,11 +7,11 @@
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
-  = admin_button_tag :new, new_admin_layout_url, :class => 'add'
+  = admin_button_tag :new, new_admin_layout_url, :class => 'new'
 
 %p= t('.help')
 
-= semantic_form_for @layout, :url => admin_layout_url(@layout) do |form|
+= semantic_form_for @layout, :url => admin_layout_url(@layout), :html => { :class => 'save-with-shortcut' } do |form|
 
   = render 'form', :f => form
 

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

@@ -4,7 +4,7 @@
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
-  = admin_button_tag :new, new_admin_layout_url, :class => 'add'
+  = admin_button_tag :new, new_admin_layout_url, :class => 'new'
 
 %p= t('.help')
 

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

@@ -1,14 +1,14 @@
-- title link_to(@account.name.blank? ? @account.name_was : @account.name, '#', :rel => 'account_name', :title => t('.ask_for_name'), :class => 'editable')
+- title link_to(@account.name.blank? ? @account.name_was : @account.name, '#', :rel => 'my_account_name', :title => t('.ask_for_name'), :class => 'editable')
 
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
-  = admin_button_tag t('.new_site'), new_admin_site_url, :class => 'add'
+  = admin_button_tag t('.new_site'), new_admin_site_url, :class => 'new'
 
 %p= t('.help')
 
-= semantic_form_for @account, :url => admin_my_account_url do |f|
+= semantic_form_for @account, :as => :my_account, :url => admin_my_account_url, :html => { :class => 'save-with-shortcut' } do |f|
 
   = f.foldable_inputs :name => :information, :style => 'display: none' do
     = f.input :name

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

@@ -8,7 +8,7 @@
 
 %p= t('.help')
 
-= semantic_form_for @page, :url => admin_page_url(@page) do |form|
+= semantic_form_for @page, :url => admin_page_url(@page), :html => { :class => 'save-with-shortcut' } do |form|
 
   = render 'form', :f => form
   

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

@@ -7,7 +7,7 @@
   = render 'admin/shared/menu/contents'
 
 - content_for :buttons do
-  = admin_button_tag :new, new_admin_page_url, :class => 'add'
+  = admin_button_tag :new, new_admin_page_url, :class => 'new'
 
 %p= t('.help')
 

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

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

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

@@ -1,6 +1,6 @@
 %ul
-  - @collections.each do |c|
-    %li{ :class => "#{'on' if @collection.id == c.id}" }
+  - @asset_collections.each do |c|
+    %li{ :class => "#{'on' if @asset_collection.id == c.id}" }
       = link_to content_tag(:span, truncate(c.name, :length => 20)), edit_admin_asset_collection_url(c)
 
 .action

data/app/views/admin/sitemaps/show.xml.builder

@@ -0,0 +1,18 @@
+xml.instruct!
+xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
+
+  xml.url do
+    xml.loc "http://#{@host}"
+    xml.priority 1.0
+  end
+
+  @pages.each do |page|
+    if not page.index_or_not_found?
+      xml.url do
+        xml.loc page_main_url(page)
+        xml.priority 0.9
+      end
+    end
+  end
+
+end

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

@@ -4,11 +4,11 @@
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
-  = admin_button_tag t('admin.snippets.index.new'), new_admin_snippet_url, :class => 'add'
+  = admin_button_tag t('admin.snippets.index.new'), new_admin_snippet_url, :class => 'new'
 
 %p= t('.help')
 
-= semantic_form_for @snippet, :url => admin_snippet_url(@snippet) do |form|
+= semantic_form_for @snippet, :url => admin_snippet_url(@snippet), :html => { :class => 'save-with-shortcut' } do |form|
 
   = render 'form', :f => form
 

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

@@ -4,7 +4,7 @@
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
-  = admin_button_tag :new, new_admin_snippet_url, :class => 'add'
+  = admin_button_tag :new, new_admin_snippet_url, :class => 'new'
 
 %p= t('.help')
 

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

@@ -4,26 +4,26 @@
 
 = f.hidden_field :performing_plain_text
 
-#file-selector{ :class => "selector #{'hidden' if @asset.performing_plain_text?}" }
+#file-selector{ :class => "selector #{'hidden' if @theme_asset.performing_plain_text?}" }
   = f.inputs :name => :information do
     = f.input :source
 
-  - if @asset.new_record? || !@asset.image?
+  - if @theme_asset.new_record? || !@theme_asset.image?
     %span.alt
       = t('admin.theme_assets.form.choose_plain_text')
 
-- if allow_plain_text_editing?(@asset)
-  #text-selector{ :class => "selector #{'hidden' if !@asset.performing_plain_text?}", :style => "#{'display: none' if !@asset.performing_plain_text?}" }
+- if allow_plain_text_editing?(@theme_asset)
+  #text-selector{ :class => "selector #{'hidden' if !@theme_asset.performing_plain_text?}", :style => "#{'display: none' if !@theme_asset.performing_plain_text?}" }
     = f.inputs :name => :code, :class => 'inputs code' do
       
-      - if @asset.new_record?
+      - if @theme_asset.new_record?
         = f.input :slug
         
         = f.custom_input :content_type do
           = f.select :content_type, ["stylesheet", "javascript"]
           
       = f.custom_input :plain_text, :css => 'full', :with_label => false do
-        %code{ :class => (@asset.size && @asset.size > 40000 ? 'nude' : (@asset.content_type || 'stylesheet')) }
+        %code{ :class => (@theme_asset.size && @theme_asset.size > 40000 ? 'nude' : (@theme_asset.content_type || 'stylesheet')) }
           = f.text_area :plain_text
         .more
           = link_to t('.picker_link'), admin_theme_assets_path, :id => 'asset-picker-link'
@@ -31,9 +31,9 @@
     %span.alt
       = t('admin.theme_assets.form.choose_file')
       
-- if @asset.image?
-  = f.foldable_inputs :name => "#{t('formtastic.titles.preview')} #{image_dimensions_and_size(@asset)}", :class => 'preview' do
+- if @theme_asset.image?
+  = f.foldable_inputs :name => "#{t('formtastic.titles.preview')} #{image_dimensions_and_size(@theme_asset)}", :class => 'preview' do
     %li
       .image
         .inside
-          = image_tag(@asset.source.url(:preview))
+          = image_tag(@theme_asset.source.url(:preview))

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

@@ -1,14 +1,14 @@
-- title t('.title', :file => @asset.source_filename)
+- title t('.title', :file => @theme_asset.source_filename)
 
 - content_for :submenu do
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
-  = admin_button_tag t('admin.theme_assets.index.new'), new_admin_theme_asset_url, :class => 'add'
+  = admin_button_tag t('admin.theme_assets.index.new'), new_admin_theme_asset_url, :class => 'new'
 
-%p= t('.help', :url => @asset.source.url)
+%p= t('.help', :url => @theme_asset.source.url)
 
-= semantic_form_for @asset, :url => admin_theme_asset_url(@asset), :html => { :multipart => true } do |form|
+= semantic_form_for @theme_asset, :url => admin_theme_asset_url(@theme_asset), :html => { :multipart => true, :class => 'save-with-shortcut' } do |form|
 
   = render 'form', :f => form
 

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

@@ -4,7 +4,7 @@
   = render 'admin/shared/menu/settings'
 
 - content_for :buttons do
-  = admin_button_tag :new, new_admin_theme_asset_url, :class => 'add'
+  = admin_button_tag :new, new_admin_theme_asset_url, :class => 'new'
 
 %p= t('.help')
 

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

@@ -5,7 +5,7 @@
 
 %p= t('.help')
 
-= semantic_form_for @asset, :url => admin_theme_assets_url, :html => { :multipart => true } do |form|
+= semantic_form_for @theme_asset, :url => admin_theme_assets_url, :html => { :multipart => true } do |form|
 
   = render 'form', :f => form
   

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

@@ -18,6 +18,7 @@
             %h2= title
         
             #local-actions-bar
+               
               = yield :buttons
           
             = yield

data/config/initializers/locomotive.rb

@@ -2,7 +2,28 @@ require File.dirname(__FILE__) + '/../../lib/locomotive.rb'
 require File.dirname(__FILE__) + '/../../lib/core_ext.rb'
 
 Locomotive.configure do |config|
+  # if not defined, locomotive will use example.com as main domain name. Remove prefix www from your domain name.
+  # Ex:
+  # config.default_domain = Rails.env.production? ? 'mydomain.com' : 'example.com'
   config.default_domain = 'example.com'
+  
+  # configure how many items we display in sub menu in the "Contents" section. 
   config.lastest_items_nb = 5
+  
+  # tell if logs are enabled. Useful for debug purpose.
   config.enable_logs = true
+  
+  # tell if the application is hosted on Heroku.
+  # Locomotive uses heroku api to add / remove domains.
+  # there are 2 ways of passing heroku credentials to Locomotive
+  #   - from ENV variables: HEROKU_LOGIN & HEROKU_PASSWORD
+  #   - from this file
+  #
+  # Notes: 
+  #   - IMPORTANT: behaviours related to this option will only be applied in production  
+  #   - credentials coming from this file take precedence over ENV variables
+  # 
+  # Ex:
+  # config.heroku = { :name => '<my heroku app name>', :login => 'john@doe.net', :password => 'easy' }
+  config.heroku = false
 end

data/config/locales/admin_ui_en.yml

@@ -88,13 +88,6 @@ en:
         show: show
         help: "The page title can be updated by clicking it."
         ask_for_title: "Please type the new page title"
-      messages:
-        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:
         cache_strategy:
           none: None
@@ -119,12 +112,6 @@ en:
         new: new layout
       layout:
         updated_at: Updated at
-      messages:
-        successful_create: "Layout was successfully created."
-        successful_update: "Layout was successfully updated."
-        successful_destroy: "Layout was successfully deleted."
-        failed_create: "Layout was not created."
-        failed_update: "Layout was not updated."
 
     snippets:
       index:
@@ -140,45 +127,27 @@ en:
         help: "Fill in the form below to update your snippet."
       snippet:
         updated_at: Updated at
-      messages:
-        successful_create: "Snippet was successfully created."
-        successful_update: "Snippet was successfully updated."
-        successful_destroy: "Snippet was successfully deleted."
-        failed_create: "Snippet was not created."
-        failed_update: "Snippet was not updated."
         
     sites:
       new:
         title: New site
         help: "Fill in the form below to create your new site."
-      messages:
-        successful_create: "Site was successfully created."
-        failed_create: "Site was not created."
         
     current_sites:
       edit:
         new_membership: add account
         help: "The site name can be updated by clicking it."
         ask_for_name: "Please type the new site name"
-      messages:
-        successful_update: "My site was successfully updated."
-        failed_update: "My site was not updated."
         
     memberships:
       new:
         title: New membership
         help: "Please give the account email to add. If it does not exist, you will be redirected to the account creation form."
-      messages:
-        successful_create: "Membership was successfully created."
-        failed_create: "Membership was not created."
-        
+                
     accounts:
       new:
         title: New account
         help: "Fill in the form below to add a new account."
-      messages:
-        successful_create: "Account was successfully created."
-        failed_create: "Account was not created."
         
     my_accounts:
       edit:
@@ -187,9 +156,6 @@ en:
         en: English
         fr: French
         ask_for_name: "Please type your new name"
-      messages:
-        successful_update: "My account was successfully updated."
-        failed_update: "My account was not updated."
         
     theme_assets:
       index:
@@ -212,12 +178,6 @@ en:
       images:
         title: Listing images
         no_items: "There are no files for now."
-      messages:
-        successful_create: "File was successfully created."
-        successful_update: "File was successfully updated."
-        successful_destroy: "File was successfully deleted."
-        failed_create: "File was not created."
-        failed_update: "File was not updated."
         
     asset_collections:
       index:
@@ -234,12 +194,6 @@ en:
         destroy: remove collection
         no_items: "There are no assets for now. Just click <a href=\"{{url}}\">here</a> to create the first one."
         ask_for_name: "Please type the new name"
-      messages:
-        successful_create: "Collection was successfully created."
-        successful_update: "Collection was successfully updated."
-        successful_destroy: "Collection was successfully deleted."
-        failed_create: "Collection was not created."
-        failed_update: "Collection was not updated."
         
     assets:
       new:
@@ -248,12 +202,6 @@ en:
       edit:
         title: Edit asset
         help: "Fill in the form below to update your asset."
-      messages:
-        successful_create: "Asset was successfully created."
-        successful_update: "Asset was successfully updated."
-        successful_destroy: "Asset was successfully deleted."
-        failed_create: "Asset was not created."
-        failed_update: "Asset was not updated."
     
     content_types:
       index:
@@ -270,12 +218,6 @@ en:
         order_by:
           updated_at: 'By "updated at" date'
           position_in_list: Manually
-      messages:
-        successful_create: "Model was successfully created."
-        successful_update: "Model was successfully updated."
-        successful_destroy: "Model was successfully deleted."
-        failed_create: "Model was not created."
-        failed_update: "Model was not updated."
         
     contents:
       index:
@@ -293,13 +235,7 @@ en:
         title: '{{type}} &mdash; new item' 
       edit:
         title: '{{type}} &mdash; editing item'
-      messages:
-        successful_create: "Content was successfully created."
-        successful_update: "Content was successfully updated."
-        successful_destroy: "Content was successfully deleted."
-        failed_create: "Content was not created."
-        failed_update: "Content was not updated."
-                      
+        
   formtastic:
     titles:
       information: General information