locomotivecms 3.0.0.pre.alpha.3 → 3.0.0.pre.beta.1

data/app/helpers/locomotive/content_types_helper.rb

@@ -1,7 +1,7 @@
 module Locomotive
   module ContentTypesHelper
 
-    # Renders the label of a content type entry. If no raw_item_template filled in the content type,
+    # Renders the label of a content type entry. If no entry_template filled in the content type,
     # it just calls the _label method of the entry (based on the label_field_id). Otherwise, it
     # parses and renders the liquid template.
     #
@@ -11,19 +11,16 @@ module Locomotive
     # @return [ String ] The label of the content type entry
     #
     def entry_label(content_type, entry)
-      if content_type.raw_item_template.blank?
-        entry._label # default one
-      else
-        assigns = { 'site' => current_site, 'entry' => entry }
+      link = edit_content_entry_path(current_site, content_type.slug, entry)
 
-        registers = {
-          controller:     self,
-          site:           current_site,
-          current_locomotive_account:  current_locomotive_account,
-          asset_host:     Locomotive::Liquid::AssetHost.new(request, current_site, Locomotive.config.asset_host)
-        }
+      if content_type.entry_template.blank?
+        link_to entry._label, link  # default one
+      else
+        assigns   = { 'site' => current_site, 'entry' => entry.to_liquid(content_type), 'link' => link, 'today' => Date.today, 'now' => Time.zone.now }
+        registers = { site: current_site, locale: ::Mongoid::Fields::I18n.locale.to_s, services: Locomotive::Steam::Services.build_instance }
+        context   = ::Liquid::Context.new({}, assigns, registers)
 
-        preserve(content_type.item_template.render(::Liquid::Context.new({}, assigns, registers)))
+        content_type.render_entry_template(context).html_safe
       end
     end
 

data/app/helpers/locomotive/custom_fields_helper.rb

