camaleon_cms 2.0.4.1 → 2.1.0

data/app/assets/javascripts/camaleon_cms/admin/uploader/uploader_manifest.js

@@ -1,2 +1,3 @@
+//= require ./_jquery.form
 //= require ./_jquery.uploadfile.min
 //= require ./_media_manager

data/app/assets/stylesheets/camaleon_cms/admin/admin-basic-manifest.css

@@ -9,6 +9,7 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require camaleon_cms/bootstrap.min
+ *= require font-awesome
  *= require ./lte/_admin
  *= require ./_custom_admin
  *= require ./lte/skins/skin-blue

data/app/assets/stylesheets/camaleon_cms/admin/admin-manifest.css

@@ -10,6 +10,7 @@
  *
  *= require ./jquery/_jquery-ui
  *= require camaleon_cms/bootstrap.min
+ *= require font-awesome
  *= require ./lte/_admin
  *= require ./lte/skins/skin-blue
  *= require ./_custom_admin

data/app/assets/stylesheets/camaleon_cms/admin/uploader/_uploadfile.css.scss

@@ -85,7 +85,7 @@ margin: 5px 10px 5px 0px;
 	font-size: 16px;
    font-weight: bold;
 	padding: 15px 20px;
-	cursor:pointer;	
+	cursor:pointer;
 	line-height:20px;
 	height:25px;
 	margin:0 10px 10px 0;
@@ -99,17 +99,17 @@ margin: 5px 10px 5px 0px;
   -moz-border-radius: 3px;
   -moz-box-shadow: 0 2px 0 0 #e8e8e8;
   -webkit-box-shadow: 0 2px 0 0 #e8e8e8;
-  box-shadow: 0 2px 0 0 #e8e8e8; 
-  padding: 6px 10px 4px 10px; 
+  box-shadow: 0 2px 0 0 #e8e8e8;
+  padding: 6px 10px 4px 10px;
   color: #fff;
   background: #2f8ab9;
   border: none;
   -moz-box-shadow: 0 2px 0 0 #13648d;
   -webkit-box-shadow: 0 2px 0 0 #13648d;
-  box-shadow: 0 2px 0 0 #13648d; 
-  vertical-align: middle;  
+  box-shadow: 0 2px 0 0 #13648d;
+  vertical-align: middle;
   }
-  
+
 .ajax-file-upload:hover {
       background: #3396c9;
       -moz-box-shadow: 0 2px 0 0 #15719f;
@@ -137,9 +137,7 @@ margin: 5px 10px 5px 0px;
 	margin:20px 0px 20px 0px;
 }
 #cama_media_gallery{
-  background-color: #fff;
   position: relative;
