camaleon_cms 2.0.4.1 → 2.1.0

data/app/helpers/camaleon_cms/html_helper.rb

@@ -9,6 +9,7 @@
 #encoding: utf-8
 module CamaleonCms::HtmlHelper
   def cama_html_helpers_init
+    @_pre_assets_content = [] #Assets contents before the libraries import
     @_assets_libraries = {}
     @_assets_content = []
   end
@@ -33,6 +34,7 @@ module CamaleonCms::HtmlHelper
       @_assets_libraries[key.to_sym] = library if library.present?
     end
   end
+
   alias_method :add_asset_library, :cama_load_libraries
 
   # add custom asset libraries (js, css or both) for the current request, also you can add extra css or js files for existent libraries
@@ -50,6 +52,7 @@ module CamaleonCms::HtmlHelper
       end
     end
   end
+
   alias_method :append_asset_libraries, :cama_load_custom_assets
 
   # add asset content into custom assets
@@ -60,6 +63,19 @@ module CamaleonCms::HtmlHelper
     @_assets_content << content
   end
 
+  # add pre asset content into custom assets
+  # content may be: <script>alert()</script>
+  # content may be: <style>a{color: red;}</style>
+  # this will be printed before assets_library with <%raw cama_draw_pre_asset_contents %>
+  def append_pre_asset_content(content)
+    @_pre_assets_content << content
+  end
+
+  # return all scripts to be executed before import the js libraries(cama_draw_custom_assets)
+  def cama_draw_pre_asset_contents
+    (@_pre_assets_content || []).join('').html_safe
+  end
+
   # return all js libraries added [aa.js, bb,js, ..]
   # def get_assets_js
   def cama_draw_custom_assets
@@ -116,4 +132,9 @@ module CamaleonCms::HtmlHelper
     libs[:admin_intro] = {js: ['camaleon_cms/admin/introjs/intro.min'], css: ["camaleon_cms/admin/introjs/introjs.min"]}
     @_cama_assets_libraries = libs
   end
+
+  # execute translation for value if this value is like: t(admin.my_text) ==> My Text
+  def cama_print_i18n_value(value)
+    value.start_with?('t(') ? eval(value.sub('t(', 'I18n.t(')) : value
+  end
 end

data/app/helpers/camaleon_cms/plugins_helper.rb

@@ -97,7 +97,8 @@ module CamaleonCms::PluginsHelper
   # return plugin full asset path
   # plugin_key: plugin name
   # asset: (String) asset name
-  # sample: <script src="<%= plugin_asset_path("js/admin.js") %>"></script> => /assets/plugins/my_plugin/assets/css/main-54505620f.css
+  # sample: <script src="<%= plugin_asset_path("admin.js") %>"></script> => /assets/plugins/my_plugin/admin-54505620f.js
+  # sample: <script src="<%= plugin_asset_path("admin.js", 'my_plugin') %>"></script> => /assets/plugins/my_plugin/admin-54505620f.js
   def plugin_asset_path(asset, plugin_key = nil)
     if plugin_key.present? && plugin_key.include?("/")
       return plugin_asset_url(plugin_key, asset || self_plugin_key(1))

data/app/helpers/camaleon_cms/session_helper.rb

@@ -59,7 +59,8 @@ module CamaleonCms::SessionHelper
     else
       if @user.save
         @user.set_meta_from_form(meta)
-        r = {user: @user, message: t('camaleon_cms.admin.users.message.created'), redirect_url: cama_admin_login_path}; hooks_run('user_after_register', r)
+        message = current_site.need_validate_email? ? t('camaleon_cms.admin.users.message.created_pending_validate_email') : t('camaleon_cms.admin.users.message.created')
+        r = {user: @user, message: message, redirect_url: cama_admin_login_path}; hooks_run('user_after_register', r)
         {:result => true, :message => r[:message], :redirect_url => r[:redirect_url]}
       else
         {:result => false, :type => :no_saved}

