locomotivecms 3.0.1 → 3.1.0.rc1

data/app/assets/stylesheets/locomotive/{base → old}/form/_select2.scss

@@ -108,3 +108,38 @@ $select2-height:                  32px;
     }
   }
 }
+
+// popover (ex.: link form in the RTE)
+.simple_form .popover-content .select2-container {
+
+  border-width: 3px;
+  padding: 3px;
+
+  .select2-selection {
+    height: 18px;
+    line-height: 18px;
+
+    .select2-selection__rendered {
+      line-height: 18px;
+      font-size: 12px;
+    }
+
+    .select2-selection__arrow {
+      top: -1px;
+    }
+  }
+
+}
+
+// popover: dropdown
+.select2-container.rte-select2-dropdown {
+  z-index: 1070;
+
+  .select2-dropdown {
+    border-width: 3px;
+
+    .select2-results__option {
+      font-size: 12px;
+    }
+  }
+}

data/app/assets/stylesheets/locomotive/{base → old}/form/_toggle.scss

@@ -1,13 +1,12 @@
 .simple_form {
-
   fieldset .input.toggle {
     display: flex;
     justify-content: space-between;
 
     & > .form-wrapper {
+      margin-top: 0;
       background: transparent;
       border: none;
-      margin-top: 0px;
 
       input[type=checkbox] {
         float: none;
@@ -27,9 +26,9 @@
       }
 
       .bootstrap-switch .bootstrap-switch-label {
-        background: #ccc;
-        color: #fff;
         font-weight: normal;
+        color: #fff;
+        background: #ccc;
       }
 
       .bootstrap-switch.bootstrap-switch-focused {
@@ -38,17 +37,13 @@
 
       .bootstrap-switch.bootstrap-switch-on .bootstrap-switch-handle-on,
       .bootstrap-switch.bootstrap-switch-off .bootstrap-switch-handle-off {
-        @include box-shadow(0px -1px 0px 0px rgba(0, 0, 0, 0.15) inset);
+        @include box-shadow(0px -1px 0px 0px rgba(0, 0, 0, .15) inset);
       }
-
     }
-
   }
-
 }
 
 @media (max-width: $screen-sm-min) {
-
   .simple_form {
     fieldset .input.toggle {
       display: block;
@@ -58,5 +53,4 @@
       }
     }
   }
-
 }

data/app/controllers/locomotive/content_entries_controller.rb

@@ -81,7 +81,7 @@ module Locomotive
     private
 
     def load_content_type
-      @content_type ||= current_site.content_types.where(slug: params[:slug]).first
+      @content_type ||= current_site.content_types.where(slug: params[:slug]).first!
     end
 
     def load_content_entry

data/app/controllers/locomotive/current_site_metafields_controller.rb

@@ -0,0 +1,34 @@
+module Locomotive
+  class CurrentSiteMetafieldsController < BaseController
+
+    account_required & within_site
+
+    localized
+
+    before_filter :load_site
+
+    helper Locomotive::SitesHelper
+
+    def index
+      authorize @site
+      respond_with(@site)
+    end
+
+    def update_all
+      authorize @site, :update?
+      service.update_all(params[:site][:metafields])
+      respond_with @site, location: -> { current_site_metafields_path(current_site) }
+    end
+
+    private
+
+    def load_site
+      @site = current_site
+    end
+
+    def service
+      @service ||= Locomotive::SiteMetafieldsService.new(current_site, current_locomotive_account)
+    end
+
+  end
+end

data/app/controllers/locomotive/custom_fields/select_options_controller.rb

@@ -2,6 +2,10 @@ module Locomotive
   module CustomFields
     class SelectOptionsController < BaseController
 
+      account_required & within_site
+
+      localized
+
       before_filter :load_content_type
       before_filter :load_custom_field
 

data/app/controllers/locomotive/pages_controller.rb

@@ -54,7 +54,7 @@ module Locomotive
     end
 
     def page_params
-      params.require(:page).permit(:title, :layout_id, :slug, :parent_id, :listed, :published, :redirect, :redirect_url, :redirect_type, :seo_title, :meta_description, :meta_keywords, :cache_enabled)
+      params.require(:page).permit(*policy(@page || Page).permitted_attributes)
     end
 
     def service

data/app/helpers/locomotive/base_helper.rb

@@ -32,6 +32,19 @@ module Locomotive
       end
     end
 
