camaleon_cms 2.3.3 → 2.3.4

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

@@ -5,174 +5,175 @@
    @index = "#{@item_id}_#{Time.now.to_i}_#{rand(999...99999)}"
    @field_config = cama_custom_field_elements[@key.to_sym]
    colors = ['primary','success','warning','colorful','info','danger']
+   unless @field_config.nil?
 %>
-
-<div id="panel-field<%= @index %>" class="panel panel-default panel-<%= colors.sample %> panel-item <%= 'panel-toggled' if @item_options_value[:panel_hidden].to_s.to_bool  %>">
-  <div class="panel-heading">
-    <h3 class="panel-title"><span class="span-title"><%= @item_value[:name]? @item_value[:name] : "#{t('camaleon_cms.admin.settings.untitled')}
-    #{@field_config[:label]}" %>
-    </span> - <%= @field_config[:label] %>
-        <%= t('camaleon_cms.admin.settings.field') %></h3>
-    <ul class="panel-controls">
-      <li><a class="panel-sortable" href="#" title="<%= t('camaleon_cms.admin.button.sortable')%>" data-toggle="tooltip" data-placement="left"><span class="fa fa-arrows"></span></a></li>
-      <li><a class="panel-delete" href="#" title="<%= t('camaleon_cms.admin.button.delete')%>" data-toggle="tooltip" data-placement="left"><span class="fa fa-times text-danger"></span></a></li>
-      <li><a class="panel-collapse" href="#"><span class="fa fa-angle-down"></span></a></li>
-    </ul>
-  </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]}") %>
-    </div>
-    <div class="form-group input-group-sm">
-      <label for=""><%= t('camaleon_cms.admin.table.slug') %></label><br>
-      <%= text_field(:fields, :slug, class: "form-control text-slug", index: @index, value: @item_value[:slug]) %>
-    </div>
-    <div class="form-group">
-      <label for=""><%= t('camaleon_cms.admin.table.description') %></label><br>
-      <%= text_area(:fields, :description, class: "form-control", index: @index, value: @item_value[:description]) %>
-    </div>
-    <%
-       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'
-                    html += "<div class='form-group'> <select id=\"field_options_#{@index}_#{input[:key]}\" name=\"field_options[#{@index}][#{input[:key]}]\" class='form-control'>"
-                    input[:values].each do |val|
-                      html += "<option value='#{val[:value]}' #{"selected" if @item_options_value.present? ? (val[:value] == @item_options_value[input[:key].to_sym]) : false}>#{val[:label]}</option>"
-                    end
-                    html += "</select> </div>"
-                  when 'radio'
-                    input[:values].each do |val|
-                      html += "<div class='radio'><label>#{radio_button(:field_options, input[:key],val[:value], index: @index, checked: @item_options_value.present? ? (val[:value] == @item_options_value[input[:key].to_sym]) : (val[:value] == '0')) } #{val[:label]}</label></div>"
-                    end
-                  when 'checkbox'
-                    input[:values].each do |val|
-                      html += "<div class='checkbox'><label><input type=\"checkbox\" id=\"field_options_#{@index}_#{input[:key]}\" name=\"field_options[#{@index}][#{input[:key]}][]\" #{"checked" if @item_options_value[input[:key].to_sym].to_s.include?(val[:value].to_s) rescue false} value=\"#{val[:value]}\"> #{val[:label]} </label></div>"
+    <div id="panel-field<%= @index %>" class="panel panel-default panel-<%= colors.sample %> panel-item <%= 'panel-toggled' if @item_options_value[:panel_hidden].to_s.to_bool  %>">
+      <div class="panel-heading">
+        <h3 class="panel-title"><span class="span-title"><%= @item_value[:name]? @item_value[:name] : "#{t('camaleon_cms.admin.settings.untitled')}
+        #{@field_config[:label]}" %>
+        </span> - <%= @field_config[:label] %>
+            <%= t('camaleon_cms.admin.settings.field') %></h3>
+        <ul class="panel-controls">
+          <li><a class="panel-sortable" href="#" title="<%= t('camaleon_cms.admin.button.sortable')%>" data-toggle="tooltip" data-placement="left"><span class="fa fa-arrows"></span></a></li>
+          <li><a class="panel-delete" href="#" title="<%= t('camaleon_cms.admin.button.delete')%>" data-toggle="tooltip" data-placement="left"><span class="fa fa-times text-danger"></span></a></li>
+          <li><a class="panel-collapse" href="#"><span class="fa fa-angle-down"></span></a></li>
+        </ul>
+      </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]}") %>
+        </div>
+        <div class="form-group input-group-sm">
+          <label for=""><%= t('camaleon_cms.admin.table.slug') %></label><br>
+          <%= text_field(:fields, :slug, class: "form-control text-slug", index: @index, value: @item_value[:slug]) %>
+        </div>
+        <div class="form-group">
+          <label for=""><%= t('camaleon_cms.admin.table.description') %></label><br>
+          <%= text_area(:fields, :description, class: "form-control", index: @index, value: @item_value[:description]) %>
+        </div>
+        <%
+           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'
+                        html += "<div class='form-group'> <select id=\"field_options_#{@index}_#{input[:key]}\" name=\"field_options[#{@index}][#{input[:key]}]\" class='form-control'>"
+                        input[:values].each do |val|
+                          html += "<option value='#{val[:value]}' #{"selected" if @item_options_value.present? ? (val[:value] == @item_options_value[input[:key].to_sym]) : false}>#{val[:label]}</option>"
+                        end
+                        html += "</select> </div>"
+                      when 'radio'
+                        input[:values].each do |val|
+                          html += "<div class='radio'><label>#{radio_button(:field_options, input[:key],val[:value], index: @index, checked: @item_options_value.present? ? (val[:value] == @item_options_value[input[:key].to_sym]) : (val[:value] == '0')) } #{val[:label]}</label></div>"
+                        end
+                      when 'checkbox'
+                        input[:values].each do |val|
+                          html += "<div class='checkbox'><label><input type=\"checkbox\" id=\"field_options_#{@index}_#{input[:key]}\" name=\"field_options[#{@index}][#{input[:key]}][]\" #{"checked" if @item_options_value[input[:key].to_sym].to_s.include?(val[:value].to_s) rescue false} value=\"#{val[:value]}\"> #{val[:label]} </label></div>"
+                        end
+                      when 'text_area'
+                        html += "#{text_area(:field_options, input[:key], index: @index , value: @item_options_value[input[:key].to_sym] || '', class: 'form-control') }"
+                      else
+                        html += "#{text_field(:field_options, input[:key], index: @index , value: @item_options_value[input[:key].to_sym] || '', class: 'form-control') }"
                     end
