locomotivecms 3.0.1 → 3.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a0a1781f88c6f7d67c51dba24298c5be9880728
-  data.tar.gz: 35b36ae8bbc5c7aa6e857dea7f67707c4c6d7e24
+  metadata.gz: b4a3cb165ff1bbe1e5b8fea705053581be456012
+  data.tar.gz: 54fc46777e3a679f2c09244def6b2bfe117d5b2b
 SHA512:
-  metadata.gz: e55ecd3fa077eb76429b00b147fad3ad12d8ab13a3d3f816183d3168042324455b145751b2eb06c2a148a44f3bb1a9024f1ec00750abfddeb064b31ade9c2426
-  data.tar.gz: d783f608c5e0b57a2c2fee907a18de0435534a815f99f4b00ac69d6cceba3a99f9118eda36db206c81f0cb0909d6385f064289f215f8aebc574796b48b7d40c1
+  metadata.gz: d93e4fe52c4a93bbbe3d5f72035212160b2648edd7980c8b5ee7b686ea234a8d8241c3a68ae1581be69a3dfa712899a95027db65536a57c2afcf54d4aede24ec
+  data.tar.gz: 89cd938a73f2d8c4fc492d5a8458a7be10756ef5b96a83086b25650914b9a640cceca5262ba24f1a126dad12574047dd1b22d7fba80581dd1b2c45d114031097

data/Gemfile

@@ -19,10 +19,13 @@ end
 group :development do
   # gem 'custom_fields', path: '../custom_fields'
   # gem 'custom_fields', path: '../gems/custom_fields' # for Developers
-  # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: '131b6a6'
+  # gem 'custom_fields', github: 'locomotivecms/custom_fields', ref: 'b5dcac5'
+
+  # gem 'locomotivecms_common', path: '../gems/common', require: false
+  # 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: '0cdb255dafd13', require: false
+  # gem 'locomotivecms_steam', github: 'locomotivecms/steam', ref: '62c274f', require: false
 
   # gem 'locomotive_liquid', path: '../gems/liquid' # for Developers
   # gem 'locomotivecms_solid', path: '../gems/solid' # for Developers

data/app/api/locomotive/api.rb

@@ -4,6 +4,10 @@ require 'pundit'
 module Locomotive
   module API
 
+    # FIX: reload! will work as expected in production
+    module Middlewares; end
+    module Entities; end
+
     def self.to_app
       Rack::Builder.new do
         use Locomotive::API::Middlewares::LocaleMiddleware

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

@@ -39,6 +39,14 @@ module Locomotive
           Locomotive::Engine.routes.url_helpers.new_locomotive_account_session_url(host: opts[:env]['HTTP_HOST'])
         end
 
+        expose :metafields do |site, opts|
+          site.metafields.to_json
+        end
+
+        expose :metafields_schema do |site, opts|
+          site.metafields_schema.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
+        attrs :name, :handle, :robots_txt, :locales, :domains, :timezone, :picture, :cache_enabled, :private_access, :password, :metafields_schema, :metafields
         attrs :seo_title, :meta_keywords, :meta_description, localized: true
 
         # Make sure locales and domains are in arrays.

data/app/api/locomotive/api/helpers/params_helper.rb

@@ -19,13 +19,18 @@ module Locomotive
         #
         # permitted_params_from_policy(current_site, :site, [:picture])
         #
-        def permitted_params_from_policy(object_or_class, key, file_inputs = nil)
+        def permitted_params_from_policy(object_or_class, key, file_keys = nil, json_keys = nil)
           _params = permitted_params[key]
 
-          build_uploaded_files_from_params!(_params, file_inputs) if file_inputs
+          build_uploaded_files_from_params!(_params, file_keys) if file_keys
+
+          json_params = json_params!(_params, json_keys || [])
 
           _attributes = policy(object_or_class).permitted_attributes
-          ::ActionController::Parameters.new(_params).permit(*_attributes)
+
+          ::ActionController::Parameters.new(_params).permit(*_attributes).tap do |strong_params|
+            (json_keys || []).each { |k| strong_params[k] = json_params[k] }
+          end
         end
 
         def build_uploaded_files_from_params!(hash, list)
@@ -38,6 +43,12 @@ module Locomotive
           end
         end
 
+        def json_params!(hash, keys)
+          {}.tap do |json_params|
+            keys.each { |key| json_params[key] = hash.delete(key) }
+          end
+        end
+
       end
 
     end

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

@@ -17,11 +17,9 @@ module Locomotive
         private
 
         def log_message(response, env)
-          return unless Rails.env.development? || Rails.env.test?
-
           message = payload(response, env).map { |p| "#{p.first}=\"#{p.last}\"" }.join(' ')
 
-          Rails.logger.debug(message)
+          Rails.logger.info(message)
         end
 
         def payload(response, env)

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

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

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

