camaleon_cms 2.1.2.1 → 2.2.0

data/app/uploaders/camaleon_cms_uploader.rb

@@ -18,19 +18,19 @@ class CamaleonCmsUploader
   # {files: {'file_name': {'name'=> 'a.jpg', key: '/test/a.jpg', url: '', url: '', size: '', format: '', thumb: 'thumb_url', type: '', created_at: '', dimension: '120x120'}}, folders: {'folder name' => {name: 'folder name', key: '/folder name', ...}}}
   def objects(prefix = '/')
     prefix = "/#{prefix}" unless prefix.starts_with?('/')
-    db = @current_site.get_meta('cama_media_cache', nil) || browser_files
+    db = @current_site.get_meta(cache_key, nil) || browser_files
     db[prefix.gsub('//', '/')] || {files: {}, folders: {}}
   end
 
   # clean cached of files structure saved into DB
   def clear_cache
-    @current_site.set_meta('cama_media_cache', nil)
+    @current_site.set_meta(cache_key, nil)
   end
 
   # search for folders or files that includes search_text in their names
   def search(search_text)
     res = {files: {}, folders: {}}
-    (@current_site.get_meta('cama_media_cache', nil) || browser_files).each do |folder_key, object|
+    (@current_site.get_meta(cache_key, nil) || browser_files).each do |folder_key, object|
       res[:folders][folder_key] = get_file(folder_key) if !['', '/'].include?(folder_key) && folder_key.split('/').last.include?(search_text)
       object[:files].each do |file_key, obj|
         res[:files][file_key] = obj if file_key.include?(search_text)
@@ -49,7 +49,7 @@ class CamaleonCmsUploader
   # file_parsed: (HASH) File parsed object
   # objects_db: HASH Object where to add the current object (optional)
   def cache_item(file_parsed, _objects_db = nil)
-    objects_db = _objects_db || @current_site.get_meta('cama_media_cache', {}) || {}
+    objects_db = _objects_db || @current_site.get_meta(cache_key, {}) || {}
     prefix = File.dirname(file_parsed['key'])
 
     s = prefix.split('/').clean_empty
@@ -62,7 +62,7 @@ class CamaleonCmsUploader
     else
       objects_db[prefix][:files][file_parsed['name']] = file_parsed
     end
-    @current_site.set_meta('cama_media_cache', objects_db) if _objects_db.nil?
+    @current_site.set_meta(cache_key, objects_db) if _objects_db.nil?
     file_parsed
   end
 
@@ -139,10 +139,17 @@ class CamaleonCmsUploader
   # check if file with :key exist and return parsed_file, else return nil
   def get_file(key, use_cache = true)
     if use_cache
-      db = (@current_site.get_meta('cama_media_cache') || {})[File.dirname(key)] || {}
+      db = (@current_site.get_meta(cache_key) || {})[File.dirname(key)] || {}
     else
       db = objects(File.dirname(key)) unless use_cache
     end
     (db[:files][File.basename(key)] || db[:folders][File.basename(key)]) rescue nil
   end
+
+  private
+  def cache_key
+    "cama_media_cache#{'_private' if is_private_uploader?}"
+  end
+  def is_private_uploader?() end
+
 end

data/app/views/camaleon_cms/admin/appearances/nav_menus/_custom_menus.html.erb

@@ -1,4 +1,11 @@
-<% r = {custom_menus: {}, menu: @nav_menu}; hooks_run("nav_menu_custom", r) %>
+<%
+# #sample hook:
+#def perspective_nav_menu_custom(args)
+    # args[:custom_menus]['pers_features'] = {link: "#{current_site.the_url(as_path: true)}#features", title: 'Features'}
+    # args[:custom_menus]['pers_portfolio'] = {link: "#{current_site.the_url(as_path: true)}#portfolio", title: 'Portfolio'}
+    # args[:custom_menus]['pers_contact_us'] = {link: "#{current_site.the_url(as_path: true)}#contact", title: 'Contact Us'}
+# end
+r = {custom_menus: {}, menu: @nav_menu}; hooks_run("nav_menu_custom", r) %>
 <% if r[:custom_menus].present? %>
     <div class="panel panel-default panel-toggled custom_menus">
         <div class="panel-heading">
