locomotivecms 3.0.0.rc1 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d10fc58170b51a43910d6f1471a3f3ef30f06591
-  data.tar.gz: 7e07b1bb55d2f426bbdb595e4e92f31b7e4d5a15
+  metadata.gz: f5fcc2bd87ac0d01a19c8ea5f798ff338f1eb8fc
+  data.tar.gz: b189780fd9fbc5c04631715245fa79a068d355f9
 SHA512:
-  metadata.gz: f4a440454798b26f56aa64e1a60ad77a8b676ac7337e6c11075b2c594528d877b0337a7326d6cd8d64fa0674de8f960f2a6e92341c13d01230b1daa4ec450089
-  data.tar.gz: 1406d6ea958450d83374bc6a5ce5ac59e0fdf72bf82b798ce693fc2436b37e690b6e3e4c1a23083b6123ba4d79de63a4a41171fdbf7aca1197370e96da6db16f
+  metadata.gz: 0b3a1a9f8d51163f4c16999f78e02d9cbcde1b00875bbb8694be328d50d2afcece5af4f8eb087b6ebb0d0bae1322770f363a5100d99acd8785f148c86334762c
+  data.tar.gz: a48ea5fc1565b9a175ae2b3e515644fed3dd15664961c75a37ab152630108cd3052db6f50bd867f21381d6601ad2dfde8420d8180f3e57d25dcc99a0e72a8231

data/Gemfile

@@ -22,10 +22,8 @@ group :development do
   # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '15cceb66ed'
 
   # gem 'locomotivecms_steam', path: '../in_progress/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c487443', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c1d1120', require: false
 
-  # gem 'locomotive-aloha-rails', path: '../gems/aloha-rails' # for Developers
-  # gem 'locomotive-tinymce-rails', path: '../gems/tinymce-rails' # for Developers
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers
 
@@ -42,6 +40,9 @@ group :development do
   # gem 'unicorn-rails' # Using unicorn_rails instead of webrick (default server)
   # gem 'thin'
   gem 'puma'
+
+  # i18n-tasks helps you find and manage missing and unused translations.
+  gem 'i18n-tasks', '~> 0.8.7'
 end
 
 group :profile, :development do

data/README.md

@@ -40,7 +40,7 @@ If you can not wait for playing with our new version, you still can use the curr
 
 ## Technologies ##
 
-Here is a list of the main gems used to power the Locomotive backend:
+Here is a list of the main gems used to power the Locomotive platform:
 
 - Rails 4.2   - *web framework*
 - Bootstrap   - *UI framework*
