locomotive_cms 2.5.5 → 2.5.6.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 934e34a25d00b8c0c55c81d20e17346b7a75f105
-  data.tar.gz: dd086d5f1ef9307fd1b6f4deb59c0581840b45c7
+  metadata.gz: b03080f0869d8c8dffe1f7394f9410ddcfe8b9e0
+  data.tar.gz: 8649c776cdb126fd7c6ba67ad7578c84d71a19a9
 SHA512:
-  metadata.gz: 3dd291b6d7e877f9187ec006a9d66300b176d7cecba047cf94a842f9d29f72d614f13e67a41006f0a1ac97537eac170134f8d31f468b99a1c2a3ca00b47c1c7a
-  data.tar.gz: 249b2e6f9b65fc55e13ff4aa31e40853d7f163a8c9e846fedeba3619ca456dd81e6610f5858b719fd8f8966f0e558e924772ab985bb5e840056120fe006d7df7
+  metadata.gz: 395d855f2fd564535e365289afb551f38ee38761f146e459a93c7b5f39dbe8b95f51d1fd07b1b5fd0dfc3fd0ce90202b4c70cfa7e21f57bedbf0d325e5b3fb3e
+  data.tar.gz: b20cf87aac7025dec0241910f99e050be41b39ae27ffb92d9cd9db2dbea1b590576abdd2e3a3510980e66fc37e66feb61c8d830c0186707e731cbacfe98cd89a

data/Gemfile

@@ -9,14 +9,13 @@ group :assets do
   gem 'sass-rails',   '~> 3.2.4'
   gem 'coffee-rails', '~> 3.2.2'
   gem 'uglifier',     '~> 1.2.4'
-  gem 'compass-rails'
 end
 
 # The rest of the dependencies are for use when in the locomotive development / test environments
 
 group :test, :development do
   gem 'rspec-rails', '~> 2.13.0' # In order to have rspec tasks and generators
-  gem 'rspec-cells'
+  gem 'rspec-cells', '0.1.10'
 end
 
 group :development do

data/README.textile

@@ -28,7 +28,7 @@ h2. Gems
 Here is a short list of main gems / technologies used in the application.
 
 * Ruby 2.x
-* Rails 3.2.17 (Rails 4.0 planned for the beginning of 2014)
+* Rails 3.2.19 (Rails 4.0 planned for the beginning of 2014)
 * Mongoid 3.1.5 (with MongoDB 2.x)
 * Liquid
 * Devise
@@ -44,7 +44,7 @@ See the "installation documentation on the official website":http://doc.locomoti
 
 h2. Upgrading
 
-We work on the procedure to upgrade from a previous version of the engine (below the 2.0.0)
+See the "engine upgrade guide on the official website":http://doc.locomotivecms.com/guides/upgrading-engine
 
 h2. Community
 
@@ -89,5 +89,5 @@ h2. Contact
 
 Feel free to contact me at didier at nocoffee dot fr.
 
-Copyright (c) 2013 NoCoffee, released under the MIT license
+Copyright (c) 2014 NoCoffee, released under the MIT license
 ...

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

@@ -39,7 +39,7 @@ window.Aloha.settings =
         crop:   false
 
   i18n:
-    available: ['en', 'fr', 'pl', 'pt-BR', 'es', 'de', 'no', 'ru', 'nl', 'ja', 'cs', 'bg', 'sk']
+    available: ['en', 'fr', 'pl', 'pt', 'pt-BR', 'es', 'de', 'no', 'ru', 'nl', 'ja', 'cs', 'bg', 'sk']
 
   sidebar:
     disabled: true

data/app/assets/javascripts/locomotive/views/current_site/edit_view.js.coffee

@@ -28,6 +28,8 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
 
     @enable_liquid_editing()
 
+    @enable_checkboxes()
+
   add_toggle_mode_for_locales: ->
     @$('#site_locales_input .list input[type=checkbox]').bind 'change', (event) ->
       el = $(event.target)
@@ -67,6 +69,9 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
 
       @editor.on 'change', (editor, change) => @model.set(robots_txt: editor.getValue())
 
+  enable_checkboxes: ->
+    @_enable_checkbox('prefix_default_locale')
+
   save: (event) ->
     # if @model.includes_domain(window.location.host)
     if !@model.get('subdomain') || @model.includes_domain(window.location.host)

data/app/assets/stylesheets/locomotive/backoffice/menu/main.css.scss

@@ -2,7 +2,7 @@
 @import "compass/css3/border-radius";
 @import "compass/css3/text-shadow";
 @import "compass/css3/box-shadow";