-                  when 'text_area'
-                    html += "#{text_area(:field_options, input[:key], index: @index , value: @item_options_value[input[:key].to_sym] || '', class: 'form-control') }"
-                  else
-                    html += "#{text_field(:field_options, input[:key], index: @index , value: @item_options_value[input[:key].to_sym] || '', class: 'form-control') }"
+                    html += "<small>#{input[:description]}</small>" if input[:description].present?
+                    html += '</div>'
                 end
-                html += "<small>#{input[:description]}</small>" if input[:description].present?
-                html += '</div>'
             end
-        end
-    %>
-    <div>
-      <%= raw html %>
-    </div>
-    <% if @field_config[:options][:multiple_options].present? %>
-        <div class="form-group">
-          <strong><%= @field_config[:options][:multiple_options][:label] %></strong>
-            <div class="sortable-fields-options">
-              <div id="clone<%= @index %>" class="hidden">
-                    <div class="actions">
-                      <i class="fa fa-arrows"></i> <i class="fa fa-times text-danger"></i>
-                    </div>
-                    <div class="inputs input-group input-group-sm">
-                      <input type="text" name="field_options[<%= @index %>][multiple_options][][title]" placeholder="Option title" class="form-control option-name" style="width: 160px;">
-                      <input type="text" name="field_options[<%= @index %>][multiple_options][][value]" placeholder="Value" class="form-control option-value" style="width: 120px;">
-                      <% if @field_config[:options][:multiple_options][:default].present? %>
-                          <div class="<%= @field_config[:options][:multiple_options][:default] %>" style="float: right; width: auto;">
-                            <label><input type="<%= @field_config[:options][:multiple_options][:default] %>" class="option-default" value="1" name="field_options[<%= @index %>][multiple_options][][default]"> <%= t('camaleon_cms.admin.table.default') %> </label>
-                          </div>
-                      <% end %>
-                    </div>
-              </div>
+        %>
+        <div>
+          <%= raw html %>
+        </div>
+        <% if @field_config[:options][:multiple_options].present? %>
+            <div class="form-group">
+              <strong><%= @field_config[:options][:multiple_options][:label] %></strong>
+                <div class="sortable-fields-options">
+                  <div id="clone<%= @index %>" class="hidden">
+                        <div class="actions">
+                          <i class="fa fa-arrows"></i> <i class="fa fa-times text-danger"></i>
+                        </div>
+                        <div class="inputs input-group input-group-sm">
+                          <input type="text" name="field_options[<%= @index %>][multiple_options][][title]" placeholder="Option title" class="form-control option-name" style="width: 160px;">
+                          <input type="text" name="field_options[<%= @index %>][multiple_options][][value]" placeholder="Value" class="form-control option-value" style="width: 120px;">
+                          <% if @field_config[:options][:multiple_options][:default].present? %>
+                              <div class="<%= @field_config[:options][:multiple_options][:default] %>" style="float: right; width: auto;">
+                                <label><input type="<%= @field_config[:options][:multiple_options][:default] %>" class="option-default" value="1" name="field_options[<%= @index %>][multiple_options][][default]"> <%= t('camaleon_cms.admin.table.default') %> </label>
+                              </div>
+                          <% end %>
+                        </div>
+                  </div>
+
 