@@ -55,6 +55,12 @@ Here is a list of the main gems used to power the Locomotive backend:
 - Get help or discuss Locomotive at the [Locomotive Google group](https://groups.google.com/forum/?fromgroups#!forum/locomotivecms)
 - [Follow us on twitter](http://twitter.com/locomotivecms)
 
+## Translating the back-office ##
+
+By default, the Locomotive back-office is fully translated in English. But adding a new language is pretty straightforward since we now manage all our I18n translation keys in [Transifex](https://www.transifex.com), a platform dedicated to this kind of task.
+
+Here is our Transifex portal page: [https://www.transifex.com/locomotive/locomotive-engine](https://www.transifex.com/locomotive/locomotive-engine). Feel free to sign up and translate!
+
 ## Contributing to Locomotive ##
 
 Locomotive is an open source project, we encourage contributions. If you have found a bug and want to contribute a fix, or have a new feature you would like to add, follow the steps below to get your patch into the project:

data/app/api/locomotive/api/entities/content_type_entity.rb

@@ -5,7 +5,10 @@ module Locomotive
       class ContentTypeEntity < BaseEntity
 
         expose  :name, :slug, :description, :label_field_name, :order_direction,
-                :public_submission_enabled, :entry_template, :display_settings
+                :public_submission_enabled,
+                :public_submission_accounts,
+                :public_submission_title_template,
+                :entry_template, :display_settings
 
         expose :fields, using: ContentTypeFieldEntity do |content_type, _|
           content_type.ordered_entries_custom_fields || []

data/app/api/locomotive/api/forms/base_form.rb

@@ -52,9 +52,11 @@ module Locomotive
 
         # @override - only return set attributes
         def serializable_hash
-          changed.inject({}) do |hash, attribute|
+          changed.sort_by do |name|
+            self.class.attributes.index(:"#{name}=")
+          end.inject({}) do |hash, attribute|
             hash.merge({ attribute => send(attribute) })
-          end.with_indifferent_access
+          end.to_h.with_indifferent_access
         end
 
         def persisted?

data/app/api/locomotive/api/forms/content_type_form.rb

@@ -10,6 +10,7 @@ module Locomotive
               :order_by, :order_direction, :group_by,
               :public_submission_enabled,
               :public_submission_accounts,
+              :public_submission_title_template,
               :entry_template,
               :entries_custom_fields_attributes,
               :display_settings

data/app/api/locomotive/api/forms/theme_asset_form.rb

@@ -4,7 +4,7 @@ module Locomotive
 
       class ThemeAssetForm < BaseForm
 
-        attrs :source, :folder, :checksum
+        attrs :folder, :source, :checksum
 
       end
 

data/app/api/locomotive/api/resources/content_type_resource.rb

@@ -61,8 +61,9 @@ module Locomotive
               optional :entry_template
               optional :raw_item_template # deprecated
               optional :display_settings
-              optional :public_submission_account_emails
               optional :public_submission_enabled
+              optional :public_submission_account_emails
+              optional :public_submission_title_template
             end
           end
           post do
@@ -105,8 +106,9 @@ module Locomotive
               optional :entry_template
               optional :raw_item_template # deprecated
               optional :display_settings
-              optional :public_submission_account_emails
               optional :public_submission_enabled
+              optional :public_submission_account_emails
+              optional :public_submission_title_template
             end
           end
           put ':id' do

data/app/assets/javascripts/locomotive/views/inputs/array_view.js.coffee

@@ -40,6 +40,7 @@ class Locomotive.Views.Inputs.ArrayView extends Backbone.View
 
   make_remote_selectable: ->
     Select2.helpers.build @$new_input
+    @$new_input.on 'change', (e) => @begin_add_item(e)
 
   make_simple_selectable: ->
     @$new_input.select2

data/app/controllers/locomotive/current_site_controller.rb

@@ -44,6 +44,14 @@ module Locomotive
       end
     end
 
+    def new_url_redirection
+      if params[:url_redirection].present? && params[:url_redirection].include?(' ')
+        render partial: 'url_redirection', locals: { url_redirection: params[:url_redirection].split(' ') }
+      else
+        head :unprocessable_entity
+      end
+    end
+
     private
 
     def load_site

data/app/helpers/locomotive/editable_elements_helper.rb

@@ -46,9 +46,9 @@ module Locomotive
 
     def options_for_page_blocks(blocks)
       options_for_select(
-        [[t('.blocks.all'), '']] +
+        [[t(:all, scope: 'locomotive.editable_elements.edit.blocks'), '']] +
         blocks.map do |block|
-          block[:name].nil? ? [t('.blocks.unknown'), '_unknown'] : [block[:label], block[:name]]
+          block[:name].nil? ? [t(:unknown, scope: 'locomotive.editable_elements.edit.blocks'), '_unknown'] : [block[:label], block[:name]]
         end)
     end
 

data/app/helpers/locomotive/errors_helper.rb

@@ -9,13 +9,17 @@ module Locomotive
       options = Locomotive.config.host ? { host: Locomotive.config.host } : { only_path: true }
 
       if Locomotive::Account.count == 0
-        [t('.message.create_account'), sign_up_url(options)]
+        [no_site_message(:create_account), sign_up_url(options)]
       elsif current_locomotive_account
-        [t('.message.add_domain', host: request.host), sites_url(options)]
+        [no_site_message(:add_domain), sites_url(options)]
       else
-        [t('.message.sign_in', host: request.host), new_locomotive_account_session_url(options)]
+        [no_site_message(:sign_in), new_locomotive_account_session_url(options)]
       end
     end
 
+    def no_site_message(error_type)
+      t(error_type, host: request.host, scope: 'locomotive.errors.no_site.messsage')
+    end
+
   end
 end

data/app/helpers/locomotive/pages_helper.rb

@@ -39,8 +39,8 @@ module Locomotive
 
     def options_for_page_redirect_type
       [
-        [t('.redirect_type.permanent'), 301],
-        [t('.redirect_type.temporary'), 302]
+        [t('redirect_type.permanent', scope: 'locomotive.pages.form'), 301],
+        [t('redirect_type.temporary', scope: 'locomotive.pages.form'), 302]
       ]
     end
 

data/app/helpers/locomotive/shared/accounts_helper.rb

@@ -12,7 +12,7 @@ module Locomotive
 
       def account_avatar_and_name(account, size = '70x70#')
         avatar  = image_tag(account_avatar_url(account, size), class: 'img-circle', style: 'width: 20px')
-        profile = avatar + (account.try(:name) || t('.unknown_account'))
+        profile = avatar + (account.try(:name) || t(:unknown_account, scope: 'locomotive.dashboard.activity'))
       end
 
     end

data/app/inputs/locomotive/api_key_input.rb

@@ -8,13 +8,13 @@ module Locomotive
     end
 
     def api_key_html
-      api_key = object.api_key || I18n.t('locomotive.api_key.none')
+      api_key = object.api_key || I18n.t('simple_form.labels.locomotive.account.no_api_key')
       template.content_tag :code, api_key
     end
 
     def regenerate_button
       url = options[:url]
-      template.content_tag :button, I18n.t('locomotive.api_key.button'),
+      template.content_tag :button, I18n.t('simple_form.buttons.locomotive.account.new_api_key'),
         class:  'btn btn-default btn-primary btn-sm',
         data:   {
           url:      url,

data/app/mailers/locomotive/notifications.rb

@@ -4,16 +4,27 @@ module Locomotive
     default from: Locomotive.config.mailer_sender
 
     def new_content_entry(account, entry)
-      @account, @entry, @type = account, entry, entry.content_type
+      @site, @account = entry.site, account
+      @entry, @type   = entry, entry.content_type
 
       @domain = entry.site.domains.first ||
         ActionMailer::Base.default_url_options[:host] ||
         'localhost'
 
-      subject = t('locomotive.notifications.new_content_entry.subject', domain: @domain, type: @type.name, locale: account.locale)
+      subject = new_content_entry_subject(entry, domain: @domain, type: @type.name, locale: account.locale)
 
       mail subject: subject, to: account.email
     end
-  end
 
+    protected
+
+    def new_content_entry_subject(entry, options)
+      if entry.content_type.public_submission_title_template.blank?
+        t('locomotive.notifications.new_content_entry.subject', options)
+      else
+        entry.content_type.public_submission_title(entry, options)
+      end
+    end
+
+  end
 end

data/app/models/locomotive/concerns/content_type/entry_template.rb

@@ -25,7 +25,13 @@ module Locomotive
         def to_steam_entry(entry)
           entry_attributes = entry.attributes.symbolize_keys
 
-          steam_repositories.content_entry.with(to_steam).build(entry_attributes)
+          steam_repositories.content_entry.with(to_steam).build(entry_attributes).tap do |entity|
+            # copy error messages
+            entry.errors.each do |name, message|
+              next if name == :_slug
+              entity.errors.add(name, message)
+            end
+          end
         end
 
         def steam_repositories

data/app/models/locomotive/concerns/content_type/public_submission_title_template.rb

@@ -0,0 +1,24 @@
+module Locomotive
+  module Concerns
+    module ContentType
+      module PublicSubmissionTitleTemplate
+
+        extend ActiveSupport::Concern
+
+        included do
+          field :public_submission_title_template
+        end
+
+        def public_submission_title(entry, options)
+          template = ::Liquid::Template.parse(self.public_submission_title_template, {})
+
+          assigns   = { 'site' => self.site, 'entry' => entry }.merge(options)
+          registers = { site: self.site }
+
+          template.render(::Liquid::Context.new({}, assigns, registers))
+        end
+
+      end
+    end
+  end
+end

data/app/models/locomotive/concerns/site/access_points.rb

@@ -10,6 +10,7 @@ module Locomotive
           ## fields ##
           field :handle
           field :domains, type: Array, default: []
+          field :redirect_to_first_domain, type: Boolean, default: false
 
           ## indexes ##
           index domains: 1

data/app/models/locomotive/concerns/site/url_redirections.rb

@@ -0,0 +1,30 @@
+module Locomotive
+  module Concerns
+    module Site
+      module UrlRedirections
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## fields ##
+          field :url_redirections, type: Array
+
+        end
+
+        def url_redirections=(array)
+          super((array || []).flatten.map do |path|
+            add_leading_slash_to(path)
+          end.each_slice(2).to_a)
+        end
+
+        protected
+
+        def add_leading_slash_to(path)
+          path.starts_with?('/') ? path : "/#{path}"
+        end
+
+      end
+    end
+  end
+end

data/app/models/locomotive/content_entry.rb

@@ -77,6 +77,10 @@ module Locomotive
 
     alias :to_label :_label
 
+    def content_type_slug
+      self.content_type.try(:slug)
+    end
+
     def as_json(*args)
       super.tap { |json| json['_label'] = _label }
     end
@@ -116,8 +120,12 @@ module Locomotive
       end
     end
 
+    def to_steam(type = nil)
+      (type || self.content_type).to_steam_entry(self)
+    end
+
     def to_liquid(type = nil)
-      (type || self.content_type).to_steam_entry(self).to_liquid
+      to_steam(type).to_liquid
     end
 
     def touch_site_attribute

data/app/models/locomotive/content_type.rb

@@ -13,6 +13,7 @@ module Locomotive
     include Concerns::ContentType::GroupBy
     include Concerns::ContentType::OrderBy
     include Concerns::ContentType::ClassHelpers
+    include Concerns::ContentType::PublicSubmissionTitleTemplate
 
     ## fields ##
     field :name

data/app/models/locomotive/page.rb

@@ -130,7 +130,7 @@ module Locomotive
 
     def build_fullpath
       if self.index_or_not_found?
-        self.fullpath = self.slug
+        self.site.each_locale { |locale, current| self.fullpath = self.slug }
       else
         _parent = self.parent # do not hit the database more than once
 

data/app/models/locomotive/site.rb

@@ -9,6 +9,7 @@ module Locomotive
     include Concerns::Site::Locales
     include Concerns::Site::Timezone
     include Concerns::Site::Cache
+    include Concerns::Site::UrlRedirections
 
     ## fields ##
     field :name

data/app/policies/locomotive/site_policy.rb

@@ -46,16 +46,17 @@ module Locomotive
     end
 
     def permitted_attributes
-      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :cache_enabled]
-      hash  = { domains: [], locales: [] }
+      plain = [:name, :handle, :picture, :remove_picture, :seo_title, :meta_keywords, :meta_description, :timezone_name, :robots_txt, :cache_enabled, :redirect_to_first_domain]
+      hash  = { domains: [], locales: [], url_redirections: [] }
 
       unless update_advanced?
         plain -= [:timezone_name, :robots_txt, :cache_enabled]
         hash.delete(:locales)
+        hash.delete(:url_redirections)
       end
 
       unless point?
-        plain -= [:handle]
+        plain -= [:handle, :redirect_to_first_domain]
         hash.delete(:domains)
       end
 

data/app/uploaders/locomotive/theme_asset_uploader.rb

@@ -13,15 +13,12 @@ module Locomotive
       %w(jpg jpeg gif png css js swf flv eot svg ttf woff woff2 otf ico htc map)
     end
 
-    def self.url_for(site, path)
-      build(site, path).url
-    end
-
-    def self.build(site, path)
-      asset     = site.theme_assets.build(folder: File.dirname(path))
-      uploader  = ThemeAssetUploader.new(asset)
-      uploader.retrieve_from_store!(File.basename(path))
-      uploader
+    def apply_content_type_exception(value)
+      if content_type == 'image/svg+xml' && model.folder.starts_with?('fonts')
+        :font
+      else
+        value
+      end
     end
 
     def self.content_types

data/app/views/locomotive/content_assets/_list.html.slim

@@ -31,7 +31,7 @@
 
           |   
 
-          = link_to content_asset_path(current_site, asset, params.slice(:types, :query, :page, :per_page)), class: 'remove', method: :delete, data: { confirm: t('locomotive.messages.confirm'), return_url: request.original_url }, title: t('locomotive.buttons.delete'), remote: remote do
+          = link_to content_asset_path(current_site, asset, params.slice(:types, :query, :page, :per_page)), class: 'remove', method: :delete, data: { confirm: t('locomotive.messages.confirm'), return_url: request.original_url }, title: t(:delete, scope: 'simple_form.buttons.defaults.locomotive'), remote: remote do
             i.fa.fa-trash-o
 
   .text-center

data/app/views/locomotive/content_entries/_entry.html.slim

@@ -17,7 +17,7 @@
       = item._label
 
     .buttons
-      = link_to t(:edit, scope: 'locomotive.shared.form.array_input'), edit_content_entry_path(current_site, slug, item, _location: false), class: 'choose btn btn-primary btn-sm'
+      = link_to t(:edit, scope: 'locomotive.inputs.array'), edit_content_entry_path(current_site, slug, item, _location: false), class: 'choose btn btn-primary btn-sm'
       |  
       = link_to '#', class: 'delete' do
         i.fa.fa-trash-o