locomotivecms 4.0.0.alpha3 → 4.0.0.rc0

data/app/assets/javascripts/locomotive/views/content_assets/edit_image_view.js.coffee

@@ -44,6 +44,7 @@ class Locomotive.Views.ContentAssets.EditImageView extends Backbone.View
       placement:  'left'
       content:    @$content
       html:       true
+      sanitize:   false
       template:   '<div class="popover" role="tooltip"><div class="arrow"></div><form><div class="popover-content"></div></form></div>'
     @$link.data('bs.popover').setContent()
 

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

@@ -20,6 +20,7 @@ class Locomotive.Views.Inputs.Rte.EditTableView extends Backbone.View
       placement:  'bottom'
       content:    @$content.html()
       html:       true
+      sanitize:   false
       title:      undefined
 
   attach_events: ->

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

@@ -36,6 +36,7 @@ class Locomotive.Views.Inputs.Rte.FileView extends Backbone.View
       placement:  'left'
       content:    @$popover
       html:       true
+      sanitize:   false
       template:   '<div class="popover" role="tooltip"><div class="arrow"></div><form class="simple_form"><div class="popover-content"></div></form></div>'
     @$link.data('bs.popover').setContent()
 

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

@@ -27,6 +27,7 @@ class Locomotive.Views.Inputs.Rte.LinkView extends Backbone.View
       placement:  'bottom'
       content:    @$content
       html:       true
+      sanitize:   false
       trigger:    'manual'
       template:   '<div class="popover" role="tooltip"><div class="arrow"></div><form class="simple_form"><div class="popover-content"></div></form></div>'
     @$link.data('bs.popover').setContent()

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

@@ -27,6 +27,7 @@ class Locomotive.Views.Inputs.Rte.TableView extends Backbone.View
       placement:  'bottom'
       content:    @$content
       html:       true
+      sanitize:   false
       trigger:    'manual'
       template:   '<div class="popover" role="tooltip"><div class="arrow"></div><form class="simple_form"><div class="popover-content"></div></form></div>'
     @$link.data('bs.popover').setContent()

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

@@ -62,6 +62,7 @@ class Locomotive.Views.Inputs.RteView extends Backbone.View
       placement:  'bottom'
       content:    html
       html:       true
+      sanitize:   false
       title:      undefined)
 
     @$style_popover.data('bs.popover').options.content = html
@@ -79,7 +80,7 @@ class Locomotive.Views.Inputs.RteView extends Backbone.View
 
     # Counter
     count = @editor.currentView.doc.body.innerText.length
-    @$counter = $("<div class='wysihtml5-counter'>#{count}</div>").insertAfter(@$('.form-wrapper'))
+    @$counter = $("<div class='wysihtml5-counter'>#{count}</div>").insertAfter(@$('> .form-wrapper'))
 
     $(@editor.currentView.doc.body).on 'keyup', (event) =>
       @$counter.html(event.currentTarget.innerText.length)

data/app/assets/stylesheets/locomotive/editor.css

@@ -108,6 +108,7 @@
   display: flex;
   align-items: center;
   margin-bottom: 6px;
