camaleon_cms 2.1.2.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4b91e4d676cfa8c8e63bbbdc8babcac88ebcba4
-  data.tar.gz: 5f4faf55c0c1328f0b30142dae585924641e91d7
+  metadata.gz: 7a8d04f6b677b60b055717333082cc33f4a5eb23
+  data.tar.gz: cb1b1292033c55314017d3feefd1f35d4f73a779
 SHA512:
-  metadata.gz: 2d1337afdf804b923538aa6edad015c4b427d4d5581513476ecf0144ba12a61f1b47781cbbcd956941d0c340a94bfed281569620a7b523c121e7d680299fa4fe
-  data.tar.gz: fcbdf1271ad46b913a7d2c773004a09f2962aadaf15ad34871a10197783e29651a2684ec3dcfbf20904ece1864d21e9a1b2f46b7a2decb1e7cd60cc9bcea2219
+  metadata.gz: cadc1f31405e3cc1fe1aa0ccd6263a0dc0a812a476cb47f7889c86baa081f6f740e27eead856a059e305b988ca47b38dff9c3d3286c8766acacac64229896978
+  data.tar.gz: 5a7a78728a449ce23abf975786a1d2797747bbd2c5998f741c40afa248c51552905e7ccaadd0781ab22c873dff947a5af97e8d00728e6fb6d3ce4fa16e306e64

data/README.md

@@ -28,7 +28,7 @@
 * Add the gem in your Gemfile
 
   ```
-  gem "camaleon_cms",  '>=2.1.2.0' # Stable versions 2.1.2.0,2.1.1.4, 2.1.1, 2.1.0
+  gem "camaleon_cms",  '>=2.2.0' # Stable versions 2.1.2.0, 2.1.1.4, 2.1.1, 2.1.0
   # gem "camaleon_cms", github: 'owen2345/camaleon-cms' # current development version
   ```
 * Install required Gem and dependencies
@@ -176,15 +176,18 @@ See more here: http://camaleon.tuzitio.com/version-history.html
   - Add this gem into your Gemfile
 
   ```
-  gem 'rspec-rails'
-  gem 'capybara'
+  group :development, :test do
+    gem 'rspec-rails', '~> 3.4'
+    gem 'capybara'
+    gem 'selenium-webdriver'
+  end
   ```
   - In your console
 
   ```
   rails generate rspec:install
   ```
