camaleon_cms 2.1.2.1 → 2.2.0

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

@@ -63,7 +63,7 @@ class CamaleonCms::Admin::UserRolesController < CamaleonCms::AdminController
 
   private
   def validate_role
-    authorize! :manager, :users
+    authorize! :manage, :users
   end
 
   def set_user_roles

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

@@ -95,7 +95,7 @@ class CamaleonCms::Admin::UsersController < CamaleonCms::AdminController
   private
 
   def validate_role
-    (params[:id].present? && cama_current_user.id == params[:id]) || authorize!(:manager, :users)
+    (params[:id].present? && cama_current_user.id == params[:id]) || authorize!(:manage, :users)
   end
 
   def set_user

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

@@ -19,6 +19,9 @@ class CamaleonCms::Apps::PluginsAdminController < CamaleonCms::AdminController
       redirect_to cama_root_url
       return
     end
-    lookup_context.prefixes.prepend(params[:controller].sub("plugins/#{plugin_name}", "#{plugin_name}/views")) if !@plugin.settings["gem_mode"].present?
+    if !@plugin.settings["gem_mode"].present?
+      lookup_context.prefixes.delete_if{|t| t =~ /plugins\/(.*)\/views/i }
+      lookup_context.prefixes.prepend(params[:controller].sub("plugins/#{plugin_name}", "plugins/#{plugin_name}/views"))
+    end
   end
 end

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

@@ -8,13 +8,7 @@
 =end
 class CamaleonCms::Apps::PluginsFrontController < CamaleonCms::FrontendController
   before_action :init_plugin
-  layout Proc.new { |controller|
-           if current_theme.settings["gem_mode"]
-             "themes/#{current_theme.slug}/layouts/index"
-           else
-             "themes/#{current_theme.slug}/views/layouts/index"
-           end
-         }
+  layout Proc.new { |controller| "themes/#{current_theme.slug}/views/layouts/index" }
 
   private
   def init_plugin
@@ -25,8 +19,9 @@ class CamaleonCms::Apps::PluginsFrontController < CamaleonCms::FrontendControlle
       redirect_to cama_root_url
       return
     end
-    lookup_context.prefixes.prepend(params[:controller].sub("plugins/#{plugin_name}", "#{plugin_name}/views")) if !@plugin.settings["gem_mode"].present?
-    lookup_context.prefixes.append("themes/#{current_theme.slug}") if current_theme.settings["gem_mode"]
-    lookup_context.prefixes.append("themes/#{current_theme.slug}/views") unless current_theme.settings["gem_mode"]
+    if !@plugin.settings["gem_mode"].present?
+      lookup_context.prefixes.delete_if{|t| t =~ /plugins\/(.*)\/views/i }
+      lookup_context.prefixes.prepend(params[:controller].sub("plugins/#{plugin_name}", "plugins/#{plugin_name}/views"))
+    end
   end
 end

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

@@ -15,9 +15,6 @@ class CamaleonCms::Apps::ThemesFrontController < CamaleonCms::FrontendController
     theme_name = params[:controller].split("/")[1]
     @theme = current_theme
     return render_error(404) unless current_theme.slug == theme_name
-    lookup_context.prefixes = []
-    lookup_context.prefixes.prepend(params[:controller].sub("themes/#{theme_name}", "themes/#{theme_name}/views"))  unless current_theme.settings["gem_mode"]
-    lookup_context.prefixes.append("themes/#{current_theme.slug}") if current_theme.settings["gem_mode"]
-    lookup_context.prefixes.append("themes/#{current_theme.slug}/views") unless current_theme.settings["gem_mode"]
+    lookup_context.prefixes.prepend(params[:controller].sub("themes/#{theme_name}", "themes/#{theme_name}/views"))
   end
 end

data/app/controllers/camaleon_cms/camaleon_controller.rb

@@ -10,6 +10,7 @@ class CamaleonCms::CamaleonController < ApplicationController
   add_flash_types :warning
   add_flash_types :error
   add_flash_types :notice
