locomotivecms 3.1.0.rc1 → 3.1.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a3cb165ff1bbe1e5b8fea705053581be456012
-  data.tar.gz: 54fc46777e3a679f2c09244def6b2bfe117d5b2b
+  metadata.gz: 68959375952f5af98ae54eaa4803399910c58c4a
+  data.tar.gz: a3d522c11a07ba0378869fe223216d49454a7e29
 SHA512:
-  metadata.gz: d93e4fe52c4a93bbbe3d5f72035212160b2648edd7980c8b5ee7b686ea234a8d8241c3a68ae1581be69a3dfa712899a95027db65536a57c2afcf54d4aede24ec
-  data.tar.gz: 89cd938a73f2d8c4fc492d5a8458a7be10756ef5b96a83086b25650914b9a640cceca5262ba24f1a126dad12574047dd1b22d7fba80581dd1b2c45d114031097
+  metadata.gz: 7dc2fd75507c0bbd07a43de5f48f447714b46386fa5a1a7df23f018f3c636b481507e4166ba0ee539cc6c6bf4e698549af5cbc0274db72f56f01623ca91cd5dd
+  data.tar.gz: 0ae3cb47025dd58f397cddfe2ac438d703e6c95e66bfb04985e1403bb0680c39517471eb3bfa6fe7e513a0d6a51affe4de76d2c48eda3d47f4d6afd54fb849a6

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: '62c274f', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: 'c44f003', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers

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

@@ -47,6 +47,10 @@ module Locomotive
           site.metafields_schema.to_json
         end
 
+        expose :metafields_ui do |site, opts|
+          site.metafields_ui.to_json
+        end
+
       end
 
     end

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

@@ -4,7 +4,7 @@ module Locomotive
 
       class SiteForm < BaseForm
 
-        attrs :name, :handle, :robots_txt, :locales, :domains, :timezone, :picture, :cache_enabled, :private_access, :password, :metafields_schema, :metafields
+        attrs :name, :handle, :robots_txt, :locales, :domains, :timezone, :picture, :cache_enabled, :private_access, :password, :metafields_schema, :metafields, :metafields_ui
         attrs :seo_title, :meta_keywords, :meta_description, localized: true
 
         # Make sure locales and domains are in arrays.

data/app/api/locomotive/api/middlewares/locale_middleware.rb

@@ -17,6 +17,7 @@ module Locomotive
         #
         def call(env)
           locale = find_locale(env)
+          setup_i18n_fallback(env['locomotive.site'])
           ::Mongoid::Fields::I18n.with_locale(locale) do
             @app.call(env)
           end
@@ -32,6 +33,13 @@ module Locomotive
           Locomotive.config.site_locales.first
         end
 
+        def setup_i18n_fallback(site)
+          ::Mongoid::Fields::I18n.clear_fallbacks
+          (site.try(:locales) || []).each do |locale|
+            ::Mongoid::Fields::I18n.fallbacks_for(locale, site.locale_fallbacks(locale))
+          end
+        end
+
         def params(env)
           @params ||= Rack::Request.new(env).params
         end

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

@@ -43,12 +43,13 @@ module Locomotive
               optional :picture
               optional :metafields_schema
               optional :metafields
+              optional :metafields_ui
             end
           end
           put do
             authorize current_site, :update?
 
-            current_site_form = Forms::SiteForm.new(permitted_params_from_policy(current_site, :site, [:picture], [:metafields_schema, :metafields]))
+            current_site_form = Forms::SiteForm.new(permitted_params_from_policy(current_site, :site, [:picture], [:metafields_ui, :metafields_schema, :metafields]))
             service.update!(current_site, current_site_form.serializable_hash)
 
             present current_site, with: entity_klass

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

@@ -70,6 +70,7 @@ module Locomotive
               optional :password
               optional :metafields_schema
               optional :metafields
+              optional :metafields_ui
             end
           end
           post do

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

@@ -33,7 +33,7 @@ class Locomotive.Views.EditableElements.PageView extends Backbone.View
 
   _scroll_to: (element) ->
     return false if element.size() == 0
-    $(@el).animate({ scrollTop: element.offset().top }, 500)
+    @$('body').animate({ scrollTop: element.offset().top }, 500)
 
   each_elements: (view, callback) ->
     $form_view  = $(view.el).parent()

data/app/assets/javascripts/locomotive/views/inputs/rte/link_view.js.coffee

@@ -25,7 +25,7 @@ class Locomotive.Views.Inputs.Rte.LinkView extends Backbone.View
   create_popover: ->
     @$content.show()
     @$link.popover
