locomotivecms 3.1.2 → 3.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6105be0f3181cce9edeefb6a62b4283db567f488
-  data.tar.gz: 5264069bb0598910ef1d38d6c0a215dba421a22a
+  metadata.gz: 6d7f0c5e48f68f759f41888d41ade21307fbcfbc
+  data.tar.gz: b62b7a54565e3b3c43e832835b4cb0594bcc4aca
 SHA512:
-  metadata.gz: 96e0be31c4108d230297dd387a68a96e541e34c2bf1adaf24d0d1abc28fda235313d11ad3f129d11c115055652fdc8c17345b14a75e6cde3d7de2d9e751e493e
-  data.tar.gz: 7272fc8c002016209806c62066aa033878abb7d3caa4ac7d52b7a6389a14fd7fe98f913de2f72e2c5f843961ed975ed8c645cd24a2cecbdc23be72120b221bc0
+  metadata.gz: 71aa9913b497f9fdd2544524eb7a0146ee53394f340ecc32bf46d631424948baf0563123db6ad463bab87f76a7966cfaad7ae5348e09d10707c7f6d583bce3d5
+  data.tar.gz: 30f413e33dc9802a3d95af5d6c4b8280dafb90c775bcf468f8c008f190ccca62f39bb832a0b4c0ba000d4f9849f2f5e0ab634c86043a7afda51ac1473512d006

data/Gemfile

@@ -25,7 +25,7 @@ group :development do
   # gem 'locomotivecms_common', github: 'locomotivecms/common', ref: '257047b', require: false
 
   # gem 'locomotivecms_steam', path: '../gems/steam', require: false
-  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'fe7403ce999a62', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c17802c', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers

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

@@ -8,7 +8,7 @@ module Locomotive
                 :public_submission_enabled,
                 :public_submission_accounts,
                 :public_submission_title_template,
-                :entry_template, :display_settings
+                :entry_template, :display_settings, :filter_fields
 
         expose :fields, using: ContentTypeFieldEntity do |content_type, _|
           content_type.ordered_entries_custom_fields || []

data/app/api/locomotive/api/exception_rescuers.rb

@@ -18,7 +18,7 @@ module Locomotive
         end
 
         rescue_from ::Mongoid::Errors::Validations do |e|
-          error_response(message: { error: 'Resource invalid', attributes: e.document.errors.full_messages }, status: 422)
+          error_response(message: { error: 'Resource invalid', attributes: e.document.errors.messages }, status: 422)
         end
 
         rescue_from Grape::Exceptions::ValidationErrors do |e|

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

@@ -13,7 +13,8 @@ module Locomotive
               :public_submission_title_template,
               :entry_template,
               :entries_custom_fields_attributes,
-              :display_settings
+              :display_settings,
+              :filter_fields
 
         # @param [ Site ] the current site, or site to scope to
         def initialize(site, attributes = {})

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

@@ -62,6 +62,7 @@ module Locomotive
               optional :entry_template
               optional :raw_item_template # deprecated
               optional :display_settings
+              optional :filter_fields
               optional :public_submission_enabled
               optional :public_submission_account_emails
               optional :public_submission_title_template
@@ -108,6 +109,7 @@ module Locomotive
               optional :entry_template
               optional :raw_item_template # deprecated
               optional :display_settings
+              optional :filter_fields
               optional :public_submission_enabled
               optional :public_submission_account_emails
               optional :public_submission_title_template

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

@@ -7,20 +7,21 @@ class Locomotive.Views.EditableElements.IframeView extends Backbone.View
   startup: true
 
   initialize: ->
-    # shortcut
-    @window = $(@el)[0].contentWindow
+    if $(@el).size() > 0
+      # shortcut
+      @window = $(@el)[0].contentWindow
 
-    # when the url of the iframe changes, process
-    $(@el).load (event) => @on_load(event)
+      # when the url of the iframe changes, process
+      $(@el).load (event) => @on_load(event)
 
   reload: ->
     $(@el).attr('src', @preview_url)
 
   on_load: (event) ->
-    @register_beforeunload()
-
     # Able to get the path to the edit form?
-    if (path = @edit_view_path())?
+    if (path = @edit_view_path(event))?
+      @register_beforeunload()
+
       @preview_url = @window.document.location.href
 
       if !@startup
@@ -29,9 +30,11 @@ class Locomotive.Views.EditableElements.IframeView extends Backbone.View
       else
         @startup = false
 
-    @build_and_render_page_view()
+      @build_and_render_page_view()
 