+    #= 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)
+      else
+        self.controller.controller_name == section.to_s
+      end
+
+      ['sidebar-link', highlighted ? 'is-active' : ''].join(' ')
+    end
+
     #= Form helpers
 
     def locomotive_form_for(object, *args, &block)

data/app/helpers/locomotive/current_site_metafields_helper.rb

@@ -0,0 +1,126 @@
+module Locomotive
+  module CurrentSiteMetafieldsHelper
+
+    def current_site_metafields_schema
+      @site_metafields_schema ||= @site.metafields_schema.map do |g|
+        SchemaGroup.new(@site, g)
+      end.sort_by(&:position)
+    end
+
+    class SchemaGroup
+
+      def initialize(site, attributes)
+        @site, @attributes = site, attributes
+      end
+
+      def name
+        @attributes['name'].downcase.underscore.gsub(' ', '_')
+      end
+
+      alias :dom_id :name
+
+      def model_name
+        ActiveModel::Name.new(self, nil, name)
+      end
+
+      def label
+        t(@attributes['label'] || @attributes['name'].humanize)
+      end
+
+
+      def position
+        @attributes['position']
+      end
+
+      def fields
+        @fields ||= @attributes['fields'].map do |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 }
+          field.value
+        else
+          super
+        end
+      end
+
+
+      protected
+
+      def t(value)
+        value.is_a?(Hash) ?  value[I18n.locale.to_s] || value['default'] : value
+      end
+
+    end
+
+    class SchemaField
+
+      def initialize(site, namespace, attributes)
+        @site, @namespace, @attributes = site, namespace, attributes
+      end
+
+      def name
+        t(@attributes['name']).downcase.underscore.gsub(' ', '_')
+      end
+
+      def label
+        t(@attributes['label'] || @attributes['name'].humanize)
+      end
+
+      def hint
+        t(@attributes['hint'])
+      end
+
+      def type
+        @type ||= case (type = @attributes['type'].try(:to_sym))
+        when :boolean then :toggle
+        when :text    then :rte
+        else
+          type || :string
+        end
+      end
+
+      def input_options
+        case type
+        when :select then { collection: select_collection }
+        else
+          {}
+        end.merge(default_input_options)
+      end
+
+      def select_collection
+        @attributes['select_options'].map do |name, label|
+          label = { 'default' => name.humanize } if label.blank?
+          [t(label).html_safe, name]
+        end
+      end
+
+      def position
+        @attributes['position']
+      end
+
+      def value
+        t((@site.metafields[@namespace] || {})[name], ::Mongoid::Fields::I18n.locale.to_s)
+      end
+
+      def default_input_options
+        {
+          label:      self.label,
+          hint:       self.hint,
+          as:         self.type,
+          required:   false
+        }
+      end
+
+      protected
+
+      def t(value, locale = I18n.locale.to_s)
+        value.is_a?(Hash) ? value[locale] || value['default'] : value
+      end
+
+    end
+
+  end
+end

data/app/helpers/locomotive/my_account_helper.rb

@@ -2,7 +2,7 @@ module Locomotive
   module MyAccountHelper
 
     def options_for_locale
-      Rails.cache.fetch('views/helpers/options_for_locale') do
+      Rails.cache.fetch("#{Locomotive::VERSION}/views/helpers/options_for_locale") do
         Locomotive.config.locales.map do |locale|
           flag_url = path_to_image "locomotive/icons/flags/#{locale}.png"
 

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

@@ -79,6 +79,10 @@ module Locomotive
           !index_or_not_found? && !templatized? ? 'draggable' : ''
         end
 
+        def draggable?
+          !index_or_not_found? && !templatized?
+        end
+
         def templatized_page
           return @templatized_page unless @templatized_page.nil?
 

data/app/helpers/locomotive/sites_helper.rb

@@ -8,18 +8,16 @@ module Locomotive
     end
 
     def options_for_site_locales
-      Rails.cache.fetch('views/helpers/site_locales') do
-        Locomotive.config.site_locales.map do |locale|
-          text          = I18n.t("locomotive.locales.#{locale}")
-          flag_url      = path_to_image "locomotive/icons/flags/#{locale}.png"
-          nice_display  = h("<img class='flag' src='#{flag_url}' width='24px' />" + text)
+      Locomotive.config.site_locales.map do |locale|
+        text          = I18n.t("locomotive.locales.#{locale}")
+        flag_url      = path_to_image "locomotive/icons/flags/#{locale}.png"
+        nice_display  = h("<img class='flag' src='#{flag_url}' width='24px' />" + text)
 