@@ -15,7 +22,7 @@
                     <% r[:custom_menus].each do |k, item| %>
                         <li>
                             <label class="class_slug">
-                                <input type="checkbox" value="<%= item[:link] %>"> <%= item[:title] %>
+                                <input type="checkbox" value="<%= item[:link] %>" data-label="<%= item[:title] %>"> <%= item[:title] %>
                             </label>
                         </li>
                     <% end %>

data/app/views/camaleon_cms/admin/appearances/nav_menus/_form.html.erb

@@ -8,6 +8,6 @@
         <%= f.text_field :slug, class: 'form-control menu-input-slug slug', 'data-parent' => 'nav_menu_name' %>
     </div>
     <div class="form-group text-right">
-        <button class="btn btn-primary" type=""><%= @nav_menu.new_record? ? t('camaleon_cms.admin.button.create_menu') : t('camaleon_cms.admin.button.update_menu') %></button>
+        <button class="btn btn-primary" type="submit"><%= @nav_menu.new_record? ? t('camaleon_cms.admin.button.create_menu') : t('camaleon_cms.admin.button.update_menu') %></button>
     </div>
 <% end %>

data/app/views/camaleon_cms/admin/appearances/nav_menus/_menu_items.html.erb

@@ -7,8 +7,8 @@
         <li class="dd-item" data-id="<%= item.id %>">
             <div class="dd-handle dd3-handle"></div>
             <div class="dd3-content"><span><%= item_data[:name] %></span>
-                <span class="label label-default"><%= item.get_option('type') %></span>
-                <%= link_to('<i class="fa fa-edit"></i>'.html_safe, item_data[:url_edit] || url_for(action: :edit_menu_item, nav_menu_id: nav_menu.id, id: item.id), target: '_blank', title: t('.edit_menu_item', default: 'Edit Menu Item'), class: "item_#{item.get_option('type')}") %>
+                <span class="label label-default"><%= item.kind %></span>
+                <%= link_to('<i class="fa fa-edit"></i>'.html_safe, item_data[:url_edit] || url_for(action: :edit_menu_item, nav_menu_id: nav_menu.id, id: item.id), target: '_blank', title: t('.edit_menu_item', default: 'Edit Menu Item'), class: "item_#{item.kind}") %>
                 <%= link_to('<i class="fa fa-cog"></i>'.html_safe, {action: :custom_settings, nav_menu_id: nav_menu.id, id: item.id, cama_skip_breadcrumb: true}, class: 'custom_settings_link', title: t('.edit_custom_settings', default: 'Edit Configurations')) if custom_fields %>
                 <%= link_to('<i class="fa fa-times-circle"></i>'.html_safe, url_for(action: :delete_menu_item, nav_menu_id: nav_menu.id, id: item.id), class: 'delete_menu_item') %>
             </div>

data/app/views/camaleon_cms/admin/appearances/themes/index.html.erb

@@ -37,7 +37,7 @@
                                         <% if current_theme.slug == theme[:key] && params[:set].nil? %>
                                             <% r = {links: []}; hook_run(theme, "theme_options", r) %>
                                             <% r[:links] << link_to(raw('&nbsp;&nbsp;Import Data (data.json)&nbsp;'), admin_plugins_export_content_settings_path(file: ["app", "apps", 'themes', theme[:key], 'data.json'].join("/"))) if current_site.plugin_installed?('export_content') && File.exist?(File.join(theme["path"], "data.json")) %>
-                                            <% r[:links] << link_to('Settings', cama_admin_settings_site_path(tab: "theme"), class: "btn btn-primary") if File.exist?(current_theme.settings_file) %>
+                                            <% r[:links] << link_to('Settings', cama_admin_settings_theme_path, class: "btn btn-primary") if File.exist?(current_theme.settings_file) %>
 
                                             <% r[:links] << link_to(raw('&nbsp;&nbsp;Import Data (data.json)&nbsp;'), "#", {'onclick' => "alert('You need to install import/export plugin to import sample data.'); return false;"}) if !current_site.plugin_installed?('export_content') && File.exist?(File.join(theme["path"], "data.json")) %>
                                             <%= raw r[:links].join(" | ") %>