-      container:  '.editable-elements'
+      container:  @$link.parents('fieldset')
       placement:  'right'
       content:    @$content
       html:       true

data/app/assets/javascripts/locomotive/views/inputs/rte/table_view.js.coffee

@@ -23,7 +23,7 @@ class Locomotive.Views.Inputs.Rte.TableView extends Backbone.View
   create_popover: ->
     @$content.show()
     @$link.popover
-      container:  '.editable-elements'
+      container:  @$link.parents('fieldset')
       placement:  'right'
       content:    @$content
       html:       true

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

@@ -33,17 +33,15 @@ class Locomotive.Views.Inputs.RteView extends Backbone.View
     @editor.on 'load', @register_editor_events
 
   render_views: ->
-    that = @
-    setTimeout(
-      ->
-        that.views = [
-          that.build_and_render_view(Locomotive.Views.Inputs.Rte.LinkView),
-          that.build_and_render_view(Locomotive.Views.Inputs.Rte.FileView),
-          that.build_and_render_view(Locomotive.Views.Inputs.Rte.ImageView),
-          that.build_and_render_view(Locomotive.Views.Inputs.Rte.TableView),
-          that.build_and_render_view(Locomotive.Views.Inputs.Rte.EditTableView)
-        ]
-    , 200)
+    @editor.on 'load', =>
+      @views = [
+        @build_and_render_view(Locomotive.Views.Inputs.Rte.LinkView),
+        @build_and_render_view(Locomotive.Views.Inputs.Rte.FileView),
+        @build_and_render_view(Locomotive.Views.Inputs.Rte.ImageView),
+        @build_and_render_view(Locomotive.Views.Inputs.Rte.TableView),
+        @build_and_render_view(Locomotive.Views.Inputs.Rte.EditTableView)
+      ]
+      console.log '[RTE] all views created and rendered'
 
   expand: (event) ->
     event.stopPropagation() & event.preventDefault()
@@ -91,7 +89,6 @@ class Locomotive.Views.Inputs.RteView extends Backbone.View
     @editor.on 'aftercommand:composer', @on_content_change
 
   on_content_change: ->
-    console.log 'modified'
     PubSub.publish 'inputs.text_changed',
       view:     @
       content:  @editor.getValue()

data/app/assets/javascripts/locomotive/views/shared/form_view.js.coffee

@@ -25,7 +25,6 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
     @enable_file_inputs()
     @enable_array_inputs()
     @enable_toggle_inputs()
-    @enable_date_inputs()
     @enable_datetime_inputs()
     @enable_text_inputs()
     @enable_rte_inputs()
@@ -116,21 +115,18 @@ class Locomotive.Views.Shared.FormView extends Backbone.View
         onSwitchChange: (event, state) ->
           $toggle.data('bootstrap-switch').labelText((if state then $toggle.data('off-text') else $toggle.data('on-text')))
 
-  enable_date_inputs: ->
-    @$('.input.date input[type=text]').each ->
-      $(@).datetimepicker
-        locale: window.content_locale
-        widgetParent: $(this).parents('.form-wrapper')
-        format: $(@).data('format')
-
   enable_datetime_inputs: ->
-    @$('.input.date-time input[type=text]').each ->
-      $(@).datetimepicker
-        locale: window.content_locale
+    @$('.input.date input[type=text], .input.date-time input[type=text]').each ->
+      format    = $(@).data('format')
+      datetime  = moment($(@).attr('value'), format)
+      datetime  = null unless datetime.isValid()
+
+      # https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1290
+      $(@).removeAttr('value').datetimepicker
+        locale:       window.locale
         widgetParent: $(this).parents('.form-wrapper')
-        use24hours: true
-        useseconds: false
-        format: $(@).data('format')
+        format:       format
+        defaultDate:  datetime
 
   enable_text_inputs: ->
     self = @

data/app/assets/javascripts/locomotive/views/shared/sidebar_view.js.coffee

@@ -17,6 +17,11 @@ class Locomotive.Views.Shared.SidebarView extends Backbone.View
     @pages_view.render()
     @collapse_in_sections()
     @close_sidebar_on_mobile()
+    @highlight_active_section()
+
+  highlight_active_section: ->
+    if section = $(@el).data('current-section')
+      @$(".sidebar-link.#{section}").addClass('is-active')
 
   toggle_sidebar: (event) ->
     if @is_sidebar_open() then @close_sidebar() else @show_sidebar()

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

