locomotive_cms 2.0.0.rc12 → 2.0.0

data/app/helpers/locomotive/content_entries_helper.rb

@@ -1,11 +1,37 @@
 module Locomotive
   module ContentEntriesHelper
 
+    # Keep track of the form used to create / edit content entries
+    # from a has_many custom field.
+    # Because of formtastic which does not work with embedded forms,
+    # we have to render them once we are done with our main form.
+    #
+    # @param [ Hash ] field The field describing the relationship
+    #
+    def push_has_many_form(field)
+      (@has_many_forms ||= []) << field
+    end
+
+    # Render all the forms used to create / edit content entries
+    # from a has_many custom field.
+    # Because of formtastic which does not work with embedded forms,
+    # we have to render them once we are done with our main form.
+    #
+    # @return [ String ] the forms
+    #
+    def render_has_many_forms
+      return unless @has_many_forms
+
+      @has_many_forms.map do |field|
+        render 'locomotive/custom_fields/types/has_many_form', field: field
+      end.join("\n").html_safe
+    end
+
     def options_for_belongs_to_custom_field(class_name)
       content_type = Locomotive::ContentType.class_name_to_content_type(class_name, current_site)
 
       if content_type
-        content_type.ordered_entries.map { |entry| [entry._label, entry._id] }
+        content_type.ordered_entries.map { |entry| [entry_label(content_type, entry), entry._id] }
       else
         [] # unknown content type
       end

data/app/helpers/locomotive/custom_fields_helper.rb

@@ -44,7 +44,7 @@ module Locomotive
 
     def options_for_content_type
       current_site.content_types.map do |c|
-        [c.name, c.klass_with_custom_fields(:entries).to_s]
+        [c.name, c.entries_class_name]
       end.compact
     end
 
@@ -58,7 +58,7 @@ module Locomotive
               hash[type] << {
                 :label      => field.label,
                 :name       => field.name,
-                :class_name => content_type.klass_with_custom_fields(:entries).to_s
+                :class_name => content_type.entries_class_name
               }
             end
           end

data/app/helpers/locomotive/pages_helper.rb

@@ -2,14 +2,20 @@ module Locomotive
   module PagesHelper
 
     def css_for_page(page)
-      %w(index not_found templatized redirect).inject([]) do |memo, state|
+      %w(index not_found templatized redirect unpublished).inject([]) do |memo, state|
         memo << state.dasherize if page.send(:"#{state}?")
         memo
       end.join(' ')
     end
 
     def page_toggler(page)
-      image_tag("locomotive/list/icons/node_#{(cookies["folder-#{page._id}"] != 'none') ? 'open' : 'closed'}.png", :class => 'toggler')
+      icon_class = cookies["folder-#{page._id}"] != 'none' ? 'icon-caret-down' : 'icon-caret-right'
+      content_tag :i, '',
+        :class  => "#{icon_class} toggler",
+        :data   => {
+          :open   => 'icon-caret-down',
+          :closed => 'icon-caret-right'
+        }
     end
 
     def parent_pages_options
@@ -59,9 +65,31 @@ module Locomotive
       ]
     end
 
+    def options_for_page_redirect_type
+      [
+        [t('.redirect_type.permanent'), 301],
+        [t('.redirect_type.temporary'), 302]
+      ]
+    end
+
     def page_response_type_to_string(page)
       options_for_page_response_type.detect { |t| t.last == page.response_type }.try(:first) || '&mdash;'
     end
 
+    # Give the path to the template of the page for the main locale ONLY IF
+    # the user does not already edit the page in the main locale.
+    #
+    # @param [ Object ] page The page
+    #
+    # @return [ String ] The path or nil if the main locale is enabled
+    #
+    def page_main_template_path(page)
+      if not_the_default_current_locale?
+        page_path(page, :content_locale => current_site.default_locale, :format => :json)
+      else
+        nil
+      end
+    end
+
   end
 end

data/app/helpers/locomotive/snippets_helper.rb