data/app/mailers/camaleon_cms/html_mailer.rb

@@ -14,11 +14,12 @@ class CamaleonCms::HtmlMailer < ActionMailer::Base
   default from: "Camaleon CMS <owenperedo@gmail.com>"
   after_action :set_delivery_options
 
-  def sender(email, subject='Hello', content='', from=nil, attachs=[], url_base='', current_site, template_name, layout_name)
+  def sender(email, subject='Hello', content='', from=nil, attachs=[], url_base='', current_site, template_name, layout_name, extra_data)
     @subject = subject
     @html = content
     @url_base = url_base
     @current_site = current_site
+    @extra_data = extra_data
 
     mail_data = {to: email, subject: subject}
     mail_data[:from] = from if from.present?
@@ -27,14 +28,14 @@ class CamaleonCms::HtmlMailer < ActionMailer::Base
       mail_data[:from] = current_site.get_option("email_from")
       mail_data[:cc] = current_site.get_option("email_cc")
       mail_data[:delivery_method] = :smtp
-      mail_data[:delivery_method_options] = { user_name: current_site.get_option("email_username"),
-                                              password: current_site.get_option("email_pass"),
-                                              address: current_site.get_option("email_server"),
-                                              port: current_site.get_option("email_port"),
-                                              domain: (current_site.the_url.to_s.parse_domain rescue "localhost"),
-                                              authentication: "plain",
-                                              enable_starttls_auto: true
-                                            }
+      mail_data[:delivery_method_options] = {user_name: current_site.get_option("email_username"),
+                                             password: current_site.get_option("email_pass"),
+                                             address: current_site.get_option("email_server"),
+                                             port: current_site.get_option("email_port"),
+                                             domain: (current_site.the_url.to_s.parse_domain rescue "localhost"),
+                                             authentication: "plain",
+                                             enable_starttls_auto: true
+      }
     end
 
     views_dir = "app/apps/"
@@ -46,15 +47,15 @@ class CamaleonCms::HtmlMailer < ActionMailer::Base
     lookup_context.prefixes.prepend("themes/#{theme.slug}/views") unless theme.settings["gem_mode"]
 
     # run hook "email" to customize values
-    r = {template_name: template_name, layout_name: layout_name, mail_data: mail_data, files: attachs, format: "html" }
+    r = {template_name: template_name, layout_name: layout_name, mail_data: mail_data, files: attachs, format: "html"}
     hooks_run("email", r)
 
     if r[:files].present?
-      r[:files].each{|attach| attachments["#{File.basename(attach)}"] = File.open(attach, 'rb'){|f| f.read} }
+      r[:files].each { |attach| attachments["#{File.basename(attach)}"] = File.open(attach, 'rb') { |f| f.read } }
     end
 
-    mail(r[:mail_data]){|format| format.html { render r[:template_name], layout: r[:layout_name] } } if r[:format] == "html"
-    mail(r[:mail_data]){|format| format.text { render r[:template_name], layout: r[:layout_name] } } if r[:format] == "txt"
+    mail(r[:mail_data]) { |format| format.html { render r[:template_name], layout: r[:layout_name] } } if r[:format] == "html"
+    mail(r[:mail_data]) { |format| format.text { render r[:template_name], layout: r[:layout_name] } } if r[:format] == "txt"
     mail(r[:mail_data]) unless r[:format].present?
 
   end

data/app/models/camaleon_cms/nav_menu_item.rb

@@ -18,12 +18,10 @@ class CamaleonCms::NavMenuItem < CamaleonCms::TermTaxonomy
 
   # return the main menu
   def main_menu
-    ctg = self
-    begin
-      main_menu = ctg.parent
-      ctg = ctg.parent_item
-    end while ctg.present?
-    main_menu
+    main_menu = self.parent
+    return main_menu if main_menu.present?
+    parent_menu = self.parent_item
+    parent_menu.main_menu if parent_menu.present?
   end
 
   # return the type of this menu (post|category|post_tag|post_type|external)