+                  <ul id="sortable<%= @index %>" >
 
-              <ul id="sortable<%= @index %>" >
+                  </ul>
+                  <% if @field_config[:options][:multiple_options][:use_not_default].present?  %>
+                      <div class="radio_none_option">
+                        <label><input type="radio" class="option-default" value="none" name="field_options[<%= @index %>][multiple_options][][default]"> <%= t('camaleon_cms.admin.table.no_default') %> </label>
+                      </div>
+                  <% end %>
 
-              </ul>
-              <% if @field_config[:options][:multiple_options][:use_not_default].present?  %>
-                  <div class="radio_none_option">
-                    <label><input type="radio" class="option-default" value="none" name="field_options[<%= @index %>][multiple_options][][default]"> <%= t('camaleon_cms.admin.table.no_default') %> </label>
+                  <div style="margin-top: 4px">
+                    <a id="add_btn<%= @index %>" href="#" class="btn btn-default btn-sm"> <i class="fa fa-plus"></i> <%= t('camaleon_cms.admin.button.add_option')%></a>
                   </div>
-              <% end %>
+                  <script>
 
-              <div style="margin-top: 4px">
-                <a id="add_btn<%= @index %>" href="#" class="btn btn-default btn-sm"> <i class="fa fa-plus"></i> <%= t('camaleon_cms.admin.button.add_option')%></a>
-              </div>
-              <script>
+                    var function_init_options<%= @index %> = function(){
+                        var that = this;
+                        var $panel = $( "#panel-field<%= @index %>" );
+                        var $sortable = $( "#sortable<%= @index %>" );
+                        var option_default_html = $('#clone<%= @index %>').html();
+                        var option_default_values = <%= raw(@item_options_value[:multiple_options].present? ? @item_options_value[:multiple_options].to_json : '[]') %>
+                        function add_option_default(values){
+                            if(!values) values = {}
+                            values = $.extend({title: I18n("msg.option_title"), value: '1',default: false},values)
+                            var $option = $('<li>'+option_default_html+'</li>');
+                            $option.find('.option-name').val(values.title);
+                            $option.find('.option-value').val(values.value);
+                            if(values.default && values.default != 'none') $option.find('.option-default').attr('checked','checked').prop('checked',true)
+                            if(values.default && values.default == 'none') $panel.find('.radio_none_option input').attr('checked','checked').prop('checked',true)
 
-                var function_init_options<%= @index %> = function(){
-                    var that = this;
-                    var $panel = $( "#panel-field<%= @index %>" );
-                    var $sortable = $( "#sortable<%= @index %>" );
-                    var option_default_html = $('#clone<%= @index %>').html();
-                    var option_default_values = <%= raw(@item_options_value[:multiple_options].present? ? @item_options_value[:multiple_options].to_json : '[]') %>
-                    function add_option_default(values){
-                        if(!values) values = {}
-                        values = $.extend({title: I18n("msg.option_title"), value: '1',default: false},values)
-                        var $option = $('<li>'+option_default_html+'</li>');
-                        $option.find('.option-name').val(values.title);
-                        $option.find('.option-value').val(values.value);
-                        if(values.default && values.default != 'none') $option.find('.option-default').attr('checked','checked').prop('checked',true)
-                        if(values.default && values.default == 'none') $panel.find('.radio_none_option input').attr('checked','checked').prop('checked',true)
+                            $sortable.append($option)
+                        };
 
-                        $sortable.append($option)
-                    };
+                        if(option_default_values.length > 0){
+                            $.each(option_default_values, function(i, value){
+                                add_option_default(value);
+                            })
+                        }else{
+                            add_option_default({default: true});
+                        }
 
-                    if(option_default_values.length > 0){
-                        $.each(option_default_values, function(i, value){
-                            add_option_default(value);
+                        $('#add_btn<%= @index %>').click(function(){
+                            add_option_default({
+                                value: $sortable.children('li').size() + 1
+                            });
+                            return false;
+                        });
+                        $sortable.sortable({
+                            handle: ".fa-arrows"
+                        });
+                        $sortable.on('click','.fa-times', function(){
+                            $(this).closest('li').remove()
+                            return false;
                         })
-                    }else{
-                        add_option_default({default: true});
+                        $('#clone<%= @index %>').remove();
                     }
-
-                    $('#add_btn<%= @index %>').click(function(){
-                        add_option_default({
-                            value: $sortable.children('li').size() + 1
-                        });
-                        return false;
-                    });
-                    $sortable.sortable({
-                        handle: ".fa-arrows"
-                    });
-                    $sortable.on('click','.fa-times', function(){
-                        $(this).closest('li').remove()
-                        return false;
-                    })
-                    $('#clone<%= @index %>').remove();
-                }
-                jQuery(function_init_options<%= @index %>);
-              </script>
+                    jQuery(function_init_options<%= @index %>);
+                  </script>
+                </div>
             </div>
-        </div>
-    <% end %>
+        <% end %>
 
-    <% 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] || @field_config[:options][:default_value], class: 'form-control') %>
-        </div>
-    <% end %>
+        <% 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] || @field_config[:options][:default_value], class: 'form-control') %>
+            </div>
+        <% end %>
 