@@ -151,6 +151,7 @@ module Locomotive
       {
         name:         "#{field.name}_id",
         as:           :editable_select,
+        wrapper_html: { class: 'select' },
         collection:   field.ordered_select_options.map { |option| [option.name, option.id] },
         manage_collection:    {
           label:  custom_field_t(:edit, field.type),

data/app/helpers/locomotive/dashboard_helper.rb

@@ -0,0 +1,91 @@
+module Locomotive
+  module DashboardHelper
+
+    def activity_to_icon(activity)
+      case activity.domain
+      when 'site'             then 'fa-cog'
+      when 'page'             then 'fa-file-text'
+      when 'editable_element' then 'fa-file-text'
+      when 'content_entry'    then activity.action == 'created_public' ? 'fa-comment' : 'fa-archive'
+      when 'content_asset'    then 'fa-file-picture-o'
+      when 'membership'       then 'fa-user'
+      end
+    end
+
+    def render_activity_sentence(activity)
+      params = activity.parameters
+
+      options = case activity.key
+      when /\Apage\./                       then activity_page_options(params)
+      when /\Acontent_entry\./              then activity_content_entry_options(params)
+      when 'editable_element.updated_bulk'  then activity_bulk_editable_elements_options(params)
+      when 'content_asset.created_bulk'     then { count: activity_emphasize(params[:assets].size) }
+      when 'content_asset.destroyed'        then { name:  activity_emphasize(params[:name]) }
+      when 'membership.created'             then { name: activity_emphasize(params[:name]) }
+      end
+
+      activity_key_to_sentence(activity.key, options)
+    end
+
+    def render_activity_additional_information(activity)
+      case activity.key
+      when 'content_asset.created_bulk' then activity_bulk_content_assets(activity.parameters)
+      # when 'editable_element.updated_bulk' then activity_bulk_editable_elements(activity.parameters)
+      else nil
+      end
+    end
+
+    def activity_key_to_sentence(key, options = nil)
+      I18n.t(key, (options || {}).merge(scope: 'locomotive.activity')).html_safe
+    end
+
+    def activity_emphasize(text)
+      content_tag(:strong, text)
+    end
+
+    def activity_page_options(params)
+      if params[:_id]
+        { page: link_to(params[:title], editable_elements_path(current_site, params[:_id])) }
+      elsif params[:title]
+        { page: activity_emphasize(params[:title]) }
+      else
+        nil
+      end
+    end
+
+    def activity_bulk_editable_elements_options(params)
+      pages = params[:pages].map do |page|
+        link_to truncate(page[:title]),  editable_elements_path(current_site, page[:_id])
+      end.join(', ').html_safe
+
+      { pages: pages }
+    end
+
+    def activity_content_entry_options(params)
+      entry = if params[:_id]
+        link_to(params[:label], edit_content_entry_path(current_site, params[:content_type_slug], params[:_id]))
+      elsif params[:label]
+        activity_emphasize(params[:label])
+      else
+        nil
+      end
+
+      content_type = link_to(params[:content_type], content_entries_path(current_site, params[:content_type_slug]))
+
+      { entry: entry, content_type: content_type }
+    end
+
+    def activity_bulk_content_assets(params)
+      list = params[:assets].map do |asset|
+        if asset[:image]
+          content_tag(:li, link_to(image_tag(Locomotive::Dragonfly.resize_url(asset[:url], '60x60#'), alt: asset[:name]), asset[:url]))
+        else
+          content_tag(:li, link_to(truncate(asset[:name], length: 20), asset[:url]))
+        end
+      end.join("\n").html_safe
+
+      content_tag(:ul, list, class: 'assets') + content_tag(:div, '', class: 'clearfix')
+    end
+
+  end
+end

data/app/helpers/locomotive/developers_documentation_helper.rb

@@ -0,0 +1,32 @@
+module Locomotive
+  module DevelopersDocumentationHelper
+    def developer_documentation_wagon_clone_string
+       [ 'wagon clone',
+         current_site_name_with_underscores,
+         current_request_url,
+         current_site_handle_parameter,
+         current_locomotive_account_email_parameter,
+         current_site_api_key_parameter].join(' ')
+    end
+
+    def current_site_name_with_underscores
+      current_site.name.underscore.gsub(/(\W+)/, '_')
+    end
+
+    def current_request_url
+      [request.scheme, '://', request.host_with_port].join
+    end
+
+    def current_site_handle_parameter
+      ['-h', current_site.handle].join(' ')
+    end
+
+    def current_locomotive_account_email_parameter
+      ['-e', current_locomotive_account.email].join(' ')
+    end
+
+    def current_site_api_key_parameter
+      ['-a', current_locomotive_account.api_key].join(' ')
+    end
+  end
+end

data/app/helpers/locomotive/editable_elements_helper.rb

@@ -1,38 +1,49 @@
 module Locomotive
   module EditableElementsHelper
 
+    def each_editable_element(blocks, elements_by_block)
+      blocks.each_with_index do |block, block_index|
+        elements_by_block[block[:name]].each_with_index do |(page, element), el_index|
+          index = block_index * 100 + el_index
+          yield(page, element, index)
+        end
+      end
+    end
+
     def editable_element_input_options(editable_element, index, options = {})
       {
-        label:        editable_element.slug,
+        label:        editable_element_label(editable_element),
         placeholder:  false,
         hint:         editable_element.hint,
         wrapper_html: {
-          id:   "#{editable_element.type.to_s.dasherize}-#{index}",
+          id:   "#{editable_element.type.to_s.dasherize}-#{editable_element._id}",
           data: { block: editable_element.block || '' }
         }
       }.merge(options)
     end
 
+    def editable_element_label(editable_element)
+      label = <<-HTML
+      <span class="label label-primary">#{editable_element.block_label}</span>
+      &nbsp;
+      #{editable_element.label}
+      HTML
+
+      label.html_safe
+    end
+
     def nice_editable_elements_path
-      _path = params[:preview_path] || current_site.localized_page_fullpath(@page)
+      _path = params[:preview_path] || current_site.localized_page_fullpath(@page, current_content_locale)
       _path = 'index' if _path.blank?
 
       truncate('/' + _path, length: 50)
     end
 
-    def ordered_editable_elements(editable_elements_by_block)
-      list = []
-      @editable_elements_by_block.each do |block, editable_elements|
-        list += editable_elements.sort { |(page, element)| element.priority || 1 }
-      end
-      list
-    end
-
-    def options_for_page_blocks(editable_elements_by_block)
+    def options_for_page_blocks(blocks)
       options_for_select(
         [[t('.blocks.all'), '']] +
-        editable_elements_by_block.keys.map do |name|
-          name.nil? ? [t('.blocks.unknown'), '_unknown'] : [name, name]
+        blocks.map do |block|
+          block[:name].nil? ? [t('.blocks.unknown'), '_unknown'] : [block[:label], block[:name]]
         end)
     end
 

data/app/helpers/locomotive/errors_helper.rb

@@ -0,0 +1,21 @@
+module Locomotive
+  module ErrorsHelper
+
+    def error_title
+      @title || t(:title, scope: "locomotive.errors.#{action_name.gsub('error_', '')}")
+    end
+
+    def no_site_message_and_link
+      options = Locomotive.config.host ? { host: Locomotive.config.host } : { only_path: true }
+
+      if Locomotive::Account.count == 0
+        [t('.message.create_account'), sign_up_url(options)]
+      elsif current_locomotive_account
+        [t('.message.add_domain', host: request.host), sites_url(options)]
+      else
+        [t('.message.sign_in', host: request.host), new_locomotive_account_session_url(options)]
+      end
+    end
+
+  end
+end

data/app/helpers/locomotive/my_account_helper.rb

@@ -2,16 +2,18 @@ module Locomotive
   module MyAccountHelper
 
     def options_for_locale
-      Locomotive.config.locales.map do |locale|
-        flag_url = path_to_image "locomotive/icons/flags/#{locale}.png"
+      Rails.cache.fetch('views/helpers/options_for_locale') do
+        Locomotive.config.locales.map do |locale|
+          flag_url = path_to_image "locomotive/icons/flags/#{locale}.png"
 
-        [
-          I18n.t("locomotive.locales.#{locale}"),
-          locale,
-          { :"data-flag" => flag_url }
-        ]
+          [
+            I18n.t("locomotive.locales.#{locale}"),
+            locale,
+            { :"data-flag" => flag_url }
+          ]
+        end
       end
     end
 
   end
-end
+end

data/app/helpers/locomotive/pages_helper.rb

@@ -34,7 +34,7 @@ module Locomotive
       layouts = current_site.pages.layouts.map do |_layout|
         [_layout.title, _layout._id]
       end
-      [[t(:no_layout, scope: 'locomotive.pages.form'), nil]] + layouts
+      [[t(:no_layout, scope: 'locomotive.pages.form'), 'parent']] + layouts
     end
 
     # def options_for_page_response_type

data/app/helpers/locomotive/public_submission_accounts_helper.rb

@@ -0,0 +1,11 @@
+module Locomotive
+  module PublicSubmissionAccountsHelper
+
+    def options_for_public_submission_accounts
+      current_site.accounts.collect { |a| [CGI::escapeHTML("#{a.name} <#{a.email}>"), a.id.to_s] }
+    end
+
+  end
+end
+
+

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

@@ -3,7 +3,7 @@ module Locomotive
     module AccountsHelper
 
       def account_avatar_url(account, size = '70x70#')
-        if account.avatar?
+        if account && account.avatar?
           Locomotive::Dragonfly.resize_url account.avatar.url, size
         else
           'locomotive/user.png'
@@ -12,7 +12,7 @@ module Locomotive
 
       def account_avatar_and_name(account, size = '70x70#')
         avatar  = image_tag(account_avatar_url(account, size), class: 'img-circle', style: 'width: 20px')
-        profile = avatar + account.name
+        profile = avatar + (account.try(:name) || t('.unknown_account'))
       end
 
     end

data/app/helpers/locomotive/sites_helper.rb

@@ -8,22 +8,26 @@ module Locomotive
     end
 
     def options_for_site_locales
-      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)
+      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)
 