@@ -103,6 +103,7 @@
 @import "old/form/document_picker";
 @import "old/form/link";
 @import "old/form/tags";
+@import "old/form/datetime_picker";
 @import "new/files";
 
 @import "old/search_bars";

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

@@ -0,0 +1,36 @@
+.simple_form {
+  fieldset .input.date, fieldset .input.date-time {
+
+    .bootstrap-datetimepicker-widget {
+
+      span.glyphicon {
+        font-family: FontAwesome;
+      }
+
+      span.glyphicon.glyphicon-chevron-up:before {
+        content: "\f077";
+      }
+
+      span.glyphicon.glyphicon-chevron-down:before {
+        content: "\f078";
+      }
+
+      span.glyphicon.glyphicon-chevron-left:before {
+        content: "\f053";
+      }
+
+      span.glyphicon.glyphicon-chevron-right:before {
+        content: "\f054";
+      }
+
+      span.glyphicon.glyphicon-calendar:before {
+        content: "\f073";
+      }
+
+      span.glyphicon.glyphicon-time:before {
+        content: "\f017";
+      }
+    }
+
+  }
+}

data/app/controllers/locomotive/concerns/within_site_controller.rb

@@ -26,6 +26,7 @@ module Locomotive
         helper  Locomotive::Shared::SitesHelper,
                 Locomotive::Shared::AccountsHelper,
                 Locomotive::Shared::PagesHelper,
+                Locomotive::Shared::SiteMetafieldsHelper,
                 Locomotive::ContentTypesHelper
 
       end

data/app/helpers/locomotive/base_helper.rb

@@ -34,15 +34,17 @@ module Locomotive
 
     #= Sidebar
 
-    def sidebar_link_class(section)
-      highlighted = case section
-      when :pages         then ['pages', 'editable_elements'].include?(self.controller.controller_name)
-      when :content_types then ['content_types', 'content_entries', 'public_submission_accounts', 'select_options'].include?(self.controller.controller_name)
+    def sidebar_current_section_class
+      case self.controller.controller_name
+      when 'pages', 'editable_elements' then :pages
+      when 'content_types', 'content_entries', 'public_submission_accounts', 'select_options' then :content_types
       else
-        self.controller.controller_name == section.to_s
+        self.controller.controller_name
       end
+    end
 
-      ['sidebar-link', highlighted ? 'is-active' : ''].join(' ')
+    def sidebar_link_class(section)
+      ['sidebar-link', section].join(' ')
     end
 
     #= Form helpers
@@ -196,8 +198,8 @@ module Locomotive
         .gsub('%d', 'DD')
         .gsub('%m', 'MM')
         .gsub('%Y', 'YYYY')
-        .gsub('%H', 'H')
-        .gsub('%M', 'm')
+        .gsub('%H', 'HH')
+        .gsub('%M', 'mm')
     end
 
     # Other helpers

data/app/helpers/locomotive/current_site_metafields_helper.rb

@@ -4,7 +4,7 @@ module Locomotive
     def current_site_metafields_schema
       @site_metafields_schema ||= @site.metafields_schema.map do |g|
         SchemaGroup.new(@site, g)
-      end.sort_by(&:position)
+      end.sort_by(&:_position)
     end
 
     class SchemaGroup
@@ -13,43 +13,41 @@ module Locomotive
         @site, @attributes = site, attributes
       end
 
-      def name
+      def _name
         @attributes['name'].downcase.underscore.gsub(' ', '_')
       end
 
-      alias :dom_id :name
+      alias :dom_id :_name
 
       def model_name
-        ActiveModel::Name.new(self, nil, name)
+        ActiveModel::Name.new(self, nil, _name)
       end
 
-      def label
-        t(@attributes['label'] || @attributes['name'].humanize)
+      def _label
+        _t(@attributes['label'] || @attributes['name'].humanize)
       end
 
-
-      def position
+      def _position
         @attributes['position']
       end
 
-      def fields
+      def _fields
         @fields ||= @attributes['fields'].map do |f|
-          SchemaField.new(@site, name, f)
+          SchemaField.new(@site, _name, f)
         end.sort_by(&:position)
       end
 
       def method_missing(name, *args, &block)
-        if field = fields.find { |f| f.name == name.to_s }
+        if field = _fields.find { |f| f.name == name.to_s }
           field.value
         else
           super
         end
       end
 
-
       protected
 
-      def t(value)
+      def _t(value)
         value.is_a?(Hash) ?  value[I18n.locale.to_s] || value['default'] : value
       end
 