@@ -0,0 +1,20 @@
+module Locomotive
+	module SnippetsHelper
+
+		# Give the path to the template of the snippet for the main locale ONLY IF
+		# the user does not already edit the snippet in the main locale.
+		#
+		# @param [ Object ] snippet The snippet
+		#
+		# @return [ String ] The path or nil if the main locale is enabled
+		#
+		def snippet_main_template_path(snippet)
+			if not_the_default_current_locale?
+				snippet_path(snippet, :content_locale => current_site.default_locale, :format => :json)
+			else
+				nil
+			end
+		end
+
+	end
+end

data/app/helpers/locomotive/translations_helper.rb

@@ -0,0 +1,19 @@
+module Locomotive
+  module TranslationsHelper
+
+    def untranslated_locales(site, translation)
+      list = site.locales.inject([]) do |memo,locale|
+        translation.values[locale].present? ? memo :  memo << I18n.t("locomotive.locales.#{locale}")
+      end
+
+      if list.empty?
+        ''
+      else
+        haml_tag :span, :class => 'untranslated' do
+          haml_tag :em, I18n.t('locomotive.translations.untranslated', :list => list.to_sentence)
+        end
+      end
+    end
+
+  end
+end

data/app/inputs/locomotive/code_input.rb

@@ -2,10 +2,9 @@ module Locomotive
   class CodeInput < Formtastic::Inputs::TextInput
 
     def input_wrapping(&block)
-      template.content_tag(:li,
-        [template.capture(&block), error_html, image_picker_html, hint_html].join("\n").html_safe,
-        wrapper_html_options
-      )
+      elements = [template.capture(&block), error_html, toolbar_html, hint_html]
+
+      template.content_tag(:li, elements.join("\n").html_safe, wrapper_html_options)
     end
 
     def hint_text
@@ -18,12 +17,35 @@ module Locomotive
       end
     end
 
-    def image_picker_html
-      return '' if options.delete(:picker) == false
+    def toolbar_html
+      elements = [image_picker_html, copy_from_main_locale_html].compact
+
+      return '' if elements.size == 0
+
       template.content_tag(:div,
-        template.link_to(template.t('locomotive.image_picker.link'), template.theme_assets_path, :id => 'image-picker-link', :class => 'picture'),
+        elements.join('&nbsp;|&nbsp;').html_safe,
         :class => 'more error-anchor')
     end
 
+    def image_picker_html
+      return nil if options.delete(:picker) == false
+
+      template.link_to(
+        template.content_tag(:i, '', :class => 'icon-picture') +
+        template.t('locomotive.code_editing.image_picker'),
+        template.theme_assets_path, :id => 'image-picker-link', :class => 'picture')
+    end
+
+    def copy_from_main_locale_html
+      url = options.delete(:main_locale_template_url)
+
+      return nil unless url
+
+      template.link_to(
+        template.content_tag(:i, '', :class => 'icon-download') +
+        template.t('locomotive.code_editing.copy_template'),
+        url, :id => 'copy-template-link', :class => 'copy')
+    end
+
   end
 end

data/app/inputs/locomotive/file_input.rb

@@ -17,6 +17,10 @@ module Locomotive
     end
 
     def file_wrapper_html
+      prefix = builder.custom_namespace.present? ? "#{builder.custom_namespace}_" : ''
+
+      template_id = "#{prefix}#{method}_file_input"
+
       template.content_tag(:script,
         %(
           {{#if url}}
@@ -24,7 +28,7 @@ module Locomotive
           {{else}}
           #{without_file_html}
           {{/if}}).html_safe,
-        :type => 'text/html', :id => "#{method}_file_input")
+        :type => 'text/html', :id => template_id)
     end
 
     def with_file_html

data/app/inputs/locomotive/locale_input.rb

@@ -14,7 +14,8 @@ module Locomotive
       template.content_tag(:div,
         Locomotive.config.locales.map do |locale|
           template.content_tag(:div, locale_to_html(locale).html_safe, :class => 'entry')
-        end.join.html_safe, :class => 'list')
+        end.join.html_safe +
+        template.content_tag(:div, '', :class => 'clear'), :class => 'list')
     end
 
     def locale_to_html(locale)
@@ -22,7 +23,7 @@ module Locomotive
 
       builder.radio_button(:locale, locale, :id => choice_input_dom_id(locale)) +
       template.content_tag(:label,
-        template.image_tag("locomotive/icons/flags/#{locale}.png", :alt => text) +
+        template.image_tag("locomotive/icons/flags/#{locale}.png", :alt => text, :size => '24x24') +
         text, :for => choice_input_dom_id(locale))
     end
 