-  edit_view_path: ->
+    return false;
+
+  edit_view_path: (event) ->
     # the browser might be unable to load the iframe because of
     # the 'X-Frame-Options' option which is set to 'SAMEORIGIN'.
     try
@@ -41,6 +44,7 @@ class Locomotive.Views.EditableElements.IframeView extends Backbone.View
       # reload the iframe with the previous url and display an error message
       @reload()
       Locomotive.notify $(@el).data('redirection-error'), 'warning'
+
       return null
 
   build_and_render_page_view: ->

data/app/assets/javascripts/locomotive/views/inputs/rte_view.js.coffee.erb

@@ -87,6 +87,7 @@ class Locomotive.Views.Inputs.RteView extends Backbone.View
 
     @editor.on 'change', @on_content_change
     @editor.on 'aftercommand:composer', @on_content_change
+    @editor.on 'change_view', @resize
 
   on_content_change: ->
     PubSub.publish 'inputs.text_changed',
@@ -98,18 +99,22 @@ class Locomotive.Views.Inputs.RteView extends Backbone.View
 
   resize: ->
     $iframe   = @$('.form-wrapper .wysihtml5-sandbox')
+    $textarea = @$('.form-wrapper textarea')
     $inputs   = $(@el).parents('.inputs')
     $wrapper  = @$('.form-wrapper')
 
     if $inputs.hasClass('expanded')
-      delta_height        = $wrapper.outerHeight() - $iframe.outerHeight()
-      wrapper_max_height  = $(@el).height() - ($wrapper.outerHeight() - $wrapper.height() + parseInt($wrapper.css('margin-top')) + parseInt($(@el).css('padding-bottom')))
-      height              = wrapper_max_height - delta_height
+      for $target in [$iframe, $textarea]
+        delta_height        = $wrapper.outerHeight() - $target.outerHeight()
+        wrapper_max_height  = $(@el).height() - ($wrapper.outerHeight() - $wrapper.height() + parseInt($wrapper.css('margin-top')) + parseInt($(@el).css('padding-bottom')))
+        height              = wrapper_max_height - delta_height
 
-      $iframe.data('height', $iframe.css('height')) unless $iframe.data('height')?
-      $iframe.css('min-height', height)
+        $target.data('height', $target.css('height')) unless $target.data('height')?
+        $target.css('min-height', height)
     else
-      $iframe.css('min-height', $iframe.data('height'))
+      for $el in [$iframe, $textarea]
+        $el.css('min-height', $el.data('height'))
+
 
   remove: ->
     _.invoke @views, 'remove'

data/app/assets/stylesheets/locomotive/application.scss

@@ -105,6 +105,7 @@
 @import "old/form/tags";
 @import "old/form/datetime_picker";
 @import "new/files";
+@import "new/flags";
 
 @import "old/search_bars";
 @import "new/notify";

data/app/assets/stylesheets/locomotive/new/_flags.scss.erb

@@ -0,0 +1,21 @@
+.flag {
+  display: inline-block;
+  vertical-align: middle;
+  width: 24px;
+  height: 24px;
+  background-repeat: no-repeat;
+  background-size: 24px;
+  background-position: 0 0;
+
+  <% %w(bf bg cs de en es et fr it ja lt mg nb nl pl pt-BR pt ru sk sr sv zh-CN).each do |locale| %>
+  &.flag-<%= locale %> {
+    background-image: url(asset-path('locomotive/icons/flags/<%= locale %>.png'));
+  }
+  <% end %>
+
+  &.flag-17-17 {
+    width: 17px;
+    height: 17px;
+    background-size: 17px;
+  }
+}

data/app/assets/stylesheets/locomotive/old/form/_popover.scss