-          [
-            text,
-            locale,
-            { :"data-display" => nice_display }
-          ]
-        end
+        [
+          text,
+          locale,
+          { :"data-display" => nice_display }
+        ]
       end
     end
 

data/app/inputs/locomotive/file_input.rb

@@ -14,7 +14,7 @@ module Locomotive
     end
 
     def file_html
-      col_wrapping :file, 9 do
+      col_wrapping :file, 8 do
         no_file_html +
         new_file_html +
         filename_or_image +
@@ -26,7 +26,7 @@ module Locomotive
     end
 
     def buttons_html
-      col_wrapping :buttons, 3 do
+      col_wrapping :buttons, 4 do
         button_html(:choose, options[:select_content_asset]) +
         button_html(:change, options[:select_content_asset]) +
         button_html(:cancel, false) +
@@ -42,7 +42,7 @@ module Locomotive
             class: 'btn btn-primary btn-sm dropdown-toggle', data: { toggle: 'dropdown', aria_expanded: false }) +
           content_tag(:ul,
             content_tag(:li, content_tag(:a, text(:select_local_file), href: '#', class: "local-file #{name}")) +
-            content_tag(:li, content_tag(:a, text(:select_content_asset), href: template.content_assets_path, class: 'content-assets')),
+            content_tag(:li, content_tag(:a, text(:select_content_asset), href: template.content_assets_path(template.current_site), class: 'content-assets')),
             class: 'dropdown-menu dropdown-menu-right', role: 'menu'),
           class: "btn-group #{name} #{hidden_css(name)}")
       else

data/app/inputs/locomotive/image_input.rb

@@ -0,0 +1,97 @@
+module Locomotive
+  class ImageInput < ::SimpleForm::Inputs::StringInput
+
+    extend Forwardable
+
+    def_delegators :template, :link_to, :content_tag, :image_tag
+
+    def input(wrapper_options = nil)
+      <<-EOF
+<div class="file-wrapper" #{file_wrapper_options}>
+  <div class="file-image">
+    #{image_html}
+    #{actions}
+  </div>
+  <label class="file">
+    #{file_input}
+    <span class="file-custom">
+      <span class="file-name">#{filename_html}</span>
+      #{browse_button_html}
+    </span>
+  </label>
+</div>
+      EOF
+    end
+
+    def file_input
+      @builder.text_field(attribute_name)
+    end
+
+    def image_html
+      url = resized_file_url || default_url
+      template.image_tag(url)
+    end
+
+    def browse_button_html
+      label, url = text(:browse), template.content_assets_path(template.current_site)
+      <<-EOF
+      <a class="file-browse" href="#{url}">#{label}</a>
+      EOF
+    end
+
+    def actions
+      <<-EOF
+      <i class="fa fa-trash" data-action="delete" style="#{'display: none;' unless file?}"></i>
+      <i class="fa fa-undo" data-action="undo" style="display: none;"></i>
+      <span class="spinner" style="display: none;">
+        <i class="fa fa-circle-o-notch fa-spin" ></i>
+      </span>
+      EOF
+    end
+
+    def resize_format
+      options[:resize] || '96x96#'
+    end
+
+    def filename_html
+      if file?
+        template.link_to(File.basename(file_url), file_url, target: 'blank')
+      else
+        text(:none)
+      end
+    end
+
+    def file?
+      self.object.send(:"#{attribute_name}").present?
+    end
+
+    def file_url
+      self.object.send(attribute_name.to_sym)
+    end
+
+    def resized_file_url
+      if file?
+        Locomotive::Dragonfly.resize_url file_url, resize_format
+      end
+    end
+
+    def default_url
+      options[:default_url] || template.asset_path('locomotive/blank.png')
+    end
+
+    def file_wrapper_options
+      {
+        resize:         resize_format,
+        persisted:      file?,
+        url:            resized_file_url,
+        default_url:    default_url,
+        no_file_label:  text(:none)
+      }.map { |k, value| "data-#{k.to_s.dasherize}=\"#{value}\"" }.join(' ')
+    end
+
+    def text(name)
+      I18n.t(name, scope: 'locomotive.inputs.file')
+    end
+
+  end
+end