@@ -108,7 +106,7 @@ module Locomotive
       def default_input_options
         {
           label:      self.label,
-          hint:       self.hint,
+          hint:       self.hint.try(:html_safe),
           as:         self.type,
           required:   false
         }

data/app/helpers/locomotive/dashboard_helper.rb

@@ -21,6 +21,7 @@ module Locomotive
       when 'content_entry'    then activity.action == 'created_public' ? 'fa-comment' : 'fa-archive'
       when 'content_asset'    then 'fa-file-picture-o'
       when 'membership'       then 'fa-user'
+      when 'site_metafields'  then current_site_metafields_ui[:icon]
       end
     end
 
@@ -34,6 +35,7 @@ module Locomotive
       when 'content_asset.created_bulk'     then { count: activity_emphasize(params[:assets].size) }
       when 'content_asset.destroyed'        then { name:  activity_emphasize(params[:name]) }
       when 'membership.created'             then { name: activity_emphasize(params[:name]) }
+      when 'site_metafields.updated'        then { label: current_site_metafields_ui[:label].downcase }
       end
 
       activity_key_to_sentence(activity.key, options)

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

@@ -0,0 +1,35 @@
+module Locomotive
+  module Shared
+    module SiteMetafieldsHelper
+
+      def current_site_metafields_ui
+        return @site_metafields_ui if @site_metafields_ui
+
+        _ui = current_site.metafields_ui
+
+        @site_metafields_ui = {}.tap do |ui|
+          # label displayed in the sidebar section
+          ui[:label] = current_site_metafields_ui_t(_ui['label'], t('locomotive.shared.sidebar.metafields'))
+
+          # top title displayed in the metafields view
+          ui[:title] = current_site_metafields_ui_t(_ui['label'], t('locomotive.current_site_metafields.index.title'))
+
+          # hint for the editing properties page
+          ui[:hint]  = current_site_metafields_ui_t(_ui['hint'], t('locomotive.current_site_metafields.index.help', default: ''))
+
+          # icon in the sidebar
+          ui[:icon]  = "fa-#{_ui['icon'].present? ? _ui['icon'] : 'newspaper-o'}"
+        end
+      end
+
+      def current_site_metafields_ui_t(value, default = nil)
+        (if value.is_a?(Hash)
+          value[I18n.locale.to_s] || value['default']
+        else
+          value
+        end || default).html_safe
+      end
+
+    end
+  end
+end

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

@@ -8,8 +8,9 @@ module Locomotive
         included do
 
           ## fields ##
-          field :metafields,        type: Hash, default: {}
-          field :metafields_schema, type: Array, default: []
+          field :metafields,        type: Hash,   default: {}
+          field :metafields_schema, type: Array,  default: []
+          field :metafields_ui,     type: Hash,   default: {}
 
           ## validations ##
           validate :validate_metafields_schema
@@ -38,11 +39,15 @@ module Locomotive
         end
 
         def metafields_schema=(schema)
-          super(schema.is_a?(String) ? ActiveSupport::JSON.decode(schema) : schema)
+          super(decode_json(schema))
         end
 
         def metafields=(values)
-          super(values.is_a?(String) ? ActiveSupport::JSON.decode(values) : values)
+          super(decode_json(values))
+        end
+
+        def metafields_ui=(ui)
+          super(decode_json(ui))
         end
 
         protected
@@ -64,13 +69,13 @@ module Locomotive
               'field' => {
                 'type' => 'object',
                 'properties' => {
-                  'name' => { 'type' => 'string' },
+                  'name' => { 'type' => 'string', 'not': { 'enum': ['dom_id', 'model_name', 'method_missing', '_name', '_label', '_position', '_fields', '_t'] } },
                   'label' => { 'type' => ['string', 'object'] },
                   'hint' => { 'type' => ['string', 'object'] },
                   'type' => { 'enum': ['string', 'text', 'integer', 'float', 'file', 'image', 'boolean', 'select', 'color'] },
                   'position' => { 'type' => 'integer' },
                   'select_options' => { 'type' => ['object', 'array'] },
-                  'localized' => { 'type' => 'boolean' }
+                  'localized' => { 'type' => 'boolean' },
                 },
                 'required' => ['name']
               }
@@ -89,6 +94,10 @@ module Locomotive
           }
         end
 
+        def decode_json(input)
+          input.is_a?(String) ? ActiveSupport::JSON.decode(input) : input
+        end
+
       end
 
     end