data/app/models/camaleon_cms/site.rb

@@ -114,6 +114,10 @@ class CamaleonCms::Site < CamaleonCms::TermTaxonomy
     get_option('security_captcha_user_register', false) == true
   end
 
+  def need_validate_email?
+    get_option('need_validate_email', false) == true
+  end
+
   # auto create default user roles
   def set_default_user_roles(post_type = nil)
     user_role = self.user_roles.where({slug: 'admin', term_group: -1}).first_or_create({name: 'Administrator', description: 'Default roles admin'})
@@ -234,6 +238,7 @@ class CamaleonCms::Site < CamaleonCms::TermTaxonomy
       CamaleonCms::User.where(site_id: self.id).destroy_all
     end
     FileUtils.rm_rf(upload_directory) # destroy current media directory
+    users.destroy_all unless PluginRoutes.system_info["users_share_sites"] # destroy all users assigned fot this site
   end
 
   # default structure for each new site

data/app/models/camaleon_cms/term_taxonomy.rb

@@ -29,14 +29,11 @@ class CamaleonCms::TermTaxonomy < ActiveRecord::Base
   validates :name, :taxonomy, presence: true
   validates_with CamaleonCms::UniqValidator
 
-  #default_scope order('users.role ASC')
   # relations
   has_many :term_relationships, :class_name => "CamaleonCms::TermRelationship", :foreign_key => :term_taxonomy_id, dependent: :destroy
   has_many :posts, foreign_key: :objectid, through: :term_relationships, :source => :objects
   belongs_to :parent, class_name: "CamaleonCms::TermTaxonomy", foreign_key: :parent_id
   belongs_to :owner, class_name: "CamaleonCms::User", foreign_key: :user_id
-  has_many :user_relationships, :class_name => "CamaleonCms::UserRelationship", :foreign_key => :term_taxonomy_id, dependent: :destroy
-  has_many :users, through: :user_relationships, :source => :user
 
   # return all children taxonomy
   # sample: sub categories of a category

data/app/models/camaleon_cms/user.rb

@@ -21,6 +21,7 @@ class CamaleonCms::User < ActiveRecord::Base
   attr_accessible :username, :role, :email, :parent_id, :last_login_at, :site_id, :password, :password_confirmation #, :profile_attributes
   attr_accessible :data_options
   attr_accessible :data_metas
+  attr_accessible :is_valid_email
 
   default_scope {order("#{CamaleonCms::User.table_name}.role ASC")}
 
@@ -112,7 +113,11 @@ class CamaleonCms::User < ActiveRecord::Base
     save!
   end
 
-
+  def send_confirm_email
+    generate_token(:confirm_email_token)
+    self.confirm_email_sent_at = Time.zone.now
+    save!
+  end
 
   private
   def create_profile

data/app/models/camaleon_cms/user_relationship.rb

@@ -12,6 +12,4 @@ class CamaleonCms::UserRelationship < ActiveRecord::Base
 
   belongs_to :term_taxonomies, :class_name => "CamaleonCms::TermTaxonomy", foreign_key: :term_taxonomy_id, inverse_of: :user_relationships
   belongs_to :user, :class_name => "CamaleonCms::User", foreign_key: :user_id, inverse_of: :user_relationships
-
-
 end

data/app/models/camaleon_cms/user_role.rb

@@ -9,6 +9,7 @@
 class CamaleonCms::UserRole < CamaleonCms::TermTaxonomy
   default_scope { where(taxonomy: :user_roles) }
   has_many :metas, ->{ where(object_class: 'UserRole')}, :class_name => "CamaleonCms::Meta", foreign_key: :objectid, dependent: :destroy
