locomotivecms 4.0.0.rc0 → 4.0.0

data/app/assets/stylesheets/locomotive/new/_sidebar.scss

@@ -14,6 +14,10 @@
   overflow: auto;
   background: $gray-darkest;
   transition: left $base-transition-speed linear;
+
+  .draggable:hover {
+     cursor: move;
+  }
 }
 
 // Sidebar top logo in the sidebar.

data/app/assets/stylesheets/locomotive/old/_list.scss

@@ -6,6 +6,41 @@
   .list-groups {
     margin-bottom: 10px;
 
+    .nav-container.nav-container--scroll {
+      padding-left: 15px;
+      padding-right: 15px;
+
+      .nav-tabs {
+        position: relative;
+        display: flex;
+        flex-wrap: nowrap;
+        overflow: auto;
+        -webkit-overflow-scrolling: touch;
+        -ms-overflow-style: -ms-autohiding-scrollbar;
+        border: none;
+        padding-left: 0px;
+        padding-right: 0px;
+        padding-bottom: 2px;
+
+        // don't display the scrollbar
+        &::-webkit-scrollbar { display: none; }
+
+        & > li {
+          flex: 0 0 auto;
+          z-index: 2;
+
+          &:last-child {
+            width: 9999px;
+            height: 2px;
+            border-bottom: 2px solid #ccc;
+            position: absolute;
+            bottom: 2px;
+            z-index: 1;
+          }
+        }
+      }
+    }
+
     .nav-tabs {
       padding-left: 15px;
       padding-right: 15px;

data/app/assets/stylesheets/locomotive/old/_main.scss

@@ -16,6 +16,12 @@
       color: rgba($main_title_color, 0.7);
     }
 
+    .dropdown-menu {
+      i {
+        margin-right: 1rem;
+      }
+    }
+
     .actions {
       text-align: right;
 
@@ -31,12 +37,6 @@
       .btn.dropdown-toggle {
         border-left: 1px solid $btn-primary-border;
       }
-
-      .dropdown-menu {
-        i {
-          margin-right: 1rem;
-        }
-      }
     }
   }
 }

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

@@ -14,10 +14,12 @@ module Locomotive
       def render_access_denied(exception)
         ::Locomotive.log "[AccessDenied] #{exception.inspect}"
 
+        message = I18n.t('locomotive.errors.access_denied.message')
+
         if request.xhr?
-          render json: { error: exception.message }, status: 401, layout: false
+          render json: { error: message }, status: 401, layout: false
         else
-          flash[:alert] = exception.message
+          flash[:alert] = message
           redirect_to current_site? ? dashboard_path(current_site) : sites_path
         end
       end

data/app/controllers/locomotive/content_entries_controller.rb

@@ -80,6 +80,12 @@ module Locomotive
       respond_with @content_type, location: content_entries_path(current_site, @content_type.slug, default_location_params)
     end
 
+    def destroy
+      authorize @content_entry
+      service.bulk_destroy([*params[:id]])
+      respond_with @content_type, location: content_entries_path(current_site, @content_type.slug, default_location_params)
+    end
+
     private
 
     def load_content_type

data/app/controllers/locomotive/content_entry_impersonations_controller.rb

@@ -12,6 +12,8 @@ module Locomotive
         # add a flag to notify that the sign in was done by impersonating the entry
         session[:authenticated_impersonation] = '1'
 
+        # notify signed in
+        notify(:signed_in, content_entry, request)
         redirect_to preview_url(current_site)
       else
         redirect_to content_entries_path(current_site, content_type.slug)
@@ -28,5 +30,14 @@ module Locomotive
       @content_entry ||= content_type.entries.find(params[:content_entry_id])
     end
 
+    def notify(action, entry, request)
+        ActiveSupport::Notifications.instrument("steam.auth.#{action}",
+          site:     current_site,
+          entry:    entry,
+          locale:   locale,
+          request:  request
+        )
+    end
+
   end
 end

data/app/controllers/locomotive/current_site_controller.rb

@@ -20,7 +20,6 @@ module Locomotive
     def update
       authorize @site
       service.update(@site, site_params)
-      logger.debug @site.errors.inspect
       respond_with @site, location: -> { edit_current_site_path(current_site) }
     end
 

data/app/controllers/locomotive/dashboard_controller.rb

@@ -1,6 +1,8 @@
 module Locomotive
   class DashboardController < BaseController
 
+    helper Locomotive::Shared::ActivitiesHelper
+
     account_required & within_site
 
     def show

data/app/helpers/locomotive/dashboard_helper.rb

@@ -12,106 +12,5 @@ module Locomotive
       end
     end
 
