locomotive_cms 2.0.0.rc11 → 2.0.0.rc12

data/Gemfile

@@ -12,6 +12,7 @@ group :development do
   # gem 'custom_fields', :git => 'git://github.com/locomotivecms/custom_fields.git', :branch => '2.0.0.rc' # Branch on Github
 
   # gem 'locomotive-aloha-rails', :path => '../gems/aloha-rails' # for Developers
+  # gem 'locomotive-tinymce-rails', '~> 3.4.7.3', :path => '../gems/tinymce-rails' # for Developers  
   # gem 'locomotive_liquid', :path => '../gems/liquid' # for Developers
 
   gem 'rspec-rails', '~> 2.8.0' # In order to have rspec tasks and generators

data/app/assets/javascripts/locomotive/utils/tinymce_settings.js.coffee

@@ -3,9 +3,9 @@ window.Locomotive.tinyMCE =
   defaultSettings:
     theme: 'advanced'
     skin: 'locomotive'
-    plugins: 'safari,jqueryinlinepopups,locomotive_media,fullscreen'
+    plugins: 'safari,jqueryinlinepopups,table,locomotive_media,fullscreen'    
     extended_valid_elements: 'iframe[width|height|frameborder|allowfullscreen|src|title]'
-    theme_advanced_buttons1: 'fullscreen,code,|,bold,italic,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,locomotive_media'
+    theme_advanced_buttons1: 'fullscreen,code,|,bold,italic,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,table,|,locomotive_media'
     theme_advanced_buttons2: 'formatselect,fontselect,fontsizeselect'
     theme_advanced_buttons3: ''
     theme_advanced_toolbar_location: 'top'
@@ -33,7 +33,7 @@ window.Locomotive.tinyMCE =
   popupSettings:
     theme: 'advanced'
     skin: 'locomotive'
-    plugins: 'safari,jqueryinlinepopups,locomotive_media,fullscreen'
+    plugins: 'safari,jqueryinlinepopups,locomotive_media,fullscreen'    
     extended_valid_elements: 'iframe[width|height|frameborder|allowfullscreen|src|title]'
     theme_advanced_buttons1: 'fullscreen,code,|,bold,italic,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,bullist,numlist,|,outdent,indent,blockquote,|,link,unlink,|,locomotive_media'
     theme_advanced_buttons2: 'formatselect,fontselect,fontsizeselect'

data/app/assets/javascripts/locomotive/views/content_entries/_popup_form_view.js.coffee

@@ -87,4 +87,4 @@ class Locomotive.Views.ContentEntries.PopupFormView extends Locomotive.Views.Con
     # disabled in a popup form
 
   tinyMCE_settings: ->
-    window.Locomotive.tinyMCE.popupSettings
+    _.extend { language: window.locale }, window.Locomotive.tinyMCE.popupSettings

data/app/assets/javascripts/locomotive/views/editable_elements/long_text_view.js.coffee

@@ -14,7 +14,7 @@ class Locomotive.Views.EditableElements.LongTextView extends Backbone.View
     return @
 
   after_render: ->