+  has_many :user_relationships, :class_name => "CamaleonCms::UserRelationship", :foreign_key => :term_taxonomy_id, dependent: :destroy
   has_many :users, through: :user_relationships, :source => :user
   belongs_to :site, :class_name => "CamaleonCms::Site", foreign_key: :parent_id
 

data/app/models/concerns/camaleon_cms/custom_fields_read.rb

@@ -41,6 +41,7 @@ module CamaleonCms::CustomFieldsRead extend ActiveSupport::Concern
         self.custom_field_groups.where(object_class: class_name)
       when 'NavMenuItem'
         # self.main_menu.custom_field_groups //verify this problem
+        puts "get_field_groups - NavMenuItem: **************#{self.inspect}***** #{self.main_menu.inspect}"
         CamaleonCms::NavMenu.find(self.main_menu.id).get_field_groups
       when 'PostType'
         if args[:kind] == "all"

data/app/views/camaleon_cms/admin/media/index.html.erb

@@ -1,25 +1,42 @@
-<div class="row" id="cama_media_gallery" data-url_actions="<%= actions_cama_admin_media_path(actions: @show_file_actions) %>" data-formats="<%= @media_formats.join(",") %>" data-folder="<%= @folder %>" data-url="<%= ajax_cama_admin_media_path(actions: @show_file_actions) %>">
-    <div class="col-md-9 media_browser_list">
-        <%= render "files_list" %>
+<div id="cama_media_gallery" data-url_actions="<%= actions_cama_admin_media_path(actions: @show_file_actions) %>" data-formats="<%= @media_formats.join(",") %>" data-folder="<%= @folder %>" data-url="<%= ajax_cama_admin_media_path(actions: @show_file_actions) %>">
+  <div class="panel panel-default">
+    <div class="panel-heading">
+      <div class="row">
+        <div class="col-md-12">
+          <h4 class="pull-left">root</h4>
+          <ol class="pull-left breadcrumb media_folder_breadcrumb"></ol>
+          <% if @show_file_actions %>
+              <a href="#" class="btn btn-primary pull-right add_folder">
+                <i class="fa fa-plus"></i> <%= t("camaleon_cms.admin.button.add_folder") %>
+              </a>
+          <% end %>
+        </div>
+      </div>
     </div>
+    <div class="panel-body">
+      <div class="row" style="margin-bottom: 16px">
+        <div class="col-md-9 media_browser_list">
+          <%= render "files_list" %>
+        </div>
 
-    <div class="col-md-3 media_file_info_col">
-        <ul class="nav nav-tabs nav-justified" role="tablist">
+        <div class="col-md-3 media_file_info_col">
+          <ul class="nav nav-tabs nav-justified" role="tablist">
             <li role="presentation" class="active"><a href="#cama_media_upload" class="link_media_upload" role="tab" data-toggle="tab"><%= t("camaleon_cms.admin.button.upload_file") %></a></li>
             <li role="presentation"><a href="#cama_media_info" class="link_media_info" role="tab" data-toggle="tab"><%= t("camaleon_cms.admin.media.info") %></a></li>
-        </ul>
-        <div class="tab-content">
+          </ul>
+          <div class="tab-content">
             <div role="tabpanel" class="tab-pane active" id="cama_media_upload">
-                <div class="cama_media_fileuploader" data-url="<%= upload_cama_admin_media_path(actions: @show_file_actions) %>"><%= t("camaleon_cms.admin.button.upload_file") %></div>
+              <div class="cama_media_fileuploader" data-url="<%= upload_cama_admin_media_path(actions: @show_file_actions) %>"><%= t("camaleon_cms.admin.button.upload_file") %></div>
             </div>
             <div role="tabpanel" class="tab-pane" id="cama_media_info">
-                <div class="media_file_info"></div>
+              <div class="media_file_info"></div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
-    <ol class="breadcrumb media_folder_breadcrumb"></ol>
-    <% if @show_file_actions %>
-        <a href="#" class="btn btn-primary pull-right add_folder btn-xs"><i class="fa fa-folder-plus"></i> <%= t("camaleon_cms.admin.button.add_folder") %></a>
-    <% end %>
+  </div>
 </div>