+  add_flash_types :info
 
   include CamaleonCms::CamaleonHelper
   include CamaleonCms::SessionHelper
@@ -26,7 +27,8 @@ class CamaleonCms::CamaleonController < ApplicationController
   include CamaleonCms::EmailHelper
   include Mobu::DetectMobile
 
-  prepend_before_action :cama_load_custom_models
+  PluginRoutes.all_helpers.each{|h| include h.constantize }
+
   before_action :cama_site_check_existence, except: [:render_error, :captcha]
   before_action :cama_before_actions, except: [:render_error, :captcha]
   after_action :cama_after_actions, except: [:render_error, :captcha]
@@ -52,7 +54,7 @@ class CamaleonCms::CamaleonController < ApplicationController
   private
   def cama_before_actions
     # including all helpers (system, themes, plugins) for this site
-    PluginRoutes.enabled_apps(current_site, current_theme.slug).each{|plugin| plugin_load_helpers(plugin) }
+    # PluginRoutes.enabled_apps(current_site, current_theme.slug).each{|plugin| plugin_load_helpers(plugin) }
 
     # initializing short codes
     shortcodes_init()
@@ -73,10 +75,6 @@ class CamaleonCms::CamaleonController < ApplicationController
     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
@@ -96,13 +94,6 @@ class CamaleonCms::CamaleonController < ApplicationController
     redirect_to cama_root_path
   end
 
-  # include CamaleonCms::all custom models created by installed plugins or themes for current site
-  def cama_load_custom_models
-    if current_site.present?
-      site_load_custom_models(current_site)
-    end
-  end
-
   # check if current site exist, if not, this will be redirected to main domain
   # Also, check current site status
   def cama_site_check_existence()

data/app/controllers/camaleon_cms/frontend_controller.rb

@@ -7,8 +7,8 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
+  before_action :init_frontent
   include CamaleonCms::FrontendConcern
-  prepend_before_action :init_frontent
   include CamaleonCms::Frontend::ApplicationHelper
   layout Proc.new { |controller| params[:cama_ajax_request].present? ? "cama_ajax" : 'index' }
 
@@ -69,7 +69,11 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   # render contents for the post tag
   def post_tag
     begin
-      @post_tag = current_site.post_tags.find(params[:post_tag_id]).decorate
+      if params[:post_tag_slug].present?
+        @post_tag = current_site.post_tags.find_by_slug(params[:post_tag_id]).decorate
+      else
+        @post_tag = current_site.post_tags.find(params[:post_tag_id]).decorate
+      end
       @post_type = @post_tag.the_post_type
     rescue
       return page_not_found
@@ -210,7 +214,7 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
   # if url hasn't a locale, then it will use default locale set on application.rb
   def init_frontent
     # preview theme initializing
-    if cama_sign_in? && params[:ccc_theme_preview].present? && can?(:manager, :themes)
+    if cama_sign_in? && params[:ccc_theme_preview].present? && can?(:manage, :themes)
       @_current_theme = (current_site.themes.where(slug: params[:ccc_theme_preview]).first_or_create!.decorate)
     end
 
@@ -224,14 +228,16 @@ class CamaleonCms::FrontendController < CamaleonCms::CamaleonController
     lookup_context.prefixes.delete("application")
     lookup_context.prefixes.delete("camaleon_cms/frontend")
     lookup_context.prefixes.delete("camaleon_cms/camaleon")
+    lookup_context.prefixes.delete("camaleon_cms/apps/plugins_front")
+    lookup_context.prefixes.delete("camaleon_cms/apps/themes_front")
+    lookup_context.prefixes.delete_if{|t| t =~ /themes\/(.*)\/views/i || t == "camaleon_cms/default_theme" || t == "themes/#{current_site.id}/views" }
+
+    lookup_context.prefixes.append("themes/#{current_site.id}/views") if Dir.exist?(Rails.root.join('app', 'apps', 'themes', current_site.id.to_s).to_s)
+    lookup_context.prefixes.append("themes/#{current_theme.slug}/views")
+    lookup_context.prefixes.append("camaleon_cms/default_theme")
 