-    <% if @field_config[:options][:multiple] || @field_config[:options][:required] || @field_config[:options][:translate] %>
-        <strong><%= t('camaleon_cms.admin.table.options_field')%></strong>
-    <% end %>
-    <% if @field_config[:options][:multiple] %>
-        <div class="checkbox"><label><%= check_box(:field_options, 'multiple', index: @index, checked: @item_options_value[:multiple].to_s.to_bool) %> <%= t('camaleon_cms.admin.table.multiple_field_int') %> </label> <%= raw cama_html_tooltip(t('camaleon_cms.admin.table.multiple_field_int'),'right')%></div>
-    <% end %>
-    <% if @field_config[:options][:required] %>
-        <div class="checkbox"><label><%= check_box(:field_options, 'required', index: @index, checked: @item_options_value[:required].to_s.to_bool) %> <%= t('camaleon_cms.admin.table.required_field_int') %> </label> <%= raw cama_html_tooltip(t('camaleon_cms.admin.table.required_field_int'),'right')%></div>
-    <% end %>
-    <% if @field_config[:options][:translate] %>
-        <div class="checkbox"><label><%= check_box(:field_options, 'translate', index: @index, checked: @item_options_value[:translate].to_s.to_bool) %> <%= t('camaleon_cms.admin.table.translate_field_int') %> </label> <%= raw cama_html_tooltip(t('camaleon_cms.admin.table.translate_field_int'),'right')%></div>
-    <% end %>
-    <% if false && @field_config[:options][:show_frontend] %>
-        <div class="checkbox"><label><%= check_box(:field_options, 'show_frontend', index: @index, checked: @item_options_value[:show_frontend].to_s.to_bool) %> <%= t('camaleon_cms.admin.table.show_in_frontend') %> </label> <%= raw cama_html_tooltip( t('camaleon_cms.admin.table.show_in_frontend'),'right')%></div>
-    <% end %>
-  </div>
-</div>
+        <% if @field_config[:options][:multiple] || @field_config[:options][:required] || @field_config[:options][:translate] %>
+            <strong><%= t('camaleon_cms.admin.table.options_field')%></strong>
+        <% end %>
+        <% if @field_config[:options][:multiple] %>
+            <div class="checkbox"><label><%= check_box(:field_options, 'multiple', index: @index, checked: @item_options_value[:multiple].to_s.to_bool) %> <%= t('camaleon_cms.admin.table.multiple_field_int') %> </label> <%= raw cama_html_tooltip(t('camaleon_cms.admin.table.multiple_field_int'),'right')%></div>
+        <% end %>
+        <% if @field_config[:options][:required] %>
+            <div class="checkbox"><label><%= check_box(:field_options, 'required', index: @index, checked: @item_options_value[:required].to_s.to_bool) %> <%= t('camaleon_cms.admin.table.required_field_int') %> </label> <%= raw cama_html_tooltip(t('camaleon_cms.admin.table.required_field_int'),'right')%></div>
+        <% end %>
+        <% if @field_config[:options][:translate] %>
+            <div class="checkbox"><label><%= check_box(:field_options, 'translate', index: @index, checked: @item_options_value[:translate].to_s.to_bool) %> <%= t('camaleon_cms.admin.table.translate_field_int') %> </label> <%= raw cama_html_tooltip(t('camaleon_cms.admin.table.translate_field_int'),'right')%></div>
+        <% end %>
+        <% if false && @field_config[:options][:show_frontend] %>
+            <div class="checkbox"><label><%= check_box(:field_options, 'show_frontend', index: @index, checked: @item_options_value[:show_frontend].to_s.to_bool) %> <%= t('camaleon_cms.admin.table.show_in_frontend') %> </label> <%= raw cama_html_tooltip( t('camaleon_cms.admin.table.show_in_frontend'),'right')%></div>
+        <% end %>
+      </div>
+    </div>
+<% end %>

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