-<script>jQuery(function(){ cama_init_media($("#cama_media_gallery")); });</script>
+<script>jQuery(function () {
+  cama_init_media($("#cama_media_gallery"));
+});</script>

data/app/views/camaleon_cms/admin/posts/_sidebar.html.erb

@@ -4,9 +4,9 @@
         <div class="panel-body ">
             <div class="row">
                 <% if @post.draft? && !@post.parent.present?  %>
-                    <div class="col-md-12 input-submit"><%= f.submit "#{ (@post.new_record?) ? t('camaleon_cms.admin.page_title.create') : t('camaleon_cms.admin.button.publish')}", class: "btn btn-success btn-lg btn-block", onclick: "$('#post_status').val('published')" %></div>
+                    <div class="col-md-12 input-submit"><%= f.submit "#{ (@post.new_record?) ? t('camaleon_cms.admin.page_title.create') : t('camaleon_cms.admin.button.publish')}", class: "btn btn-success btn-lg btn-block", onclick: "$('#post_status').val('#{@post.get_option('draft_status')}')" %></div>
                 <% elsif @post.draft? && @post.parent.present? %>
-                    <div class="col-md-12 input-submit"><%= f.submit "#{ t('camaleon_cms.admin.button.recover') }", class: "btn btn-success btn-lg btn-block", onclick: "$('#post_status').val('published')" %></div>
+                    <div class="col-md-12 input-submit"><%= f.submit "#{ t('camaleon_cms.admin.button.recover') }", class: "btn btn-success btn-lg btn-block", onclick: "$('#post_status').val('#{@post.get_option('draft_status')}')" %></div>
                 <% else  %>
                     <div class="col-md-12 input-submit"><%= f.submit "#{ (@post.new_record?) ? t('camaleon_cms.admin.page_title.create') : t('camaleon_cms.admin.page_title.update')}", class: "btn btn-success btn-lg btn-block" %></div>
                 <% end  %>

data/app/views/camaleon_cms/admin/posts/form.html.erb

@@ -82,7 +82,7 @@
                     post_id: '<%= @post.draft? ? (@post.parent.present? ? @post.parent.id : nil) : @post.id %>',
                     post_draft_id: '<%= @post.id if @post.draft? %>',
                     post_status: '<%= @post.status %>',
-                    _post_path: '<%= @post_type.posts.new({slug: '__-__', locale: '____'}).decorate.the_url() %>',
+                    _post_urls: <%= raw @post_type.posts.new({slug: '__-__'}).decorate.the_urls.to_json %>,
                     _drafts_path: '<%= (@post.draft? && !@post.new_record?) ? cama_admin_post_type_draft_path(@post_type.id, @post) : cama_admin_post_type_drafts_path(@post_type.id)  %>',
                     _posts_path: '<%= cama_admin_post_type_posts_path(@post_type.id) %>',
                     _ajax_path: '<%= ajax_cama_admin_post_type_posts_path(@post_type.id) %>',

data/app/views/camaleon_cms/admin/settings/_configuration_settings.html.erb

@@ -32,4 +32,8 @@
         <label for=""><%= t('camaleon_cms.admin.settings.security.captcha_user_register') %></label><br>
         <%= check_box :options, :security_captcha_user_register, {checked: @site.security_user_register_captcha_enabled?, class: "icheckbox0"}, "true", "" %>
     </div>
+  <div class="form-group">
+    <label for=""><%= t('camaleon_cms.admin.settings.security.need_validate_email') %></label><br>
+    <%= check_box :options, :need_validate_email, {checked: @site.need_validate_email?, class: "icheckbox0"}, "true", "" %>
+  </div>
 </div>

data/app/views/camaleon_cms/admin/settings/post_types/_form.html.erb

