camaleon_cms 2.1.1 → 2.1.1.4

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

@@ -148,11 +148,15 @@ margin: 5px 10px 5px 0px;
     .file_item, .folder_item{
       position: relative;
       cursor: pointer;
-      width: 150px;
+      width: 157px;
       float: left;
-      margin: 5px;
-      height: 152px;
+      margin: 0px;
+      height: 157px;
       overflow: hidden;
+      border: 5px solid transparent;
+      &.selected{
+        border-color: #3c8dbc;
+      }
       .actions{
         position: absolute;
         top: 0;

data/app/controllers/camaleon_cms/admin/appearances/nav_menus_controller.rb

@@ -76,7 +76,11 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
   # show external menu form
   def form
     if params[:custom_fields].present?
-      @nav_menu = current_site.nav_menus.find_by_id(params[:menu_id])
+      if params[:item_id] == 'undefined'
+        @nav_menu = current_site.nav_menus.find_by_id(params[:menu_id])
+      else
+        @nav_menu = current_site.nav_menu_items.find_by_id(params[:item_id])
+      end
       render "_custom_fields", layout: "camaleon_cms/admin/_ajax"
     else
       render "_external_menu", layout: false, locals: {submit: true}
@@ -87,11 +91,10 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
 
   def get_nav_items(menu_items, parent_id = 0)
     items = []
-    # menu_items.eager_load(:metas, :field_values).each do |nav_item| # changed for "DEPRECATION WARNING: The association scope 'field_values' is instance dependent"
     menu_items.eager_load(:metas).each do |nav_item|
       object = _get_object_nav_menu(nav_item)
       if object.present?
-        items << {id: nav_item.id, label: object[:name], link: nav_item.options[:object_id], url_edit: object[:url_edit], type: nav_item.options[:type], parent: parent_id.to_i, fields: "#{nav_item.get_field_values_hash.to_json}"}
+        items << {id: nav_item.id, label: object[:name], link: nav_item.options[:object_id], url_edit: object[:url_edit], type: nav_item.options[:type], parent: parent_id.to_i, fields: "#{nav_item.get_field_values_hash(true).to_json}"}
         items += get_nav_items(nav_item.children, nav_item.id)
       end
     end
@@ -115,11 +118,12 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
           post_type = CamaleonCms::PostType.find(nav_menu_item.get_option('object_id')).decorate
           {link: post_type.the_url, name: post_type.the_title, url_edit: post_type.the_edit_url}
         when 'external'
-          {link: nav_menu_item.get_option('object_id'), name: nav_menu_item.name.to_s.translate}
+          {link: nav_menu_item.get_option('object_id'), name: nav_menu_item.name.to_s}
         else
           false
       end
-    rescue
+    rescue => e
+      puts "@@@@@@@@@@@@@@@@@@@@@@@@@ Skipped menu for: #{e.message} (#{nav_menu_item})"
       false
     end
   end

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

@@ -48,6 +48,11 @@ class CamaleonCms::Admin::CategoriesController < CamaleonCms::AdminController
     end
   end
 
+  # return html category list used to reload categories list in post editor form
+  def list
+    render inline: post_type_html_inputs(@post_type, "categories", "categories" , "checkbox" , params[:categories] || [], "categorychecklist", true )
+  end
+
   def destroy
     flash[:notice] = t('camaleon_cms.admin.post_type.message.deleted') if @category.destroy
 

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

@@ -8,7 +8,7 @@
 =end
 class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
   skip_before_filter :cama_authenticate, only: :img
-  skip_before_filter :admin_logged_actions, except: :index
+  skip_before_filter :admin_logged_actions, except: [:index, :search]
   skip_before_filter :verify_authenticity_token, only: :upload
   before_action :init_media_vars
 
@@ -19,6 +19,15 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
     add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.media")
   end
 
+  def search
+    authorize! :manager, :media
+    @tree = { files: cama_media_search_file(params[:q]), folders: [] }
+    @search = params[:q]
+    add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.media")
+    add_breadcrumb params[:q]
+    render 'index'
+  end
+
   # crop a image to save as a new file
   def crop
     path_image = Rails.root.join("tmp", File.basename(params[:cp_img_path])).to_s
@@ -37,7 +46,9 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
 
   # render media for modal content
   def ajax
-    render partial: "files_list" if params[:partial].present?
+    if params[:partial].present?
+      render partial: "files_list", locals: { files: @tree[:files], folders: @tree[:folders] }
+    end
     render "index", layout: false unless params[:partial].present?
   end
 
@@ -55,21 +66,27 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
       when "del_file"
         cama_uploader_destroy_file(params[:folder].gsub("//", "/"))
         render inline: ""
+      when 'crop_url'
+        params[:url] = Rails.public_path.join(params[:url].sub(current_site.the_url, '')).to_s if params[:url].include?(current_site.the_url) # local file
+        r = cama_tmp_upload(params[:url], formats: params[:formats])
+        unless r[:error].present?
+          params[:file_upload] = r[:file_path]
+          upload({remove_source: true})
+        else
+          render inline: r[:error]
+        end
     end
   end
 
   # upload files from media uploader
-  def upload
+  def upload(settings = {})
     f = {error: "File not found."}
     if params[:file_upload].present?
-      f = upload_file(params[:file_upload], {folder: params[:folder]})
+      f = upload_file(params[:file_upload], {folder: params[:folder], dimension: params['dimension'], formats: params[:formats]}.merge(settings))
     end
 
-    unless f[:error].present?
-      render partial: "render_file_item", locals:{ file: f }
-    else
-      render inlien: f[:error]
-    end
+    render(partial: "render_file_item", locals:{ file: f }) unless f[:error].present?
+    render inline: f[:error] if f[:error].present?
   end
 
   private
@@ -78,7 +95,7 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
     @media_formats = (params[:media_formats] || "").sub("media", ",video,audio").sub("all", "").split(",")
     @folder = params[:folder] || "/"
     @tree = cama_media_find_folder(@folder)
-    @show_file_actions ||= params[:actions].to_s == true
+    @show_file_actions ||= params[:actions].to_s == 'true'
   end
 
 end

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

@@ -15,6 +15,7 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
 
   def index
     authorize! :posts, @post_type
+    per_page = current_site.admin_per_page
     posts_all = @post_type.posts.eager_load(:parent, :post_type)
     if params[:taxonomy].present? && params[:taxonomy_id].present?
       if params[:taxonomy] == "category"
@@ -33,7 +34,8 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     end
 
     if params[:q].present?
-      posts_all = posts_all.where(params[:q].split(" ").map{|text| "#{CamaleonCms::Post.table_name}.title LIKE '%#{text}%'" }.join(" OR "))
+      params[:q] = (params[:q] || '').downcase
+      posts_all = posts_all.where("LOWER(#{CamaleonCms::Post.table_name}.title) LIKE ?", "%#{params[:q]}%")
     end
 
     @posts = posts_all
@@ -49,9 +51,10 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     end
 
     @btns = {published: "#{t('camaleon_cms.admin.post_type.published')} (#{posts_all.where(status: "published").size})", all: "#{t('camaleon_cms.admin.post_type.all')} (#{posts_all.no_trash.size})", pending: "#{t('camaleon_cms.admin.post_type.pending')} (#{posts_all.where(status: "pending").size})", draft: "#{t('camaleon_cms.admin.post_type.draft')} (#{posts_all.where(status: "draft").size})", trash: "#{t('camaleon_cms.admin.post_type.trash')} (#{posts_all.where(status: "trash").size})"}
-    r = {posts: @posts, post_type: @post_type, btns: @btns, all_posts: posts_all, render: 'index' }
+    r = {posts: @posts, post_type: @post_type, btns: @btns, all_posts: posts_all, render: 'index', per_page: per_page }
     hooks_run("list_post", r)
-    @posts = r[:posts].paginate(:page => params[:page], :per_page => current_site.admin_per_page)
+    per_page = 9999999 if @post_type.manage_hierarchy?
+    @posts = r[:posts].paginate(:page => params[:page], :per_page => r[:per_page])
     render r[:render]
   end
 
@@ -118,7 +121,7 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     @post = @post_type.posts.find(params[:post_id])
     authorize! :destroy, @post
     @post.set_option('status_default', @post.status)
-    @post.children.destroy_all unless @post.draft?
+    # @post.children.destroy_all unless @post.draft? TODO: why delete children?
     @post.update_column('status', 'trash')
     @post.update_extra_data
     flash[:notice] = t('camaleon_cms.admin.post.message.trash', post_type: @post_type.decorate.the_title)
@@ -153,15 +156,8 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
     json = {error: 'Not Found'}
     case params[:method]
       when 'exist_slug'
-        slug_orig = params[:slug].to_s
-        slug = slug_orig
-        post_id = params[:post_id].present? ? params[:post_id] : 0
-        i = 0
-        while _exist_slug?(slug, post_id)  do
-          i +=1
-          slug = "#{slug_orig}-#{i}"
-        end
-        json = {slug: slug, index: i}
+        slug = current_site.get_valid_post_slug(params[:slug].to_s, params[:post_id])
+        json = {slug: slug, index: 1}
     end
     render json: json
   end
@@ -193,16 +189,10 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
   # is_create: indicate if this info is for create a new post
   def get_post_data(is_create = false)
     post_data = params[:post]
-    post_data[:post_parent] = nil
     post_data[:user_id] = cama_current_user.id if is_create
     post_data[:status] == 'pending' if post_data[:status] == 'published' && cannot?(:publish_post, @post_type)
     post_data[:data_tags] = params[:tags].to_s
     post_data[:data_categories] = params[:categories] || []
     post_data
   end
-
-  # valid slug post
-  def _exist_slug?(slug, post_id)
-    current_site.posts.where("#{CamaleonCms::Post.table_name}.slug LIKE ? OR #{CamaleonCms::Post.table_name}.slug = ?",  "%-->#{slug}<!--%", slug).where("#{CamaleonCms::Post.table_name}.status != 'draft'").where(post_parent: nil).where.not(id: post_id).present?
-  end
 end

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

@@ -95,15 +95,7 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
       data_user = params[:user]
       @user = current_site.users.find_by_email(data_user[:email])
       if @user.present?
-        @user.send_password_reset
-
-        reset_url = cama_admin_forgot_url({h: @user.password_reset_token})
-
-        html = "<p>#{t('camaleon_cms.admin.login.message.hello')}, <b>#{@user.fullname}</b></p>
-            <p>#{t('camaleon_cms.admin.login.message.reset_url')}:</p>
-            <p><a href='#{reset_url}'><b>#{reset_url}</b></a></p> "
-        sendmail(@user.email, t('camaleon_cms.admin.login.message.subject_email'), html)
-
+        send_password_reset_email(@user)
         flash[:notice] = t('camaleon_cms.admin.login.message.send_mail_succes')
         redirect_to cama_admin_login_path
         return
@@ -162,7 +154,8 @@ class CamaleonCms::Admin::SessionsController < CamaleonCms::CamaleonController
   private
 
   def before_hook_session
-    I18n.locale = params[:locale] || current_site.get_languages.first
+    session[:cama_current_language] = params[:cama_set_language].to_sym if params[:cama_set_language].present?
+    I18n.locale = params[:locale] || session[:cama_current_language] || current_site.get_languages.first
     hooks_run("session_before_load")
   end
 

data/app/controllers/camaleon_cms/admin/settings/custom_fields_controller.rb

@@ -7,7 +7,6 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin::SettingsController
-  include CamaleonCms::Admin::CustomFieldsHelper
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.custom_fields"), :cama_admin_settings_custom_fields_path
   before_action :set_custom_field_group, only: [:show,:edit,:update,:destroy]
   before_action :set_post_data, only: [:create, :update]

data/app/controllers/camaleon_cms/admin/settings/sites_controller.rb

@@ -28,10 +28,15 @@ class CamaleonCms::Admin::Settings::SitesController < CamaleonCms::Admin::Settin
   end
 
   def update
+    tmp = @site.slug
     if @site.update(params[:site])
       save_metas(@site)
       flash[:notice] = t('camaleon_cms.admin.sites.message.updated')
-      redirect_to action: :index
+      if @site.id == Cama::Site.main_site.id && tmp != @site.slug
+        redirect_to @site.the_admin_url
+      else
+        redirect_to action: :index
+      end
     else
       edit
     end

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

@@ -52,14 +52,7 @@ class CamaleonCms::Admin::UsersController < CamaleonCms::AdminController
   # update som ajax requests from profile or user form
   def updated_ajax
     @user = current_site.users.find(params[:user_id])
-    # update password
-    if params[:password]
-      if @user.authenticate(params[:password][:password_old])
-        render inline: @user.update(params[:password]) ? "" : @user.errors.full_messages.join(', ')
-      else
-        render inline: t('camaleon_cms.admin.users.message.incorrect_old_password')
-      end
-    end
+    render inline: @user.update(params[:password]) ? "" : @user.errors.full_messages.join(', ')
   end
 
   def edit

data/app/controllers/camaleon_cms/admin_controller.rb

@@ -19,7 +19,7 @@ class CamaleonCms::AdminController < CamaleonCms::CamaleonController
   before_action :admin_before_hooks
   after_action :admin_after_hooks
   layout Proc.new { |controller| params[:cama_ajax_request].present? ? "camaleon_cms/admin/_ajax" : 'camaleon_cms/admin' }
-  add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.dashboard"), :cama_admin_path
+  add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.dashboard", default: 'Dashboard'), :cama_admin_path
 
   # render admin dashboard
   def index
@@ -50,13 +50,14 @@ class CamaleonCms::AdminController < CamaleonCms::CamaleonController
   def search
     add_breadcrumb I18n.t("camaleon_cms.admin.button.search")
     params[:kind] = "content" unless params[:kind].present?
+    params[:q] = (params[:q] || '').downcase
     case params[:kind]
       when "category"
-        @items = current_site.full_categories.where("#{CamaleonCms::Category.table_name}.name LIKE ?", "%#{params[:q]}%")
+        @items = current_site.full_categories.where("LOWER(#{CamaleonCms::Category.table_name}.name) LIKE ?", "%#{params[:q]}%")
       when "tag"
-        @items = current_site.post_tags.where("#{CamaleonCms::PostTag.table_name}.name LIKE ?", "%#{params[:q]}%")
+        @items = current_site.post_tags.where("LOWER(#{CamaleonCms::PostTag.table_name}.name) LIKE ?", "%#{params[:q]}%")
       else
-        @items = current_site.posts.where("#{CamaleonCms::Post.table_name}.title LIKE ?", "%#{params[:q]}%")
+        @items = current_site.posts.where("LOWER(#{CamaleonCms::Post.table_name}.title) LIKE ?", "%#{params[:q]}%")
     end
     @items = @items.paginate(:page => params[:page], :per_page => current_site.admin_per_page)
   end

data/app/controllers/camaleon_cms/apps/plugins_front_controller.rb

@@ -26,13 +26,5 @@ class CamaleonCms::Apps::PluginsFrontController < CamaleonCms::FrontendControlle
       return
     end
     lookup_context.prefixes.prepend(params[:controller].sub("plugins/#{plugin_name}", "#{plugin_name}/views")) if !@plugin.settings["gem_mode"].present?
-
-    views_dir = "app/apps/"
-    self.prepend_view_path(File.join($camaleon_engine_dir, views_dir).to_s)
-    self.prepend_view_path(Rails.root.join(views_dir).to_s)
-    # lookup_context.prefixes.prepend("camaleon_cms/default_theme")
-    # lookup_context.prefixes.prepend("themes/#{current_theme.slug}") if current_theme.settings["gem_mode"]
-    # lookup_context.prefixes.prepend("themes/#{current_theme.slug}/views") unless current_theme.settings["gem_mode"]
-    # lookup_context.prefixes.prepend("themes/#{current_site.id}/views")
   end
 end

data/app/controllers/camaleon_cms/camaleon_controller.rb

@@ -37,7 +37,7 @@ class CamaleonCms::CamaleonController < ApplicationController
 
   # show page error
   def render_error(status = 404, exception = nil, message = "")
-    Rails.logger.info "========#{exception.message if exception.present?}====#{params[:error_msg]}========#{caller.inspect}"
+    Rails.logger.info "======url: #{request.original_url rescue nil}======message: #{exception.message if exception.present?}====#{params[:error_msg]}========#{caller.inspect}"
     @message = "#{message} #{params[:error_msg] || (exception.present? ? "#{exception.message}<br><br>#{caller.inspect}" : "")}"
     @message = "" if Rails.env == "production"
     render "camaleon_cms/#{status}", :status => status
@@ -69,9 +69,14 @@ class CamaleonCms::CamaleonController < ApplicationController
 
     request.env.except!('HTTP_X_FORWARDED_HOST') if request.env['HTTP_X_FORWARDED_HOST'] # just drop the variable
 
+    views_dir = "app/apps/"
+    self.prepend_view_path(File.join($camaleon_engine_dir, views_dir).to_s)
+    self.prepend_view_path(Rails.root.join(views_dir).to_s)
+
     # past plugins version support
     self.prepend_view_path(File.join($camaleon_engine_dir, "app", "apps", "plugins"))
     self.prepend_view_path(Rails.root.join("app", "apps", 'plugins'))
+
     CamaleonCms::PostDefault.current_user = cama_current_user
     CamaleonCms::PostDefault.current_site = current_site
   end

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -86,7 +86,8 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     @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]}%")
+    params[:q] = (params[:q] || '').downcase
+    @posts = r[:posts] != nil ? r[:posts] : current_site.the_posts.where("LOWER(title) LIKE ? OR LOWER(content_filtered) LIKE ?", "%#{params[:q]}%", "%#{params[:q]}%")
     @posts_size = @posts.size
     @posts = @posts.paginate(:page => params[:page], :per_page => current_site.front_per_page)
     render r[:render], layout: r[:layout]