-    settings = _.extend {}, @tinymce_settings(),
+    settings = _.extend {}, @tinymce_settings(),    
       oninit: ((editor) =>
         $.cmd 'S', (() =>
           @model.set(content: editor.getBody().innerHTML)
@@ -26,7 +26,7 @@ class Locomotive.Views.EditableElements.LongTextView extends Backbone.View
     @$('textarea').tinymce(settings)
 
   tinymce_settings: ->
-    window.Locomotive.tinyMCE.defaultSettings
+    _.extend { language: window.locale }, window.Locomotive.tinyMCE.defaultSettings
 
   refresh: ->
     # do nothing

data/app/controllers/locomotive/api/base_controller.rb

@@ -21,10 +21,10 @@ module Locomotive
 
       protected
 
-    def set_current_thread_variables
-      Thread.current[:account]  = current_locomotive_account
-      Thread.current[:site]     = current_site
-    end
+      def set_current_thread_variables
+        Thread.current[:account]  = current_locomotive_account
+        Thread.current[:site]     = current_site
+      end
 
       def current_ability
         @current_ability ||= Ability.new(current_locomotive_account, current_site)

data/app/controllers/locomotive/api/memberships_controller.rb

@@ -3,8 +3,8 @@ module Locomotive
     class MembershipsController < BaseController
 
       # It's an embedded document, so we'll just load manually
-      before_filter :load_membership, :only => [ :show, :update, :destroy ]
-      before_filter :load_memberships, :only => [ :index ]
+      before_filter :load_membership, :only => [:show, :update, :destroy]
+      before_filter :load_memberships, :only => [:index]
 
       authorize_resource :class => Locomotive::Membership
 

data/app/controllers/locomotive/api/my_account_controller.rb

@@ -0,0 +1,18 @@
+module Locomotive
+  module Api
+    class MyAccountController < BaseController
+
+      skip_load_and_authorize_resource
+
+      # FIXME: the auto-loaded site won't pass authorization for show, update, or destroy
+      # skip_load_and_authorize_resource :only => [ :show, :update, :destroy ]
+
+      def show
+        respond_with(current_locomotive_account)
+      end
+
+    end
+
+  end
+end
+

data/app/controllers/locomotive/api/sites_controller.rb

@@ -5,7 +5,7 @@ module Locomotive
       load_and_authorize_resource :class => Locomotive::Site
 
       # FIXME: the auto-loaded site won't pass authorization for show, update, or destroy
-      skip_load_and_authorize_resource :only => [ :show, :update, :destroy ]
+      skip_load_and_authorize_resource :only => [:show, :update, :destroy]
 
       def index
         @sites = Locomotive::Site.all

data/app/controllers/locomotive/current_site_controller.rb

@@ -3,6 +3,8 @@ module Locomotive
 
     sections 'settings', 'site'
 
+    localized
+
     skip_load_and_authorize_resource
 
     load_and_authorize_resource :class => 'Site'

data/app/controllers/locomotive/passwords_controller.rb

@@ -9,5 +9,11 @@ module Locomotive
 
     helper 'locomotive/base'
 
+    protected
+
+    def after_sending_reset_password_instructions_path_for(resource_name)
+      new_locomotive_account_session_path
+    end
+
   end
 end

data/app/mailers/locomotive/notifications.rb

@@ -4,9 +4,9 @@ module Locomotive
     default :from => Locomotive.config.mailer_sender
 
     def new_content_entry(account, entry)
-      @account, @entry, @type = account, entry, entry.content_type
+      @account, @entry, @type, @domain = account, entry, entry.content_type, entry.site.domains.first
 
-      subject = t('locomotive.notifications.new_content_entry.subject', :type => @type.name, :locale => account.locale)
+      subject = t('locomotive.notifications.new_content_entry.subject', :domain => @domain, :type => @type.name, :locale => account.locale)
 
       mail :subject => subject, :to => account.email
     end

data/app/models/locomotive/content_entry.rb

@@ -57,7 +57,7 @@ module Locomotive
 
     alias :to_label :_label
 
-    # Tells if the content entry has been translated or not.
+    # Tell if the content entry has been translated or not.
     # It just checks if the field used for the label has been translated.
     #
     # @return [ Boolean ] True if translated, false otherwise
@@ -70,6 +70,18 @@ module Locomotive
       end
     end
 
+    # Return the locales the content entry has been translated to.
+    #
+    # @return [ Array ] The list of locales. Nil if not localized
+    #
+    def translated_in
+      if self.respond_to?(:"#{self._label_field_name}_translations")
+        self.send(:"#{self._label_field_name}_translations").keys
+      else
+        nil
+      end
+    end
+
     # Return the next content entry based on the order defined in the parent content type.
     #
     # @param [ Object ] The next content entry or nil if not found

data/app/models/locomotive/editable_element.rb

@@ -31,6 +31,10 @@ module Locomotive
       !!self.disabled # the original method does not work quite well with the localization
     end
 
+    def disabled_in_all_translations?
+      self.disabled_translations.all? { |_, v| v == true }
+    end
+
     # Determines if the current element can be edited in the back-office
     #
     def editable?

data/app/models/locomotive/extensions/page/editable_elements.rb

@@ -72,8 +72,8 @@ module Locomotive
             else
               existing_el.disabled = false
 
-              # only the type and hint properties can be modified from the parent element
-              %w(_type hint).each do |attr|
+              # only the type, hint and fixed properties can be modified from the parent element
+              %w(_type hint fixed).each do |attr|
                 existing_el.send(:"#{attr}=", el.send(attr.to_sym))
               end
             end
@@ -81,10 +81,13 @@ module Locomotive
         end
 
         def remove_disabled_editable_elements
-          return unless self.editable_elements.any? { |el| el.disabled? }
+          # get only those which are fully disabled, meaning in ALL the locales
+          ids = self.editable_elements.find_all { |el| el.disabled_in_all_translations? }.map(&:_id)
+
+          return if ids.empty?
 
           # super fast way to remove useless elements all in once
-          self.collection.update(self.atomic_selector, '$pull' => { 'editable_elements' => { "disabled.#{::Mongoid::Fields::I18n.locale}" => true } })
+          self.collection.update(self.atomic_selector, '$pull' => { 'editable_elements' => { '_id' => { '$in' => ids } } })
         end
 
       end

data/app/models/locomotive/extensions/page/templatized.rb

@@ -42,6 +42,20 @@ module Locomotive
           target_klass_name.constantize
         end
 
+        # Returns the slug related to the target_klass.
+        # In other words, it returns the slug of the target content type.        
+        #
+        # @return [ String ] The slug of the target class / content type. Nil if no target klass.
+        #
+        def target_klass_slug
+          if self.target_klass_name =~ /^Locomotive::Entry([a-z0-9]+)$/
+            @content_type ||= self.site.content_types.find($1)
+            @content_type.slug
+          else
+            nil
+          end
+        end
+
         # Gives the name which can be used in a liquid template in order
         # to reference an entry. It uses the slug property if the target klass
         # is a Locomotive content type or the class name itself for the other classes.

data/app/models/locomotive/extensions/page/tree.rb

@@ -22,6 +22,7 @@ module Locomotive
 
           alias_method_chain :rearrange, :identity_map
           alias_method_chain :rearrange_children, :identity_map
+          alias_method_chain :siblings_and_self, :scoping
         end
 
         module ClassMethods
@@ -98,6 +99,14 @@ module Locomotive
           end
         end
 
+        ##
+        # Returns this document's siblings and itself, all scoped by the site
+        #
+        # @return [Mongoid::Criteria] Mongoid criteria to retrieve the document's siblings and itself
+        def siblings_and_self_with_scoping
+          base_class.where(:parent_id => self.parent_id, :site_id => self.site_id)
+        end
+
         def depth
           self.parent_ids.count
         end

data/app/models/locomotive/extensions/site/locales.rb

@@ -41,7 +41,13 @@ module Locomotive
           locale = (locale || I18n.locale).to_s
           fullpath = page.fullpath_translations[locale] || page.fullpath_translations[self.default_locale]
 
-          locale == self.default_locale ? fullpath : File.join(locale, fullpath)
+          if locale == self.default_locale.to_s # no need to specify the locale
+            page.index? ? '' : fullpath
+          elsif page.index? # avoid /en/index or /fr/index, prefer /en or /fr instead
+            locale
+          else
+            File.join(locale, fullpath)
+          end
         end
 
         def locales=(array)

data/app/models/locomotive/page.rb

@@ -40,10 +40,10 @@ module Locomotive
     before_destroy      :do_not_remove_index_and_404_pages
 
     ## validations ##
-    validates_presence_of     :site, :title, :slug
-    validates_uniqueness_of   :slug, :scope => [:site_id, :parent_id]
-    validates_uniqueness_of   :handle, :allow_blank => true
-    validates_exclusion_of    :slug, :in => Locomotive.config.reserved_slugs, :if => Proc.new { |p| p.depth <= 1 }
+    validates_presence_of     :site,    :title, :slug
+    validates_uniqueness_of   :slug,    :scope => [:site_id, :parent_id]
+    validates_uniqueness_of   :handle,  :scope => :site_id, :allow_blank => true
+    validates_exclusion_of    :slug,    :in => Locomotive.config.reserved_slugs, :if => Proc.new { |p| p.depth <= 1 }
 
     ## named scopes ##
     scope :latest_updated,      :order_by => [[:updated_at, :desc]], :limit => Locomotive.config.ui[:latest_entries_nb]
@@ -81,6 +81,10 @@ module Locomotive
       self.title_translations.key?(::Mongoid::Fields::I18n.locale.to_s) rescue false
     end
 
+    def translated_in
+      self.title_translations.keys
+    end
+
     def to_liquid
       Locomotive::Liquid::Drops::Page.new(self)
     end

data/app/presenters/locomotive/content_entry_presenter.rb

@@ -1,9 +1,9 @@
 module Locomotive
   class ContentEntryPresenter < BasePresenter
 
-    delegate :_label, :_slug, :_position, :seo_title,
-      :meta_keywords, :meta_description, :select_custom_fields,
-      :file_custom_fields, :has_many_custom_fields, :many_to_many_custom_fields, :to => :source
+    delegate  :_label, :_slug, :_position, :translated_in, :seo_title,
+              :meta_keywords, :meta_description, :select_custom_fields,
+              :file_custom_fields, :has_many_custom_fields, :many_to_many_custom_fields, :to => :source
 
     # Lists of all the attributes editable thru the html form for instance
     #
@@ -33,7 +33,7 @@ module Locomotive
     end
 
     def included_methods
-      default_list = %w(_label _slug _position content_type_slug select_custom_fields file_custom_fields has_many_custom_fields many_to_many_custom_fields safe_attributes)
+      default_list = %w(_label _slug _position content_type_slug select_custom_fields file_custom_fields has_many_custom_fields many_to_many_custom_fields translated_in safe_attributes)
       default_list << 'errors' if !!self.options[:include_errors]
       super + self.filtered_custom_fields_methods + default_list
     end

data/app/presenters/locomotive/page_presenter.rb

@@ -1,7 +1,7 @@
 module Locomotive
   class PagePresenter < BasePresenter
 
-    delegate :title, :slug, :fullpath, :handle, :raw_template, :published, :listed, :templatized, :templatized_from_parent, :redirect, :redirect_url, :template_changed, :cache_strategy, :response_type, :to => :source
+    delegate :title, :slug, :fullpath, :handle, :position, :raw_template, :published, :listed, :templatized, :templatized_from_parent, :target_klass_slug, :redirect, :redirect_url, :template_changed, :cache_strategy, :response_type, :translated_in, :to => :source
 
     def escaped_raw_template
       h(self.source.raw_template)
@@ -12,7 +12,7 @@ module Locomotive
     end
 
     def included_methods
-      super + %w(title slug fullpath handle raw_template published listed templatized templatized_from_parent redirect redirect_url cache_strategy response_type template_changed editable_elements localized_fullpaths)
+      super + %w(title slug fullpath handle position raw_template published listed templatized templatized_from_parent target_klass_slug redirect redirect_url cache_strategy response_type template_changed editable_elements localized_fullpaths translated_in)
     end
 
     def localized_fullpaths

data/app/views/locomotive/current_site/edit.html.haml

@@ -3,6 +3,9 @@
 - content_for :submenu do
   = render_cell 'locomotive/settings_menu', :show
 
+- content_for :actions do
+  = locale_picker_link
+
 - content_for :buttons do
   - if can?(:create, Locomotive::Account)
     = local_action_button t('.new_membership'), new_membership_url, :class => 'new'

data/app/views/locomotive/devise_mailer/reset_password_instructions.html.haml

@@ -1,11 +1,11 @@
 %p
-  != t('locomotive.mailer.common.hello')
+  != t('locomotive.devise_mailer.common.hello')
   = @resource.email
   \!
 %p
   != t('.reset_password_instruction')
 %p
-  = link_to t('.change_my_password'), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token)
+  = link_to t('.change_my_password'), edit_locomotive_account_password_url(:reset_password_token => @resource.reset_password_token)
 %p
   != t('.wrong_request_instruction')
 %p

data/app/views/locomotive/notifications/new_content_entry.html.haml

@@ -1,6 +1,4 @@
-%p= t('.title', :name => @account.name, :date => I18n.l(Time.now), :locale => @account.locale)
-
-%hr
+%p= t('.title', :name => @account.name, :domain => @domain, :date => I18n.l(Time.now), :locale => @account.locale).html_safe
 
 %p
   %b= t('.type', :type => @type.name, :locale => @account.locale)
@@ -21,7 +19,7 @@
           = value
         - when 'file'
           - url = value.guess_url
-          - url = url =~ /^http/ ? url : URI.join("http://#{@entry.site.domains.first}", url).to_s # Amazon S3 (http/https) or local files ?
+          - url = url =~ /^http/ ? url : URI.join("http://#{@domain}", url).to_s # Amazon S3 (http/https) or local files ?
           = link_to File.basename(url), url
         - when 'select'
           = value

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

@@ -18,6 +18,10 @@
 
     = f.input :slug, :required => false, :hint => @page.slug.blank? ? t('.empty_slug') : public_page_url(@page), :input_html => { :'data-url' => get_path_pages_url, :disabled => @page.index? || @page.not_found? }, :wrapper_html => { :style => "#{'display: none' if @page.templatized? && !@page.templatized_from_parent?};", :class => 'em-inline-hints' }
 
+- else
+  = f.inputs :name => :information, :style => 'display: none' do
+    = f.text_field :title
+
 = f.inputs :name => :seo, :class => "inputs foldable #{'folded' if inputs_folded?(@page)}" do
 
   = f.input :seo_title

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

@@ -1,6 +1,6 @@
 - title t('.title')
 
-= semantic_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f|
+= semantic_form_for(resource, :as => resource_name, :url => locomotive_account_password_url, :html => { :method => :put }) do |f|
 
   = f.hidden_field :reset_password_token
 

data/config/locales/admin_ui.de.yml

@@ -68,7 +68,7 @@ de:
 
     notifications:
       new_content_entry:
-        subject: "[%{type}] neu"
+        subject: "[%{domain}][%{type}] neu"
         title: "Hi %{name}, nur damit Sie Bescheid wissen, am %{date} wurde eine neue Instanz erstellt."
         type: "Model: %{type}"
 

data/config/locales/admin_ui.en.yml

@@ -68,8 +68,8 @@ en:
 
     notifications:
       new_content_entry:
-        subject: "[%{type}] new"
-        title: "Hi %{name}, just to let you know that a new instance has been created on %{date}"
+        subject: "[%{domain}][%{type}] new entry"
+        title: "Hi %{name}, just to let you know that a new instance has been created on %{date} for the site <b>%{domain}</b>"
         type: "Model: %{type}"
 
     sites_picker:

data/config/locales/admin_ui.es.yml

@@ -49,7 +49,7 @@ es:
 
     notifications:
       new_content_entry:
-        subject: "[%{type}] nuevo"
+        subject: "[%{domain}][%{type}] nuevo"
         title: "Hola %{name}, queremos hacerte saber que una nueva instancia se creó el día %{date}"
         type: "Modelo: %{type}"