locomotive_cms 2.4.1 → 2.5.0.rc1

data/app/assets/stylesheets/locomotive/backoffice/content_assets.css.scss

@@ -10,6 +10,7 @@ ul.content-assets {
   list-style: none;
   margin: 0px;
   padding: 0px;
+  background: transparent;
 
   li.asset {
     position: relative;
@@ -41,15 +42,34 @@ ul.content-assets {
       @include background-image(linear-gradient(#ebedf4, #d7dbe7));
       border-bottom: 1px solid #ccced7;
 
+      padding-left: 5px;
+      font-size: 11px;
+      color: #333;
+      font-weight: bold;
+
       a {
         @include hover-link;
 
-        margin-left: 5px;
         outline: none;
-
-        font-size: 11px;
         color: #1f82bc;
-        font-weight: bold;
+      }
+    }
+
+    .uploading {
+      margin: 54px 10px 0 10px;
+      padding: 2px;
+      height: 14px;
+      background: #333;
+      border-bottom: 1px solid #fff;
+      @include border-radius(10px);
+
+      .progress-bar {
+        display: inline-block;
+        width: 20%;
+        height: 13px;
+        border-top: 1px solid #d6f6ff;
+        @include background-image(linear-gradient(#65c3ff, #008ced));
+        @include border-radius(10px);
       }
     }
 
@@ -127,4 +147,54 @@ ul.content-assets {
 
   } // li.asset
 
+}
+
+.content-asset-picker-dialog {
+
+  .ui-dialog-content {
+    padding: 0px !important;
+  }
+
+  .ui-dialog-titlebar {
+    border-bottom: 1px solid transparent !important;
+  }
+
+  .filter-and-search {
+    @include background-image(linear-gradient(#55565c, #45454a));
+    padding: 10px 10px;
+    border-bottom: 1px solid #000;
+
+    .search-bar {
+      position: relative;
+      float: right;
+
+      input {
+        @include border-radius(20px);
+        outline: none;
+        border: 0px;
+        font-size: 12px;
+        padding: 3px 10px 3px 30px;
+        line-height: 20px;
+        z-index: 100;
+        width: 150px;
+      }
+
+      i.icon-search {
+        position: absolute;
+        left: 10px;
+        top: 2px;
+        font-size: 18px;
+        z-index: 101;
+      }
+    }
+  }
+
+  ul.content-assets {
+    padding: 10px;
+    margin: 0px;
+  }
+
+  .no-items {
+    margin: 50px 10px 0px;
+  }
 }

data/app/assets/stylesheets/locomotive/backoffice/dialog_changes.css.scss

@@ -72,6 +72,10 @@
       height: 360px;
     }
 
+    &.hovered {
+      background: rgba(224, 237, 253, 1);
+    }
+
     form.formtastic {
       fieldset {
         legend, ol {

data/app/assets/stylesheets/locomotive/shared/common.css.scss

@@ -33,3 +33,10 @@ p.no-items {
     color: #ff2900;
   }
 }
+
+/* ___ stop window scrolling (when an ui-dialog is open) ___ */
+
+.stop-scrolling {
+  height: 100%;
+  overflow: hidden;
+}

data/app/controllers/locomotive/api/documentation_controller.rb

@@ -2,14 +2,20 @@ require 'locomotive/misc/api_documentation'
 
 module Locomotive
   module Api
-
     class DocumentationController < ApplicationController
 
+      before_filter :require_account
+
       def show
         render text: Locomotive::Misc::ApiDocumentation.generate
       end
 
-    end
+      protected
 
+      def require_account
+        authenticate_locomotive_account!
+      end
+
+    end
   end
 end

data/app/controllers/locomotive/api/pages_controller.rb

@@ -2,7 +2,7 @@ module Locomotive
   module Api
     class PagesController < BaseController
 
-      load_and_authorize_resource class: Locomotive::Page, through: :current_site
+      load_and_authorize_resource class: ::Locomotive::Page, through: :current_site
 
       def index
         @pages = @pages.order_by(:depth.asc, :position.asc)

data/app/controllers/locomotive/content_assets_controller.rb

@@ -5,6 +5,10 @@ module Locomotive
 
     def index
       @content_assets = current_site.content_assets
+        .ordered
+        .by_content_types(params[:types])
+        .by_filename(params[:query])
+        .page(params[:page] || 1).per(params[:per_page] || Locomotive.config.ui[:per_page])
       respond_with(@content_assets)
     end
 

data/app/models/locomotive/content_asset.rb

@@ -15,7 +15,7 @@ module Locomotive
     field :position,      type: Integer, default: 0
 
     ## associations ##
-    belongs_to :site, class_name: 'Locomotive::Site'
+    belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
 
     ## validations ##
     validates_presence_of :source
@@ -23,6 +23,10 @@ module Locomotive
     ## behaviours ##
     mount_uploader :source, ContentAssetUploader, mount_on: :source_filename
 
+    ## scopes ##
+    scope :ordered,     order_by(created_at: :desc)
+    scope :by_filename, ->(query) { where(source_filename: /.*#{query}.*/i) }
+
     ## methods ##
 
     alias :name :source_filename

data/app/models/locomotive/content_entry.rb

@@ -20,7 +20,7 @@ module Locomotive
     validates_uniqueness_of   :_slug, scope: :content_type_id, allow_blank: true
 
     ## associations ##
-    belongs_to  :site,          class_name: 'Locomotive::Site'
+    belongs_to  :site,          class_name: 'Locomotive::Site', validate: false, autosave: false
     belongs_to  :content_type,  class_name: 'Locomotive::ContentType', inverse_of: :entries, custom_fields_parent_klass: true
 
     ## callbacks ##
@@ -130,7 +130,12 @@ module Locomotive
     # @return [ Object ] The next or previous content entry or nil if none
     #
     def next_or_previous(matcher = :gt)
-      attribute, direction = self.content_type.order_by_definition(matcher == :lt)
+      # the matchers is supposed to be fine for the default direction, meaning 'asc'
+      # if the direction is not ascending, we need to reverse the matcher
+      matcher = matcher == :gt ? :lt : :gt if self.content_type.order_direction != 'asc'
+
+      attribute = self.content_type.order_by_attribute
+      direction = matcher == :gt ? 'asc' : 'desc'
 
       criterion = attribute.to_sym.send(matcher)
       value     = self.send(attribute.to_sym)

data/app/models/locomotive/content_type.rb

@@ -22,7 +22,7 @@ module Locomotive
     field :public_submission_accounts,  type: Array
 
     ## associations ##
-    belongs_to  :site,      class_name: 'Locomotive::Site'
+    belongs_to  :site,      class_name: 'Locomotive::Site', validate: false
     has_many    :entries,   class_name: 'Locomotive::ContentEntry', dependent: :destroy do
 
       def find_by_id_or_permalink(id_or_permalink)

data/app/models/locomotive/editable_element.rb

@@ -34,6 +34,7 @@ module Locomotive
 
     def disabled_in_all_translations?
       return self.disabled_translations if self.disabled_translations.is_a?(Boolean)
+      return false if disabled_translations.blank?
       self.disabled_translations.all? { |_, v| v == true }
     end
 

data/app/models/locomotive/extensions/asset/types.rb

@@ -6,7 +6,10 @@ module Locomotive
         extend ActiveSupport::Concern
 
         included do
-          %w{media image stylesheet javascript font pdf}.each do |type|
+          scope :by_content_type,   ->(content_type)  { content_type.blank? ? all : where(content_type: content_type.to_s) }
+          scope :by_content_types,  ->(content_types) { content_types.blank? ? all : where(:content_type.in => [*content_types]) }
+
+          all_types.each do |type|
             scope :"only_#{type}", where(content_type: type)
 
             define_method("#{type}?") do
@@ -17,10 +20,12 @@ module Locomotive
 
         module ClassMethods
 
-          def by_content_type(content_type)
-            return self.all if content_type.blank?
+          def all_types
+            %w{image pdf media stylesheet javascript font}
+          end
 
-            self.all.where(content_type: content_type.to_s)
+          def types_for_content_editing
+            all_types - %w(stylesheet javascript font)
           end
 
         end

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

@@ -10,6 +10,8 @@ module Locomotive
             else
               Locomotive::Dragonfly.resize_url(self.source, '85x85#')
             end
+          elsif self.pdf?
+            Locomotive::Dragonfly.thumbnail_pdf(self.source, '85x85#')
           end
         end
 

data/app/models/locomotive/extensions/content_entry/csv.rb

@@ -43,7 +43,7 @@ module Locomotive
           when :tags
             [*value].join(', ')
           else
-            value
+            value == nil ? '' : value
           end
         end
 
@@ -79,4 +79,4 @@ module Locomotive
       end
     end
   end
-end
+end

data/app/models/locomotive/extensions/content_entry/localized.rb

@@ -3,6 +3,18 @@ module Locomotive
     module ContentEntry
       module Localized
 
+        extend ActiveSupport::Concern
+
+        included do
+
+          ## fields ##
+          field :_translated, type: Boolean, localize: true
+
+          ## callbacks ##
+          before_save :persist_translated_status
+
+        end
+
         # Tell if the content entry has been translated or not.
         # It just checks if the field used for the label has been translated.
         # It assumes the entry is localized.
@@ -56,6 +68,12 @@ module Locomotive
           self.respond_to?(:"#{self._label_field_name}_translations")
         end
 
+        protected
+
+        def persist_translated_status
+          self._translated = self.translated?
+        end
+
       end
     end
   end

data/app/models/locomotive/page.rb

@@ -3,7 +3,7 @@ module Locomotive
 
     include Locomotive::Mongoid::Document
 
-    MINIMAL_ATTRIBUTES = %w(_id title slug fullpath position depth published templatized redirect listed response_type parent_id parent_ids site_id created_at updated_at)
+    MINIMAL_ATTRIBUTES = %w(_id title slug fullpath position depth published templatized target_klass_name redirect listed response_type parent_id parent_ids site_id created_at updated_at)
 
     ## Extensions ##
     include Extensions::Page::Tree
@@ -28,7 +28,7 @@ module Locomotive
     field :response_type,       default: 'text/html'
 
     ## associations ##
-    belongs_to :site, class_name: 'Locomotive::Site', autosave: false
+    belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
 
     ## indexes ##
     index site_id:    1

data/app/models/locomotive/snippet.rb

@@ -10,7 +10,7 @@ module Locomotive
     field :template, localize: true
 
     ## associations ##
-    belongs_to :site, class_name: 'Locomotive::Site'
+    belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
 
     ## callbacks ##
     after_save        :update_templates
@@ -33,17 +33,18 @@ module Locomotive
       return unless (self.site rescue false) # not run if the site is being destroyed
 
       pages = ::I18n.with_locale(::Mongoid::Fields::I18n.locale) do
-        pages = self.site.pages.any_in(snippet_dependencies: [self.slug]).to_a
+        self.site.pages.any_in(snippet_dependencies: [self.slug]).to_a
       end
 
-      pages.each do |page|
+      pages.each_with_index do |page, index|
+        # make direct changes directly in the Liquid template
         self._change_snippet_inside_template(page.template.root)
 
-        page.send(:_serialize_template)
+        # serialize it
+        serialized_template = page.send(:_serialize_template)
 
-        Page.without_callback(:save, :after, :update_template_descendants) do
-          page.save(validate: false)
-        end
+        # persist the change to MongoDB by bypassing the validation and the callbacks
+        page.set("serialized_template.#{::Mongoid::Fields::I18n.locale}", serialized_template)
       end
     end
 

data/app/models/locomotive/theme_asset.rb

@@ -18,7 +18,7 @@ module Locomotive
     mount_uploader :source, ThemeAssetUploader, mount_on: :source_filename, validate_integrity: true
 
     ## associations ##
-    belongs_to :site, class_name: 'Locomotive::Site', autosave: false
+    belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
 
     ## indexes ##
     index site_id:  1
@@ -40,6 +40,7 @@ module Locomotive
 
     ## named scopes ##
 
+
     ## accessors ##
     attr_accessor   :plain_text_name, :plain_text, :plain_text_type, :performing_plain_text
     attr_accessible :folder, :source, :plain_text_type, :performing_plain_text, :plain_text_name, :plain_text
@@ -72,11 +73,8 @@ module Locomotive
     end
 
     def plain_text
-      if RUBY_VERSION =~ /1\.9/
-        @plain_text ||= (self.source.read.force_encoding('UTF-8') rescue nil)
-      else
-        @plain_text ||= self.source.read
-      end
+      # only for ruby >= 1.9.x. Forget about ruby 1.8
+      @plain_text ||= (self.source.read.force_encoding('UTF-8') rescue nil)
     end
 
     def plain_text_type
@@ -111,6 +109,14 @@ module Locomotive
       assets.group_by { |a| a.folder.split('/').first.to_sym }
     end
 
+    def self.checksums
+      {}.tap do |hash|
+        self.only(:local_path, :checksum).each do |asset|
+          hash[asset.local_path] = asset.checksum
+        end
+      end
+    end
+
     def to_liquid
       { url: self.source.url }.merge(self.attributes).stringify_keys
     end

data/app/models/locomotive/translation.rb

@@ -7,7 +7,7 @@ class Locomotive::Translation
   field :values, type: Hash, default: {}
 
   ## associations ##
-  belongs_to :site, class_name: 'Locomotive::Site'
+  belongs_to :site, class_name: 'Locomotive::Site', validate: false, autosave: false
 
   ## validations ##
   validates_uniqueness_of :key, scope: :site_id

data/app/views/locomotive/content_assets/_picker.html.haml

@@ -2,6 +2,16 @@
 
   %h2!= t('.title')
 
+  .filter-and-search
+    .button-groups.asset-types
+      - Locomotive::ContentAsset.types_for_content_editing.each do |type|
+        %button.btn{ data: { type: type } }= t(".types.#{type}")
+      %button.btn{ data: { type: 'other'} }= t('.types.others')
+
+    .search-bar
+      %input{ type: 'text', name: 'query', placeholder: t('.placeholder_search') }
+      %i.icon-search
+
   %p.no-items{ style: 'display: none' }!= t('.no_items')
 
   %ul.list.content-assets{ style: 'display: none' }
@@ -17,9 +27,18 @@
 
 %script{ type: 'text/html', id: 'content_asset' }
 
+  {{#if uploading}}
+  %h4 {{filename}}
+  .uploading
+    .progress-bar
+       
+
+  {{else}}
+
   %h4
     = link_to '{{filename}}', '{{url}}', alt: '{{full_filename}}', title: '{{full_filename}}'
-  {{#if image}}
+
+  {{#if with_thumbnail}}
   .image
     .inside
       %img{ src: '{{vignette_url}}' }
@@ -30,4 +49,6 @@
   {{/if}}
 
   .actions
-    = link_to_icon :trash, '#', class: 'remove', :'data-confirm' => t('locomotive.messages.confirm')
+    = link_to_icon :trash, '#', class: 'remove', data: { confirm: t('locomotive.messages.confirm') }
+
+  {{/if}}