@@ -30,7 +30,7 @@
                                 <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) %>
+                                <%= render(field.get_option('render') || (cama_custom_field_elements[field.get_option('field_key').to_sym][:render] rescue nil) || "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>
                         </div>
                     <% end %>

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-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 class="checkbox"><label><input type="checkbox" value="1" name="<%= field_name %>[<%= field.slug %>][values][]">  <%= field.the_name %> </label></div>
 </div>

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

@@ -1,4 +1,4 @@
-<div class="group-input-fields-content" data-callback-render="custom_field_checkboxs_val">
+<div class="group-input-fields-content cama_skip_cf_rename_multiple" 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 %>

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

@@ -4,12 +4,9 @@
     <% if field.options[:post_types].present? %>
     <% (field.options[:post_types].include?("all") ? current_site.post_types : current_site.post_types.where(id: field.options[:post_types])).each do |pt| %>
         <optgroup label="<%= pt.name %>">
-        <%
-        pt.posts.public_posts.each do |post|
-            post = post.decorate
-        %>
+        <% pt.posts.public_posts.each do |post| post = post.decorate %>
             <option value="<%= post.id %>"><%= post.the_title %></option>
-        <%  end %>
+        <% end %>
         </optgroup>
     <%  end %>
     <% end %>

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

@@ -61,7 +61,7 @@
                                     <option value="<%= value %>" data-help="<%= t('camaleon_cms.admin.settings.tooltip.add_custom_field_users') %>"><%= t('camaleon_cms.admin.sidebar.users') %></option>
                                     <% value = "Site,#{current_site.id}" %>
                                     <option value="<%= value %>" data-help="<%= t('camaleon_cms.admin.settings.tooltip.add_custom_field_sites') %>"><%= t('camaleon_cms.admin.sidebar.site_settings') %></option>
-                                    <% @_extra_models_for_fields.each do |model| %>
+                                    <% f_args={models: @_extra_models_for_fields || []}; hooks_run('custom_field_custom_models', f_args); f_args[:models].each do |model| %>
                                         <% value = "#{model.name},#{current_site.id}" %>
                                         <option value="<%= value %>" data-help=""><%= model.name %></option><%= model.name %>
                                     <% end %>

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

@@ -95,12 +95,6 @@
                         <input name="meta[has_featured]" type="hidden" value="false"/>
                         <label class="check0"><input name="meta[has_featured]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_featured', false) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.permit_is_featured', default: 'Permit Featured Articles') %></label>
                     </div>
-                    <div class="form-group">
-                        <input name="meta[has_picture]" type="hidden" value="false"/>
-                        <label class="check0"><input name="meta[has_picture]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_picture', true) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_picture') %>
-                        </label>
-                        <%= raw cama_html_tooltip("#{t('camaleon_cms.admin.post_type.tooltip.permission_add_image_presentation')}", 'right') %>
-                    </div>
                     <div class="form-group">
                         <input name="meta[has_keywords]" type="hidden" value="false"/>
                         <label class="check0"><input name="meta[has_keywords]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_keywords', true) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_keywords') %></label>
@@ -111,6 +105,29 @@
                         <label class="check0"><input name="meta[has_parent_structure]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.manage_hierarchy? %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_parent_structure', default: 'Manage page hierarchy') %></label>
                         <%= raw cama_html_tooltip("#{t('camaleon_cms.admin.post_type.tooltip.permission_to_support_parent_structure', default: "Permit to posts indicate the parent page")}", 'right') %>
                     </div>
+                    <div class="form-group">
+                        <input name="meta[has_picture]" type="hidden" value="false"/>
+                        <label class="check0"><input name="meta[has_picture]" type="checkbox" class="icheckbox0" value="true" <%= 'checked' if @post_type.get_option('has_picture', true) %>/>&nbsp;   <%= t('camaleon_cms.admin.table.manage_picture') %>
+                        </label>
+                        <%= raw cama_html_tooltip("#{t('camaleon_cms.admin.post_type.tooltip.permission_add_image_presentation')}", 'right') %>
+                    </div>
+                    <div class="picture_settings" style="margin-left: 30px">
+                        <div class="form-group">
+                            <label><%= cama_t('camaleon_cms.admin.custom_field.fields.image_dimension') %></label>
+                            <%= raw cama_html_tooltip("#{cama_t('camaleon_cms.admin.custom_field.fields.image_dimension_descr')}", 'right') %>
+                            <%= text_field_tag 'meta[posts_image_dimension]', @post_type.get_option('posts_image_dimension'), class: 'form-control' %>
+                        </div>
+                        <div class="form-group">
+                            <label><%= cama_t('camaleon_cms.admin.custom_field.fields.image_versions') %></label>
+                            <%= raw cama_html_tooltip("#{cama_t('camaleon_cms.admin.custom_field.fields.image_versions_descr')}", 'right') %>
+                            <%= text_field_tag 'meta[posts_thumb_versions]', @post_type.get_option('posts_thumb_versions'), class: 'form-control' %>
+                        </div>
+                        <div class="form-group">
+                            <label><%= cama_t('camaleon_cms.admin.custom_field.fields.image_thumb') %></label>
+                            <%= raw cama_html_tooltip("#{cama_t('camaleon_cms.admin.custom_field.fields.image_thumb_descr', d: current_site.get_option('filesystem_thumb_size', '100x100'))}", 'right') %>
+                            <%= text_field_tag 'meta[posts_thumb_size]', @post_type.get_option('posts_thumb_size'), class: 'form-control' %>
+                        </div>
+                    </div>
                 </div>
                 <div role="tabpanel" class="tab-pane" id="post_type_setting_front">
                     <div class="form-group">
@@ -141,15 +158,6 @@
     </div>
 <% end %>
 <script>
-    jQuery(function($){
-        var form = $("#post_type_form");
-        form.find('.unput_upload').input_upload();
-        form.find("[name='meta[has_parent_structure]']").change(function(){ // permit hierarchy route only for post types enabled "Manage page hierarchy"
-            var item = form.find("#meta_contents_route_format_hierarchy_post");
-            item.parent().siblings().find("input").prop("disabled", $(this).is(":checked"));
-            if($(this).is(":checked")) item.prop("checked", true).prop("disabled", false);
-            else item.prop("disabled", true)
-        }).trigger("change");
-    });
+    jQuery(function($){ cama_init_posttype_form(); });
 </script>
 

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

@@ -13,7 +13,7 @@
 
     <div class="row">
         <%= form_for @user, as: "user", url:{action: @user.new_record? ? :create : :update, id: @user.id}, html:{class: 'validate-user  form-horizontal cama_ajax_request', id: "user_form"} do |f| %>
-            <div class="col-md-3 col-sm-4">
+            <div class="col-md-3">
                 <div class="panel panel-default">
                     <div class="panel-body">
                         <%= render partial: 'layouts/camaleon_cms/admin/form_error', locals: {data: @user} %>
@@ -69,7 +69,7 @@
                 </div>
             </div>
 
-            <div class="col-md-6 col-sm-8">
+            <div class="col-md-6">
                 <div class="panel panel-default">
                     <div class="panel-body form-group-separated">
                         <div class="form-group">