@@ -54,7 +54,6 @@
                     </div>
                 </div>
             </div>
-
         </div>
     </div>
 </div>
@@ -64,6 +63,5 @@
         page.find(".preview_link").ajax_modal({mode: "iframe", modal_size: "modal-lg", callback: function(modal){
             modal.children(".modal-dialog").css("width", "98%").find("iframe").css("min-height", $(window).height()-150);
         }});
-
     });
 </script>

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

@@ -1,4 +1,5 @@
 <% (files rescue {file['name'] => file}).each do |k, file| next if @media_formats.present? && !@media_formats.include?(file["format"]) && !@media_formats.include?(file["url"].split('.').last) %>
+    <% file['url'] = download_private_file_cama_admin_media_url(file: file[:url]) if params[:private].present? %>
     <div class="media_item file_item <%= file["format"] %>_format" data-key="<%= file["name"] %>">
         <div class="thumb">
             <% case file["format"]  %>

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

@@ -1,4 +1,4 @@
-<div id="cama_media_gallery" data-url_actions="<%= actions_cama_admin_media_path(actions: @show_file_actions, dimension: params[:dimension]) %>" data-versions="<%= params[:versions] %>" data-thumb_size="<%= params[:thumb_size] %>" data-formats="<%= @media_formats.join(",") %>" data-folder="<%= @folder %>" data-url="<%= ajax_cama_admin_media_path(actions: @show_file_actions) %>" data-dimension="<%= params[:dimension] %>">
+<div id="cama_media_gallery" data-url_actions="<%= actions_cama_admin_media_path(actions: @show_file_actions, dimension: params[:dimension]) %>" data-extra-params="<%= {versions: params[:versions], thumb_size: params[:thumb_size], formats: @media_formats.join(","), media_formats: @media_formats.join(","), dimension: params[:dimension], private: params[:private]}.to_json %>" data-versions="<%= params[:versions] %>" data-thumb_size="<%= params[:thumb_size] %>" data-formats="<%= @media_formats.join(",") %>" data-folder="<%= @folder %>" data-url="<%= ajax_cama_admin_media_path(actions: @show_file_actions) %>" data-dimension="<%= params[:dimension] %>">
   <div class="panel panel-default">
     <div class="panel-heading">
       <div class="row">
@@ -42,13 +42,13 @@
           </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, dimension: params[:dimension]) %>" data-dragDropStr="<%= t("camaleon_cms.admin.button.drag_drop") %>" data-uploadStr="<%= t("camaleon_cms.admin.button.upload_file") %>"><%= t("camaleon_cms.admin.button.upload_file") %></div>
+                <div class="cama_media_fileuploader" data-input-id="cama-upload-files" data-url="<%= upload_cama_admin_media_path(actions: @show_file_actions, dimension: params[:dimension]) %>" data-dragDropStr="<%= t("camaleon_cms.admin.button.drag_drop") %>" data-uploadStr="<%= t("camaleon_cms.admin.button.upload_file") %>"><%= t("camaleon_cms.admin.button.upload_file") %></div>
                 <hr/>
                 <form id="cama_media_external">
                     <fieldset>
                         <legend><%= t("camaleon_cms.admin.media.external", default: 'From URL') %></legend>
                         <div class="form-group">
-                            <input type="text" class="form-control" placeholder="http://..." class="required">
+                            <input type="text" name="remote_file" class="form-control" placeholder="http://..." class="required">
                         </div>
                         <div class="form-group">
                             <button type="submit" class="btn btn-primary"><%= t("camaleon_cms.admin.button.submit") %></button>

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

@@ -73,7 +73,7 @@
             <!-- has comments? -->
             <% if @post.manage_comments?(@post_type) %>
                 <div class="form-group">
-                    <label class="control-label"><%= check_box("meta", "has_comments", {checked: ( params[:meta][:has_comments] == '1' rescue false || @post.can_commented?)  }) %> &nbsp; <%= t('camaleon_cms.admin.post_type.permit_comments')%></label>
+                    <label class="control-label"><%= check_box("meta", "has_comments", {checked: ((params[:meta][:has_comments] == '1' rescue false) || (@post.new_record? ? true : @post.get_meta('has_comments').to_s.cama_true?))  }) %> &nbsp; <%= t('camaleon_cms.admin.post_type.permit_comments')%></label>
                 </div>
             <% end %>
             <% if @post_type.get_option('has_featured', false) %>

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