-    if ['camaleon_cms/frontend', 'frontend'].include?(params[:controller]) # 'frontend' will be removed in new versions (move into camaleon_cms/frontend)
-      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
     lookup_context.prefixes = lookup_context.prefixes.uniq
+    lookup_context.use_camaleon_partial_prefixes = true
     theme_init()
   end
 

data/app/controllers/concerns/camaleon_cms/frontend_concern.rb

@@ -36,22 +36,31 @@ module CamaleonCms::FrontendConcern extend ActiveSupport::Concern
   # save comment from a post
   def save_comment
     @post = current_site.posts.find_by_id(params[:post_id]).decorate
-    if @post.can_commented?
-      comment_data = {}
-      comment_data[:user_id] = cama_current_user.id
-      comment_data[:author] = cama_current_user.the_name
-      comment_data[:author_email] = cama_current_user.email
-      comment_data[:author_url] = ""
+    user = current_user
+    comment_data = {}
+    if !user.present? && current_site.get_option('permit_anonimos_comment', false)
+      user = current_site.get_anonymous_user
+      comment_data[:is_anonymous] = true
+      comment_data[:author] = params[:post_comment][:name]
+      comment_data[:author_email] = params[:post_comment][:email]
+    else
+      comment_data[:author] = user.fullname
+      comment_data[:author_email] = user.email
+    end
+
+    if @post.can_commented? && user.present?
+      comment_data[:user_id] = user.id
+      comment_data[:author_url] = params[:post_comment][:url] || ""
       comment_data[:author_IP] = request.remote_ip.to_s
       comment_data[:approved] = current_site.front_comment_status
       comment_data[:agent] = request.user_agent.force_encoding("ISO-8859-1").encode("UTF-8")
       comment_data[:content] = params[:post_comment][:content]
-      @comment = @post.comments.main.new(comment_data)
+      @comment = params[:post_comment][:parent_id].present? ? @post.comments.find_by_id(params[:post_comment][:parent_id]).children.new(comment_data) :  @post.comments.main.new(comment_data)
       if @comment.save
         flash[:notice] = t('camaleon_cms.admin.comments.message.created')
         redirect_to :back
       else
-        flash[:error] = t('camaleon_cms.admin.validate.required')
+        flash[:error] = "#{t('camaleon_cms.common.comment_error', default: 'An error was occurred on save comment')}:<br> #{@comment.errors.full_messages.join(', ')}"
         redirect_to :back
       end
     else

data/app/decorators/camaleon_cms/application_decorator.rb

@@ -51,12 +51,12 @@ class CamaleonCms::ApplicationDecorator < Draper::Decorator
 
   # get the locale for current decorator
   def get_locale(locale = nil)
-    locale || @_deco_locale || h.cama_get_i18n_frontend || I18n.locale
+    locale || @_deco_locale || (h.cama_get_i18n_frontend rescue false) || I18n.locale
   end
 
   # return the current locale prefixed to add in frontend routes
   def _calc_locale(_l)
-    _l = (_l || @_deco_locale || h.cama_get_i18n_frontend || I18n.locale).to_s
+    _l = (_l || @_deco_locale || (h.cama_get_i18n_frontend rescue false) || I18n.locale).to_s
     "_#{_l}"
   end
-end
+end

data/app/decorators/camaleon_cms/custom_fields_concern.rb

@@ -44,21 +44,36 @@ module CamaleonCms::CustomFieldsConcern
   def the_attribute_fields(field_key)
     r = []
     object.get_fields(field_key).each do |text|