-    # Activity
-
-    def activity_to_icon(activity)
-      case activity.domain
-      when 'site'             then 'fa-cog'
-      when 'page'             then 'fa-file-alt'
-      when 'page_content'     then 'fa-file-alt'
-      when 'editable_element' then 'fa-file-alt'
-      when 'content_entry'    then activity.action == 'created_public' ? 'fa-comment' : 'fa-archive'
-      when 'content_asset'    then 'fa-image'
-      when 'membership'       then 'fa-user'
-      when 'site_metafields'  then current_site_metafields_ui[:icon]
-      end
-    end
-
-    def render_activity_sentence(activity)
-      params = activity.parameters
-      locale = activity.locale
-
-      options = case activity.key
-      when /\Apage\./                       then activity_page_options(params)
-      when /\Acontent_entry\./              then activity_content_entry_options(params, locale)
-      when 'page_content.updated'           then activity_page_content_options(params, locale)
-      when 'editable_element.updated_bulk'  then activity_bulk_editable_elements_options(params)
-      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)
-    end
-
-    def render_activity_additional_information(activity)
-      case activity.key
-      when 'content_asset.created_bulk' then activity_bulk_content_assets(activity.parameters)
-      # when 'editable_element.updated_bulk' then activity_bulk_editable_elements(activity.parameters)
-      else nil
-      end
-    end
-
-    def activity_key_to_sentence(key, options = nil)
-      I18n.t(key, (options || {}).merge(scope: 'locomotive.activity')).html_safe
-    end
-
-    def activity_emphasize(text)
-      content_tag(:strong, text)
-    end
-
-    def activity_page_options(params)
-      if params[:_id]
-        { page: link_to(params[:title], editable_elements_path(current_site, params[:_id])) }
-      elsif params[:title]
-        { page: activity_emphasize(params[:title]) }
-      else
-        nil
-      end
-    end
-
-    def activity_page_content_options(params, locale)
-      path = edit_page_content_path(current_site, params[:_id], content_locale: locale)
-      { page: link_to(truncate(params[:title]), path).html_safe }
-    end
-
-    def activity_bulk_editable_elements_options(params)
-      pages = params[:pages].map do |page|
-        link_to truncate(page[:title]), editable_elements_path(current_site, page[:_id])
-      end.join(', ').html_safe
-
-      { pages: pages }
-    end
-
-    def activity_content_entry_options(params, locale)
-      entry = if params[:_id]
-        path = edit_content_entry_path(current_site, params[:content_type_slug], params[:_id], content_locale: locale)
-        link_to(params[:label], path)
-      elsif params[:label]
-        activity_emphasize(params[:label])
-      elsif params[:labels]
-        activity_emphasize(params[:labels].join(', '))
-      else
-        nil
-      end
-
-      content_type = link_to(params[:content_type], content_entries_path(current_site, params[:content_type_slug]))
-
-      { entry: entry, content_type: content_type }
-    end
-
-    def activity_bulk_content_assets(params)
-      list = params[:assets].map do |asset|
-        if asset[:image] && asset[:id] && current_site.content_assets.where(_id: asset[:id]).exists?
-          content_tag(:li, link_to(image_tag(Locomotive::Dragonfly.resize_url(asset[:url], '60x60#'), alt: asset[:name]), asset[:url]))
-        else
-          content_tag(:li, link_to(truncate(asset[:name], length: 20), asset[:url]))
-        end
-      end.join("\n").html_safe
-
-      content_tag(:ul, list, class: 'assets') + content_tag(:div, '', class: 'clearfix')
-    end
-
   end
 end

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

