locomotivecms 3.0.1 → 3.1.0.rc1

data/app/inputs/locomotive/rte_input.rb

@@ -15,7 +15,8 @@ module Locomotive
           wysihtml5_prefix: wysihtml5_prefix,
           link_popover:     link_popover,
           image_popover:    image_popover,
-          table_popover:    table_popover
+          table_popover:    table_popover,
+          inline:           input_html_options[:data].try(:[], :inline)
         })
     end
 

data/app/inputs/locomotive/simple_image_input.rb

@@ -1,27 +1,5 @@
 module Locomotive
-  class SimpleImageInput < ::SimpleForm::Inputs::FileInput
-
-    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>
-      <span class="file-browse">#{text(:browse)}</span>
-    </span>
-  </label>
-</div>
-      EOF
-    end
+  class SimpleImageInput < ImageInput
 
     def file_input
       @builder.file_field(attribute_name, input_html_options.merge(accept: 'image/*')) +
@@ -29,59 +7,18 @@ module Locomotive
       @builder.hidden_field(:"remote_#{attribute_name}_url", class: 'remote-url', value: '')
     end
 
-    def image_html
-      url = resized_file_url || options[:default_url]
-      url ? template.image_tag(url) : ''
-    end
-
-    def actions
+    def browse_button_html
       <<-EOF
-      <i class="fa fa-trash" data-action="delete"></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>
+      <span class="file-browse">#{text(:browse)}</span>
       EOF
     end
 
-    def resize_format
-      options[:resize] || '96x96#'
-    end
-
-    def filename_html
-      if file?
-        template.link_to(File.basename(file.to_s), file.url, target: 'blank')
-      else
-        text(:none)
-      end
-    end
-
-    def file?
-      self.object.send(:"#{attribute_name}?")
-    end
-
     def file
       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 file_wrapper_options