@@ -109,7 +110,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     if params[:draft_id].present?
       draft_render
     else
-      render_post(@post || params[:slug].to_s, true)
+      render_post(@post || params[:slug].to_s.split("/").last, true)
     end
   end
 
@@ -150,7 +151,11 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     end
 
     unless @post.present?
-      page_not_found()
+      if params[:format] == 'html' || !params[:format].present?
+        page_not_found()
+      else
+        render nothing: true, status: 404
+      end
     else
       @post = @post.decorate
       @cama_visited_post = @post
@@ -203,13 +208,10 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     end
 
     @_site_options = current_site.options
-    I18n.locale = params[:locale] || current_site.get_languages.first
+    session[:cama_current_language] = params[:cama_set_language].to_sym if params[:cama_set_language].present?
+    I18n.locale = params[:locale] || session[:cama_current_language] || current_site.get_languages.first
     return page_not_found unless current_site.get_languages.include?(I18n.locale.to_sym) # verify if this locale is available for this site
 
-    views_dir = "app/apps/"
-    self.prepend_view_path(File.join($camaleon_engine_dir, views_dir).to_s)
-    self.prepend_view_path(Rails.root.join(views_dir).to_s)
-
     # define render paths
     lookup_context.prefixes.delete("frontend")
     lookup_context.prefixes.delete("application")