-        [
-          text,
-          locale,
-          { :"data-display" => nice_display }
-        ]
+          [
+            text,
+            locale,
+            { :"data-display" => nice_display }
+          ]
+        end
       end
     end
 
     def options_for_site_timezones
-      ActiveSupport::TimeZone.all.map do |tz|
-        [tz, tz.name]
+      Rails.cache.fetch('views/helpers/timezones') do
+        ActiveSupport::TimeZone.all.map do |tz|
+          [tz.to_s, tz.name]
+        end
       end
     end
 

data/app/helpers/locomotive/translations_helper.rb

@@ -1,19 +1,27 @@
 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
+    def translation_completion_to_class(site, translation)
+      (case translation.values.count { |v| v.present? }
+      when 0                  then 'zero'
+      when site.locales.size  then 'all'
+      else 'partially'
+      end) + '-done'
     end
 
+    # 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
+end

data/app/inputs/locomotive/api_key_input.rb

@@ -1,6 +1,8 @@
 module Locomotive
   class ApiKeyInput < ::SimpleForm::Inputs::Base
 
+    include Locomotive::SimpleForm::Inputs::FasterTranslate
+
     def input(wrapper_options)
       api_key_html + regenerate_button
     end

data/app/inputs/locomotive/array_input.rb

@@ -3,6 +3,7 @@ module Locomotive
 
     include Locomotive::SimpleForm::BootstrapHelpers
     include Locomotive::SimpleForm::HeaderLink
+    include Locomotive::SimpleForm::Inputs::FasterTranslate
 
     def input(wrapper_options)
       array_wrapper + new_item_wrapper
@@ -25,7 +26,7 @@ module Locomotive
 
     def collection_to_html
       _template = options[:template]
-      key       = attribute_name.to_s.singularize.to_sym
+      key       = self.singularized_name
 
       path, locals = (if _template.respond_to?(:has_key?)
        [_template[:path].to_s, _template[:locals] || {}]
@@ -63,13 +64,13 @@ module Locomotive
       css = 'form-control input'
 
       if options[:select_options]
-        template.select_tag('locale', template.options_for_select(options[:select_options]), class: css)
+        template.select_tag(singularized_name, template.options_for_select(options[:select_options]), class: css)
       elsif data = options[:picker]
         template.hidden_field_tag('id', '', class: css, data: data)
       else
         text_options = input_html_options.dup
         text_options[:class] << css
-        template.text_field_tag(attribute_name.to_s.singularize, '', text_options)
+        template.text_field_tag(singularized_name, '', text_options)
       end
     end
 
@@ -77,6 +78,10 @@ module Locomotive
       options[:template_url].present?
     end
 
+    def singularized_name
+      attribute_name.to_s.singularize.to_sym
+    end
+
     def text(name)
       I18n.t(name, scope: 'locomotive.inputs.array')
     end