@@ -53,7 +53,7 @@
 
             <!-- render all custom fields assigned to this post -->
             <%
-              r = {render: 'camaleon_cms/admin/settings/custom_fields/render', record: @post, field_groups: @post.get_field_groups({kind: 'Post', include_parent: true}), show_shortcode: true}
+              r = {render: 'camaleon_cms/admin/settings/custom_fields/render', record: @post, field_groups: @post.get_field_groups(), show_shortcode: true}
               hooks_run('posts_form_custom_fields_render', r)
             %>
              <%= render partial: r[:render], locals: {record: r[:record], field_groups: r[:field_groups], show_shortcode: r[:show_shortcode]} %>

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

@@ -40,6 +40,10 @@
         <label for=""><%= t('camaleon_cms.admin.settings.comment_status') %></label><br>
         <%= check_box :options, :comment_status, {checked: @site.front_comment_status == "approved"}, "approved", "pending" %>
     </div>
+    <div class="form-group">
+        <label for=""><%= t('camaleon_cms.admin.settings.comment_anonymous', default: 'Permit anonymous comments?') %></label><br>
+        <%= check_box :options, :permit_anonimos_comment, {checked: @site.get_option('permit_anonimos_comment', false)}, "true", "" %>
+    </div>
     <div class="form-group">
         <label for=""><%= t('camaleon_cms.admin.settings.allow_user_registration') %></label><br>
         <%= check_box :meta, :permit_create_account, {checked: @site.get_option('permit_create_account', false), class: "icheckbox0"}, "true", "" %>

data/app/views/camaleon_cms/admin/settings/custom_fields/_get_items.html.erb

@@ -21,6 +21,9 @@
   </div>
   <div class="panel-body">
     <%= hidden_field(:fields, :id, index: @index, value: @item_id) %>
+    <%= hidden_field(:field_options, :field_key, index: @index, value: @key) %>
+    <%= hidden_field(:field_options, :label_eval, index: @index, value: @item_options_value[:label_eval].to_s.cama_true? ? 'true' : '') %>
+    <%= hidden_field(:field_options, :panel_hidden, index: @index, value: @item_options_value[:panel_hidden], class: 'input-panel-hidden') %>
     <div class="form-group input-group-sm">
       <label for=""><%= t('camaleon_cms.admin.table.name') %></label><br>
       <%= text_field(:fields, :name, class: "form-control text-title", index: @index, value: @item_value[:name]? @item_value[:name] : "#{t('camaleon_cms.admin.settings.untitled')} #{@field_config[:label]}") %>
@@ -33,16 +36,12 @@
       <label for=""><%= t('camaleon_cms.admin.table.description') %></label><br>
       <%= text_area(:fields, :description, class: "form-control", index: @index, value: @item_value[:description]) %>
     </div>
-
-    <%= hidden_field(:field_options, :field_key, index: @index, value: @key) %>
-    <%= hidden_field(:field_options, :panel_hidden, index: @index, value: @item_options_value[:panel_hidden], class: 'input-panel-hidden') %>
-
     <%
        html = ''
        if @field_config[:extra_fields].present?
-
            @field_config[:extra_fields].each do |input|
                 type = input[:type]
+                html += '<div class="form-group">'
                 html += "<label>#{input[:label]}</label>" if input[:label].present?
                 case type
                   when 'select'
@@ -65,10 +64,11 @@
                     html += "#{text_field(:field_options, input[:key], index: @index , value: @item_options_value[input[:key].to_sym] || '', class: 'form-control') }"
                 end
                 html += "<small>#{input[:description]}</small>" if input[:description].present?
+                html += '</div>'
             end
         end
     %>
-    <div class="form-group">
+    <div>
       <%= raw html %>
     </div>
     <% if @field_config[:options][:multiple_options].present? %>

data/app/views/camaleon_cms/admin/settings/custom_fields/_meta_data.html.erb