-  - Add this to spec/rails_helper.rb (Insert before line of "RSpec.configure do |config|")
+  - Add this to spec/rails_helper.rb (Insert before line of "RSpec.configure do |config|") and change use_transactional_fixtures into false
 
   ```
   Dir[File.join($camaleon_engine_dir, 'spec/support/**/*.rb')].each { |f| require f }

data/app/apps/plugins/attack/attack_helper.rb

@@ -34,6 +34,9 @@ module Plugins::Attack::AttackHelper
         t.datetime "created_at"
       end
     end
+    CamaleonCms::Site.class_eval do
+      has_many :attack, class_name: "Plugins::Attack::Models::Attack"
+    end
   end
 
   # here all actions on going to inactive

data/app/apps/plugins/attack/config/custom_models.rb

@@ -1,4 +1,6 @@
 # custom class for site
-CamaleonCms::Site.class_eval do
-  has_many :attack, class_name: "Plugins::Attack::Models::Attack"
+Rails.application.config.to_prepare do
+  CamaleonCms::Site.class_eval do
+    has_many :attack, class_name: "Plugins::Attack::Models::Attack"
+  end
 end

data/app/apps/plugins/attack/config/locales/translation.yml

@@ -16,6 +16,25 @@
         settings_saved: 'Settings saved!'
       settings: 'Settings'
 
+pt-BR:
+  plugin:
+    attack:
+      title: 'Ataque'
+      attack_security: 'Segurança contra ataques'
+      form:
+        in: 'em'
+        seconds: 'Segundos'
+        minutes: 'Minutos'
+        type_max_requests_time: 'Requisições %{type} máximas'
+        type_time_requests_seconds: 'Requisições %{type} por tipo [segundos]'
+        ban_time_minutes: 'Tempo de expulsão'
+        ban_messages: 'Mensagem de expulsão'
+        request_limit_exceeded: 'Número de requisições excedeu o limite!'
+      messages:
+        settings_saved: 'Configurações salvas com sucesso!'
+      settings: 'Configurações'
+
+
 
 es:
   plugin:

data/app/apps/plugins/attack/models/attack.rb

@@ -9,4 +9,4 @@
 class Plugins::Attack::Models::Attack < ActiveRecord::Base
   attr_accessible :path, :browser_key
   belongs_to :site
-end
+end

data/app/apps/plugins/front_cache/config/initializer.rb

@@ -1,3 +1,5 @@
-CamaleonCms::Site.all.each do |site|
-  site.set_option("refresh_cache", true)
+if(CamaleonCms::Site.any? rescue false)
+  CamaleonCms::Site.all.each do |site|
+    site.set_option("refresh_cache", true)
+  end
 end

data/app/apps/plugins/front_cache/config/locales/translation.yml

@@ -55,3 +55,22 @@ nl:
         settings_saved: 'instellingen opgeslagen!'
         cache_destroyed: 'Cache opgeschoond!'
       settings: 'instellingen'
+
+pt-BR:
+  plugin:
+    front_cache:
+      button:
+        add_new_path: 'Adicionar novo caminho'
+      custom_url_paths: 'Caminhos de URL customizados'
+      clean_cache: 'Limpar Cache'
+      title: 'Cache de Páginas de Front End'
+      home_page: 'Página Inicial'
+      pages: 'Páginas'
+      pages_of: 'Páginas de'
+      skip_cache_pages: 'Pular Cache de Páginas'
+      message:
+        please_checkpost_need_cache: 'Por favor cheque todos os posts ou o tipo do post que você precisa cachear.'
+        enabled_cache_inner_content_logged_users: 'Permitir cache para conteúdo interno de usuários logados'
+        settings_saved: 'Configurações Salvas!'
+        cache_destroyed: 'Cache destruído!'
+      settings: 'Configurações'

data/app/apps/themes/camaleon_first/main_helper.rb

@@ -12,9 +12,7 @@ module Themes::CamaleonFirst::MainHelper
   end
 
   def camaleon_first_settings(theme)
-    # here your code on save settings for current site, by default params[:theme_fields] is auto saved into theme
-    # Also, you can save your extra values added in admin/settings.html.erb
-    # sample: theme.set_meta("my_key", params[:my_value])
+
   end
 
   # return a list of options for "Recent items from " on site settings -> theme settings

data/app/apps/themes/default/views/admin/settings.html.erb

@@ -1 +0,0 @@
-<%= render partial: "camaleon_cms/admin/settings/custom_fields/render", locals: {record: current_theme, field_groups: current_theme.get_field_groups, fields_name: "theme_fields"} %>

data/app/apps/themes/default/views/layouts/index.html.erb

@@ -33,9 +33,9 @@
                                 <li class="dropdown">
                                     <a class="dropdown-toggle" href="#"><img src="<%= cama_current_user.decorate.the_avatar %>" style="max-width: 24px; border-radius: 50%" alt=""/> <%= cama_current_user.username %></a>
                                     <ul class="dropdown-menu">
-                                        <li><a href="<%= cama_admin_dashboard_path %>">Dashboard</a></li>
-                                        <li><a href="<%= cama_admin_profile_path %>">Profile</a></li>
-                                        <li><a href="<%= cama_admin_logout_path %>">Logout</a></li>
+                                        <li><a href="<%= cama_admin_dashboard_path %>"><%= I18n.t('camaleon_cms.common.dashboard') %></a></li>
+                                        <li><a href="<%= cama_admin_profile_path %>"><%= I18n.t('camaleon_cms.common.profile') %></a></li>
+                                        <li><a href="<%= cama_admin_logout_path %>"><%= I18n.t('camaleon_cms.common.logout') %></a></li>
                                     </ul>
                                 </li>
                             <% else %>
@@ -43,8 +43,8 @@
                                 <li class="dropdown">
                                     <a id="login-user" class="dropdown-toggle" href="#">Login / Register</a>
                                     <ul class="dropdown-menu">
-                                        <li><a href="<%= cama_admin_login_path %>">Login</a></li>
-                                        <li><a href="<%= cama_admin_register_path %>">Register</a></li>
+                                        <li><a href="<%= cama_admin_login_path %>"><%= I18n.t('camaleon_cms.common.login') %></a></li>
+                                        <li><a href="<%= cama_admin_register_path %>"><%= I18n.t('camaleon_cms.common.register') %></a></li>
                                     </ul>
                                 </li>
                             <% end %>

data/app/apps/themes/new/assets/css/main.css

@@ -8,7 +8,7 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require ./bootstrap/bootstrap.min.css
+ *= require camaleon_cms/bootstrap.min
  *= require font-awesome
  *= require ./styles
  */

data/app/apps/themes/new/assets/js/main.js

@@ -11,4 +11,4 @@
 // about supported directives.
 //
 //= require jquery
-//= require ./plugins/bootstrap/bootstrap.min.js
+//= require camaleon_cms/bootstrap.min

data/app/apps/themes/new/views/admin/settings.html.erb

@@ -1 +1 @@
-<%= render partial: "camaleon_cms/admin/settings/custom_fields/render", locals: {record: current_theme, field_groups: current_theme.get_field_groups, fields_name: "theme_fields"} %>
+<!--Here my custom settings for current theme-->

data/app/assets/javascripts/camaleon_cms/admin/_custom_fields.js

@@ -1,56 +1,101 @@
-function build_custom_field(values, multiple, field_key, rand, default_value) {
-    var $content = $("#content-field-" + rand);
-    var $sortable = $("#sortable-" + rand);
-    var callback = $content.find('.clone-field .group-input-fields-content').attr('data-callback-function');
-    var callback_set_value = $content.find('.clone-field .group-input-fields-content').attr('data-callback-set-value');
-    var $field = $('<li>' + $content.find('.clone-field').html() + '</li>');
-    var field_counter = 0;
-
-    function add_field(value) {
-        var field = $field.clone(true);
+// build custom field groups with values recovered from DB received in field_values
+function build_custom_field_group(field_values, group_id, fields_data, is_repeat){
+    if(field_values.length == 0) field_values = [{}];
+    var group_panel = $('#custom_field_group_'+group_id);
+    var group_panel_body = group_panel.find(' > .panel-body');
+    var group_clone = group_panel_body.children('.custom_sortable_grouped').clone().removeClass('hidden');
+    var field_group_counter = 0;
+    group_panel_body.children('.custom_sortable_grouped').remove();
 
-        var input = field.find('.input-value');
-        if(input.length > 0) input.attr('name', input.attr('name').replace('[]', '['+field_counter+']'))
-        input = field.find('.input-attr');
-        if(input.length > 0) input.attr('name', input.attr('name').replace('[]', '['+field_counter+']'))
+    function add_group(values){
+        var clone = group_clone.clone();
+        clone.find('input, textarea, select').not('.code_style').each(function(){ $(this).attr('name', $(this).attr('name').replace('field_options', 'field_options['+field_group_counter+']')) });
+        group_panel_body.append(clone);
+        group_panel.trigger('update_custom_group_number');
+        for(var k in fields_data){
+            cama_build_custom_field(clone.find('.content-field-'+fields_data[k].id), fields_data[k], values[k]);
+        }
+        if(field_group_counter == 0) clone.children('.header-field-grouped').find('.del').remove();
+        field_group_counter ++;
+        return false;
+    }
 
-        if (value) field.find('.input-value').val(value);
-        $sortable.append(field);
-        if(callback) eval(callback + "(field, value);")
-        if(callback_set_value) eval(callback_set_value + "(field, value);")
-        field_counter ++;
+    if(is_repeat){
+        group_panel_body.sortable({ handle: ".move.fa-arrows", items: ' > .custom_sortable_grouped',
+            update: function(){ group_panel.trigger('update_custom_group_number'); },
+            start: function (e, ui) { // fix tinymce
+                $(ui.item).find('.mce-panel').each(function () {
+                    tinymce.execCommand('mceRemoveEditor', false, $(this).next().addClass('cama_restore_editor').attr('id'));
+                });
+            },
+            stop: function (e, ui) { // fix tinymce
+                $(ui.item).find('.cama_restore_editor').each(function () {
+                    tinymce.execCommand('mceAddEditor', true, $(this).attr('id'));
+                });
+            }});
+        group_panel.find('.btn.duplicate_cutom_group').click(add_group);
+        group_panel_body.on('click', '.header-field-grouped .del', function(){ if(confirm(I18n("msg.delete_item"))) $(this).closest('.custom_sortable_grouped').fadeOut('slow', function(){ $(this).remove(); group_panel.trigger('update_custom_group_number'); }); return false; });
+        group_panel_body.on('click', '.header-field-grouped .toggleable', function(){
+            if($(this).hasClass('fa-angle-down')) $(this).removeClass('fa-angle-down').addClass('fa-angle-up').closest('.header-field-grouped').next().slideUp();
+            else $(this).removeClass('fa-angle-up').addClass('fa-angle-down').closest('.header-field-grouped').next().slideDown();
+            return false;
+        });
+        group_panel.bind('update_custom_group_number', function(){ $(this).find('.custom_sortable_grouped').each(function(index){ $(this).find('input.cama_custom_group_number').val(index); }); });
+        $.each(field_values, function(field_val, key){ add_group(this); });
+    }else{
+        add_group(field_values[0]);
     }
+}
 
-    if (values.length > 0) {
-        if (field_key == 'checkboxes') {
-            add_field(values);
-        } else {
-            if (!multiple && values.length > 1) values = [values[0]];
-            $.each(values, function (i, value) {
-                add_field(value);
-            });
+function cama_build_custom_field(panel, field_data, values){
+    values = values || [];
+    var field_counter = 0;
+    var $field = panel.clone().wrap('li');
+    panel.html("<div class='cama_w_custom_fields'></div>"+(field_data.multiple ? "<div class='field_multiple_btn'> <a href='#' class='btn btn-warning btn-xs'> <i class='fa fa-plus'></i> "+panel.attr('data-add_field_title')+"</a></div>" : ''));
+    var field_actions = '<div class="actions"><i style="cursor: move" class="fa fa-arrows"></i> <i style="cursor: pointer" class="fa fa-times text-danger"></i></div>';
+    var callback = $field.find('.group-input-fields-content').attr('data-callback-render');
+    var $sortable = panel.children('.cama_w_custom_fields');
+    function add_field(value){
+        var field = $field.clone(true);
+        if(field_data.multiple) {
+            field.prepend(field_actions);
+            if(field_counter == 0) field.children('.actions').find('.fa-times').remove();
+        }
+        field.find('input, textarea, select').each(function(){ $(this).attr('name', $(this).attr('name').replace('[]', '['+field_counter+']')) });
+        if(field_data.disabled){
+            field.find('input, textarea, select').prop('readonly', true).filter('select').click(function(){ return false; }).focus(function(){ $(this).blur(); });
+            field.find('.btn').addClass('disabled').unbind().click(function(){ return false; });
         }
-    } else add_field(default_value);
 
-    if (multiple) {
-        $content.find('.btn-add-field').click(function () {
-            add_field(default_value);
-            return false;
+        if(value) field.find('.input-value').val(value);
+        $sortable.append(field);
+        if(callback) eval(callback + "(field, value);");
+        field_counter ++;
+    }
+    if(values.length <= 0) values = [field_data.default_value];
+    if(field_data.kind != 'checkboxes') {
+        if (!field_data.multiple && values.length > 1) values = [values[0]];
+        $.each(values, function (i, value) {
+            add_field(value);
         });
-        $sortable.delegate('.actions .fa-times', "click", function () {
-            var parent = $(this).parents('li');
-            if (confirm(I18n("msg.delete_item"))) {
-                parent.remove();
+    } else add_field(values);
+
+    if(field_data.multiple){ // sortable actions
+        panel.find('.field_multiple_btn .btn').click(function () { add_field(field_data.default_value); return false; });
+        panel.delegate('.actions .fa-times', "click", function () { if(confirm(I18n("msg.delete_item"))) $(this).closest('.editor-custom-fields').remove(); return false; });
+        $sortable.sortable({ handle: ".fa-arrows", items: ' > .editor-custom-fields',
+            start: function (e, ui) { // fix tinymce
+                $(ui.item).find('.mce-panel').each(function () {
+                    tinymce.execCommand('mceRemoveEditor', false, $(this).next().addClass('cama_restore_editor').attr('id'));
+                });
+            },
+            stop: function (e, ui) { // fix tinymce
+                $(ui.item).find('.cama_restore_editor').each(function () {
+                    tinymce.execCommand('mceAddEditor', true, $(this).attr('id'));
+                });
             }
-            return false;
-        });
-        $sortable.find('li:first .fa-times').hide();
-        $sortable.sortable({
-            handle: ".fa-arrows"
         });
     }
-
-    $content.find('.clone-field').remove();
 }
 
 function custom_field_colorpicker($field) {
@@ -140,8 +185,8 @@ function custom_field_text_box($field) {
     }
 }
 
-function load_upload_audio_field(dom) {
-    var $input = $(dom).parents('li:first').find('input');
+function load_upload_audio_field(thiss) {
+    var $input = $(thiss).prev();
     $.fn.upload_filemanager({
         formats: "audio",
         selected: function (file, response) {
@@ -149,8 +194,8 @@ function load_upload_audio_field(dom) {
         }
     });
 }
-function load_upload_file_field(dom) {
-    var $input = $(dom).parents('li:first').find('input');
+function load_upload_file_field(thiss) {
+    var $input = $(thiss).prev();
     $.fn.upload_filemanager({
         formats: $input.data("formats") ? $input.data("formats") : "",
         selected: function (file, response) {
@@ -158,8 +203,17 @@ function load_upload_file_field(dom) {
         }
     });
 }
-function load_upload_image_field(dom) {
-    var $input = $(dom).parents('li:first').find('input');
+function load_upload_private_file_field(thiss) {
+    var $input = $(thiss).prev();
+    $.fn.upload_filemanager({
+        formats: $input.data("formats") ? $input.data("formats") : "",
+        selected: function (file, response) {
+            $input.val(file.url.split('?file=')[1].replace(/%2/g, '/'));
+        },
+        private: true
+    });
+}
+function load_upload_image_field($input) {
     $.fn.upload_filemanager({
         formats: "image",
         dimension: $input.attr("data-dimension"),
@@ -170,8 +224,8 @@ function load_upload_image_field(dom) {
         }
     });
 }
-function load_upload_video_field(dom) {
-    var $input = $(dom).parents('li:first').find('input');
+function load_upload_video_field(thiss) {
+    var $input = $(thiss).prev();
     $.fn.upload_filemanager({
         formats: "video",
         selected: function (file, response) {

data/app/assets/javascripts/camaleon_cms/admin/_libraries.js

@@ -19,7 +19,9 @@ jQuery(function(){
 /****************** form validations ************/
 // panel can be a object: $("#my_form")
 // if panel is null, then this will be replaced by body
-var init_form_validations = function (form) {
+    // args: {validate_settings}
+var init_form_validations = function (form, args) {
+    args = args || {};
     // slug management
     // you need to add class no_translate to avoid translations in slugs
     (form ? form : $('#admin_content')).find('input.slug').each(function () {
@@ -54,7 +56,7 @@ var init_form_validations = function (form) {
             $form.find('.translatable').Translatable();
         }
     }).filter(".validate").each(function () {
-        $(this).validate()
+        $(this).validate(args['validate_settings'])
     });
 };
 

data/app/assets/javascripts/camaleon_cms/admin/_translator.js

@@ -38,7 +38,7 @@ jQuery(function($){
                 var splitted = text.split('<!--:-->');
                 for(var i in splitted){
                     var str = splitted[i];
-                    var m_atch = str.trim().match(/^<!--:([\w]{2,5})/);
+                    var m_atch = str.trim().match(/^<!--:([\w||-]{2,5})/);
                     if(m_atch && m_atch.length == 2){
                         m_atch[1] = m_atch[1].replace("--", "")
                         translations_per_locale[m_atch[1]] = str.replace("<!--:"+m_atch[1]+"-->", "")
@@ -110,4 +110,4 @@ jQuery(function($){
         });
         return this;
     }
-});
+});

data/app/assets/javascripts/camaleon_cms/admin/custom_fields_form.js

@@ -6,7 +6,7 @@ jQuery(function($){
     $content_fields.sortable({
         handle: ".panel-sortable"
     });
-    //$content_fields.disableSelection();
+    var slugger_count = $content_fields.children().length;
     cama_custom_field_set_slug();
 
     $("#content-items-default > a", panel).click(function(){
@@ -14,10 +14,12 @@ jQuery(function($){
         showLoading();
         $.post(href, function(html){
             hideLoading();
-            var li = '<li class="item">' + html + '</li>';
-            $content_fields.append(li)
-            cama_custom_field_set_slug();
-            $content_fields.find("input.text-title").trigger("keyup");
+            var li = $('<li class="item">' + html + '</li>');
+            $content_fields.append(li);
+            cama_custom_field_set_slug(li);
+            var title_field = li.find("input.text-title");
+            title_field.val(title_field.val() + '-' + (slugger_count ++));
+            title_field.trigger("keyup");
             $('[data-toggle="tooltip"], a[title!=""]', $content_fields).tooltip();
         });
         return false;
@@ -52,8 +54,8 @@ jQuery(function($){
         $('#select_assign_group_caption', panel).val(option.parent('optgroup').attr("label") + ': ' + option.text());
     }).val(group_class_name).trigger('change');
 
-    function cama_custom_field_set_slug(){
-        $('.text-slug:not(.runned)', panel).each(function(){
+    function cama_custom_field_set_slug(_panel){
+        $('.text-slug:not(.runned)', _panel || panel).each(function(){
             var $parent = $(this).parents('.panel-item');
             var $label = $parent.find('.span-title');
             $(this).slugify($parent.find('.text-title'), {