@@ -21,6 +21,13 @@
           <%= f.text_area :description, :class => "form-control translatable", :rows => 4 %>
         </div>
 
+        <div class="form-group">
+            <label><%= t('camaleon_cms.admin.post_type.icon', default: 'Icon') %></label>
+            <%= text_field_tag "meta[icon]", @post_type.get_option("icon", ''), class: 'form-control' %>
+            <small>Please enter any icon name from <a href="https://fortawesome.github.io/Font-Awesome/icons/" target="_blank">this site</a></small>
+        </div>
+
+        <hr/>
         <h4><%= t('camaleon_cms.admin.table.settings') %></h4>
 
         <!-- Settings -->

data/app/views/camaleon_cms/default_theme/layouts/index.html.erb

@@ -9,7 +9,6 @@
     <!-- END META SECTION -->
 
     <%= stylesheet_link_tag theme_asset_path("css/main.css") %>
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     <%= javascript_include_tag theme_asset_path("js/main.js") %>
     <%= raw the_head %>
 </head>

data/app/views/camaleon_cms/default_theme/partials/_render_custom_field.html.erb

@@ -1,10 +1,8 @@
-
-
 <% fields.each do |slug, field|
   field_key = field[:options][:field_key]
 %>
     <div class="field-box field-<%= slug %> field-type-<%= field_key %>">
-      <strong><%= field[:name] %></strong><br/>
+      <strong><%= cama_print_i18n_value(field[:name]) %></strong><br/>
       <%
          values = field[:values].is_a?(Array) ? field[:values] : [field[:values]]
       %>

data/app/views/camaleon_cms/html_mailer/confirm_email.html.erb

@@ -0,0 +1,3 @@
+<p><%= t('camaleon_cms.admin.login.welcome') %> <%= @extra_data[:fullname] %></p>
+<p><%= t('camaleon_cms.admin.login.confirm.text') %>:</p>
+<p><%= @extra_data[:url] %></p>

data/app/views/camaleon_cms/shortcode_templates/widget.html.erb

@@ -3,8 +3,8 @@
    widget = @current_site.widgets.where("slug = ?", key).first
 %>
 <% if widget.present? %>
-    <% if key == 'visits-counter' %>
-        <%=  render partial: plugin_view("admin/partials/table") %>
+    <% if (r = widget.renderer).present? %>
+        <%= render partial: r, locals: {attributes: attributes } %>
     <% else %>
         <%= raw widget[:description].translate %>
     <% end %>

data/app/views/layouts/camaleon_cms/admin.html.erb

@@ -7,7 +7,6 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
     <%= stylesheet_link_tag "camaleon_cms/admin/admin-manifest", media: "all" %>
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     <script>
         var root_url = '<%= cama_root_url %>';
         var root_admin_url = '<%= cama_admin_url %>';

data/app/views/layouts/camaleon_cms/admin/_footer.html.erb

@@ -1,6 +1,6 @@
 <footer class="main-footer">
     <div class="row">
-        <div class="col-md-6"><strong>Copyright &copy; 2015-2016 <a href="http://camaleon.tuzitio.com">Camaleon CMS.</a> </strong>.</div>
+        <div class="col-md-6"><strong>Copyright &copy; 2015-2016 <a href="http://camaleon.tuzitio.com">Camaleon CMS.</a> </strong></div>
         <div class="col-md-6 hidden-xs">
             <div class="pull-left">
                 <a id="link_see_intro" href="#" onclick="init_intro(); return false;"><i class="fa fa-tv"></i> See Intro.</a>

data/app/views/layouts/camaleon_cms/admin/installer.html.erb