@@ -1,26 +1,30 @@
 .popover {
+  margin-top: 60px !important;
+  .arrow {
+    margin-top: -71px !important;
+  }
   .simple_form {
-    padding-bottom: 0px;
+    padding-bottom: 0;
 
     fieldset {
-      padding-top: 0px;
+      padding-top: 0;
 
       .input {
-        padding: 0px;
-        background: transparent;
+        padding: 0;
         margin-bottom: 10px;
+        background: transparent;
 
         .control-label {
           font-size: 10px;
         }
 
         .form-wrapper {
-          margin-top: 0px;
+          margin-top: 0;
           border-width: 3px;
 
           .form-control {
-            padding: 5px 6px;
             height: 22px;
+            padding: 5px 6px;
             font-size: 12px;
           }
 
@@ -29,8 +33,8 @@
               border: none;
             }
             .input-group-addon {
-              border: none;
               padding: 3px 4px;
+              border: none;
             }
           }
         }
@@ -39,13 +43,13 @@
           .form-wrapper {
             border: none;
             .form-control {
-              border-width: 3px;
               height: 28px;
               line-height: 28px;
+              border-width: 3px;
 
               .select2-choice {
-                padding-left: 0px;
                 height: 28px;
+                padding-left: 0;
                 line-height: 14px;
 
                 .select2-arrow {
@@ -60,7 +64,7 @@
     }
 
     p {
-      margin: 3px 0px;
+      margin: 3px 0;
     }
   }
 }

data/app/assets/stylesheets/locomotive/old/form/_select2.scss

@@ -80,8 +80,8 @@ $select2-height:                  32px;
 // custom label
 
 .select2-selection, .select2-results {
-  img.flag {
-    margin-right: 5px;
+  .flag {
+    margin-right: 3px;
   }
 }
 

data/app/helpers/locomotive/base_helper.rb

@@ -90,9 +90,9 @@ module Locomotive
       end
     end
 
-    def locale_picker_link
+    def locale_picker_link(&block)
       return '' if current_site.locales.size == 1
-      render 'locomotive/shared/locale_picker_link'
+      render partial: 'locomotive/shared/locale_picker_link', locals: { url_block: block_given? ? block : nil }
     end
 
     def flash_message
@@ -152,7 +152,7 @@ module Locomotive
     # @return [ String ] The HTML image tag with the path to the matching flag.
     #
     def flag_tag(locale, size = '24x24')
-      image_tag("locomotive/icons/flags/#{locale}.png", class: "flag flag-#{locale}", size: size)
+      %(<i class="flag flag-#{locale} flag-#{size.gsub('x', '-')}"></i>).html_safe
     end
 
     def nocoffee_tag
@@ -239,20 +239,32 @@ module Locomotive
 
     # cache keys
 
+    def base_cache_key_without_site
+      [Locomotive::VERSION, locale]
+    end
+
+    def base_cache_key
+      base_cache_key_without_site + [ current_site._id, current_site.handle]
+    end
+
+    def base_cache_key_for_sidebar
+      base_cache_key + [current_membership.role]
+    end
+
     def cache_key_for_sidebar
-      "#{Locomotive::VERSION}/site/#{current_site._id}/sidebar/#{current_site.last_modified_at.to_i}/role/#{current_membership.role}/locale/#{::Mongoid::Fields::I18n.locale}"
+      base_cache_key_for_sidebar + ['sidebar', current_site.last_modified_at.to_i, current_content_locale]
     end
 
     def cache_key_for_sidebar_pages
       count          = current_site.pages.count
       max_updated_at = current_site.pages.max(:updated_at).try(:utc).try(:to_s, :number).to_i
-      "#{Locomotive::VERSION}/site/#{current_site._id}/#{current_site.handle}/sidebar/pages-#{count}-#{max_updated_at}/locale/#{::Mongoid::Fields::I18n.locale}"
+      base_cache_key_for_sidebar + ['pages', count, max_updated_at, current_content_locale]
     end
 
     def cache_key_for_sidebar_content_types
       count          = current_site.content_types.count
-      max_updated_at = current_site.content_entries.max(:updated_at).try(:utc).try(:to_s, :number).to_i
-      "#{Locomotive::VERSION}/site/#{current_site._id}/#{current_site.handle}/sidebar/content_types-#{count}-#{max_updated_at}"
+      max_updated_at = current_site.content_types.max(:updated_at).try(:utc).try(:to_s, :number).to_i
+      base_cache_key_for_sidebar + ['content_types', count, max_updated_at]
     end
 
   end

data/app/helpers/locomotive/content_types_helper.rb

@@ -18,7 +18,7 @@ module Locomotive
         link_to label, link  # default one
       else
         assigns   = { 'site' => current_site, 'entry' => entry.to_liquid(content_type), 'link' => link, 'today' => Date.today, 'now' => Time.zone.now }
-        registers = { site: current_site, locale: ::Mongoid::Fields::I18n.locale.to_s, services: Locomotive::Steam::Services.build_instance }
+        registers = { site: current_site, locale: current_content_locale.to_s, services: Locomotive::Steam::Services.build_instance }
         context   = ::Liquid::Context.new({}, assigns, registers)
 
         content_type.render_entry_template(context).html_safe

data/app/helpers/locomotive/editable_elements_helper.rb

@@ -52,5 +52,20 @@ module Locomotive
         end)
     end
 
+    def page_locale_picker_link(page, content_entry)
+      service = Locomotive::Steam::Services.build_instance
+      _page   = Locomotive::Steam::Decorators::PageDecorator.new(page.to_steam, current_content_locale, current_site.default_locale)
+
+      _page.content_entry   = content_entry
+      service.current_site  = current_site
+
+      base_params = @content_entry ? "content_entry_id=#{@content_entry.try(:_id)}" : ""
+
+      locale_picker_link do |locale|
+        url = service.url_builder.url_for(_page, locale)[1..-1]
+        "?content_locale=#{locale}&preview_path=#{url}&#{base_params}"
+      end
+    end
+
   end
 end

data/app/helpers/locomotive/my_account_helper.rb

@@ -2,16 +2,12 @@ module Locomotive
   module MyAccountHelper
 
     def options_for_locale
-      Rails.cache.fetch("#{Locomotive::VERSION}/views/helpers/options_for_locale") do
-        Locomotive.config.locales.map do |locale|
-          flag_url = path_to_image "locomotive/icons/flags/#{locale}.png"
-
-          [
-            I18n.t("locomotive.locales.#{locale}"),
-            locale,
-            { :"data-flag" => flag_url }
-          ]
-        end
+      Locomotive.config.locales.map do |locale|
+        [
+          I18n.t("locomotive.locales.#{locale}"),
+          locale,
+          {}
+        ]
       end
     end
 

data/app/helpers/locomotive/pages_helper.rb

@@ -26,7 +26,7 @@ module Locomotive
     end
 
     def display_page_layouts?
-      ((@page.persisted? && @page.allow_layout?) || !@page.persisted?) &&
+      ((@page.persisted? && @page.allow_layout? && @page.use_layout?) || !@page.persisted?) &&
       !current_site.pages.layouts.empty?
     end
 
@@ -34,6 +34,7 @@ module Locomotive
       layouts = current_site.pages.layouts.map do |_layout|
         [_layout.title, _layout._id]
       end
+
       @page.index? ? layouts : [[t(:no_layout, scope: 'locomotive.pages.form'), 'parent']] + layouts
     end
 

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

@@ -36,32 +36,15 @@ module Locomotive
 
         extend Forwardable
 
-        def_delegators :page, :_id, :title, :index_or_not_found?, :published?, :templatized?, :translated?, :redirect?, :response_type, :depth
+        def_delegators :page, :_id, :parent, :title, :index_or_not_found?, :published?, :templatized?, :translated?, :redirect?, :response_type, :depth
 
         def fold_state
           controller.send(:cookies)["node-#{_id}"] != 'unfolded' ? 'folded' : 'unfolded'
         end
 
         def nodes
-          children.map { |(child, children)| self.class.new(child, children, controller) }
-        end
-
-        def icon
-          if templatized?
-            'fa-gear'
-          elsif redirect?
-            'fa-link'
-          else
-            response_type_icon
-          end
-        end
-
-        def response_type_icon
-          case response_type
-          when 'application/rss+xml'          then 'fa-rss'
-          when 'application/json', 'text/xml' then 'fa-file-code-o'
-          else
-            'fa-file-text-o fa-flip-horizontal'
+          children.map do |(child, children)|
+            self.class.new(child, children, controller)
           end
         end
 
@@ -77,20 +60,32 @@ module Locomotive
           base.join(' ')
         end
 
-        def text_inline_style
-          if width = max_width
+        def text_inline_style(inc = 0)
+          if width = max_width(inc)
             "max-width: #{width}px;"
           else
             ''
           end
         end
 
+        def deeper_text_inline_style
+          text_inline_style(1)
+        end
+
         def draggable
-          !index_or_not_found? && !templatized? ? 'draggable' : ''
+          draggable? ? 'draggable' : ''
         end
 
         def draggable?
-          !index_or_not_found? && !templatized?
+          !index_or_not_found? && (templatized? || !templatized_parent?)
+        end
+
+        def templatized_parent?
+          parent.templatized?
+        end
+
+        def templatized_children?
+          !templatized_page.nil?
         end
 
         def templatized_page
@@ -109,8 +104,8 @@ module Locomotive
           end)
         end
 
-        def max_width
-          depth >= 2 ? MAX_WIDTH[depth - 2] : nil
+        def max_width(inc = 0)
+          depth >= 2 ? MAX_WIDTH[depth - 2 + inc] : nil
         end
 
         alias :to_param :_id