-  padding-top: 37px;
   .media_browser_list{
     background-color: #fff;
     border-right: 1px solid #3C8DBC;

data/app/controllers/camaleon_cms/admin/posts/drafts_controller.rb

@@ -16,14 +16,17 @@ class CamaleonCms::Admin::Posts::DraftsController < CamaleonCms::Admin::PostsCon
   def create
     if params[:post_id].present?
       @post_draft = CamaleonCms::Post.drafts.where(post_parent: params[:post_id]).first
-      @post_draft.attributes = @post_data if @post_draft.present?
+      if @post_draft.present?
+        @post_draft.set_option('draft_status', @post_draft.status)
+        @post_draft.attributes = @post_data
+      end
     end
     @post_draft = @post_type.posts.new(@post_data) unless @post_draft.present?
-    r = {post: @post_draft, post_type: ""}; hooks_run("create_post", r)
+    r = {post: @post_draft, post_type: @post_type}; hooks_run("create_post_draft", r)
     if @post_draft.save(:validate => false)
       @post_draft.set_params(params[:meta], params[:field_options], @post_data[:keywords])
       msg = {draft: {id: @post_draft.id}, _drafts_path: cama_admin_post_type_draft_path(@post_type.id, @post_draft)}
-      r = {post: @post_draft, post_type: ""}; hooks_run("created_post", r)
+      r = {post: @post_draft, post_type: ""}; hooks_run("created_post_draft", r)
     else
       msg = {error: @post_draft.errors.full_messages}
     end
@@ -34,10 +37,10 @@ class CamaleonCms::Admin::Posts::DraftsController < CamaleonCms::Admin::PostsCon
   def update
     @post_draft = CamaleonCms::Post.drafts.find(params[:id])
     @post_draft.attributes = @post_data
-    r = {post: @post_draft, post_type: ""}; hooks_run("update_post", r)
+    r = {post: @post_draft, post_type: @post_type}; hooks_run("update_post", r)
     if @post_draft.save(validate: false)
       @post_draft.set_params(params[:meta], params[:field_options], @post_data[:keywords])
-      hooks_run("updated_post", {post: @post_draft, post_type: ""})
+      hooks_run("updated_post_draft", {post: @post_draft, post_type: ""})
       msg = {draft: {id: @post_draft.id}}
     else
       msg = {error: @post_draft.errors.full_messages}

data/app/controllers/camaleon_cms/admin/sessions_controller.rb

@@ -18,6 +18,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
     if signin?
       return redirect_to (params[:return_to].present? ? params[:return_to] : cama_admin_dashboard_path)
     else
+      cookies[:return_to] = params[:return_to] if params[:return_to].present?
       @user ||= current_site.users.new
     end
     render "login"
@@ -32,9 +33,16 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
     r = {user: @user, params: params, password: data_user[:password], captcha_validate: captcha_validate, stop_process: false}; hooks_run("user_before_login", r)
     return if r[:stop_process] # permit to redirect for data completion
     if captcha_validate && @user && @user.authenticate(data_user[:password])
-      cama_captcha_reset_attack("login")
-      r={user: @user, redirect_to: nil}; hooks_run('after_login', r)
-      login_user(@user, params[:remember_me].present?, r[:redirect_to])
+      #Email validation if is necessary
+      if @user.is_valid_email? || !current_site.need_validate_email?
+        cama_captcha_reset_attack("login")
+        r={user: @user, redirect_to: nil}; hooks_run('after_login', r)
+        login_user(@user, params[:remember_me].present?, r[:redirect_to])
+      else
+        flash[:error] = t('camaleon_cms.admin.login.message.email_not_validated')
+        @user = current_site.users.new(data_user)
+        login
+      end
     else
       cama_captcha_increment_attack("login")
       if captcha_validate
@@ -69,7 +77,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
         if params[:user].present?
           if @user.update(params[:user].permit(:password, :password_confirmation))
             flash[:notice] = t('camaleon_cms.admin.login.message.reset_password_succes')
-            redirect_to admin_login_path
+            redirect_to cama_admin_login_path
             return
           else
             flash[:error] = t('camaleon_cms.admin.login.message.reset_password_error')
@@ -110,6 +118,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
     @user ||= current_site.users.new
     if params[:user].present?
       params[:user][:role] = PluginRoutes.system_info["default_user_role"]
+      params[:user][:is_valid_email] = false if current_site.need_validate_email?
       user_data = params[:user]
       result = cama_register_user(user_data, params[:meta])
       if result[:result] == false && result[:type] == :captcha_error
@@ -120,6 +129,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
         render 'register'
       elsif result[:result]
         flash[:notice] = result[:message]
+        send_user_confirm_email(@user) if current_site.need_validate_email?
         r = {user: @user, redirect_url: result[:redirect_url]}; hooks_run('user_registered', r)
         redirect_to r[:redirect_url]
       else
@@ -132,6 +142,23 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
     end
   end
 
+  def confirm_email
+    @user = current_site.users.new
+    if params[:h]
+      @user = current_site.users.where(confirm_email_token: params[:h]).first
+      if @user.nil?
+        flash[:error] = t('camaleon_cms.admin.login.message.confirm_email_token_incorrect')
+      elsif @user.confirm_email_sent_at.nil? || @user.confirm_email_sent_at < 2.hours.ago
+        flash[:error] = t('camaleon_cms.admin.login.message.confirm_email_token_expired')
+      else
+        flash[:notice] = t('camaleon_cms.admin.login.message.confirm_email_success')
+        @user.is_valid_email = true
+        @user.save!
+      end
+    end
+    redirect_to cama_admin_login_path
+  end
+
   private
 
   def before_hook_session

data/app/controllers/camaleon_cms/camaleon_controller.rb

@@ -23,6 +23,7 @@ class CamaleonCms::CamaleonController < ApplicationController
   include CamaleonCms::ContentHelper
   include CamaleonCms::CaptchaHelper
   include CamaleonCms::UploaderHelper
+  include CamaleonCms::EmailHelper
   include Mobu::DetectMobile
 
   prepend_before_action :cama_load_custom_models

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -82,7 +82,8 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   # search contents
   def search
     breadcrumb_add(ct("search"))
-    @cama_visited_search = params[:q]
+    @cama_visited_search = true
+    @param_search = params[:q]
     layout_ = lookup_context.template_exists?("layouts/search") ? "search" : (self.send :_layout)
     r = {layout: layout_, render: "search", posts: nil}; hooks_run("on_render_search", r)
     @posts = r[:posts] != nil ? r[:posts] : current_site.the_posts.where("title LIKE ? OR content_filtered LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%")

data/app/decorators/camaleon_cms/application_decorator.rb

@@ -18,8 +18,8 @@ class CamaleonCms::ApplicationDecorator < Draper::Decorator
     k.to_s.translate(get_locale)
   end
 
-  def the_slug
-    object.slug.translate(get_locale)
+  def the_slug(locale = nil)
+    object.slug.translate(get_locale(locale))
   end
 
   # return the identifier
@@ -53,6 +53,7 @@ class CamaleonCms::ApplicationDecorator < Draper::Decorator
   # if the request is not for frontend, then this will show current locale visited
   def get_locale(locale = nil)
     l = locale || @_deco_locale
+    return l if l.present?
     (h.cama_is_admin_request? rescue false) ? h.current_site.get_languages.first : l
   end
 

data/app/decorators/camaleon_cms/custom_field_decorator.rb

@@ -10,15 +10,10 @@ class CamaleonCms::CustomFieldDecorator < Draper::Decorator
   delegate_all
 
   def the_name
-    object.name.start_with?('t(')? eval(object.name.sub('t(', 'I18n.t(')) : object.name
+    h.cama_print_i18n_value(object.name)
   end
+
   def the_description
-    if object.description.start_with?('t(')
-      eval(object.description.sub('t(', 'I18n.t('))
-    elsif object.description.start_with?('eval(')
-      eval(object.description)
-    else
-      object.description
-    end
+    h.cama_print_i18n_value(object.description)
   end
 end

data/app/decorators/camaleon_cms/post_decorator.rb

@@ -11,8 +11,8 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
   delegate_all
 
 
-  def the_title
-    r = {title: object.title.to_s.translate(get_locale), post: object}
+  def the_title(locale = nil)
+    r = {title: object.title.to_s.translate(get_locale(locale)), post: object}
     h.hooks_run("post_the_title", r)
     r[:title]
   end
@@ -64,9 +64,9 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
   # Return String URL
   def the_url(*args)
     args = args.extract_options!
-    args[:slug] = the_slug
     args[:locale] = get_locale unless args.include?(:locale)
     args[:format] = "html"
+    args[:slug] = the_slug(args[:locale])
     p = args.delete(:as_path).present? ? "path" : "url"
     l = _calc_locale(args[:locale])
     ptype = object.post_type.decorate
@@ -74,25 +74,25 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
     case p_url_format
       when "post_of_post_type"
         args[:post_type_id] = ptype.id
-        args[:title] = ptype.the_title.parameterize
+        args[:title] = ptype.the_title(args[:locale]).parameterize
       when "post_of_category"
         if ptype.manage_categories?
           cat = object.categories.first.decorate rescue ptype.default_category.decorate
           args[:category_id] = cat.id
-          args[:title] = cat.the_title.parameterize
+          args[:title] = cat.the_title(args[:locale]).parameterize
         else
           p_url_format = "post"
           l = ""
         end
       when "post_of_posttype"
-        args[:post_type_title] = ptype.the_title.parameterize
+        args[:post_type_title] = ptype.the_title(args[:locale]).parameterize
         l = ""
       when "post_of_category_post_type"
         if ptype.manage_categories?
           cat = object.categories.first.decorate rescue ptype.default_category.decorate
-          args[:post_type_title] = ptype.the_title.parameterize
+          args[:post_type_title] = ptype.the_title(args[:locale]).parameterize
           args[:category_id] = cat.id
-          args[:title] = cat.the_title.parameterize
+          args[:title] = cat.the_title(args[:locale]).parameterize
         else
           p_url_format = "post"
           l = ""

data/app/decorators/camaleon_cms/term_taxonomy_decorator.rb

@@ -11,8 +11,8 @@ class CamaleonCms::TermTaxonomyDecorator < CamaleonCms::ApplicationDecorator
   delegate_all
 
   # return the title for current locale
-  def the_title
-    r = {title: object.name.translate(get_locale), object: object}
+  def the_title(locale = nil)
+    r = {title: object.name.translate(get_locale(locale)), object: object}
     h.hooks_run("taxonomy_the_title", r) rescue nil # avoid error for command the_url for categories
     r[:title]
   end

data/app/helpers/camaleon_cms/admin/menus_helper.rb

@@ -25,7 +25,7 @@ module CamaleonCms::Admin::MenusHelper
       if pt.manage_tags?
         items_i << {icon: "tags", title: t('camaleon_cms.admin.post_type.tags'), url: cama_admin_post_type_post_tags_path(pt.id)} if can? :post_tags, pt
       end
-      items << {icon: "copy", title: pt.the_title, url: "", items: items_i } if items_i.present? #if can? :posts, pt
+      items << {icon: pt.get_option('icon', "copy"), title: pt.the_title, url: "", items: items_i } if items_i.present? #if can? :posts, pt
     end
     admin_menu_add_menu("content", {icon: "database", title: t('camaleon_cms.admin.sidebar.contents'), url: "", items: items, datas: "data-intro='#{t("camaleon_cms.admin.intro.content")}' data-position='right' data-wait='600'"}) if items.present?
     #end
@@ -37,6 +37,7 @@ module CamaleonCms::Admin::MenusHelper
     items << {icon: "desktop", title: t('camaleon_cms.admin.sidebar.themes'), url: cama_admin_appearances_themes_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.themes")}' data-position='right'"} if can? :manager, :themes
     items << {icon: "archive", title: t('camaleon_cms.admin.sidebar.widgets'), url: cama_admin_appearances_widgets_main_index_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.widgets")}' data-position='right'"} if can? :manager, :widgets
     items << {icon: "list", title: t('camaleon_cms.admin.sidebar.menus'), url: cama_admin_appearances_nav_menus_menu_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.menus", image: view_context.asset_path("camaleon_cms/admin/intro/menus.png"))}' data-position='right'"} if can? :manager, :nav_menu
+    items << {icon: "code", title: t('camaleon_cms.admin.sidebar.shortcodes', default: "Shortcodes"), url: cama_admin_settings_shortcodes_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.shortcodes")}' data-position='right'"} if can? :manager, :shortcodes
     admin_menu_add_menu("appearance", {icon: "paint-brush", title: t('camaleon_cms.admin.sidebar.appearance'), url: "", items: items, datas: "data-intro='#{t("camaleon_cms.admin.intro.appearance")}' data-position='right' data-wait='500'"}) if items.present?
 
 
@@ -57,7 +58,6 @@ module CamaleonCms::Admin::MenusHelper
       items << {icon: "files-o", title: t('camaleon_cms.admin.sidebar.content_groups'), url: cama_admin_settings_post_types_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.post_type")}' data-position='right'"}
       items << {icon: "cog", title: t('camaleon_cms.admin.sidebar.custom_fields'), url: cama_admin_settings_custom_fields_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.custom_fields")}' data-position='right'"}
       items << {icon: "language", title: t('camaleon_cms.admin.sidebar.languages'), url: cama_admin_settings_languages_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.languages")}' data-position='right'"}
-      items << {icon: "code", title: t('camaleon_cms.admin.sidebar.shortcodes', default: "Shortcodes"), url: cama_admin_settings_shortcodes_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.shortcodes")}' data-position='right'"}
       admin_menu_add_menu("settings", {icon: "cogs", title: t('camaleon_cms.admin.sidebar.settings'), url: "", items: items, datas: "data-intro='#{t("camaleon_cms.admin.intro.settings")}' data-position='right' data-wait='500'"})
     end
 

data/app/helpers/camaleon_cms/camaleon_helper.rb

@@ -16,9 +16,9 @@ module CamaleonCms::CamaleonHelper
   # layout_name: path of the template to render
   # template_name: template name to render in template_path
   def sendmail(email,subject='Tiene una notificacion',content='',from=nil,attachs=[],template_name = 'mailer', layout_name = 'camaleon_cms/mailer')
-    # Thread.abort_on_exception=true
+    Thread.abort_on_exception=true
     Thread.new do
-      HtmlMailer.sender(email, subject, content, from, attachs, cama_root_url, current_site, template_name, layout_name).deliver_now
+      HtmlMailer.sender(email, subject, content, from, attachs, cama_root_url, current_site, template_name, layout_name, {}).deliver_now
       ActiveRecord::Base.connection.close
     end
   end

data/app/helpers/camaleon_cms/email_helper.rb

@@ -0,0 +1,27 @@
+module CamaleonCms::EmailHelper
+
+  # send and email
+  # email: email to
+  # subject: Subject of the email
+  # content: content of the email
+  # from: email figured as from
+  # attachs: array of files to be attached to the email
+  # layout_name: path of the template to render
+  # template_name: template name to render in template_path
+  def send_email(email, subject='Tiene una notificacion', content='', from=nil, attachs=[], template_name = 'mailer', layout_name = 'camaleon_cms/mailer', extra_data = {})
+    # Thread.abort_on_exception=true
+    Thread.new do
+      HtmlMailer.sender(email, subject, content, from, attachs, cama_root_url, current_site, template_name, layout_name, extra_data).deliver_now
+      ActiveRecord::Base.connection.close
+    end
+  end
+
+  def send_user_confirm_email(user_to_confirm)
+    user_to_confirm.send_confirm_email
+    confirm_email_url = cama_admin_confirm_email_url({h: @user.confirm_email_token})
+    Rails.logger.info "Sending email verification to #{user_to_confirm}"
+    extra_data = {:url => confirm_email_url, :fullname => user_to_confirm.fullname}
+    send_email(user_to_confirm.email, t('camaleon_cms.admin.login.confirm.text'), '', nil, [], 'confirm_email', 'camaleon_cms/mailer', extra_data)
+  end
+
+end

data/app/helpers/camaleon_cms/frontend/seo_helper.rb

@@ -13,55 +13,52 @@ module CamaleonCms::Frontend::SeoHelper
     if is_home?
       data2 = {}
     elsif is_page?
-      data2 = {image: @cama_visited_post.the_thumb_url, title: @cama_visited_post.the_title, description: @cama_visited_post.the_excerpt, keywords: @cama_visited_post.the_keywords, object: @cama_visited_post }
+      data2 = {image: @cama_visited_post.the_thumb_url, title: "#{current_site.the_title} | #{@cama_visited_post.the_title}", description: @cama_visited_post.the_excerpt, keywords: @cama_visited_post.the_keywords, object: @cama_visited_post }
     elsif is_ajax?
       data2 = {}
     elsif is_search?
       data2 = {title: "#{current_site.the_title} | #{ct("search_title", default: "Search")}"}
     elsif is_post_type?
-      data2 = {image: @cama_visited_post_type.the_thumb_url, title: @cama_visited_post_type.the_title, description: @cama_visited_post_type.the_excerpt, keywords: @cama_visited_post_type.the_keywords, object: @cama_visited_post_type }
+      data2 = {image: @cama_visited_post_type.the_thumb_url, title: "#{current_site.the_title} | #{@cama_visited_post_type.the_title}", description: @cama_visited_post_type.the_excerpt, keywords: @cama_visited_post_type.the_keywords, object: @cama_visited_post_type }
     elsif is_post_tag?
-      data2 = {image: @cama_visited_tag.the_thumb_url, title: @cama_visited_tag.the_title, description: @cama_visited_tag.the_excerpt, keywords: @cama_visited_tag.the_keywords, object: @cama_visited_tag }
+      data2 = {image: @cama_visited_tag.the_thumb_url, title: "#{current_site.the_title} | #{@cama_visited_tag.the_title}", description: @cama_visited_tag.the_excerpt, keywords: @cama_visited_tag.the_keywords, object: @cama_visited_tag }
     elsif is_category?
-      data2 = {image: @cama_visited_category.the_thumb_url, title: @cama_visited_category.the_title, description: @cama_visited_category.the_excerpt, keywords: @cama_visited_category.the_keywords, object: @cama_visited_category }
+      data2 = {image: @cama_visited_category.the_thumb_url, title: "#{current_site.the_title} | #{@cama_visited_category.the_title}", description: @cama_visited_category.the_excerpt, keywords: @cama_visited_category.the_keywords, object: @cama_visited_category }
     else
       data2 = {}
     end
-    cama_build_seo((@_cama_seo_default_values || {}).merge(data2).merge(data))
+    cama_build_seo(data2.merge(@_cama_seo_setting_values || {}).merge(data))
   end
 
-  # permit to define define default seo attributes by code without hooks
-  # @Sample: cama_seo_default({title: "my custom title", description: "my descr", keywords: "my keywords", image: 'my img url'})
-  def cama_seo_default(options)
-    @_cama_seo_default_values ||= {}
-    @_cama_seo_default_values = @_cama_seo_default_values.merge(options)
+  # permit to define seo attributes by code without hooks (check here for more attributes: https://github.com/kpumuk/meta-tags)
+  # @Sample: cama_seo_settings({title: "my custom title", description: "my descr", keywords: "my keywords", image: 'my img url'})
+  def cama_seo_settings(options)
+    @_cama_seo_setting_values ||= {}
+    @_cama_seo_setting_values = @_cama_seo_setting_values.merge(options)
   end
 
   # create seo attributes with options + default attributes
   def cama_build_seo(options = {})
-    options[:image] = options[:image] || current_site.get_option("screenshot", current_site.the_logo)
-    options[:title] = I18n.transliterate(options[:title].present? ? "#{current_site.the_title} | #{options[:title]}" : current_site.the_title)
+    options[:image] = current_site.get_option("screenshot", current_site.the_logo) unless options[:image].present?
+    options[:title] = I18n.transliterate(options[:title].present? ? options[:title] : current_site.the_title)
     options[:description] = I18n.transliterate(options[:description].present? ? options[:description].to_s : current_site.the_option("seo_description"))
-    options[:keywords] = I18n.transliterate(options[:keywords].present? ? options[:keywords] : current_site.the_option("keywords"))
     options[:url] = request.original_url
     s = {
-      title: options[:title],
-      description: options[:description],
-      keywords: options[:keywords],
-      image: options[:image],
+      keywords: I18n.transliterate(options[:keywords].present? ? options[:keywords] : current_site.the_option("keywords")),
       author: current_site.get_option('seo_author'),
+      icon: current_site.the_icon,
       og: {
         title: options[:title],
         description: options[:description],
         type: 'website',
-        url: request.original_url,
+        url: options[:url],
         image: options[:image]
       },
       twitter: {
         card: 'summary',
         title: options[:title],
         description: options[:description],
-        url:   request.original_url,
+        url:   options[:url],
         image: options[:image],
         site: current_site.get_option('twitter_card'),
         creator: current_site.get_option('twitter_card'),
@@ -70,7 +67,7 @@ module CamaleonCms::Frontend::SeoHelper
       alternate: [
         { type: 'application/rss+xml', href: cama_rss_url }
       ]
-    }
+    }.merge(options.except(:object))
 
     l = current_site.get_languages
     if l.size > 1

data/app/helpers/camaleon_cms/frontend/site_helper.rb

@@ -21,7 +21,7 @@ module CamaleonCms::Frontend::SiteHelper
   #**************** section is a? ****************#
   # check if current section visited is home page
   def is_home?
-    @cama_visited_home.present? || (["camaleon_cms/frontend", "frontend"].include?(params[:controller]) && params[:action] == "index")
+    @cama_visited_home.present?
   end
 
   # check if current section visited is for post
@@ -41,7 +41,7 @@ module CamaleonCms::Frontend::SiteHelper
 
   # check if current section visited is for search
   def is_search?
-    @cama_visited_search.present? || ["camaleon_cms/frontend", "frontend"].include?(params[:controller]) && params[:action] == "search"
+    @cama_visited_search.present?
   end
 
   # check if current section visited is for post type
@@ -58,6 +58,7 @@ module CamaleonCms::Frontend::SiteHelper
   def is_category?
     @cama_visited_category.present?
   end
+
   #**************** end section is a? ****************#
 
   # show custom assets added by plugins
@@ -65,8 +66,8 @@ module CamaleonCms::Frontend::SiteHelper
   # seo_attrs: Custom attributes for seo in Hash format
   # show_seo: (Boolean) control to append or not the seo attributes
   def the_head(seo_attrs = {}, show_seo = true)
-    icon = "<link rel='shortcut icon' href='#{current_site.the_icon}'>"
-    js = "<script>var ROOT_URL = '#{cama_root_url}'; var LANGUAGE = '#{I18n.locale}'; </script>"
-    icon + "\n" + (csrf_meta_tag || "") + "\n" + (show_seo ? display_meta_tags(cama_the_seo(seo_attrs)) : "") + "\n" + js + "\n" + cama_draw_custom_assets
+    js = "<script>var ROOT_URL = '#{cama_root_url}'; var LANGUAGE = '#{I18n.locale}'; </script>".html_safe
+    js += cama_draw_pre_asset_contents
+    (csrf_meta_tag || "") + "\n" + display_meta_tags(cama_the_seo(seo_attrs)) + "\n" + js + "\n" + cama_draw_custom_assets
   end
 end