locomotivecms 4.0.3 → 4.1.0.rc1

data/app/assets/javascripts/locomotive/views/content_entry_imports/new_view.js.coffee

@@ -0,0 +1,12 @@
+Locomotive.Views.ContentEntryImports ||= {}
+
+class Locomotive.Views.ContentEntryImports.NewView extends Locomotive.Views.Shared.FormView
+
+  el: '.main'
+
+  initialize: ->
+    super()
+    $('#collapseContentTypes').addClass('in')
+
+  render: ->
+    super()

data/app/assets/javascripts/locomotive/views/content_entry_imports/show_view.js.coffee

@@ -0,0 +1,8 @@
+Locomotive.Views.ContentEntryImports ||= {}
+
+class Locomotive.Views.ContentEntryImports.ShowView extends Backbone.View
+
+  el: '.main'
+
+  initialize: ->
+    $('#collapseContentTypes').addClass('in')

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

@@ -111,3 +111,5 @@
 @import "old/dashboard";
 @import "old/activity_feed";
 @import "old/developers";
+
+@import "new/dashboard";

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

@@ -25,6 +25,7 @@
   opacity: 0.3;
   cursor: default;
 }
+
 .rdw-dropdown-wrapper {
   height: 30px;
   background: white;
@@ -88,6 +89,7 @@
   box-shadow: 1px 1px 0px #BFBDBD;
   background-color: #FFFFFF;
 }
+
 .rdw-dropdownoption-default {
   min-height: 25px;
   display: flex;
@@ -104,6 +106,7 @@
   opacity: 0.3;
   cursor: default;
 }
+
 .rdw-inline-wrapper {
   display: flex;
   align-items: center;
@@ -118,6 +121,7 @@
   display: flex;
   justify-content: center;
 }