@@ -222,6 +224,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
       lookup_context.prefixes.prepend("themes/#{current_theme.slug}/views") unless current_theme.settings["gem_mode"]
       lookup_context.prefixes.prepend("themes/#{current_site.id}/views")
     end
+    lookup_context.prefixes = lookup_context.prefixes.uniq
     theme_init()
   end
 

data/app/decorators/camaleon_cms/category_decorator.rb

@@ -13,7 +13,8 @@ class CamaleonCms::CategoryDecorator < CamaleonCms::TermTaxonomyDecorator
   def the_url(*args)
     args = args.extract_options!
     args[:category_id] = the_id
-    args[:title] = the_title.parameterize
+    args[:title] = the_title.parameterize || the_slug
+    args[:title] = the_slug unless args[:title].present?
     args[:locale] = @_deco_locale unless args.include?(:locale)
     args[:format] = "html"
     as_path = args.delete(:as_path)

data/app/decorators/camaleon_cms/post_decorator.rb

@@ -71,32 +71,46 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
     l = _calc_locale(args[:locale])
     ptype = object.post_type.decorate
     p_url_format = ptype.contents_route_format
+    p_url_format = "hierarchy_post" if ptype.manage_hierarchy?
     case p_url_format
       when "post_of_post_type"
         args[:post_type_id] = ptype.id
         args[:title] = ptype.the_title(args[:locale]).parameterize