data/app/inputs/locomotive/locales_input.rb

@@ -16,7 +16,8 @@ module Locomotive
 
     def choices_group_wrapping(&block)
       template.content_tag(:div,
-        template.capture(&block),
+        template.capture(&block) +
+        template.content_tag(:div, '', :class => 'clear'),
         choices_group_wrapping_html_options
       )
     end
@@ -38,7 +39,7 @@ module Locomotive
 
     def choice_label(choice)
       text = I18n.t("locomotive.locales.#{choice}")
-      template.image_tag("locomotive/icons/flags/#{choice}.png", :alt => text) << text
+      template.image_tag("locomotive/icons/flags/#{choice}.png", :alt => text, :size => '24x24') << text
     end
 
     def choices_group_wrapping_html_options

data/app/mailers/locomotive/notifications.rb

@@ -4,7 +4,13 @@ module Locomotive
     default :from => Locomotive.config.mailer_sender
 
     def new_content_entry(account, entry)
-      @account, @entry, @type, @domain = account, entry, entry.content_type, entry.site.domains.first
+      @account, @entry, @type = account, entry, entry.content_type
+
+      if Locomotive.config.multi_sites_or_manage_domains?
+        @domain = entry.site.domains.first
+      else
+        @domain = ActionMailer::Base.default_url_options[:host] || 'localhost'
+      end
 
       subject = t('locomotive.notifications.new_content_entry.subject', :domain => @domain, :type => @type.name, :locale => account.locale)
 

data/app/models/locomotive/ability.rb

@@ -9,9 +9,13 @@ module Locomotive
 
       alias_action :index, :show, :edit, :update, :to => :touch
 
-      @membership = @site.memberships.where(:account_id => @account.id).first
+      if @site
+        @membership = @site.memberships.where(:account_id => @account.id).first
+      elsif @account.admin?
+        @membership = Membership.new(:account => @account, :role => 'admin')
+      end
 
-      return false if @membership.blank?
+      return false if @membership.nil?
 
       if @membership.admin?
         setup_admin_permissions!
@@ -32,7 +36,7 @@ module Locomotive
       can :touch, [Page, ThemeAsset]
       can :sort, Page
 
-      can :manage, [ContentEntry, ContentAsset]
+      can :manage, [ContentEntry, ContentAsset, Translation]
 
       can :touch, Site do |site|
         site == @site
@@ -54,6 +58,8 @@ module Locomotive
 
       can :manage, ContentAsset
 
+      can :manage, Translation
+
       can :manage, Site do |site|
         site == @site
       end

data/app/models/locomotive/account.rb

@@ -34,7 +34,17 @@ module Locomotive
     ## methods ##
 
     def sites
-      @sites ||= Site.where({ 'memberships.account_id' => self._id })
+      @sites ||= Site.where('memberships.account_id' => self._id)
+    end
+
+    # Tell if the account has admin privileges or not.
+    # Actually, an account is considered as an admin if
+    # it owns at least one admin membership in all its sites.
+    #
+    # @return [ Boolean ] True if admin
+    #
+    def admin?
+      Site.where(:memberships => { '$elemMatch' => { :account_id => self._id, :role => :admin } }).count > 0
     end
 
     # Create the API token which will be passed to all the requests to the Locomotive API.
@@ -85,10 +95,6 @@ module Locomotive
       Locomotive::DeviseMailer
     end
 
-    def as_json(options = {})
-      Locomotive::AccountPresenter.new(self, options).as_json
-    end
-
     protected
 
     def password_required?

data/app/models/locomotive/content_asset.rb

@@ -1,8 +1,7 @@
 module Locomotive
   class ContentAsset
 
-    include ::Mongoid::Document
-    include ::Mongoid::Timestamps
+    include Locomotive::Mongoid::Document
 
     ## extensions ##
     include Extensions::Asset::Types
@@ -37,9 +36,5 @@ module Locomotive
       { :url => self.source.url }.merge(self.attributes).stringify_keys
     end
 