@@ -14,14 +14,14 @@ module Locomotive
 
           desc 'Index of pages'
           get '/' do
-            authorize(pages, :index?)
+            authorize Page, :index?
 
             present pages, with: entity_klass, site: current_site
           end
 
           desc 'Only full path of pages'
           get '/fullpaths' do
-            authorize(pages, :index?)
+            authorize Page, :index?
 
             present pages.only(:_id, :fullpath), with: Locomotive::API::Entities::FullpathPageEntity
           end

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

@@ -68,6 +68,8 @@ module Locomotive
               optional :cache_enabled
               optional :private_access
               optional :password
+              optional :metafields_schema
+              optional :metafields
             end
           end
           post do
@@ -96,6 +98,8 @@ module Locomotive
               optional :cache_enabled
               optional :private_access
               optional :password
+              optional :metafields_schema
+              optional :metafields
             end
           end
           put ':id' do

data/app/assets/javascripts/locomotive.js

@@ -12,6 +12,9 @@
 //= require backbone/backbone
 //= require bootstrap-tagsinput/bootstrap-tagsinput
 //= require select2/select2
+//= require moment/moment
+//= require moment-timezone/moment-timezone
+//= require eonasdan-bootstrap-datetimepicker/bootstrap-datetimepicker
 //= require codemirror
 //= require codemirror/modes/markdown
 //= require nprogress
@@ -22,4 +25,3 @@
 $(document).ready(function() {
   $.datepicker.setDefaults($.datepicker.regional[window.locale]);
 });
-

data/app/assets/javascripts/locomotive/utils/core_ext.js

@@ -71,5 +71,15 @@
 
   $.ui.dialog.prototype.overlayEl = function() { return this.overlay.$el; }
 
+  window.absolute_url = function(url) {
+    if (url.indexOf('http') == 0)
+      return url;
+
+    http    = location.protocol;
+    slashes = http.concat("//");
+
+    return slashes.concat(window.location.host).concat(url);
+  }
+
 })();
 

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

@@ -10,22 +10,6 @@
 
 )(wysihtml5)
 