-      {
-        resize:         resize_format,
-        persisted:      file?,
-        url:            resized_file_url,
-        default_url:    options[: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')
+    def file_url
+      file.url
     end
 
   end

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

@@ -0,0 +1,96 @@
+module Locomotive
+  module Concerns
+    module Site
+      module Metafields
+
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## fields ##
+          field :metafields,        type: Hash, default: {}
+          field :metafields_schema, type: Array, default: []
+
+          ## validations ##
+          validate :validate_metafields_schema
+
+        end
+
+        def has_metafields?
+          !self.metafields_schema.blank?
+        end
+
+        def any_localized_metafield?
+          return false unless self.has_metafields?
+
+          self.metafields_schema.any? { |g| g['fields'].any? { |f| f['localized'] ==  true } }
+        end
+
+        def find_metafield(name)
+          return nil if name.blank? || !has_metafields?
+
+          fields = self.metafields_schema.map { |g| g['fields'] }.flatten
+
+          fields.find do |f|
+            _name = f['name'].downcase.underscore.gsub(' ', '_')
+            _name == name
+          end
+        end
+
+        def metafields_schema=(schema)
+          super(schema.is_a?(String) ? ActiveSupport::JSON.decode(schema) : schema)
+        end
+
+        def metafields=(values)
+          super(values.is_a?(String) ? ActiveSupport::JSON.decode(values) : values)
+        end
+
+        protected
+
+        def validate_metafields_schema
+          return if metafields_schema.blank?
+
+          begin
+            JSON::Validator.validate!(metafields_schema_schema, metafields_schema)
+          rescue JSON::Schema::ValidationError
+            self.errors.add(:metafields_schema, $!.message)
+          end
+        end
+
+        def metafields_schema_schema
+          {
+            'id' => 'http://locomotive.works/schemas/metafields.json',
+            'definitions' => {
+              'field' => {
+                'type' => 'object',
+                'properties' => {
+                  'name' => { 'type' => 'string' },
+                  'label' => { 'type' => ['string', 'object'] },
+                  'hint' => { 'type' => ['string', 'object'] },
+                  'type' => { 'enum': ['string', 'text', 'integer', 'float', 'file', 'image', 'boolean', 'select', 'color'] },
+                  'position' => { 'type' => 'integer' },
+                  'select_options' => { 'type' => ['object', 'array'] },
+                  'localized' => { 'type' => 'boolean' }
+                },
+                'required' => ['name']
+              }
+            },
+            'type' => 'array',
+            'items' => {
+              'type' => 'object',
+              'properties' => {
+                  'name'      => { 'type' => 'string' },
+                  'label'     => { 'type' => ['string', 'object'] },
+                  'fields'    => { 'type' => 'array', 'items': {'$ref': '#/definitions/field' } },
+                  'position'  => { 'type' => 'integer', 'minimum' => 0 }
+                },
+              'required' => ['name', 'fields']
+            }
+          }
+        end
+
+      end
+
+    end
+  end
+end

data/app/models/locomotive/editable_text.rb

@@ -6,7 +6,8 @@ module Locomotive
     field :default_content, type: Boolean, localize: true, default: true
     field :format,          default: 'html'
     field :rows,            type: Integer, default: 15
-    field :line_break,      type: Boolean, default: true
+    field :inline,          type: Boolean, default: false
+    field :line_break,      type: Boolean, default: true # deprecated
 
     ## callbacks ##
     before_save :strip_content

data/app/models/locomotive/site.rb

@@ -11,6 +11,7 @@ module Locomotive
     include Concerns::Site::Cache
     include Concerns::Site::UrlRedirections
     include Concerns::Site::PrivateAccess
+    include Concerns::Site::Metafields
 
     ## fields ##
     field :name

data/app/policies/locomotive/page_policy.rb

@@ -17,5 +17,11 @@ module Locomotive
       site_staff? && !@resource.index_or_not_found?
     end
 
+    def permitted_attributes
+      attributes = [:title, :layout_id, :slug, :parent_id, :listed, :published, :redirect, :redirect_url, :redirect_type, :seo_title, :meta_description, :meta_keywords, :cache_enabled]
+      attributes += [:handle] if site_admin_or_designer?
+      attributes
+    end
+
   end
 end

data/app/services/locomotive/content_entry_service.rb

@@ -33,6 +33,9 @@ module Locomotive
       klass = self.content_type.klass_with_custom_fields(:entries)
       klass.sort_entries!(ids, self.content_type.sortable_column)
 
+      # we need to clear out the cache
+      content_type.site.touch(:content_version)
+
       track_activity 'content_entry.sorted', parameters: activity_parameters
     end
 

data/app/services/locomotive/site_metafields_service.rb

@@ -0,0 +1,39 @@
+module Locomotive
+
+  class SiteMetafieldsService < Struct.new(:site, :account)
+
+    def update_all(attributes)
+      each_metafield(attributes) do |namespace, name, value|
+        next unless field = site.find_metafield(name)
+
+        if field['localized']
+          (namespace[name] ||= {})[locale] = value
+        else
+          namespace[name] = value
+        end
+      end
+
+      site.save
+    end
+
+    protected
+
+    def each_metafield(attributes, &block)
+      return if attributes.blank?
+
+      attributes.each do |_name, _attributes|
+        site.metafields[_name] ||= {}
+        namespace = site.metafields[_name]
+
+        _attributes.each do |name, value|
+          yield(namespace, name, value)
+        end
+      end
+    end
+
+    def locale
+      ::Mongoid::Fields::I18n.locale
+    end
+
+  end
+end

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

@@ -2,6 +2,9 @@
 
 = help t('.help', default: '')
 
+- content_for :actions do
+  = locale_picker_link
+
 = locomotive_form_for @site, url: current_site_path(current_site), html: { multipart: true }, defaults: { placeholder: false } do |f|
 
   = hidden_field_tag :active_tab, ''

data/app/views/locomotive/current_site_metafields/form/_panes.html.slim

@@ -0,0 +1,19 @@
+.tab-content
+  = f.simple_fields_for :metafields do |namespace_form|
+
+    - current_site_metafields_schema.each_with_index do |namespace, index|
+
+      = form_tab_pane namespace.dom_id, index == 0 do
+
+        = namespace_form.inputs namespace.dom_id do
+
+          - namespace.fields.each do |field|
+
+            = namespace_form.simple_fields_for namespace do |metafield_form|
+
+              = metafield_form.input field.name, field.input_options
+
+  = f.actions do
+    = f.action
+
+

data/app/views/locomotive/current_site_metafields/form/_tabs.html.slim

@@ -0,0 +1,6 @@
+ul.nav.nav-tabs role='tablist'
+  - current_site_metafields_schema.each_with_index do |namespace, index|
+
+    = form_nav_tab namespace.label, index == 0 do
+
+      = link_to namespace.label, "##{namespace.dom_id}", role: 'tab', data: { toggle: 'tab' }

data/app/views/locomotive/current_site_metafields/index.html.slim

@@ -0,0 +1,26 @@
+- title t('.title')
+
+= help t('.help', default: '')
+
+- if @site.has_metafields?
+
+  - content_for :actions do
+    - if @site.any_localized_metafield?
+      = locale_picker_link
+
+  = locomotive_form_for @site, url: update_all_current_site_metafields_path(current_site), html: { multipart: true }, defaults: { placeholder: false } do |f|
+
+    = hidden_field_tag :active_tab, ''
+
+    = f.action class: 'hide'
+
+    = render 'locomotive/current_site_metafields/form/tabs', f: f
+
+    = render 'locomotive/current_site_metafields/form/panes', f: f
+
+- else
+
+  br
+
+  .alert.alert-warning
+    == t('.no_metafields')

data/app/views/locomotive/editable_elements/_form.html.slim

@@ -13,7 +13,7 @@
         - case editable_element.type.to_sym
 
         - when :editable_text
-          = g.input :content, editable_element_input_options(editable_element, index, as: editable_text_format_to_input_type(editable_element), input_html: { rows: editable_element.rows })
+          = g.input :content, editable_element_input_options(editable_element, index, as: editable_text_format_to_input_type(editable_element), input_html: { rows: editable_element.rows, data: { inline: editable_element.inline? } })
 
         - when :editable_file
           = g.input :source, editable_element_input_options(editable_element, index, as: :file, select_content_asset: true, resize_format: editable_element.resize_format, hidden_fields: [:content, :default_source_url])

data/app/views/locomotive/layouts/application.html.slim

@@ -4,16 +4,19 @@ html xmlns='http://www.w3.org/1999/xhtml'
   head
     = render 'locomotive/shared/head'
 
-  body class=body_class
+  body class="sidebar-open on-main #{body_class}"
+    = render 'locomotive/shared/navigation'
+    = render 'locomotive/shared/sidebar'
 
-    - # HEADER: brand + current site + account
-    = render 'locomotive/shared/header'
+    .content-main
+      .content-overlay
 
-    - # WRAPPER
-    .wrapper
-      nav.sidebar
-        .scrollable
-          = render 'locomotive/shared/sidebar'
+      .drawer
+        .close-button
+          i.fa.fa-times
+        .content-inner
+          = yield :drawer
+          = yield :foot
 
       .content
         .scrollable
@@ -31,14 +34,14 @@ html xmlns='http://www.w3.org/1999/xhtml'
 
             = yield
 
-      section.drawer
-        .close-button
-          i.fa.fa-times
-        .inner
-          .scrollable
-            .container-fluid
-              .row
-                .col-md-12
-                  h1 Right sidebar
-
-    = yield :foot
+      / .drawer
+      /   .close-button
+      /     i.fa.fa-times
+      /   .content-inner
+      /     .scrollable
+      /       .container-fluid
+      /         .row
+      /           .col-md-12
+      /             h1 Right sidebar
+
+      = yield :foot

data/app/views/locomotive/layouts/live_editing.html.slim

@@ -5,36 +5,25 @@ html xmlns='http://www.w3.org/1999/xhtml'
     = render 'locomotive/shared/head'
 
   body class="live-editing sidebar-closed"
-
-    - # HEADER: brand + current site + account
-    = render 'locomotive/shared/header'
-
-    - # WRAPPER
-    .wrapper
-      .slide-sidebar
-        .bar
-          .expand-button
-            i.fa.fa-chevron-right
-        nav.sidebar
-          .scrollable
-            = render 'locomotive/shared/sidebar'
-
-      section.preview
-        .scrollable
-          = yield :preview
-
-      .content
-        .close-button
-          i.fa.fa-chevron-left
-        .expand-button
-          i.fa.fa-chevron-right
-        .inner
-          = yield
-
-      section.drawer
+    = render 'locomotive/shared/navigation'
+    = render 'locomotive/shared/sidebar'
+    
+    .content-main
+      .content-overlay
+      
+      .drawer
         .close-button
           i.fa.fa-times
-        .inner
+        .content-inner
           = yield :drawer
-
-    = yield :foot
+          = yield :foot
+          
+      .actionbar
+        .actionbar-trigger
+          i.fa.fa-chevron-left
+        .content
+          = yield
+      
+      .content-preview.preview
+        .scrollable
+          = yield :preview