-    def as_json(options = {})
-      Locomotive::ContentAssetPresenter.new(self).as_json
-    end
-
   end
-end
+end

data/app/models/locomotive/content_entry.rb

@@ -10,15 +10,15 @@ module Locomotive
     ## fields ##
     field :_slug
     field :_label_field_name
-    field :_position, :type => Integer, :default => 0
-    field :_visible,  :type => Boolean, :default => true
+    field :_position,         type: Integer, default: 0
+    field :_visible,          type: Boolean, default: true
 
     ## validations ##
-    validates :_slug, :presence => true, :uniqueness => { :scope => :content_type_id }
+    validates :_slug, presence: true, uniqueness: { scope: :content_type_id }
 
     ## associations ##
-    belongs_to  :site,          :class_name => 'Locomotive::Site'
-    belongs_to  :content_type,  :class_name => 'Locomotive::ContentType', :inverse_of => :entries
+    belongs_to  :site,          class_name: 'Locomotive::Site'
+    belongs_to  :content_type,  class_name: 'Locomotive::ContentType', inverse_of: :entries, custom_fields_parent_klass: true
 
     ## callbacks ##
     before_validation :set_slug
@@ -29,8 +29,8 @@ module Locomotive
     after_create      :send_notifications
 
     ## named scopes ##
-    scope :visible, :where => { :_visible => true }
-    scope :latest_updated, :order_by => :updated_at.desc, :limit => Locomotive.config.ui[:latest_entries_nb]
+    scope :visible, where: { _visible: true }
+    scope :latest_updated, order_by: :updated_at.desc, limit: Locomotive.config.ui[:latest_entries_nb]
 
     ## methods ##
 
@@ -105,7 +105,7 @@ module Locomotive
     # @return [ Object ] The content entry matching the permalink or nil if not found
     #
     def self.find_by_permalink(permalink)
-      self.where(:_slug => permalink).first
+      self.where(_slug: permalink).first
     end
 
     # Sort the content entries from an ordered array of content entry ids.
@@ -114,24 +114,30 @@ module Locomotive
     # @param [ Array ] The ordered array of ids
     #
     def self.sort_entries!(ids)
-      list = self.any_in(:_id => ids.map { |id| BSON::ObjectId.from_string(id.to_s) }).to_a
+      list = self.any_in(_id: ids.map { |id| BSON::ObjectId.from_string(id.to_s) }).to_a
       ids.each_with_index do |id, position|
         if entry = list.detect { |e| e._id.to_s == id.to_s }
-          entry.update_attributes :_position => position
+          entry.update_attributes _position: position
         end
       end
     end
 
-    def to_liquid
-      Locomotive::Liquid::Drops::ContentEntry.new(self)
-    end
-
-    def to_presenter(options = {})
-      Locomotive::ContentEntryPresenter.new(self, options)
+    # All the content entries no matter the content type they belong to
+    # share the same presenter class.
+    #
+    # @param [ Class ] The content entry presenter class
+    #
+    def self.presenter_class
+      Locomotive::ContentEntryPresenter
     end
 
-    def as_json(options = {})
-      self.to_presenter(options).as_json
+    # All the content entries no matter the content type they belong to
+    # share the same liquid drop class.
+    #
+    # @param [ Class ] The liquid drop class
+    #
+    def self.drop_class
+      Locomotive::Liquid::Drops::ContentEntry
     end
 
     protected
@@ -166,13 +172,13 @@ module Locomotive
     # Return the next available unique slug as a string
     def next_unique_slug
       slug        = self._slug.gsub(/-\d*$/, '')
-      last_slug   = self.class.where(:_id.ne => self._id, :_slug => /^#{slug}-?\d*?$/i).order_by(:_slug).last._slug
+      last_slug   = self.class.where(:_id.ne => self._id, _slug: /^#{slug}-?\d*?$/i).order_by(:_slug).last._slug
       next_number = last_slug.scan(/-(\d)$/).flatten.first.to_i + 1
       [slug, next_number].join('-')
     end
 
     def slug_already_taken?
-      self.class.where(:_id.ne => self._id, :_slug => self._slug).any?
+      self.class.where(:_id.ne => self._id, _slug: self._slug).any?
     end
 
     def set_site