+  flex-wrap: wrap
 }
 .rdw-inline-dropdown {
   width: 50px;
@@ -121,6 +122,7 @@
   display: flex;
   align-items: center;
   margin-bottom: 6px;
+  flex-wrap: wrap
 }
 .rdw-block-dropdown {
   width: 110px;
@@ -129,6 +131,7 @@
   display: flex;
   align-items: center;
   margin-bottom: 6px;
+  flex-wrap: wrap
 }
 .rdw-fontsize-dropdown {
   min-width: 40px;
@@ -141,6 +144,7 @@
   display: flex;
   align-items: center;
   margin-bottom: 6px;
+  flex-wrap: wrap
 }
 .rdw-fontfamily-dropdown {
   width: 115px;
@@ -158,6 +162,7 @@
   display: flex;
   align-items: center;
   margin-bottom: 6px;
+  flex-wrap: wrap
 }
 .rdw-list-dropdown {
   width: 50px;
@@ -172,6 +177,7 @@
   display: flex;
   align-items: center;
   margin-bottom: 6px;
+  flex-wrap: wrap
 }
 .rdw-text-align-dropdown {
   width: 50px;
@@ -211,6 +217,7 @@
   align-items: center;
   margin-bottom: 6px;
   position: relative;
+  flex-wrap: wrap
 }
 .rdw-colorpicker-modal {
   position: absolute;
@@ -262,7 +269,6 @@
   width: 22px;
   height: 22px;
   min-width: 22px;
-  box-shadow: 1px 2px 1px #BFBDBD inset;
 }
 .rdw-colorpicker-option:hover {
   box-shadow: 1px 2px 1px #BFBDBD;
@@ -278,6 +284,7 @@
   align-items: center;
   margin-bottom: 6px;
   position: relative;
+  flex-wrap: wrap
 }
 .rdw-link-dropdown {
   width: 50px;
@@ -363,6 +370,7 @@
   align-items: center;
   margin-bottom: 6px;
   position: relative;
+  flex-wrap: wrap
 }
 .rdw-embedded-modal {
   position: absolute;
@@ -466,6 +474,7 @@
   align-items: center;
   margin-bottom: 6px;
   position: relative;
+  flex-wrap: wrap
 }
 .rdw-emoji-modal {
   overflow: auto;
@@ -536,6 +545,7 @@
   align-items: center;
   margin-bottom: 6px;
   position: relative;
+  flex-wrap: wrap
 }
 .rdw-image-modal {
   position: absolute;
@@ -705,11 +715,13 @@
   align-items: center;
   margin-bottom: 6px;
   position: relative;
+  flex-wrap: wrap
 }
 .rdw-history-wrapper {
   display: flex;
   align-items: center;
   margin-bottom: 6px;
+  flex-wrap: wrap
 }
 .rdw-history-dropdownoption {
   height: 40px;
@@ -765,7 +777,7 @@
   border-radius: 2px;
 }
 .rdw-image-alignment-options-popup {
-  position: absolute;;
+  position: absolute;
   background: white;
   display: flex;
   padding: 5px 2px;
@@ -1055,8 +1067,11 @@
     margin-left: 2rem;
     font-size: 1.2rem;
     font-weight: bold;
-    text-transform: uppercase;
-    color: #555; }
+    text-transform: uppercase; }
+    .editor-list-item--label a {
+      color: #555; }
+      .editor-list-item--label a:hover {
+        text-decoration: none; }
   .editor-list-item--actions {
     margin-left: auto;
     margin-right: 2rem;
@@ -1227,6 +1242,18 @@
 
 .DraftEditor-editorContainer, .DraftEditor-root, .public-DraftEditor-content {
   height: 100%; }
+  .DraftEditor-editorContainer h1, .DraftEditor-root h1, .public-DraftEditor-content h1 {
+    font-size: 2.4rem; }
+  .DraftEditor-editorContainer h2, .DraftEditor-root h2, .public-DraftEditor-content h2 {
+    font-size: 2.2rem; }
+  .DraftEditor-editorContainer h3, .DraftEditor-root h3, .public-DraftEditor-content h3 {
+    font-size: 2.0rem; }
+  .DraftEditor-editorContainer h4, .DraftEditor-root h4, .public-DraftEditor-content h4 {
+    font-size: 1.8rem; }
+  .DraftEditor-editorContainer h5, .DraftEditor-root h5, .public-DraftEditor-content h5 {
+    font-size: 1.6rem; }
+  .DraftEditor-editorContainer h6, .DraftEditor-root h6, .public-DraftEditor-content h6 {
+    font-size: 1.4rem; }
 
 .editor-input-rich-text .rdw-editor-wrapper {
   border: 1px solid #e3e4e7;

data/app/controllers/locomotive/content_entries_controller.rb

@@ -16,6 +16,8 @@ module Locomotive
 
     helper 'Locomotive::CustomFields'
 
+    helper_method :default_location_params
+
     def index
       authorize ContentEntry
       @content_entries = service.all(list_params)
@@ -75,7 +77,7 @@ module Locomotive
     def bulk_destroy
       authorize ContentEntry, :destroy?
       service.bulk_destroy(params[:ids].split(','))
-      respond_with @content_type, location: content_entries_path(current_site, @content_type.slug, page: params[:page], q: params[:q])
+      respond_with @content_type, location: content_entries_path(current_site, @content_type.slug, default_location_params)
     end
 
     private
@@ -104,8 +106,12 @@ module Locomotive
       params.require(:content_entry).permit(service.permitted_attributes)
     end
 
+    def default_location_params
+      { page: params[:page], q: params[:q] }.compact
+    end
+
     def location_after_persisting
-      default = edit_content_entry_path(current_site, @content_type.slug, @content_entry)
+      default = edit_content_entry_path(current_site, @content_type.slug, @content_entry, default_location_params)
 
       if params[:_location].present?
         last_saved_location!(default)

data/app/controllers/locomotive/content_entry_impersonations_controller.rb

@@ -0,0 +1,32 @@
+module Locomotive
+  class ContentEntryImpersonationsController < BaseController
+
+    account_required & within_site
+
+    def create
+      if content_entry.with_authentication?
+        # automatically sign in the entry
+        session[:authenticated_entry_type]    = content_type.slug
+        session[:authenticated_entry_id]      = content_entry.id.to_s
+
+        # add a flag to notify that the sign in was done by impersonating the entry
+        session[:authenticated_impersonation] = '1'
+
+        redirect_to preview_url(current_site)
+      else
+        redirect_to content_entries_path(current_site, content_type.slug)
+      end
+    end
+
+    private
+
+    def content_type
+      @content_type ||= current_site.content_types.where(slug: params[:slug]).first!
+    end
+
+    def content_entry
+      @content_entry ||= content_type.entries.find(params[:content_entry_id])
+    end
+
+  end
+end

data/app/helpers/locomotive/content_types_helper.rb

@@ -10,8 +10,8 @@ module Locomotive
     #
     # @return [ String ] The label of the content type entry
     #
-    def entry_label(content_type, entry)
-      link = edit_content_entry_path(current_site, content_type.slug, entry)
+    def entry_label(content_type, entry, location_options = {})
+      link = edit_content_entry_path(current_site, content_type.slug, entry, location_options)
 
       if content_type.entry_template.blank?
         label = entry._label(content_type).presence || t(:untranslated, scope: 'locomotive.shared.list')

data/app/mailers/locomotive/notifications.rb

@@ -1,8 +1,8 @@
+require 'adomain'
+
 module Locomotive
   class Notifications < ActionMailer::Base
 
-    default from: Locomotive.config.mailer_sender
-
     def new_content_entry(account, entry)
       @site, @account = entry.site, account
       @entry, @type   = entry, entry.content_type
@@ -12,8 +12,13 @@ module Locomotive
         'localhost'
 
       subject = new_content_entry_subject(entry, domain: @domain, type: @type.name, locale: account.locale)
+      from    = (if top_level_domain = Adomain.domain(@domain)
+         "noreply@#{top_level_domain}"
+      else
+        Locomotive.config.mailer_sender
+      end)
 
-      mail subject: subject, to: account.email
+      mail subject: subject, from: from, to: account.email, reply_to: from
     end
 
     protected

data/app/models/locomotive/concerns/content_entry/authentication.rb

@@ -0,0 +1,13 @@
+module Locomotive
+  module Concerns
+    module ContentEntry
+      module Authentication
+
+        def with_authentication?
+          self.content_type.entries_custom_fields.where(type: 'password').count > 0
+        end
+
+      end
+    end
+  end
+end

data/app/models/locomotive/concerns/page/editable_elements.rb

@@ -6,7 +6,7 @@ module Locomotive
         extend ActiveSupport::Concern
 
         included do
-          embeds_many   :editable_elements, class_name: 'Locomotive::EditableElement', cascade_callbacks: true
+          embeds_many :editable_elements, class_name: 'Locomotive::EditableElement', cascade_callbacks: true
 
           accepts_nested_attributes_for :editable_elements
         end

data/app/models/locomotive/content_entry.rb

@@ -13,6 +13,7 @@ module Locomotive
     include Concerns::ContentEntry::Localized
     include Concerns::ContentEntry::Counter
     include Concerns::ContentEntry::FileSize
+    include Concerns::ContentEntry::Authentication
     include Concerns::ContentEntry::NextPrevious
 
     ## fields ##

data/app/models/locomotive/content_type.rb

@@ -27,6 +27,7 @@ module Locomotive
     field :order_by # either a BSON::ObjectId (field id) or a String (:_position, ...etc)
     field :order_direction,             default: 'asc'
     field :public_submission_enabled,   type: Boolean,  default: false
+    field :recaptcha_required,          type: Boolean,  default: false
     field :public_submission_accounts,  type: Array,    default: []
     field :number_of_entries
     field :display_settings,            type: Hash

data/app/services/locomotive/content_entry_service.rb

@@ -73,7 +73,7 @@ module Locomotive
     # A notification email is sent to the selected members of the site.
     #
     # @param [ Hash ] attributes The attributes of new content entry.
-    # @param [ Hash ] options For now, only store the ip address of the person who submitted the content entry.
+    # @param [ Hash ] options For now, only store the ip address of the person who submitted the content entry + other accounts
     #
     # @return [ Object ] An instance of the content entry.
     #
@@ -82,8 +82,8 @@ module Locomotive
 
       without_tracking_activity { create(form.serializable_hash) }.tap do |entry|
         if entry.errors.empty?
-          # send an email to selected local accounts
-          send_notifications(entry)
+          # send an email to selected local accounts + potential external accounts described by their emails
+          send_notifications(entry, options[:emails])
 
           track_activity 'content_entry.created_public', locale: locale, parameters: activity_parameters(entry)
         end
@@ -166,14 +166,13 @@ module Locomotive
       end
     end
 
-    def send_notifications(entry)
+    def send_notifications(entry, emails = nil)
       return unless self.content_type.public_submission_enabled?
 
-      account_ids = (self.content_type.public_submission_accounts || []).map(&:to_s)
-
-      self.content_type.site.accounts.each do |account|
-        next unless account_ids.include?(account._id.to_s)
-
+      Locomotive::Account.any_of(
+        { :_id.in   => self.content_type.public_submission_accounts || [] },
+        { :email.in => emails || [] }
+      ).each do |account|
         Locomotive::Notifications.new_content_entry(account, entry).deliver
       end
     end

data/app/uploaders/locomotive/theme_asset_uploader.rb

@@ -10,7 +10,7 @@ module Locomotive
     end
 
     def extension_whitelist
-      %w(jpg jpeg gif png css js swf flv mp4 eot svg svgz ttf ttc woff woff2 otf ico htc map html cur txt xml json)
+      %w(jpg jpeg gif png css js swf flv mp4 eot svg svgz ttf ttc woff woff2 otf ico htc map html cur txt xml json ogv)
     end
 
     def apply_content_type_exception(value)

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

@@ -19,7 +19,7 @@
 
         .text
           .item-label
-            = entry_label(content_type, entry)
+            = entry_label(content_type, entry, default_location_params)
           .stamp
             == document_stamp(entry)
 

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

@@ -3,17 +3,24 @@
 - help @content_type.description
 
 - content_for :actions do
+  - if @content_entry.with_authentication?
+    = link_to content_entry_impersonation_path(current_site, @content_type.slug, @content_entry, default_location_params), class: 'btn btn-sm btn-primary', method: 'post', target: '_blank' do
+      i.fas.fa-user-secret
+      = t(:impersonate)
+
   - if @content_type.localized?
-    = locale_picker_link
+    = locale_picker_link { |locale| url_for({ content_locale: locale }.merge(default_location_params)) }
     |  
 
-  = link_to t(:back, scope: 'locomotive.content_entries.shared').html_safe, content_entries_path(current_site, @content_type.slug), class: 'btn btn-sm btn-default'
+  = link_to t(:back, scope: 'locomotive.content_entries.shared').html_safe, content_entries_path(current_site, @content_type.slug, default_location_params), class: 'btn btn-sm btn-default'
 
 = locomotive_form_for @content_entry, as: :content_entry, url: content_entry_path(current_site, @content_type.slug, @content_entry), html: { multipart: true, novalidate: true } do |f|
 
   = hidden_field_tag :content_locale, current_content_locale
   = hidden_field_tag :active_tab, ''
-  = hidden_field_tag :_location,  params[:_location]
+  = hidden_field_tag :page, params[:page]
+  = hidden_field_tag :q, params[:q]
+  = hidden_field_tag :_location, params[:_location]
 
   = f.action class: 'hide'
 

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

@@ -3,11 +3,13 @@
 - help @content_type.description
 
 - content_for :actions do
-  = link_to t(:back, scope: 'locomotive.content_entries.shared').html_safe, content_entries_path(current_site, @content_type.slug), class: 'btn btn-sm btn-default'
+  = link_to t(:back, scope: 'locomotive.content_entries.shared').html_safe, content_entries_path(current_site, @content_type.slug, default_location_params), class: 'btn btn-sm btn-default'
 
 = locomotive_form_for @content_entry, as: :content_entry, url: content_entries_path(current_site, @content_type.slug), html: { multipart: true, novalidate: true } do |f|
 
   = hidden_field_tag :active_tab, ''
+  = hidden_field_tag :page, params[:page]
+  = hidden_field_tag :q, params[:q]
   = hidden_field_tag :_location,  params[:_location]
 
   = f.action class: 'hide'