+        args[:title] = ptype.the_slug unless args[:title].present?
       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(args[:locale]).parameterize
+          args[:title] = cat.the_slug unless args[:title].present?
         else
           p_url_format = "post"
           l = ""
         end
       when "post_of_posttype"
         args[:post_type_title] = ptype.the_title(args[:locale]).parameterize
+        args[:post_type_title] = ptype.the_slug unless args[:post_type_title].present?
         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(args[:locale]).parameterize
+          args[:post_type_title] = ptype.the_slug unless args[:post_type_title].present?
           args[:category_id] = cat.id
           args[:title] = cat.the_title(args[:locale]).parameterize
+          args[:title] = cat.the_slug unless args[:title].present?
         else
           p_url_format = "post"
           l = ""
         end
+      when 'hierarchy_post'
+        l = ""
+        if object.post_parent.present?
+          slugs = ([args[:slug]]+object.parents.map{|parent| parent.decorate.the_slug(args[:locale]) }).reverse
+          args[:slug], args[:parent_title] = slugs.slice(1..-1).join("/"), slugs.first
+        else
+          p_url_format = "post"
+        end
       else
         l = ""
     end
@@ -195,12 +209,14 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
   # children: true/false (show/hide last item link)
   # show_categories: true/false, true: add categories tree to the breadcrumb
   def generate_breadcrumb(show_categories = true, add_post_type = true)
+    p_type = object.post_type
     f_cat = object.categories.first
     if f_cat.present? && show_categories
       f_cat.decorate.generate_breadcrumb(add_post_type, true)
     else
-      object.post_type.decorate.generate_breadcrumb(add_post_type, true)
+      p_type.decorate.generate_breadcrumb(add_post_type, true)
     end
+    object.parents.reverse.each{|p| p=p.decorate; h.breadcrumb_add(p.the_title, p.published? ? p.the_url : nil) } if object.post_parent.present? && p_type.manage_hierarchy?
     h.breadcrumb_add(self.the_title)
   end
 
@@ -209,4 +225,15 @@ class CamaleonCms::PostDecorator < CamaleonCms::ApplicationDecorator
     object.post_type.decorate
   end
 
+  # return the title with hierarchy prefixed
+  # sample: title paren 1 - title parent 2 -.. -...
+  # if add_parent_title: true will add parent title like: —— item 1.1.1 | item 1.1
+  def the_hierarchy_title
+    return the_title unless object.post_parent.present?
+    res = '&#8212;' * object.parents.count
+    res << " " + the_title
+    res << " | #{object.parent.decorate.the_title}" if object.show_title_with_parent
+    res.html_safe
+  end
+
 end