camaleon_cms 2.1.1.4 → 2.1.2.0

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

@@ -10,8 +10,6 @@
                 <% 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  %>
-
-
             </div>
         </div>
         <div class="panel-footer">
@@ -30,7 +28,6 @@
         </div>
     </div>
 
-
     <div class="panel panel-default panel-lite">
         <div class="panel-heading">
             <h3 class="panel-title"><%= t('camaleon_cms.admin.post_type.configuration')%></h3>
@@ -50,7 +47,7 @@
                 </select>
             </div>
             <!-- templates -->
-            <% if @post.manage_template?(@post_type) && (template_files = cama_get_list_template_files).present? %>
+            <% if @post.manage_template?(@post_type) && (template_files = cama_get_list_template_files(@post_type)).present? %>
                 <div class="form-group">
                     <label class="control-label"><%= t('camaleon_cms.admin.post_type.template')%></label>
                     <%= select("meta", "template", template_files, { include_blank: true, selected: (params[:meta][:template] rescue false || @post.get_template(@post_type) ) }, {class: 'form-control'}) %>
@@ -58,7 +55,7 @@
             <% end %>
 
             <!-- layouts -->
-            <% if @post.manage_layout? && (layout_files = cama_get_list_layouts_files).present? %>
+            <% if @post.manage_layout? && (layout_files = cama_get_list_layouts_files(@post_type)).present? %>
                 <div class="form-group">
                     <label class="control-label"><%= t('camaleon_cms.admin.post_type.layout')%></label>
                     <%= select("meta", "layout", layout_files, { include_blank: true, selected: (params[:meta][:layout] rescue false || @post.get_layout(@post_type) ) }, {class: 'form-control'}) %>
@@ -142,4 +139,6 @@
             </div>
         </div>
     <% end %>
+
+    <%= _hook_args = {html: "", f: f, post: @post, post_type: @post_type}; hooks_run("post_form_sidebar_custom_html", _hook_args); raw(_hook_args[:html]); %>
 </div>

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

@@ -47,6 +47,7 @@
                             <input name="post[keywords]" id="post_keywords" class="form-control translatable" value="<%= @post.get_option("keywords") %>"/>
                         </div>
                     <% end %>
+                    <%= _hook_args = {html: "", f: f, post: @post, post_type: @post_type}; hooks_run("post_form_custom_html", _hook_args); raw(_hook_args[:html]); %>
                 </div>
             </div>
 

data/app/views/camaleon_cms/admin/sessions/forgot.html.erb