-      _r = JSON.parse(text || '{}')
-      _r['attr'] = h.do_shortcode(_r['attr'].to_s.translate(@_deco_locale), object)
-      _r['value'] = h.do_shortcode(_r['value'].to_s.translate(@_deco_locale), object)
+      _r = JSON.parse(text || '{}').with_indifferent_access
+      _r.keys.each do |k|
+        _r[k] = h.do_shortcode(_r[k].to_s.translate(@_deco_locale), object)
+      end
       r << _r
     end
     r
   end
 
+  # the same function as get_fields_grouped(..) but this returns translated and shortcodes evaluated
+  def the_fields_grouped(field_keys)
+    res = []
+    object.get_fields_grouped(field_keys).each do |_group|
+      group = {}.with_indifferent_access
+      _group.keys.each do |k|
+        group[k] = _group[k].map{|v| h.do_shortcode(v.to_s.translate(@_deco_locale), object) }
+      end
+      res << group
+    end
+    res
+  end
+
   # return custom field content with key field_key (only for type attributes)
   # translated and short codes evaluated like the content
   # default_val: default value returned when this field was not registered
   def the_attribute_field(field_key, default_val = '')
-    r = JSON.parse(object.get_field(field_key, default_val) || '{}')
-    r['attr'] = h.do_shortcode(r['attr'].to_s.translate(@_deco_locale), object)
-    r['value'] = h.do_shortcode(r['value'].to_s.translate(@_deco_locale), object)
+    r = JSON.parse(object.get_field(field_key, default_val) || '{}').with_indifferent_access
+    r.keys.each do |k|
+      r[k] = h.do_shortcode(r[k].to_s.translate(@_deco_locale), object)
+    end
     r
   end
 end

data/app/decorators/camaleon_cms/post_comment_decorator.rb

@@ -20,7 +20,28 @@ class CamaleonCms::PostCommentDecorator < Draper::Decorator
   end
   alias_method :the_author, :the_user
 
+  def the_post
+    object.post.decorate
+  end
+
   def the_content
     object.content
   end
+
+  def the_answers
+    object.children.approveds
+  end
+
+  def the_author_name
+    object.author.presence || object.user.full_name
+  end
+
+  def the_author_email
+    object.author_email.presence || object.user.email
+  end
+
+  def the_author_url
+    object.author_url.presence || (object.user.username == 'anonymous' ? '' : object.user.decorate.the_url)
+  end
+
 end

data/app/decorators/camaleon_cms/site_decorator.rb

@@ -26,9 +26,9 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
   # return all contents from this site registered for post_type = slug (filter visibility, hidden, expired, ...)
   # slug_or_id: slug or id of the post_type or array of slugs of post_types, default 'post'
   def the_contents(slug_or_id = "post")
-    return h.verify_front_visibility(object.posts.where("#{CamaleonCms::TermTaxonomy.table_name}.id = ?", slug_or_id)).eager_load(:post_type) if slug_or_id.is_a?(Integer)
-    return h.verify_front_visibility(object.posts.where("#{CamaleonCms::TermTaxonomy.table_name}.slug = ?", slug_or_id)).eager_load(:post_type) if slug_or_id.is_a?(String)
-    return h.verify_front_visibility(object.posts.where("#{CamaleonCms::TermTaxonomy.table_name}.slug in (?)", slug_or_id)).eager_load(:post_type) if slug_or_id.is_a?(Array)
+    return h.verify_front_visibility(object.posts.where("#{CamaleonCms::TermTaxonomy.table_name}.id = ?", slug_or_id)) if slug_or_id.is_a?(Integer)
+    return h.verify_front_visibility(object.posts.where("#{CamaleonCms::TermTaxonomy.table_name}.slug = ?", slug_or_id)) if slug_or_id.is_a?(String)
+    return h.verify_front_visibility(object.posts.where("#{CamaleonCms::TermTaxonomy.table_name}.slug in (?)", slug_or_id)) if slug_or_id.is_a?(Array)
   end
 
   # return all contents for this site filteredby (visibility, hidden, expired, ...)