-@import "compass/css3/transform-legacy";
+@import "compass/css3/transform";
 
 #menu {
   padding: 0;

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

@@ -5,7 +5,7 @@ module Locomotive
       load_and_authorize_resource class: Locomotive::ThemeAsset, through: :current_site
 
       def index
-        respond_with(@theme_assets)
+        respond_with(@theme_assets.sort_by(&:local_path))
       end
 
       def show

data/app/controllers/locomotive/public/content_entries_controller.rb

@@ -10,26 +10,24 @@ module Locomotive
 
       before_filter :sanitize_entry_params, only: :create
 
+      self.responder = Locomotive::ActionController::PublicResponder
+
       respond_to :html, :json
 
       def create
         @entry = @content_type.entries.safe_create(params[:entry] || params[:content])
-
-        respond_with @entry, {
-          location:   self.callback_url,
-          responder:  Locomotive::ActionController::PublicResponder
-        }
+        respond_with @entry
       end
 
       protected
 
       def set_locale
-        ::I18n.locale = params[:locale] || current_site.default_locale
+        ::I18n.locale = request.env['locomotive.locale'] || params[:locale] || current_site.default_locale
         ::Mongoid::Fields::I18n.locale = ::I18n.locale
       end
 
       def set_content_type
-        @content_type = current_site.content_types.where(slug: params[:slug]).first
+        @content_type = current_site.content_types.where(slug: params[:content_type_slug] || params[:slug]).first
 
         # check if ability to receive public submissions
         unless @content_type.public_submission_enabled?
@@ -41,10 +39,6 @@ module Locomotive
         end
       end
 
-      def callback_url
-        (@entry.errors.empty? ? params[:success_callback] : params[:error_callback]) || main_app.root_path
-      end
-
       def sanitize_entry_params
         entry_params = params[:entry] || params[:content] || {}
         entry_params.each do |key, value|
@@ -53,6 +47,7 @@ module Locomotive
         end
       end
 
+      # only verify csrf protection if it has been enable in the Locomotive config file
       def handle_unverified_request
         if Locomotive.config.csrf_protection
           reset_session

data/app/controllers/locomotive/public/pages_controller.rb

@@ -39,7 +39,7 @@ module Locomotive
       end
 
       def set_locale
-        ::Mongoid::Fields::I18n.locale = params[:locale] || current_site.default_locale
+        ::Mongoid::Fields::I18n.locale = request.env['locomotive.locale'] || params[:locale] || current_site.default_locale
         ::I18n.locale = ::Mongoid::Fields::I18n.locale
 
         self.setup_i18n_fallbacks

data/app/controllers/locomotive/public/sitemaps_controller.rb

@@ -14,7 +14,7 @@ module Locomotive
       protected
 
       def set_locale
-        ::Mongoid::Fields::I18n.locale = params[:locale] || current_site.default_locale
+        ::Mongoid::Fields::I18n.locale = request.env['locomotive.locale'] || params[:locale] || current_site.default_locale
         ::I18n.locale = ::Mongoid::Fields::I18n.locale
       end
 

data/app/models/locomotive/extensions/content_type/sync.rb

@@ -6,16 +6,17 @@ module Locomotive
         extend ActiveSupport::Concern
 
         included do
-          after_save :sync_relationships_order_by
+          before_update :sync_relationships_order_by_for_has_many_fields
+          after_save :sync_relationships_order_by_for_belongs_to_fields
         end
 
         protected
 
-        # If the user changes the order of the content type, we have to make
-        # sure that other related content types tied to the current one through
-        # a belongs_to / has_many relationship also gets updated.
+        # If an user changes the default order of a content type, we need to make sure
+        # that all the content types referencing this content type through a has_many
+        # relationship without UI enabled (this is very important) have the new order_by.
         #
-        def sync_relationships_order_by
+        def sync_relationships_order_by_for_belongs_to_fields
           current_class_name = self.klass_with_custom_fields(:entries).name
 
           self.entries_custom_fields.where(type: 'belongs_to').each do |field|
@@ -37,6 +38,16 @@ module Locomotive
           end
         end
 
+        # If an user enables the UI option for a has_many relationship in the current content type,
+        # then all the content entries of that content type should order the entries of the has_many relationship
+        # from the "position_in_<field name>" value.
+        #
+        def sync_relationships_order_by_for_has_many_fields
+          self.entries_custom_fields.where(:type.in => %w(has_many), ui_enabled: true).each do |field|
+            field.order_by = nil # that will force the content entry to use the position_in_<inverse_of> field
+          end
+        end
+
         # Save the changes for the content type passed in parameter without forgetting
         # to bump the version.. It also updates the recipe for related entries.
         # That method does not call the Mongoid API but directly MongoDB.

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