@@ -47,8 +47,6 @@
                 </div>
           </div>
         </div>
-
-
         <script>
             jQuery(function($){
                 var values = <%= raw(values.to_json) %>;
@@ -63,7 +61,6 @@
                     if(data.key) field.find('.input-key').val(data.key);
                     if(data.value) field.find('.input-value').val(data.value);
                     $sortable.append(field);
-
                 }
                 if(values.length > 0) {
                     $.each(values, function(i, data){
@@ -83,20 +80,14 @@
                         }
                         return false;
                     });
-                    //$sortable.find('li:first .fa-times').hide();
                     $sortable.sortable({
                         handle: ".fa-arrows"
                     });
                 }
-
                 $content.find('.clone-field').remove();
             });
         </script>
-
-
   </div>
-
-
 </div>
 
 

data/app/views/camaleon_cms/admin/settings/custom_fields/_render.html.erb

@@ -1,61 +1,45 @@
-<% @default_use = record.new_record?; @field_name = (defined?(fields_name) ? fields_name : "field_options").to_sym %>
-<% field_groups.each do |group| %>
-    <%
-    fields = group.fields.where.not(slug: record.get_option("skip_fields", [])).eager_load(:metas)
-    next if fields.size == 0
-    if defined?(skip_panel) || group.slug == "_default"
-        header = "<div class=\"panel panel-default panel-lite c-field-group\" data-slug=\"#{group.slug}\"> <div class=\"panel-body\">"
-        footer = "</div></div>"
-    else
-        header = "<div class=\"panel panel-default panel-lite c-field-group\" data-slug=\"#{group.slug}\"><div class=\"panel-heading\"><h3 class=\"panel-title\">#{group.name}</h3><ul class=\"panel-controls\"><li><a class=\"panel-collapse\" href='#'><span class='fa fa-angle-down'></span></a></li></ul></div><div class='panel-body'>#{content_tag :p, group.description if group.description.present?}"
-        footer = "</div></div>"
-    end
-    %>
-    <%= raw header %>
-    <%
-    fields.each do |field| # iterate all fields of current group
-      @field = field.decorate
-      @field = @field || {options:{}}
-      @rand = "#{field.id}#{rand(99)}"
-      values = record.get_fields(@field.slug)
-      values = params[@field_name][@field.slug.to_sym][:values] if values.blank? && params[@field_name].present?
-      is_disabled = @field.options[:disabled].present? || @field.options[:readonly].present?
-      obj_class = record.class.name.parseCamaClass.downcase
-    %>
-        <div class="item-custom-field c-field-<%= @field.options[:field_key] %>">
-            <label for="input-<%= @rand %>">
-                <%= @field.options[:label_eval].present? ? eval(@field.name) : @field.name %>
-                <%= raw "<em class='text-danger'>*</em>" if @field.options[:required].to_s.to_bool %>
-                <% if ["post", "posttype", "category", "postTag", "site", "user", "navmenu", "theme"].include?(obj_class) %>
-                    <small class="shortcode_field"><br><%= raw cama_shortcode_print("[data field='#{@field.slug}' #{"object='#{obj_class}' #{"id='#{record.id}'" if obj_class != "Theme" }" unless record.new_record?}]") %></small>
+<% default_use = record.new_record?; field_name = (defined?(fields_name) ? fields_name : "field_options").to_sym; obj_class = record.class.name.parseCamaClass.downcase %>
+<% field_groups.each do |group| fields = group.fields.where.not(slug: record.get_option("skip_fields", [])).eager_load(:metas); next if fields.size == 0; group_field_data = {} %>
+    <div class="panel panel-default panel-lite c-field-group" id="custom_field_group_<%= group.id %>">
+        <div class="panel-heading <%= 'hidden' if defined?(skip_panel) || group.slug == "_default" %>">
+            <h3 class="panel-title"><%= group.name %></h3>
+            <ul class="panel-controls"><li><a class="panel-collapse" href='#'><span class='fa fa-angle-down'></span></a></li></ul>
+        </div>
+        <div class='panel-body'>
+            <%= content_tag :p, group.description if group.description.present? %>
+            <div class="custom_sortable_grouped hidden">
+                <% if group.is_repeat %>
+                    <div class="text-right header-field-grouped bg-info">
+                        <i class="fa fa-angle-down toggleable" style="cursor: pointer"></i>
+                        <i style="cursor: pointer" class="fa fa-times del text-danger"></i> <i style="cursor: move" class="fa fa-arrows move"></i>
+                    </div>
                 <% end %>
-            </label>
-            <% if @field.description.present? %>
-                <p><small><%= @field.options[:label_eval].present? ? eval(@field.description) : @field.description %></small></p>
-            <% end  %>
-            <input name="<%= @field_name %>[<%= @field.slug %>][id]" type="hidden" value="<%= @field.id %>"/>
-            <div id="content-field-<%= @rand %>" class="editor-custom-fields">
-                <div class="clone-field hidden">
-                    <div class="input-group-parent">
-                        <% if @field.options[:multiple].to_s.to_bool && !is_disabled %>
-                            <div class="actions">
-                                <i class="fa fa-arrows"></i> <i class="fa fa-times text-danger"></i>
+                <div class="fields_container">
+                    <% fields.decorate.each do |field| is_disabled = field.options[:disabled].present? || field.options[:readonly].present?; group_field_data[field.slug] = {default_value: field.options[:default_value], is_disabled: is_disabled, id: field.id, multiple: field.options[:multiple].to_s.to_bool && !is_disabled, kind: field.get_option('field_key')} %>
+                        <div class="item-custom-field c-field-<%= field.options[:field_key] %>">
+                            <input name="<%= field_name %>[<%= field.slug %>][id]" type="hidden" value="<%= field.id %>"/>
+                            <input name="<%= field_name %>[<%= field.slug %>][group_number]" class="cama_custom_group_number" type="hidden" value="0"/>
+                            <label>
+                                <%= field.options[:label_eval].present? ? eval(field.name) : field.name %>
+                                <%= raw "<em class='text-danger'>*</em>" if field.options[:required].to_s.to_bool %>
+                                <% if ["post", "posttype", "category", "postTag", "site", "user", "navmenu", "theme"].include?(obj_class) %>
+                                    <small class="shortcode_field"><br><%= raw cama_shortcode_print("[data field='#{field.slug}' #{"object='#{obj_class}' #{"id='#{record.id}'" if obj_class != "Theme" }" unless record.new_record?}]") %></small>
+                                <% end %>
+                            </label>
+                            <% if field.description.present? %>
+                                <p><small><%= field.options[:label_eval].present? ? eval(field.description) : field.description %></small></p>
+                            <% end  %>
+                            <div class="editor-custom-fields content-field-<%= field.id %>" data-add_field_title="<%= t('camaleon_cms.admin.button.add_new_field', default: 'Add new field')%>">
+                                <%= render(field.get_option('render') || cama_custom_field_elements[field.get_option('field_key').to_sym][:render] || "camaleon_cms/admin/settings/custom_fields/fields/#{field.options[:field_key]}", field: field, values: nil, is_disabled: is_disabled, default_use: default_use, field_name: field_name) %>
                             </div>
-                        <% end %>
-                        <%= render cama_custom_field_elements[@field.options[:field_key].to_sym][:render] || "camaleon_cms/admin/settings/custom_fields/fields/#{@field.options[:field_key]}" %>
-                    </div>
+                        </div>
+                    <% end %>
                 </div>
-
-                <ul id="sortable-<%= @rand %>"></ul>
-
-                <% if @field.options[:multiple].to_s.to_bool && !is_disabled %>
-                    <div class="field_multiple_btn">
-                        <a class="btn btn-warning btn-sm btn-add-field" href="#"> <i class="fa fa-plus"></i> <%= t('camaleon_cms.admin.button.add_new_field')%></a>
-                    </div>
-                <% end %>
+                <script> jQuery(function(){ build_custom_field_group(<%= raw(params[:field_options].present? ? (r = []; params[:field_options].each{|k, v| val = {}; v.each{|kk, vv| val["#{kk}"] = vv['values'].values; }; r << val }; r) : record.get_fields_grouped(fields.pluck(:slug).uniq).to_json) %>, '<%= group.id %>', <%= raw group_field_data.to_json %>, <%= group.is_repeat %>); }); </script>
             </div>
-            <script> jQuery(function(){ build_custom_field(<%= raw(values.to_json) %>, <%= @field.options[:multiple].to_s.to_bool  %>, '<%= @field.options[:field_key]  %>', '<%= @rand %>', '<%= @field.options[:default_value] if record.new_record? %>'); }); </script>
         </div>
-    <% end %>
-    <%= raw footer %>
+        <% if group.is_repeat %>
+            <div class="panel-footer text-right"><a href="#" class="btn btn-warning duplicate_cutom_group btn-xs"><i class="fa fa-plus"></i> <%= t('camaleon_cms.admin.button.add_new_group', default: 'Add new group')%></a></div>
+        <% end %>
+    </div>
 <% end %>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_audio.html.erb

@@ -1,4 +1,4 @@
 <div class="group-input-fields-content input-group">
-  <input type="url" name="<%= @field_name %>[<%= @field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %> />
+  <input type="url" name="<%= field_name %>[<%= field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
   <span class="input-group-addon btn_upload" onclick="load_upload_audio_field(this);return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_audio')%></span>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_checkbox.html.erb

@@ -1,3 +1,3 @@
-<div class="group-input-fields-content" data-callback-set-value="custom_field_checkbox_val">
-    <div class="checkbox"><label><input type="checkbox" value="<%= @field.options[:default_value] || 1 %>" name="<%= @field_name %>[<%= @field.slug %>][values][]" <%= 'checked' if false %> <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>>  <%= @field.the_name %> </label></div>
+<div class="group-input-fields-content" data-callback-render="custom_field_checkbox_val">
+    <div class="checkbox"><label><input type="checkbox" value="<%= field.options[:default_value] || 1 %>" name="<%= field_name %>[<%= field.slug %>][values][]" <%= 'checked' if false %> >  <%= field.the_name %> </label></div>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_checkboxes.html.erb

@@ -1,5 +1,5 @@
-<div class="group-input-fields-content" data-callback-set-value="custom_field_checkboxs_val">
-    <% @field.options[:multiple_options].each do |option|  %>
-        <div class="checkbox"><label><input type="checkbox" value="<%= option[:value] %>" name="<%= @field_name %>[<%= @field.slug %>][values][]" <%= 'checked' if @default_use && option[:default].present? %> <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>> <%= option[:title] %></label></div>
+<div class="group-input-fields-content" data-callback-render="custom_field_checkboxs_val">
+    <% field.options[:multiple_options].each do |option|  %>
+        <div class="checkbox"><label><input type="checkbox" value="<%= option[:value] %>" name="<%= field_name %>[<%= field.slug %>][values][]" <%= 'checked' if default_use && option[:default].present? %> > <%= option[:title] %></label></div>
     <% end %>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_colorpicker.html.erb

@@ -1,7 +1,7 @@
 <% add_asset_library('colorpicker') %>
-<div class="group-input-fields-content" data-callback-function="custom_field_colorpicker"  data-callback-set-value="custom_field_colorpicker_val" style="max-width: 300px;">
-  <div data-color-format="<%= @field.options[:color_format].present? ? @field.options[:color_format] : 'hex' %>" data-color="#fff" class="input-group color my-colorpicker">
-    <input  type="text" name="<%= @field_name %>[<%= @field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %> />
+<div class="group-input-fields-content" data-callback-render="custom_field_colorpicker_val" style="max-width: 300px;">
+  <div data-color-format="<%= field.options[:color_format].present? ? field.options[:color_format] : 'hex' %>" data-color="#fff" class="input-group color my-colorpicker">
+    <input  type="text" name="<%= field_name %>[<%= field.slug %>][values][]" class="data-error-place-parent form-control input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
     <span class="input-group-addon"><i></i></span>
   </div>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_date.html.erb

@@ -1,6 +1,6 @@
-<div class="group-input-fields-content" data-callback-function="custom_field_date" style="max-width: 300px;">
-  <div class="input-group date date-input-box <%= "is_datetimepicker" if @field.options[:type_date].to_s.to_bool %>">
-    <input type="text" data-locale='<%= current_locale %>' name="<%= @field_name %>[<%= @field.slug %>][values][]" class="data-error-place-parent input-value form-control <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
+<div class="group-input-fields-content" data-callback-render="custom_field_date" style="max-width: 300px;">
+  <div class="input-group date date-input-box <%= "is_datetimepicker" if field.options[:type_date].to_s.to_bool %>">
+    <input type="text" data-locale='<%= current_locale %>' name="<%= field_name %>[<%= field.slug %>][values][]" class="data-error-place-parent input-value form-control <%= "required" if field.options[:required].to_s.to_bool %>" />
     <span class="add-on input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
   </div>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_editor.html.erb

@@ -1,3 +1,3 @@
-<div class="group-input-fields-content" data-callback-function="custom_field_editor">
-  <textarea id="" name="<%= @field_name %>[<%= @field.slug %>][values][]"  rows="8" class="form-control <%= 'is_translate' if @field.options[:translate].to_s.to_bool %> input-value <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if true %> <%= "disabled" if @field.options[:disabled].present? %>></textarea>
+<div class="group-input-fields-content" data-callback-render="custom_field_editor">
+  <textarea id="" name="<%= field_name %>[<%= field.slug %>][values][]"  rows="8" class="form-control <%= 'is_translate' if field.options[:translate].to_s.to_bool %> input-value <%= "required" if field.options[:required].to_s.to_bool %>" <%= "readonly" if true %> <%= "disabled" if field.options[:disabled].present? %>></textarea>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_email.html.erb

@@ -1,3 +1,3 @@
 <div class="group-input-fields-content">
-  <input type="email" name="<%= @field_name %>[<%= @field.slug %>][values][]" class="form-control email input-value <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
+  <input type="email" name="<%= field_name %>[<%= field.slug %>][values][]" class="form-control email input-value <%= "required" if field.options[:required].to_s.to_bool %>" />
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_field_attrs.html.erb

@@ -1,8 +1,8 @@
-<div class="group-input-fields-content row" data-callback-set-value="custom_field_field_attrs_val">
+<div class="group-input-fields-content row" data-callback-render="custom_field_field_attrs_val">
     <div class="col-md-4">
-        <input type="text" name="<%= @field_name %>[<%= @field.slug %>][values][][attr]" placeholder="<%= t('camaleon_cms.admin.table.attribute') %>" class="<%= 'is_translate' if @field.get_option('translate') %> form-control input-attr <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
+        <input type="text" name="<%= field_name %>[<%= field.slug %>][values][][attr]" placeholder="<%= t('camaleon_cms.admin.table.attribute') %>" class="<%= 'is_translate' if field.get_option('translate') %> form-control input-attr <%= "required" if field.options[:required].to_s.to_bool %>" />
     </div>
     <div class="col-md-8">
-        <input type="text" name="<%= @field_name %>[<%= @field.slug %>][values][][value]"  placeholder="<%= t('camaleon_cms.admin.table.value') %>" class="<%= 'is_translate' if @field.get_option('translate') %> form-control input-value" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
+        <input type="text" name="<%= field_name %>[<%= field.slug %>][values][][value]"  placeholder="<%= t('camaleon_cms.admin.table.value') %>" class="<%= 'is_translate' if field.get_option('translate') %> form-control input-value" />
     </div>
 </div>

data/app/views/camaleon_cms/admin/settings/custom_fields/fields/_file.html.erb

@@ -1,4 +1,4 @@
 <div class="group-input-fields-content input-group">
-  <input type="url" data-formats="<%= @field.options[:formats] || "" %>" name="<%= @field_name %>[<%= @field.slug %>][values][]" class="form-control input-value data-error-place-parent file_format <%= "required" if @field.options[:required].to_s.to_bool %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %> />
+  <input type="url" data-formats="<%= field.options[:formats] || "" %>" name="<%= field_name %>[<%= field.slug %>][values][]" class="form-control input-value data-error-place-parent file_format <%= "required" if field.options[:required].to_s.to_bool %>"  />
   <span class="input-group-addon btn_upload" onclick="load_upload_file_field(this);return false;"><i class="fa fa-upload"></i> <%= t('camaleon_cms.admin.button.upload_file') %></span>
 </div>