@@ -41,7 +41,7 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
     if slug_or_id.present?
       the_contents(slug_or_id)
     else
-      h.verify_front_visibility(object.posts).eager_load(:post_type)
+      h.verify_front_visibility(object.posts)
     end
   end
 
@@ -101,7 +101,7 @@ class CamaleonCms::SiteDecorator < CamaleonCms::TermTaxonomyDecorator
 
   # return all post types for this site
   def the_post_types
-    object.post_types.eager_load(:metas)
+    object.post_types
   end
 
   # return a post_type object with id or slug = slug_or_id

data/app/decorators/camaleon_cms/theme_decorator.rb

@@ -12,4 +12,14 @@ class CamaleonCms::ThemeDecorator < CamaleonCms::TermTaxonomyDecorator
   def the_id
     object.id
   end
+
+  def the_settings_url
+    h.cama_admin_settings_theme_url
+  end
+
+  def the_settings_link
+    return '' unless h.cama_current_user.present?
+    attrs = {target: "_blank", style: "font-size:11px !important;cursor:pointer;"}.merge(attrs)
+    h.link_to("&rarr; #{title || h.ct("edit", default: 'Edit')}".html_safe, the_settings_url, attrs)
+  end
 end

data/app/decorators/camaleon_cms/user_decorator.rb

@@ -26,8 +26,8 @@ class CamaleonCms::UserDecorator < CamaleonCms::ApplicationDecorator
   end
 
   # return the avatar for this user, default: assets/admin/img/no_image.jpg
-  def the_avatar
-    avatar_exists? ? object.get_meta("avatar") : h.asset_url("camaleon_cms/admin/img/no_image.jpg")
+  def the_avatar(default_avatar = nil)
+    avatar_exists? ? object.get_meta("avatar") : (default_avatar || h.asset_url("camaleon_cms/admin/img/no_image.jpg"))
   end
 
   # return the slogan for this user, default: Hello World

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

@@ -203,8 +203,14 @@ module CamaleonCms::Admin::CustomFieldsHelper
             {
                 type: 'text_box',
                 key: 'dimension',
-                label: 'Dimensions',
-                description: 'Crop images with dimension (widthxheight), sample:<br>400x300 | 400x | x300 | ?400x?500 | ?1400x (? => maximum, empty => auto)'
+                label: t('camaleon_cms.admin.custom_field.fields.image_dimension', default: 'Dimension'),
+                description: t('camaleon_cms.admin.custom_field.fields.image_dimension_descr', default: 'Crop the image with indicated dimension (widthxheight), sample: 400x300 <br>Possible values: 400x300 | 400x | x300 | ?400x?500 | ?1400x (? => maximum, empty => auto)'),
+            },
+            {
+                type: 'text_box',
+                key: 'versions',
+                label: t('camaleon_cms.admin.custom_field.fields.image_versions_descr', default: 'Versions'),
+                description: t('camaleon_cms.admin.custom_field.fields.image_versions_descr', default: 'Create addtional multiple versions of the image uploaded, sample: \'300x300,505x350\' ==> Will create two extra images with these dimensions')
             }
         ]
     }
@@ -303,6 +309,22 @@ module CamaleonCms::Admin::CustomFieldsHelper
             translate: true
         }
     }
+    items[:private_file] = {
+        key: 'private_file',
+        label: t('camaleon_cms.admin.custom_field.fields.private_file', default: 'Private File'),
+        options: {
+            required: true,
+            multiple: true,
+            default_value: ''
+        },
+        extra_fields:[
+            {
+                type: 'text_box',
+                key: 'formats',
+                label: 'File Formats (image,video,audio)'
+            }
+        ]
+    }
     r = {fields: items}; hooks_run("extra_custom_fields", r)
     @_cama_custom_field_elements = r[:fields]
   end

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