@@ -19,9 +19,9 @@ module Locomotive
           before_destroy  :delete_descendants
 
           ## indexes ##
-          index position: 1
-          index depth:    1, position: 1
           index site_id:  1, depth:    1, position: 1
+          index depth:    1, position: 1
+          index position: 1
 
           alias_method_chain :rearrange, :identity_map
           alias_method_chain :rearrange_children, :identity_map
@@ -46,6 +46,10 @@ module Locomotive
 
         module ClassMethods
 
+          def order_by_depth_and_position
+            order_by(:depth.asc, :position.asc)
+          end
+
           # Returns the tree of pages from the site with the most minimal amount of queries.
           # This method should only be used for read-only purpose since
           # the mongodb returns the minimal set of required attributes to build
@@ -56,7 +60,7 @@ module Locomotive
           # @return [ Array ] The first array of pages (depth = 0)
           #
           def quick_tree(site, minimal_attributes = true)
-            pages = (minimal_attributes ? site.pages.unscoped.minimal_attributes : site.pages.unscoped).order_by(:depth.asc, :position.asc).to_a
+            pages = (minimal_attributes ? site.pages.unscoped.minimal_attributes : site.pages.unscoped).order_by_depth_and_position.to_a
 
             tmp = []
 

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

@@ -9,6 +9,7 @@ module Locomotive
 
           ## fields ##
           field :locales, type: ::RawArray, default: []
+          field :prefix_default_locale, type: ::Boolean, default: false
 
           ## validations ##
           validate :can_not_remove_default_locale
@@ -19,6 +20,10 @@ module Locomotive
 
         end
 
+        def prefix_default_locale?
+          self.prefix_default_locale
+        end
+
         # Tell if the site serves other locales than the default one.
         #
         # @return [ Boolean ] True if the number of locales is greater than 1
@@ -47,15 +52,9 @@ module Locomotive
           return nil if page.fullpath_translations.blank?
 
           locale    = (locale || I18n.locale).to_s
-          fullpath  = page.fullpath_translations[locale] || page.fullpath_translations[self.default_locale]
-
-          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
+          fullpath  = page.index? ? nil : (page.fullpath_translations[locale] || page.fullpath_translations[self.default_locale])
+          locale_prefix = is_default_locale?(locale) && !prefix_default_locale ? nil : locale
+          [locale_prefix, fullpath].compact.join '/'
         end
 
         def locales=(array)
@@ -66,6 +65,10 @@ module Locomotive
           self.locales.first || Locomotive.config.site_locales.first
         end
 
+        def is_default_locale?(locale)
+          locale == default_locale.to_s
+        end
+
         def default_locale_was
           self.locales_was.try(:first) || Locomotive.config.site_locales.first
         end

data/app/models/locomotive/site.rb

@@ -41,6 +41,16 @@ module Locomotive
       Page.quick_tree(self)
     end
 
+    # Get all the pages in the right order: depth and position, both ASC.
+    #
+    # @param [ Hash ] conditions Extra conditions passed to the Mongoid criteria
+    #
+    # @return [ Criteria ] a Mongoid criteria
+    #
+    def ordered_pages(conditions = {})
+      self.pages.unscoped.where(conditions || {}).order_by_depth_and_position
+    end
+
     def fetch_page(path, logged_in)
       Locomotive::Page.fetch_page_from_path self, path, logged_in
     end

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

@@ -10,6 +10,7 @@
 = f.inputs name: :information  do
   = f.input :name, wrapper_html: { style: 'display: none' }
   = f.input :locales, as: '::Locomotive::Locales', collection: ordered_current_site_locales, input_html: { class: 'locales' }
+  = f.input :prefix_default_locale, as: :'Locomotive::Toggle', input_html: { class: 'simple-toggle' }
   = f.input :timezone_name, as: :select, include_blank: false, collection: options_for_site_timezones
 
 - if can?(:point, Locomotive::Site)

data/config/locales/admin_ui.cs.yml

@@ -14,6 +14,7 @@ cs:
       de: Němčina
       fr: Francouzština
       pl: Polština
+      pt: Portugalština
       pt-BR: "Brazilská portugalština"
       it: Italština
       nl: Holandština
@@ -26,6 +27,7 @@ cs:
       cs: Čeština
       sk: Slovenština
       sr: Serbian