+
 .rdw-block-wrapper {
   display: flex;
   align-items: center;
@@ -127,6 +131,7 @@
 .rdw-block-dropdown {
   width: 110px;
 }
+
 .rdw-fontsize-wrapper {
   display: flex;
   align-items: center;
@@ -140,6 +145,7 @@
   display: flex;
   justify-content: center;
 }
+
 .rdw-fontfamily-wrapper {
   display: flex;
   align-items: center;
@@ -158,6 +164,7 @@
 .rdw-fontfamily-optionwrapper {
   width: 140px;
 }
+
 .rdw-list-wrapper {
   display: flex;
   align-items: center;
@@ -173,6 +180,7 @@
   display: flex;
   justify-content: center;
 }
+
 .rdw-text-align-wrapper {
   display: flex;
   align-items: center;
@@ -212,6 +220,7 @@
 .rdw-justify-aligned-block > div {
   display: inline-block;
 }
+
 .rdw-colorpicker-wrapper {
   display: flex;
   align-items: center;
@@ -280,6 +289,7 @@
 .rdw-colorpicker-option-active {
   box-shadow: 0px 0px 2px 2px #BFBDBD;
 }
+
 .rdw-link-wrapper {
   display: flex;
   align-items: center;
@@ -366,6 +376,7 @@
 .rdw-history-dropdown {
   width: 50px;
 }
+
 .rdw-embedded-wrapper {
   display: flex;
   align-items: center;
@@ -470,6 +481,7 @@
 .rdw-embedded-modal-size-input:focus {
   outline: none;
 }
+
 .rdw-emoji-wrapper {
   display: flex;
   align-items: center;
@@ -503,6 +515,7 @@
   justify-content: center;
   align-items: center;
 }
+
 .rdw-spinner {
   display: flex;
   align-items: center;
@@ -541,6 +554,7 @@
     transform: scale(1.0);
   }
 }
+
 .rdw-image-wrapper {
   display: flex;
   align-items: center;
@@ -711,6 +725,7 @@
   margin-left: 3px;
   margin-right: 3px;
 }
+
 .rdw-remove-wrapper {
   display: flex;
   align-items: center;
@@ -718,6 +733,7 @@
   position: relative;
   flex-wrap: wrap
 }
+
 .rdw-history-wrapper {
   display: flex;
   align-items: center;
@@ -732,6 +748,7 @@
 .rdw-history-dropdown {
   width: 50px;
 }
+
 .rdw-link-decorator-wrapper {
   position: relative;
 }
@@ -742,6 +759,7 @@
   cursor: pointer;
   background-color: white;
 }
+
 .rdw-mention-link {
   text-decoration: none;
   color: #1236ff;
@@ -749,6 +767,7 @@
   padding: 1px 2px;
   border-radius: 2px;
 }
+
 .rdw-suggestion-wrapper {
   position: relative;
 }
@@ -770,6 +789,7 @@
 .rdw-suggestion-option-active {
   background-color: #F1F1F1;
 }
+
 .rdw-hashtag-link {
   text-decoration: none;
   color: #1236ff;
@@ -777,6 +797,7 @@
   padding: 1px 2px;
   border-radius: 2px;
 }
+
 .rdw-image-alignment-options-popup {
   position: absolute;
   background: white;
@@ -816,6 +837,7 @@
 .rdw-image-alignment-options-popup-right {
   right: 0;
 }
+
 .rdw-editor-main {
   height: 100%;
   overflow: auto;
@@ -850,7 +872,8 @@
   background: #f1f1f1;
   border-radius: 3px;
   padding: 1px 10px;
-}/**
+}
+/**
  * Draft v0.9.1
  *
  * Copyright (c) 2013-present, Facebook, Inc.
@@ -892,12 +915,11 @@
 }
 .rc-slider-handle {
   position: absolute;
-  margin-left: -7px;
-  margin-top: -5px;
   width: 14px;
   height: 14px;
   cursor: pointer;
   cursor: -webkit-grab;
+  margin-top: -5px;
   cursor: grab;
   border-radius: 50%;
   border: solid 2px #96dbfa;
@@ -962,6 +984,10 @@
 .rc-slider-dot-active {
   border-color: #96dbfa;
 }
+.rc-slider-dot-reverse {
+  margin-left: 0;
+  margin-right: -4px;
+}
 .rc-slider-disabled {
   background-color: #e9e9e9;
 }
@@ -995,7 +1021,6 @@
 }
 .rc-slider-vertical .rc-slider-handle {
   margin-left: -5px;
-  margin-bottom: -7px;
   -ms-touch-action: pan-y;
       touch-action: pan-y;
 }
@@ -1284,6 +1309,12 @@
       width: 14px;
       margin-left: -7px; } }
 
+.ml-3 {
+  margin-left: 1rem; }
+
+.mr-3 {
+  margin-right: 1rem; }
+
 .editor-list-item {
   display: flex;
   align-items: center;
@@ -1297,6 +1328,8 @@
      -moz-user-select: none;
       -ms-user-select: none;
           user-select: none; }
+  .editor-list-item--dragging {
+    box-shadow: 0 0 0 1px rgba(63, 63, 68, 0.25), 0 1px 3px 0 rgba(63, 63, 68, 0.75); }
   .editor-list-item.with-separator {
     margin-top: 4rem; }
   .editor-list-item--icon, .editor-list-item--image {
@@ -1377,14 +1410,10 @@
     padding: 0.5rem 0.8rem;
     border-radius: 3px;
     border: 1px solid #e3e4e7; }
-    .editor-input--text::-webkit-input-placeholder {
-      color: #c8cbcf; }
     .editor-input--text::-moz-placeholder {
       color: #c8cbcf; }
     .editor-input--text:-ms-input-placeholder {
       color: #c8cbcf; }
-    .editor-input--text::-ms-input-placeholder {
-      color: #c8cbcf; }
     .editor-input--text::placeholder {
       color: #c8cbcf; }
   .editor-input--select {
@@ -1422,6 +1451,12 @@
   align-items: center;
   justify-content: center; }
 
+.editor-input-asset-picker--actions {
+  margin-top: 1rem;
+  display: flex;
+  align-items: center;
+  justify-content: center; }
+
 .editor-input-url--info {
   display: flex;
   align-items: center; }
@@ -1434,6 +1469,16 @@
   align-items: center;
   justify-content: center; }
 
+.editor-input-content-entry--info {
+  display: flex;
+  align-items: center; }
+
+.editor-input-content-entry--actions {
+  margin-top: 1rem;
+  display: flex;
+  align-items: center;
+  justify-content: center; }
+
 .editor-input-radio--option input {
   margin-right: 1rem; }
 
@@ -1757,6 +1802,7 @@
   .preview-iframe > .preview-iframe-loader {
     background: #fff;
     display: flex;
+    flex-direction: column;
     align-items: center;
     justify-content: center;
     position: absolute;
@@ -1769,6 +1815,8 @@
     .preview-iframe > .preview-iframe-loader img {
       display: block;
       width: 12rem; }
+    .preview-iframe > .preview-iframe-loader p {
+      margin-top: 2rem; }
   .preview-iframe--loading > .scrollable {
     opacity: 0;
     z-index: 998; }
@@ -1903,6 +1951,46 @@
   background: none;
   border: none; }
 
+.editor-asset-uploader {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  background: #fff;
+  border: dashed 1px #e3e4e7;
+  border-radius: 3px;
+  margin-bottom: 1rem;
+  padding: 1rem 1.2rem; }
+  .editor-asset-uploader input[type=file] {
+    display: none; }
+  .editor-asset-uploader--button {
+    text-transform: uppercase;
+    cursor: pointer; }
+
+.editor-asset-list {
+  margin: 2rem; }
+  .editor-asset-list--loading {
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center; }
+  .editor-asset-list--container {
+    margin-top: 2rem;
+    display: flex;
+    flex-wrap: wrap;
+    flex-direction: row;
+    align-content: flex-start;
+    justify-content: space-around; }
+  .editor-asset-list .editor-list-item {
+    width: 100%;
+    cursor: pointer; }
+  .editor-asset-list--pagination {
+    display: flex;
+    align-items: center;
+    margin-top: 2rem; }
+    .editor-asset-list--pagination .pagination {
+      margin: 0 auto; }
+
 .editor-image-uploader {
   display: flex;
   align-items: center;
@@ -2008,14 +2096,10 @@
       color: #91979f;
       margin-bottom: 0;
       cursor: pointer; }
-  .url-picker .react-autosuggest__input::-webkit-input-placeholder {
-    color: #c8cbcf; }
   .url-picker .react-autosuggest__input::-moz-placeholder {
     color: #c8cbcf; }
   .url-picker .react-autosuggest__input:-ms-input-placeholder {
     color: #c8cbcf; }
-  .url-picker .react-autosuggest__input::-ms-input-placeholder {
-    color: #c8cbcf; }
   .url-picker .react-autosuggest__input::placeholder {
     color: #c8cbcf; }
 
@@ -2023,6 +2107,15 @@
   min-width: 42rem;
   padding: 2rem 0 0 0; }
 
+.content-entry-picker {
+  padding: 2rem; }
+  .content-entry-picker .react-autosuggest__input::-moz-placeholder {
+    color: #c8cbcf; }
+  .content-entry-picker .react-autosuggest__input:-ms-input-placeholder {
+    color: #c8cbcf; }
+  .content-entry-picker .react-autosuggest__input::placeholder {
+    color: #c8cbcf; }
+
 .locale-switcher {
   position: relative;
   display: inline-block;

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

@@ -0,0 +1,20 @@
+.metric {
+  background: rgb(21, 90, 148);
+  border-radius: 3px;
+  padding: 2rem 1rem;
+  text-align: center;
+
+  h2 {
+    color: rgba(255, 255, 255, 0.6);
+    font-weight: bold;
+    font-size: 1.15rem;
+    text-transform: uppercase;
+  }  
+
+  h3 {  
+    margin-top: 1rem;
+    color: #fff;
+    font-weight: bold;
+    font-size: 2.5rem;    
+  }
+}

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

@@ -58,7 +58,7 @@ body.live-editing .drawer {
         color: #555;
       }
 
-      i {
+      i.fas {
         font-size: 65px;
         color: #bec1c2;
       }

data/app/controllers/locomotive/content_assets_controller.rb

@@ -17,7 +17,7 @@ module Locomotive
 
     def create
       authorize Locomotive::ContentAsset
-      @content_asset = current_site.content_assets.create(content_asset_params)
+      @content_asset = service.create(content_asset_params)
       respond_with @content_asset, location: content_assets_path
     end
 

data/app/controllers/locomotive/content_entry_imports_controller.rb

@@ -0,0 +1,50 @@
+module Locomotive
+  class ContentEntryImportsController < BaseController
+
+    account_required & within_site
+
+    before_action :only_if_import_enabled
+
+    def show
+      authorize @content_type, :import?
+    end
+
+    def new
+      authorize @content_type, :import?
+      @import = Locomotive::ContentEntryImport.new
+    end
+
+    def create
+      authorize @content_type, :import?
+      @import = Locomotive::ContentEntryImport.new(import_params)
+      service.async_import(@import.file, @import.options) if @import.valid?
+      respond_with @import, location: content_entry_import_path(current_site, @content_type.slug)
+    end
+
+    def destroy
+      authorize @content_type, :import?
+      message = t('flash.locomotive.content_entry_imports.destroy.notice')
+      service.cancel(message)
+      flash[:alert] = message
+      redirect_to new_content_entry_import_path(current_site, @content_type.slug)
+    end
+
+    private    
+
+    def only_if_import_enabled
+      redirect_to content_entries_path(current_site, content_type.slug) unless content_type.import_enabled
+    end
+
+    def content_type
+      @content_type ||= current_site.content_types.where(slug: params[:slug]).first!
+    end
+
+    def service
+      @service ||= Locomotive::ContentEntryImportService.new(content_type)
+    end
+
+    def import_params
+      params.require(:content_entry_import).permit(:file, :col_sep, :quote_char)
+    end
+  end
+end

data/app/helpers/locomotive/base_helper.rb

@@ -49,7 +49,7 @@ module Locomotive
     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
+      when 'content_types', 'content_entries', 'content_entry_imports', 'public_submission_accounts', 'select_options' then :content_types
       else
         self.controller.controller_name
       end

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

@@ -104,7 +104,7 @@ module Locomotive
         end
 
         def templatized_parent?
-          parent.templatized?
+          parent&.templatized?
         end
 
         def templatized_children?

data/app/jobs/locomotive/import_content_entry_job.rb

@@ -0,0 +1,12 @@
+module Locomotive
+  class ImportContentEntryJob < ActiveJob::Base
+
+    queue_as :default
+
+    def perform(content_type_id, csv_asset_id, csv_options)
+      content_type = Locomotive::ContentType.find(content_type_id)
+      service = Locomotive::ContentEntryImportService.new(content_type)
+      service.import(csv_asset_id, csv_options)
+    end
+  end
+end

data/app/mailers/locomotive/notifications.rb

@@ -3,20 +3,18 @@ require 'adomain'
 module Locomotive
   class Notifications < ActionMailer::Base
 
-    def new_content_entry(account, entry)
-      @site, @account = entry.site, account
-      @entry, @type   = entry, entry.content_type
+    SMTP_SETTINGS_NAMES = %w(smtp_settings mailer_settings email_settings).freeze
+    SMTP_ATTRIBUTES = %w(address authentication port enable_starttls_auto user_name password domain).freeze
+
+    after_action :set_delivery_options
 
-      @domain = entry.site.domains.first ||
-        ActionMailer::Base.default_url_options[:host] ||
-        'localhost'
+    def new_content_entry(site, account, entry)
+      @site, @account = site, account
+      @entry, @type   = entry, entry.content_type
+      @domain         = fetch_domain
 
       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)
+      from    = fetch_from
 
       # attach uploaded files
       if @type.public_submission_email_attachments
@@ -39,5 +37,33 @@ module Locomotive
       end
     end
 
+    def site_mailer_settings
+      SMTP_SETTINGS_NAMES
+      .map { |namespace| @site.cast_metafields(namespace) }
+      .compact.first || {}
+    end
+
+    def fetch_domain
+      @site.domains.first || ActionMailer::Base.default_url_options[:host] || 'localhost'
+    end
+
+    def fetch_from
+      if from = site_mailer_settings['from']
+        from
+      elsif top_level_domain = Adomain.domain(@domain)
+        "noreply@#{top_level_domain}"
+      else
+        Locomotive.config.mailer_sender
+      end
+    end
+
+    def set_delivery_options
+      smtp_settings = site_mailer_settings.slice(*SMTP_ATTRIBUTES).delete_if { |_, value| value.blank? }.symbolize_keys
+
+      if smtp_settings && smtp_settings[:address].present?
+        mail.delivery_method.settings = smtp_settings
+      end
+    end
+
   end
 end

data/app/models/locomotive/account.rb

@@ -30,6 +30,7 @@ module Locomotive
 
     ## validations ##
     validates_presence_of :name
+    validates :email, format: { with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, on: :create }
 
     ## associations ##
     has_many :created_sites, class_name: 'Locomotive::Site', validate: false, autosave: false

data/app/models/locomotive/concerns/asset/vignette.rb

@@ -5,13 +5,15 @@ module Locomotive
 
         def vignette_url
           if self.image?
-            if self.width < 85 && self.height < 85
+            # In some case (like an invalid extension) the height, width can be nill
+            # In that case we should directly return the url
+            if self.width && self.height && self.width < 85 && self.height < 85
               self.source.url
             else
-              Locomotive::Dragonfly.resize_url(self.source, '85x85#')
+              Locomotive::Dragonfly.resize_url(self.source, '85x85#', self.updated_at.to_i)
             end
           elsif self.pdf?
-            Locomotive::Dragonfly.thumbnail_pdf(self.source, '85x85#')
+            Locomotive::Dragonfly.thumbnail_pdf(self.source, '85x85#', self.updated_at.to_i)
           end
         end
 
@@ -22,7 +24,7 @@ module Locomotive
             '190x120#'
           end
 
-          Locomotive::Dragonfly.thumbnail_pdf(self.source, format) if format
+          Locomotive::Dragonfly.thumbnail_pdf(self.source, format, self.updated_at.to_i) if format
         end
 
         def big_vignette_url
@@ -30,7 +32,7 @@ module Locomotive
             '200x200#'
           end
 
-          Locomotive::Dragonfly.thumbnail_pdf(self.source, format) if format
+          Locomotive::Dragonfly.thumbnail_pdf(self.source, format, self.updated_at.to_i) if format
         end
 
       end