@@ -0,0 +1,106 @@
+module Locomotive
+  module Shared
+    module ActivitiesHelper
+
+      def activity_to_icon(activity)
+        case activity.domain
+        when 'site'             then 'fa-cog'
+        when 'page'             then 'fa-file-alt'
+        when 'page_content'     then 'fa-file-alt'
+        when 'editable_element' then 'fa-file-alt'
+        when 'content_entry'    then activity.action == 'created_public' ? 'fa-comment' : 'fa-archive'
+        when 'content_asset'    then 'fa-image'
+        when 'membership'       then 'fa-user'
+        when 'site_metafields'  then current_site_metafields_ui[:icon]
+        end
+      end
+
+      def render_activity_sentence(activity)
+        params = activity.parameters
+        locale = activity.locale
+
+        options = case activity.key
+        when /\Apage\./                       then activity_page_options(params)
+        when /\Acontent_entry\./              then activity_content_entry_options(params, locale)
+        when 'page_content.updated'           then activity_page_content_options(params, locale)
+        when 'editable_element.updated_bulk'  then activity_bulk_editable_elements_options(params)
+        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)
+      end
+
+      def render_activity_additional_information(activity)
+        case activity.key
+        when 'content_asset.created_bulk' then activity_bulk_content_assets(activity.parameters)
+        # when 'editable_element.updated_bulk' then activity_bulk_editable_elements(activity.parameters)
+        else nil
+        end
+      end
+
+      def activity_key_to_sentence(key, options = nil)
+        I18n.t(key, (options || {}).merge(scope: 'locomotive.activity')).html_safe
+      end
+
+      def activity_emphasize(text)
+        content_tag(:strong, text)
+      end
+
+      def activity_page_options(params)
+        if params[:_id]
+          { page: link_to(params[:title], editable_elements_path(current_site, params[:_id])) }
+        elsif params[:title]
+          { page: activity_emphasize(params[:title]) }
+        else
+          nil
+        end
+      end
+
+      def activity_page_content_options(params, locale)
+        path = edit_page_content_path(current_site, params[:_id], content_locale: locale)
+        { page: link_to(truncate(params[:title]), path).html_safe }
+      end
+
+      def activity_bulk_editable_elements_options(params)
+        pages = params[:pages].map do |page|
+          link_to truncate(page[:title]), editable_elements_path(current_site, page[:_id])
+        end.join(', ').html_safe
+
+        { pages: pages }
+      end
+
+      def activity_content_entry_options(params, locale)
+        entry = if params[:_id]
+          path = edit_content_entry_path(current_site, params[:content_type_slug], params[:_id], content_locale: locale)
+          link_to(params[:label], path)
+        elsif params[:label]
+          activity_emphasize(params[:label])
+        elsif params[:labels]
+          activity_emphasize(params[:labels].join(', '))
+        else
+          nil
+        end
+
+        content_type = link_to(params[:content_type], content_entries_path(current_site, params[:content_type_slug]))
+
+        { entry: entry, content_type: content_type }
+      end
+
+      def activity_bulk_content_assets(params)
+        list = params[:assets].map do |asset|
+          if asset[:image] && asset[:id] && current_site.content_assets.where(_id: asset[:id]).exists?
+            content_tag(:li, link_to(image_tag(Locomotive::Dragonfly.resize_url(asset[:url], '60x60#'), alt: asset[:name]), asset[:url]))
+          else
+            content_tag(:li, link_to(truncate(asset[:name], length: 20), asset[:url]))
+          end
+        end.join("\n").html_safe
+
+        content_tag(:ul, list, class: 'assets') + content_tag(:div, '', class: 'clearfix')
+      end
+
+    end
+  end
+end

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

@@ -18,7 +18,7 @@ module Locomotive
           ui[:hint]  = current_site_metafields_ui_t(_ui['hint'], t('locomotive.current_site_metafields.index.help', default: ''))
 
           # icon in the sidebar
-          ui[:icon]  = "far fa-#{_ui['icon'].present? ? _ui['icon'] : 'newspaper'}"
+          ui[:icon]  = "fas fa-#{_ui['icon'].present? ? _ui['icon'] : 'newspaper'}"
         end
       end
 

data/app/mailers/locomotive/notifications.rb

@@ -18,6 +18,14 @@ module Locomotive
         Locomotive.config.mailer_sender
       end)
 
+      # attach uploaded files
+      if @type.public_submission_email_attachments
+        entry.file_custom_fields.each do |name|
+          next if (file = entry.send(name)&.file).nil?
+          attachments[file.filename] = file.read
+        end
+      end
+
       mail subject: subject, from: from, to: account.email, reply_to: from
     end
 

data/app/models/locomotive/account.rb

@@ -26,6 +26,7 @@ module Locomotive
     field :name
     field :locale,  default: Locomotive.config.default_locale.to_s or 'en'
     field :super_admin, type: Boolean, default: false
+    field :visitor, type: Boolean, default: false
 
     ## validations ##
     validates_presence_of :name

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

@@ -9,6 +9,8 @@ module Locomotive
 
           ## fields ##
           field :cache_enabled,     type: Boolean, default: false
+          field :cache_control
+          field :cache_vary
           field :template_version,  type: DateTime
           field :content_version,   type: DateTime
 

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

@@ -10,6 +10,7 @@ module Locomotive
           ## fields ##
           field :locales, type: ::RawArray, default: []
           field :prefix_default_locale, type: ::Boolean, default: false
+          field :bypass_browser_locale, type: ::Boolean, default: false
 
           ## validations ##
           validate :can_not_remove_default_locale

data/app/models/locomotive/content_type.rb

@@ -20,17 +20,18 @@ module Locomotive
     field :name
     field :description
     field :slug
-    field :label_field_id,              type: BSON::ObjectId
+    field :label_field_id,                      type: BSON::ObjectId
     field :label_field_name
     field :tree_parent_field_name
-    field :group_by_field_id,           type: BSON::ObjectId
+    field :group_by_field_id,                   type: BSON::ObjectId
     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 :order_direction,                     default: 'asc'
+    field :public_submission_enabled,           type: Boolean,  default: false
+    field :public_submission_email_attachments, type: Boolean,  default: false
+    field :public_submission_accounts,          type: Array,    default: []
+    field :recaptcha_required,                  type: Boolean,  default: false
     field :number_of_entries
-    field :display_settings,            type: Hash
+    field :display_settings,                    type: Hash
 
     ## associations ##
     has_many :entries,   class_name: 'Locomotive::ContentEntry', dependent: :destroy

data/app/models/locomotive/membership.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     include Locomotive::Mongoid::Document
 
-    ROLES = %w(author designer admin)
+    ROLES = %w(visitor author designer admin)
 
     ## fields ##
     field :role, default: 'author'