-
-# New command: insert file
-((wysihtml5) ->
-
-  wysihtml5.commands.insertFile =
-    exec: (composer, command, param) ->
-      # do nothing
-      # console.log "[insertFile] exec(#{command}, #{param})"
-
-    state: (composer, command) ->
-      # console.log "[insertFile] state(#{command})"
-      wysihtml5.commands.insertImage.state(composer, command, "IMG")
-      # wysihtml5.commands.formatBlock.state(composer, "formatBlock", null, CLASS_NAME, REG_EXP)
-
-)(wysihtml5)
-
 # Replace command: insert table
 ((wysihtml5) ->
 

data/app/assets/javascripts/locomotive/views/application_view.js.coffee

@@ -5,13 +5,19 @@ class Locomotive.Views.ApplicationView extends Locomotive.Views.SimpleView
   el: 'body'
 
   events:
-    'click .navbar .navbar-toggle': 'slide_sidebar'
+    'click .navigation-app .navigation-trigger': 'toggle_sidebar'
 
   initialize: ->
+    _.bindAll(@, 'toggle_sidebar')
+
     @header_view  = new Locomotive.Views.Shared.HeaderView()
     @sidebar_view = new Locomotive.Views.Shared.SidebarView()
     @drawer_view  = new Locomotive.Views.Shared.DrawerView()
 
+    @tokens = [PubSub.subscribe 'sidebar.close', @toggle_sidebar]
+
+    window.unsaved_content = false
+
   render: ->
     super
 
@@ -22,8 +28,10 @@ class Locomotive.Views.ApplicationView extends Locomotive.Views.SimpleView
 
     @automatic_max_height()
 
-  slide_sidebar: (event) ->
-    $('body').toggleClass('slide-right-sidebar')
+    @register_warning_if_unsaved_content()
+
+  toggle_sidebar: (event) ->
+    @sidebar_view.toggle_sidebar()
 
   automatic_max_height: ->
     $(window).on 'resize', =>
@@ -37,3 +45,12 @@ class Locomotive.Views.ApplicationView extends Locomotive.Views.SimpleView
     @$('> .wrapper').height(height)
 
     height
+
+  register_warning_if_unsaved_content: ->
+    $(window).bind 'beforeunload', ->
+      if window.unsaved_content
+        return $('meta[name=unsaved-content-warning]').attr('content')
+
+  remove: ->
+    super()
+    _.each @tokens, (token) -> PubSub.unsubscribe(token)

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

@@ -8,8 +8,15 @@ class Locomotive.Views.CurrentSite.EditView extends Locomotive.Views.Shared.Form
 
   initialize: ->
     @attach_events_on_private_access_attribute()
+    @display_locale_picker_only_for_seo()
 
   attach_events_on_private_access_attribute: ->
     @$('#site_private_access').on 'switchChange.bootstrapSwitch', (event, state) ->
       $inputs = $('.locomotive_site_password')
       $inputs.toggleClass('hide')
+
+  display_locale_picker_only_for_seo: ->
+    $picker = @$('.locale-picker-btn-group').css(visibility: 'hidden')
+
+    @$('a[data-toggle="tab"]').on 'shown.bs.tab', (event) ->
+      if $(event.target).attr('href') == '#seo' then $picker.css(visibility: '') else $picker.css(visibility: 'hidden')

data/app/assets/javascripts/locomotive/views/current_site_metafields/index_view.js.coffee

@@ -0,0 +1,7 @@
+#= require ../shared/form_view
+
+Locomotive.Views.CurrentSiteMetafields ||= {}
+
+class Locomotive.Views.CurrentSiteMetafields.IndexView extends Locomotive.Views.Shared.FormView
+
+  el: '.main'

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

@@ -2,9 +2,9 @@ Locomotive.Views.EditableElements ||= {}
 
 class Locomotive.Views.EditableElements.EditView extends Locomotive.Views.Shared.FormView
 
-  el: '.content > .inner'
+  el: '.content-main > .actionbar .content'
 
-  events:
+  events: _.extend {}, Locomotive.Views.Shared.FormView.prototype.events,
     'click .form-group.rte label':  'select_editable_text'
     'click .form-group.text label': 'select_editable_text'
 

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

@@ -17,6 +17,8 @@ class Locomotive.Views.EditableElements.IframeView extends Backbone.View
     $(@el).attr('src', @preview_url)
 
   on_load: (event) ->
+    @register_beforeunload()
+
     # Able to get the path to the edit form?
     if (path = @edit_view_path())?
       @preview_url = @window.document.location.href
@@ -53,6 +55,14 @@ class Locomotive.Views.EditableElements.IframeView extends Backbone.View
     # insert the highlighter CSS (path to the CSS in the iframe data)
     window.addStylesheet(@window.document, $(@el).data('style-path'))
 
+  register_beforeunload: ->
+    $(@window).off  'beforeunload', @warn_if_unsaved_content
+    $(@window).on   'beforeunload', @warn_if_unsaved_content
+
+  warn_if_unsaved_content: ->
+    if window.unsaved_content
+      return $('meta[name=unsaved-content-warning]').attr('content')
+
   remove: ->
     super()
     @page_view.remove() if @page_view?

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

@@ -2,13 +2,15 @@ Locomotive.Views.EditableElements ||= {}
 
 class Locomotive.Views.EditableElements.IndexView extends Backbone.View
 
-  el: '.wrapper'
+  el: '.content-main'
 
   events:
-    'click .content .expand-button': 'expand_preview'
-    'click .content .close-button':  'shrink_preview'
+    'click .actionbar .actionbar-trigger': 'toggle_preview'
+    'click .content-overlay': 'close_sidebar'
 
   initialize: ->
+    _.bindAll(@, 'shrink_preview', 'close_sidebar')
+
     view_options = if $('body').hasClass('live-editing') then {} else { el: '.main' }
 
     @tokens = [
@@ -25,11 +27,14 @@ class Locomotive.Views.EditableElements.IndexView extends Backbone.View
     super()
     _.invoke @views, 'render'
 
-  expand_preview: (event) ->
-    $('body').addClass('full-width-preview')
+  toggle_preview: (event) ->
+    $(@el).toggleClass('actionbar-closed')
 
   shrink_preview: (event) ->
-    $('body').removeClass('full-width-preview')
+    $(@el).removeClass('actionbar-closed')
+
+  close_sidebar: (event) ->
+    PubSub.publish 'sidebar.close'
 
   replace_edit_view: (url) ->
     @views[0].remove()

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

@@ -18,6 +18,8 @@ class Locomotive.Views.EditableElements.TextHighLighterView extends Backbone.Vie
   edit: (event) ->
     event.stopPropagation() & event.preventDefault()
 
+    @hide()
+
     PubSub.publish 'editable_elements.highlighted_text', element_id: @highlighted_element_id
 
   build: ->
@@ -47,9 +49,12 @@ class Locomotive.Views.EditableElements.TextHighLighterView extends Backbone.Vie
 
   hide: (event) ->
     @hiding_timeout = setTimeout ( =>
-      @$('.locomotive-highlighter-text').hide()
+      @_hide()
     ), 600
 
+  _hide: ->
+    @$('.locomotive-highlighter-text').hide()
+
   clear_hiding_timeout: ->
     # stop the process of hiding the selectors
     clearTimeout(@hiding_timeout) if @hiding_timeout?