@@ -6,17 +6,17 @@
       <%= form_for(@user, as: "user", :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal"  }, :url => cama_admin_forgot_path({h: params[:h]}) ) do |f| %>
           <div class="form-group">
             <div class="col-md-12">
-              <%= f.password_field :password, :class => "form-control", :placeholder => t('camaleon_cms.admin.table.password') %>
+              <%= f.password_field :password, :class => "form-control", :placeholder => t('camaleon_cms.admin.table.password', default: 'Password') %>
             </div>
           </div>
           <div class="form-group">
             <div class="col-md-12">
-              <%= f.password_field :password_confirmation, :class => "form-control", :placeholder => t('camaleon_cms.admin.table.password_confirmation') %>
+              <%= f.password_field :password_confirmation, :class => "form-control", :placeholder => t('camaleon_cms.admin.table.password_confirmation', default: 'Password Confirmation') %>
             </div>
           </div>
           <div class="form-group">
             <div class="col-md-12">
-              <button class="btn btn-primary btn-block"><%= t('camaleon_cms.admin.button.enter') %></button>
+              <button class="btn btn-primary btn-block"><%= t('camaleon_cms.admin.button.enter', default: 'Enter') %></button>
             </div>
           </div>
       <% end %>
@@ -25,18 +25,18 @@
       <%= form_for(@user, as: "user", :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal"  }, :url => cama_admin_forgot_path ) do |f| %>
           <div class="form-group">
             <div class="col-md-12">
-              <%= f.email_field :email, :class => "form-control", :placeholder => t("camaleon_cms.admin.login.email") %>
+              <%= f.email_field :email, :class => "form-control", :placeholder => t("camaleon_cms.admin.login.email", default: 'Email') %>
             </div>
           </div>
           <div class="form-group">
             <div class="col-md-12">
-              <button class="btn btn-primary btn-block"><%= t('camaleon_cms.admin.button.submit') %></button>
+              <button class="btn btn-primary btn-block"><%= t('camaleon_cms.admin.button.submit', default: 'Submit') %></button>
             </div>
           </div>
       <% end %>
   <% end %>
     <div class="text-right">
-        <%= link_to("#{t("camaleon_cms.common.login")}&raquo;".html_safe, cama_admin_login_path, class: "btn btn-default") %>
+        <%= link_to("#{t("camaleon_cms.common.login", default: 'Log In')}&raquo;".html_safe, cama_admin_login_path, class: "btn btn-default") %>
     </div>
 </div>
 

data/app/views/camaleon_cms/admin/sessions/login.html.erb

@@ -1,17 +1,17 @@
 <script>var kk = "<%= cama_get_session_id %>";</script>
 <%= javascript_include_tag "camaleon_cms/admin/login_manifest" %>
 <div class="login-body">
-    <h3 class="login-box-msg"><%= raw t('camaleon_cms.admin.login.welcome_login_html') %>  </h3>
+    <h3 class="login-box-msg"><%= raw t('camaleon_cms.admin.login.welcome_login_html', default: 'Please Login') %>  </h3>
     <%= render "layouts/camaleon_cms/admin/flash_messages" %>
     <%= form_for(@user, as: "user", :html => { method: "post", role: "form", id:"login_user", class: "form-horizontal"  }, :url => cama_admin_login_path ) do |f| %>
         <div class="form-group">
             <div class="col-md-12">
-                <%= f.text_field :username, :class => "form-control", :placeholder => t("camaleon_cms.admin.login.username") %>
+                <%= f.text_field :username, :class => "form-control", :placeholder => t("camaleon_cms.admin.login.username", default: 'Username') %>
             </div>
         </div>
         <div class="form-group">
             <div class="col-md-12">
-                <%= f.password_field :password, :class => "form-control", :placeholder => t("camaleon_cms.admin.login.password") %>
+                <%= f.password_field :password, :class => "form-control", :placeholder => t("camaleon_cms.admin.login.password", default: 'Password') %>
             </div>
         </div>
         <div class="form-group">
@@ -23,12 +23,12 @@
         <div class="row">
             <div class="col-xs-6">
                 <div class="checkbox">
-                    <label><input name="remember_me" type="checkbox"> <%= t("camaleon_cms.admin.login.remember_me") %> </label>
+                    <label><input name="remember_me" type="checkbox"> <%= t("camaleon_cms.admin.login.remember_me", default: 'Remember me') %> </label>
                 </div>
             </div>
             <!-- /.col -->
             <div class="col-xs-6">
-                <button type="submit" class="btn btn-primary btn-block btn-flat"><%= t('camaleon_cms.admin.button.log_in') %></button>
+                <button type="submit" class="btn btn-primary btn-block btn-flat"><%= t('camaleon_cms.admin.button.log_in', default: 'Log In') %></button>
             </div>
             <!-- /.col -->
         </div>
@@ -39,10 +39,10 @@
 
         <div class="row">
             <% if current_site.get_option('permit_create_account', false) %>
-                <div class="col-xs-6"><%= t('camaleon_cms.admin.login.do_not_have_account_yet') %><br> <a href="<%= cama_admin_register_path %>"><%= t('camaleon_cms.admin.login.create_account') %></a></div>
+                <div class="col-xs-6"><%= t('camaleon_cms.admin.login.do_not_have_account_yet') %><br> <a href="<%= cama_admin_register_path %>"><%= t('camaleon_cms.admin.login.create_account', default: 'Create Account') %></a></div>
             <% end %>
             <div class="col-xs-6">
-                <a href="<%= cama_admin_forgot_path %>" class=""><%= t('camaleon_cms.admin.login.forgot_your_password_int') %></a>
+                <a href="<%= cama_admin_forgot_path %>" class=""><%= t('camaleon_cms.admin.login.forgot_your_password_int', default: 'Forgot Password') %></a>
             </div>
         </div>
     <% end %>

data/app/views/camaleon_cms/admin/sessions/register.html.erb

@@ -8,17 +8,17 @@
         <h4><%= t('camaleon_cms.admin.login.personal_info') %></h4>
         <div class="form-group">
             <div class="col-md-12">
-                <input type="text" class="form-control" placeholder="<%= t("camaleon_cms.admin.login.first_name") %>" name="meta[first_name]" value="<%= @first_name if @first_name.present? %>"/>
+                <input type="text" class="form-control" placeholder="<%= t("camaleon_cms.admin.login.first_name", default: 'First Name') %>" name="meta[first_name]" value="<%= @first_name if @first_name.present? %>"/>
             </div>
         </div>
         <div class="form-group">
             <div class="col-md-12">
-                <input type="text" class="form-control" placeholder="<%= t("camaleon_cms.admin.login.last_name") %>" name="meta[last_name]" value="<%= @last_name if @last_name.present? %>"/>
+                <input type="text" class="form-control" placeholder="<%= t("camaleon_cms.admin.login.last_name", default: 'Last Name') %>" name="meta[last_name]" value="<%= @last_name if @last_name.present? %>"/>
             </div>
         </div>
         <div class="form-group">
             <div class="col-md-12">
-                <%= f.email_field :email, :class => "form-control required email", placeholder: t("camaleon_cms.admin.login.email") %>
+                <%= f.email_field :email, :class => "form-control required email", placeholder: t("camaleon_cms.admin.login.email", default: 'Email') %>
             </div>
         </div>
 
@@ -26,25 +26,25 @@
         <h4><%= t('camaleon_cms.admin.login.authentication') %></h4>
         <div class="form-group">
             <div class="col-md-12">
-                <%= f.text_field :username, :class => "form-control required", placeholder: t("camaleon_cms.admin.login.username") %>
+                <%= f.text_field :username, :class => "form-control required", placeholder: t("camaleon_cms.admin.login.username", default: 'User Name') %>
             </div>
         </div>
         <div class="form-group">
             <div class="col-md-12">
-                <%= f.password_field :password, :class => "form-control #{"required" if @user.new_record?}", placeholder: t("camaleon_cms.admin.login.password") %>
+                <%= f.password_field :password, :class => "form-control #{"required" if @user.new_record?}", placeholder: t("camaleon_cms.admin.login.password", default: 'Password') %>
             </div>
         </div>
         <div class="form-group">
             <div class="col-md-12">
-                <%= f.password_field :password_confirmation, :class => "form-control #{"required" if @user.new_record?}", "equalTo" => "#user_password", placeholder: t("camaleon_cms.admin.login.password_confirm") %>
+                <%= f.password_field :password_confirmation, :class => "form-control #{"required" if @user.new_record?}", "equalTo" => "#user_password", placeholder: t("camaleon_cms.admin.login.password_confirm", default: 'Password Confirmation') %>
             </div>
         </div>
 
         <% if current_site.security_user_register_captcha_enabled? %>
-            <h4><%= t('camaleon_cms.admin.login.captcha') %></h4>
+            <h4><%= t('camaleon_cms.admin.login.captcha', default: 'Security Code') %></h4>
             <div class="form-group">
                 <div class="col-md-12">
-                    <%= raw cama_captcha_tag(5, {}, {class: 'form-control required', placeholder: t('camaleon_cms.admin.login.captcha')}) %>
+                    <%= raw cama_captcha_tag(5, {}, {class: 'form-control required', placeholder: t('camaleon_cms.admin.login.captcha', default: 'Security Code')}) %>
                 </div>
             </div>
         <% end %>

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

@@ -1,17 +1,33 @@
-<% posts = current_site.posts.public_posts.all %>
+<% posts = current_site.the_posts('page').public_posts.all.decorate %>
 <div id="tab-configuration" class="<%= "active" if "config" == params[:tab] %> tab-pane ">
     <div class="form-group">
         <label for=""><%= t('camaleon_cms.admin.table.home_page') %></label><br>
-        <%= select_tag "options[home_page]", options_for_select([[t('camaleon_cms.admin.table.default'), ""]]+(posts.collect { |x| x = x.decorate; [x.the_title, x.id] }), @site.options[:home_page]), class: "form-control select" %>
+        <%= select_tag "options[home_page]", options_from_collection_for_select(posts, :id, :the_title, current_site.get_option('home_page')), include_blank: t('.default_page', default: '- Default -'), class: "form-control select" %>
     </div>
     <div class="form-group">
         <label for=""><%= t('camaleon_cms.admin.table.page_404') %></label><br>
-        <%= select_tag "options[error_404]", options_for_select([[t('camaleon_cms.admin.table.default'), ""]]+(posts.collect { |x| x = x.decorate; [x.the_title, x.id] }), @site.options[:error_404]), class: "form-control select" %>
+        <%= select_tag "options[error_404]", options_from_collection_for_select(posts, :id, :the_title, current_site.get_option('error_404')), include_blank: t('.default_page', default: '- Default -'), class: "form-control select" %>
     </div>
+
     <div class="form-group">
-        <label for=""><%= t('camaleon_cms.admin.table.email_address') %></label><br>
-        <%= email_field :options, :email, :class => "form-control", :value => @site.options[:email] %>
+        <%= f.label t('.status', default: 'Site Status') %><br>
+        <%= f.select :status, current_site.the_status_options, {}, :class => "form-control" %>
     </div>
+    <div class="hidden site_options_for_status status_maintenance">
+        <div class="form-group">
+            <%= label_tag 'options[page_maintenance]', t('.maintenance_page', default: 'Page to show for Maintenance') %>
+            <%= select_tag 'options[page_maintenance]', options_from_collection_for_select(posts, :id, :the_title, current_site.get_option('page_maintenance')), :class => "form-control" %>
+        </div>
+        <div class="form-group">
+            <label for=""><%= t('.maintenance_ips', default: 'Maintenance IP\'s (Separated by commas)') %></label><br>
+            <%= text_field :options, :maintenance_ips, :class => "form-control", :value => @site.get_option('maintenance_ips') %>
+        </div>
+    </div>
+    <div class=" site_options_for_status status_inactive">
+        <%= label_tag 'options[page_inactive]', t('.inactive_page', default: 'Page to show for Inactive') %>
+        <%= select_tag 'options[page_inactive]', options_from_collection_for_select(posts, :id, :the_title, current_site.get_option('page_inactive')), :class => "form-control" %>
+    </div>
+
     <div class="form-group">
         <label for=""><%= t('camaleon_cms.admin.settings.list_per_page_front') %></label><br>
         <%= text_field :options, :front_per_page, :class => "form-control number", :value => @site.front_per_page %>
@@ -36,4 +52,12 @@
     <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>
+</div>
+<script>
+    jQuery(function(){
+        var form = $('#site_settings_form');
+        form.find('#site_status').change(function(){
+            form.find('.site_options_for_status').hide().removeClass('hidden').filter('.status_'+$(this).val()).slideDown();
+        }).trigger('change');
+    })
+</script>

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

@@ -1,4 +1,13 @@
 <div id="tab-email_settings" class="<%= "active" if "email" == params[:tab] %> tab-pane ">
+    <div class="form-group">
+        <%= label_tag t('camaleon_cms.admin.settings.email_from') %><br>
+        <%= text_field :options, :email, :class => "form-control", value: @site.get_option("email"), placeholder: 'My Name <my_email@gmyserver.com>' %>
+    </div>
+    <div class="form-group">
+        <%= label_tag t('camaleon_cms.admin.settings.email_cc') %><br>
+        <%= text_field :options, :email_cc, :class => "form-control", value: @site.get_option("email_cc"), placeholder: 'test@gmail.com,test2@gmail.com' %>
+    </div>
+    <hr>
     <div class="alert alert-info">Gmail Need Permissions:
         <a href="http://know.mailsbestfriend.com/smtp_error_password_command_failed_5345714-1194946499.shtml" target="_blank">Check
             here.</a></div>
@@ -6,28 +15,22 @@
         <%= label_tag t('camaleon_cms.admin.settings.email_enabled') %><br>
         <%= check_box :options, :mailer_enabled, {checked: @site.get_option("mailer_enabled") == 1}, 1, 0 %>
     </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.email_server') %> (*)<br>
-        <%= text_field :options, :email_server, :class => "form-control required", value: @site.get_option("email_server") %>
-    </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.email_port') %> (*)<br>
-        <%= text_field :options, :email_port, :class => "form-control required", value: @site.get_option("email_port") %>
-    </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.email_username') %> (*)<br>
-        <%= text_field :options, :email_username, :class => "form-control required", value: @site.get_option("email_username") %>
-    </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.email_pass') %> (*)<br>
-        <%= text_field :options, :email_pass, :class => "form-control required", value: @site.get_option("email_pass") %>
-    </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.email_from') %> (*)<br>
-        <%= text_field :options, :email_from, :class => "form-control required", value: @site.get_option("email_from") %>
-    </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.email_cc') %><br>
-        <%= text_field :options, :email_cc, :class => "form-control", value: @site.get_option("email_cc") %>
+    <div class="toggleable">
+        <div class="form-group">
+            <%= label_tag t('camaleon_cms.admin.settings.email_server') %> (*)<br>
+            <%= text_field :options, :email_server, :class => "form-control required", value: @site.get_option("email_server"), placeholder: 'smtp.gmail.com' %>
+        </div>
+        <div class="form-group">
+            <%= label_tag t('camaleon_cms.admin.settings.email_port') %> (*)<br>
+            <%= text_field :options, :email_port, :class => "form-control required", value: @site.get_option("email_port"), placeholder: '587' %>
+        </div>
+        <div class="form-group">
+            <%= label_tag t('camaleon_cms.admin.settings.email_username') %> (*)<br>
+            <%= text_field :options, :email_username, :class => "form-control required", value: @site.get_option("email_username"), placeholder: 'myuser@gmail.com' %>
+        </div>
+        <div class="form-group">
+            <%= label_tag t('camaleon_cms.admin.settings.email_pass') %> (*)<br>
+            <%= text_field :options, :email_pass, :class => "form-control required", value: @site.get_option("email_pass"), placeholder: 'mypassword' %>
+        </div>
     </div>
 </div>

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

@@ -3,25 +3,30 @@
         <%= label_tag t('camaleon_cms.admin.settings.aws', default: "Save Files in AWS3") %><br>
         <%= check_box :options, :filesystem_type, {checked: @site.get_option("filesystem_type") == "s3"}, "s3", "local" %>
     </div>
-
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_access_key') %> <small>(Sample: AKIAJAwdgTSHWLAD5VGA)</small><br>
-        <%= text_field :options, :filesystem_s3_access_key, :class => "form-control required", value: @site.get_option("filesystem_s3_access_key") %>
-    </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_secret_key') %> <small>(Sample: f5T2CntRcPQBPzACBHUyvM4zEpkiZdH/77N85seBM)</small><br>
-        <%= text_field :options, :filesystem_s3_secret_key, :class => "form-control required", value: @site.get_option("filesystem_s3_secret_key") %>
-    </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_bucket_name') %> <small>(Sample: my_bucket)</small><br>
-        <%= text_field :options, :filesystem_s3_bucket_name, :class => "form-control required", value: @site.get_option("filesystem_s3_bucket_name") %>
-    </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_region', default: 'filesystem_region') %> <small>(Sample: us-west-2)</small><br>
-        <%= text_field :options, :filesystem_region, :class => "form-control required", value: @site.get_option("filesystem_region") %>
-    </div>
-    <div class="form-group">
-        <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_endpoint', default: 'filesystem_s3_endpoint') %> <small>(Sample: s3-us-west-2.amazonaws.com)</small><br>
-        <%= text_field :options, :filesystem_s3_endpoint, :class => "form-control required", value: @site.get_option("filesystem_s3_endpoint") %>
+    <div class="toggleable">
+        <div class="form-group">
+            <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_access_key') %> <small>(*)</small><br>
+            <%= text_field :options, :filesystem_s3_access_key, :class => "form-control required", value: @site.get_option("filesystem_s3_access_key"), placeholder: 'AKIAJAwdgTSHWLAD5VGA' %>
+        </div>
+        <div class="form-group">
+            <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_secret_key') %> <small>(*)</small><br>
+            <%= text_field :options, :filesystem_s3_secret_key, :class => "form-control required", value: @site.get_option("filesystem_s3_secret_key"), placeholder: 'f5T2CntRcPQBPzACBHUyvM4zEpkiZdH/77N85seBM' %>
+        </div>
+        <div class="form-group">
+            <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_bucket_name') %> <small>(*)</small><br>
+            <%= text_field :options, :filesystem_s3_bucket_name, :class => "form-control required", value: @site.get_option("filesystem_s3_bucket_name"), placeholder: 'my_bucket' %>
+        </div>
+        <div class="form-group">
+            <%= label_tag t('camaleon_cms.admin.settings.filesystem_region', default: 'filesystem_region') %> <small>(*)</small><br>
+            <%= text_field :options, :filesystem_region, :class => "form-control required", value: @site.get_option("filesystem_region"), placeholder: 'us-west-2' %>
+        </div>
+        <!--<div class="form-group">
+            <%#= label_tag t('camaleon_cms.admin.settings.filesystem_s3_endpoint', default: 'filesystem_s3_endpoint') %> <small>(*)</small><br>
+            <%#= text_field :options, :filesystem_s3_endpoint, :class => "form-control required", value: @site.get_option("filesystem_s3_endpoint"), placeholder: 's3-us-west-2.amazonaws.com' %>
+        </div>-->
+        <div class="form-group">
+            <%= label_tag t('camaleon_cms.admin.settings.filesystem_s3_cloudfront', default: 'Cloudfront URL') %><br>
+            <%= text_field :options, :filesystem_s3_cloudfront, :class => "form-control", value: @site.get_option("filesystem_s3_cloudfront"), placeholder: 'https://cloudfront_id.cloudfront.net' %>
+        </div>
     </div>
 </div>

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

@@ -0,0 +1,10 @@
+<div id="tab-media_settings" class="<%= 'active' if 'media' == params[:tab] %> tab-pane ">
+    <div class="form-group">
+        <label for=""><%= t('camaleon_cms.admin.settings.filesystem_max_file_size', default: 'Max. File Size to Upload [MB]') %></label><br>
+        <%= number_field :options, :filesystem_max_size, :class => "form-control number", :value => @site.get_option('filesystem_max_size', 100), placeholder: '100' %>
+    </div>
+    <div class="form-group">
+        <label for=""><%= t('camaleon_cms.admin.settings.filesystem_thumb_size', default: 'Thumbnail dimension [100x100]') %></label><br>
+        <%= text_field :options, :filesystem_thumb_size, :class => "form-control", :value => @site.get_option('filesystem_thumb_size', '100x100'), placeholder: '100x100' %>
+    </div>
+</div>

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

@@ -152,11 +152,10 @@
         </div>
     <% end %>
 
-    <% if @field_config[:options][:default_value] %>
-
+    <% if @field_config[:options].key?(:default_value) %>
         <div class="form-group input-group-sm">
           <label><%= t('camaleon_cms.admin.table.default_value')%></label>
-        <%= text_field(:field_options, 'default_value', index: @index, value: @item_options_value[:default_value], class: 'form-control') %>
+        <%= text_field(:field_options, 'default_value', index: @index, value: @item_options_value[:default_value] || @field_config[:options][:default_value], class: 'form-control') %>
         </div>
     <% end %>
 

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

@@ -24,14 +24,14 @@
     %>
         <div class="item-custom-field c-field-<%= @field.options[:field_key] %>">
             <label for="input-<%= @rand %>">
-                <%= @field.the_name %>
+                <%= @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.the_description %></small></p>
+                <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">

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="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 %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %> />
   <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/_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">
+<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="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="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? %> />
     <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="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? %>/>
+    <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? %>/>
     <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/_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="col-md-4">
-        <input type="text" name="<%= @field_name %>[<%= @field.slug %>][values][][attr]" placeholder="<%= t('camaleon_cms.admin.table.attribute') %>" class="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.options[:translate].to_s.to_bool %> 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? %>/>
     </div>
     <div class="col-md-8">
-        <input type="text" name="<%= @field_name %>[<%= @field.slug %>][values][][value]"  placeholder="<%= t('camaleon_cms.admin.table.value') %>" class="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.options[:translate].to_s.to_bool %> form-control input-value" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %>/>
     </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 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 %>" <%= "readonly" if @field.options[:readonly].present? %> <%= "disabled" if @field.options[:disabled].present? %> />
   <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>