@@ -11,7 +11,6 @@ module CamaleonCms::Admin::MenusHelper
 
   def admin_menus_add_commons
     admin_menu_add_menu("dashboard", {icon: "dashboard", title: t('camaleon_cms.admin.sidebar.dashboard'), url: cama_admin_dashboard_path})
-    #if can? :manager, :content
     items = []
 
     current_site.post_types.eager_load(:metas).visible_menu.all.each do |pt|
@@ -30,20 +29,20 @@ module CamaleonCms::Admin::MenusHelper
     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
 
-    admin_menu_add_menu("media", {icon: "picture-o", title: t('camaleon_cms.admin.sidebar.media'), url: cama_admin_media_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.media")}' data-position='right'"}) if can? :manager, :media
-    admin_menu_add_menu("comments", {icon: "comments", title: t('camaleon_cms.admin.sidebar.comments'), url: cama_admin_comments_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.comments")}' data-position='right'"}) if can? :manager, :comments
+    admin_menu_add_menu("media", {icon: "picture-o", title: t('camaleon_cms.admin.sidebar.media'), url: cama_admin_media_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.media")}' data-position='right'"}) if can? :manage, :media
+    admin_menu_add_menu("comments", {icon: "comments", title: t('camaleon_cms.admin.sidebar.comments'), url: cama_admin_comments_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.comments")}' data-position='right'"}) if can? :manage, :comments
 
     items = []
-    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_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
+    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? :manage, :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? :manage, :widgets
+    items << {icon: "list", title: t('camaleon_cms.admin.sidebar.menus'), url: cama_admin_appearances_nav_menus_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? :manage, :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? :manage, :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?
 
 
-    admin_menu_add_menu("plugins", {icon: "plug", title: "#{t('camaleon_cms.admin.sidebar.plugins')} <small class='label label-primary'>#{PluginRoutes.all_plugins.clone.delete_if{|plugin| plugin[:domain].present? && !plugin[:domain].split(",").include?(current_site.the_slug) }.size}</small>", url: cama_admin_plugins_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.plugins")}' data-position='right'"}) if can? :manager, :plugins
+    admin_menu_add_menu("plugins", {icon: "plug", title: "#{t('camaleon_cms.admin.sidebar.plugins')} <small class='label label-primary'>#{PluginRoutes.all_plugins.clone.delete_if{|plugin| plugin[:domain].present? && !plugin[:domain].split(",").include?(current_site.the_slug) }.size}</small>", url: cama_admin_plugins_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.plugins")}' data-position='right'"}) if can? :manage, :plugins
 
-    if can? :manager, :users
+    if can? :manage, :users
       items = []
       items << {icon: "list", title: t('camaleon_cms.admin.users.all_users'), url: cama_admin_users_path}
       items << {icon: "plus", title: t('camaleon_cms.admin.users.add_user'), url: new_cama_admin_user_path}
@@ -51,16 +50,18 @@ module CamaleonCms::Admin::MenusHelper
       admin_menu_add_menu("users", {icon: "users", title: t('camaleon_cms.admin.sidebar.users'), url: "", items: items, datas: "data-intro='#{t("camaleon_cms.admin.intro.users")}' data-position='right' data-wait='500'"})
     end
 
-    if can? :manager, :settings
-      items = []
+    items = []
+    if can? :manage, :settings
       items << {icon: "desktop", title: t('camaleon_cms.admin.sidebar.general_site'), url: cama_admin_settings_site_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.gral_site")}' data-position='right'"}
       items << {icon: "cog", title: t('camaleon_cms.admin.sidebar.sites'), url: cama_admin_settings_sites_path, datas: "data-intro='#{t("camaleon_cms.admin.intro.sites")}' data-position='right'"} if current_site.manage_sites?
       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'"}
-      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
 
+    items << {icon: "windows", title: t('camaleon_cms.admin.settings.theme_setting', default: 'Theme Settings'), url: cama_admin_settings_theme_path} if can? :manage, :theme_settings
+    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'"}) if items.present?
+
   end
 
   # add menu item to admin menu at the the end