+      bg: Bulgarian
 
     messages:
       confirm: Jste si jistý?

data/config/locales/admin_ui.de.yml

@@ -15,6 +15,7 @@ de:
       de: Deutsch
       fr: Französisch
       pl: Polnisch
+      pt: Portugiesisch
       pt-BR: "Bras. Portugiesisch"
       it: Italienisch
       nl: Niederländisch
@@ -73,7 +74,7 @@ de:
         send: Senden
         disable_with: "Transfer..."
       footer:
-        who_is_behind: "LocomitveCMS - entwickelt von %{development} und entworfen von <a href=\"http://www.sachagreif.com\">Sacha Greif</a> &mdash; <small>version</small> %{version}"
+        who_is_behind: "LocomotiveCMS - entwickelt von %{development} und entworfen von <a href=\"http://www.sachagreif.com\">Sacha Greif</a> &mdash; <small>version</small> %{version}"
 
     notifications:
       new_content_entry:
@@ -337,4 +338,4 @@ de:
           buttons:
             back: "Zurück zur Administration"
             confirm: Bestätigen
-            cancel: Abbrechen
+            cancel: Abbrechen

data/config/locales/admin_ui.en.yml

@@ -14,6 +14,7 @@ en:
       de: German
       fr: French
       pl: Polish
+      pt: Portuguese
       pt-BR: "Brazilian Portuguese"
       it: Italian
       nl: Dutch

data/config/locales/admin_ui.es.yml

@@ -20,6 +20,7 @@ es:
       pl: Polaco
       nl: Holandés
       et: Estonio
+      pt: Portugués
       pt-BR: "Portugués brasileño"
       nb: Noruego
       ja: Japonés
@@ -39,7 +40,7 @@ es:
 
     messages:
       confirm: Por favor confirme
-      sending_form: "locomotive.messages.sending_form"
+      sending_form: El formulario está siendo enviado
 
     shared:
       header:

data/config/locales/admin_ui.et.yml

@@ -14,6 +14,7 @@ et:
       de: Saksa
       fr: Prantsuse
       pl: Poola
+      pt: Portugali
       pt-BR: "Brasiilia Portugali"
       it: Itaalia
       nl: Hollandi

data/config/locales/admin_ui.fr.yml

@@ -15,7 +15,8 @@ fr:
       de: Allemand
       fr: Français
       pl: Polonais
-      pt-BR: "Portugais"
+      pt: "Portugais"
+      pt-BR: "Brésilien Portugais"
       it: "Italien"
       nl: "Hollandais"
       nb: "Norvégien"

data/config/locales/admin_ui.it.yml

@@ -5,6 +5,7 @@ it:
       de: Tedesco
       fr: Francese
       pl: Polacco
+      pt: Portoghese
       pt-BR: "Portoghese Brasiliano"
       it: Italiano
       nl: Olandese
@@ -17,6 +18,7 @@ it:
       bg: Bulgaro
       sk: Slovacco
       sr: Serbe
+      zh-CN: "Chiński"
 
     buttons:
       login: Entra
@@ -46,6 +48,7 @@ it:
         account: Mio account
         site: Sito
         theme_assets: Files del tema
+        translations: Traduzioni
       footer:
         who_is_behind: "Servizio sviluppato da %{development} e desig di <a href=\"http://www.sachagreif.com\">Sacha Greif</a>"
       form_actions:
@@ -86,6 +89,11 @@ it:
       index:
         is_required: è richiesto
         default_label: Nome campo
+      form:
+        required: Obbligatorio
+        default_label: Nome campo
+        select_options:
+          ask_name: "Inserisci il label della option"
 
     sessions:
       new:
@@ -300,3 +308,18 @@ it:
         explanations: "Questo è l'ultimo passo dell'installazione. Puoi caricare un tema come file zip. Noi abbiao dei temi gratuiti <a href=\"http://www.locomotivecms.com/support/themes\">qui</a>."
         back_to_default_template: "Invece clicca <a href='#'>qui</a> per selezionare il modello di sito predefinito"
         next: Crea sito
+
+    public:
+      pages:
+        show_toolbar:
+          statuses:
+            loading: "Loading...."
+            disabled: "Inline Editor disabilitato"
+          labels:
+            save_changes: "Salva modifiche: "
+            editing_mode: "Modalità di modifica: "
+            lang: "Lingua: "
+          buttons:
+            back: "Ritorna all'amministrazione"
+            confirm: Conferma
+            cancel: Annulla