@@ -10,7 +10,6 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 
     <%= stylesheet_link_tag  "camaleon_cms/bootstrap.min.css", media: "all" %>
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     <%= javascript_include_tag "camaleon_cms/admin/login_manifest" %>
     <script>
         jQuery(function(){

data/app/views/layouts/camaleon_cms/login.html.erb

@@ -7,7 +7,6 @@
     <%= raw the_head({}) if current_site.present? %>
     <title><%= (content_for?(:title) ? yield(:title) : t('camaleon_cms.admin.login.login')) %></title>
     <%= stylesheet_link_tag "camaleon_cms/admin/admin-basic-manifest", media: "all" %>
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     <%= javascript_include_tag "camaleon_cms/admin/admin-basic-manifest" %>
 </head>
 <body class="hold-transition login-page">

data/config/initializers/sass.rb

@@ -12,18 +12,18 @@ module Sprockets
       # return them path (this prefix automatically the path with current theme location)
       # Sample: .container{ background: #ffffff url(asset_theme_path('img/patterns/pattern1.jpg')); }
       def asset_theme_path(path, options = {})
-        asset_path(Autoload::Sass::Script::String.new("#{get_theme_prefix}/#{path.value}"), options)
+        asset_path(Autoload::Sass::Script::String.new("#{get_theme_prefix}/#{path.value}".gsub("//", "/")), options)
       end
 
       # return them path (this prefix automatically the path with current theme location)
-      def asset_plugin_path(path, options = {})
-        asset_path(Autoload::Sass::Script::String.new("#{get_plugin_prefix}/#{path.value}"), options)
+      # Sample: .container{ background: #ffffff asset-theme-url('img/patterns/pattern1.jpg'); }
+      def asset_theme_url(path, options = {})
+        asset_url(Autoload::Sass::Script::String.new("#{get_theme_prefix}/#{path.value}".gsub("//", "/")), options)
       end
 
       # return them path (this prefix automatically the path with current theme location)
-      # Sample: .container{ background: #ffffff asset-theme-url('img/patterns/pattern1.jpg'); }
-      def asset_theme_url(path, options = {})
-        asset_url(Autoload::Sass::Script::String.new("#{get_theme_prefix}/#{path.value}"), options)
+      def asset_plugin_path(path, options = {})
+        asset_path(Autoload::Sass::Script::String.new("#{get_plugin_prefix}/#{path.value}"), options)
       end
 
       # return them path (this prefix automatically the path with current theme location)

data/config/locales/camaleon_cms/admin/en.yml

@@ -135,6 +135,10 @@ en:
           send_mail_succes: 'Send email reset success.'
           send_mail_error: 'Not found email address.'
           invalid_caption: 'Invalid captcha'
+          email_not_validated: 'Email has not been validated.'
+          confirm_email_token_incorrect: 'URL incorrect'
+          confirm_email_token_expired: 'Confirm email URL expired'
+          confirm_email_success: 'Confirm email success!'
         personal_info: 'Personal info'
         please_login: 'Please login'
         reset_password: 'reset password'
@@ -152,6 +156,9 @@ en:
         last_name: "Last Name"
         email: "Email"
         remember_me: "Remember Me"
+        confirm:
+          text: "Please confirm your account by clicking this link"
+          subject: "Confirm your account"
       logout:
         log: 'Log'
         out: 'Out'
@@ -256,6 +263,7 @@ en:
         keywords: 'Keywords'
         default_layout: 'Default Layout'
         default_template: 'Default Template'
+        icon: 'Icon'
         message:
           error: 'Error class'
           error_term: 'Error term class'
@@ -346,6 +354,7 @@ en:
         filesystem_cdn: "CDN url"
         security:
           captcha_user_register: "Enable captcha on user registration?"
+          need_validate_email: "Need validate email?"
         message:
           language_updated: 'Your languages was configured.'
           site_updated: 'The site has been updated.'
@@ -550,6 +559,7 @@ en:
          requires_different_name: 'Requires different name'
          requires_different_username: 'Requires different username'
          requires_different_email: 'Requires different email'
+         created_pending_validate_email: "The user has been created, please confirm your email"
         new_photo: 'New Photo'
         others_permissions: 'Others permissions'
         profile: 'Profile'