camaleon_cms 1.1.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cea0e20904867353221500a789c0be49e87c80eb
-  data.tar.gz: 022d415a2db1170f92adac875566e29620e4db71
+  metadata.gz: 26a1b3d9ecfe2245bf5ea8433ed4afd17aec2068
+  data.tar.gz: 6c12fdee9c298d839365b5c483c1be8963f0109f
 SHA512:
-  metadata.gz: 1bace7010fdafbfea80899f224db85e909b519fe72c56599d042fe451f56dcad563e78ab122e1dd9346e7c49758ac4bed09a9274aaf5ab39c094ea105d690312
-  data.tar.gz: f3917659e5ac4cf78271802c9ba07960267c2bebc86624aaad146ace1887756d695a64c04e396e0b9eadaea54db2d2d885c21aa1e93030463c14dccc022dd195
+  metadata.gz: a9c99606e7639f95de900026fa49b0fbff69f9cd32e6aed9a08acbc033881a90819402162262471134902dace53c3c936480fcfa7359dffd46b1993f431c7a2f
+  data.tar.gz: 458464ce7b3f1f2422dfd1a5eb27f11ed10bdf85d7898566448ff06ae5c69a4b8d72c5f6f21e473265084c42b729227cd3f6fc4cb349b474aee5a1efdd78f0f6

data/README.md

@@ -8,7 +8,7 @@
 ![](https://img.shields.io/badge/Support-Inmediate-green.svg)
 
 [![Deploy](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy?template=https://github.com/owen2345/Camaleon-CMS-Sample)   
-# CAMALEON CMS
+# CAMALEON CMS V2
 ![](http://camaleon.tuzitio.com/media/132/logo2.png)
 
 # Requirements
@@ -26,25 +26,22 @@
   rails new my_project
   ```
 * Add the gem in your Gemfile
-
+  
   ```
-  gem 'camaleon_cms', '1.1.0' # if you want the stable version before 2x
+  gem "camaleon_cms", github: 'owen2345/camaleon-cms', branch: "moduler" # version 2
+  # If you are using Camaleon CMS 1x, you can use this patch to use this new version
+  gem "camaleon_cms", github: 'owen2345/camaleoncms_1xmigration'
   ```
-* Install the gem
-
+* Install required Gem and dependencies
+  
   ```
-  bundle install # bundle update if you have previous version installed
+  bundle install
   ```
 * Install the CMS (This will copy some basic templates and plugins in your project)
 
   ```
   rails generate camaleon_cms:install
   ```
-* Install required Gems for CMS and basic plugins
-
-  ```
-  bundle install
-  ```
 * Create database structure
 
   ```
@@ -56,36 +53,6 @@
   rails server # and then go to your browser http://localhost:3000/
   ```
 
-# Migrating from 0.2.x or earlier?
-
-1. Install camaleon as a gem as stated above or run `bundle update 'camaleon_cms'`
-1. Remove `lib/Gemfile_camaleon`
-
-  ```bash
-  rm lib/Gemfile_camaleon
-  ```
-1. Remove code from `Gemfile`
-
-  ```bash
-  require './lib/plugin_routes'
-  instance_eval(PluginRoutes.draw_gems)
-  ```
-1. Install gems
-
-  ```bash
-  bundle install
-  ```
-1. Update `lib/plugin_routes.rb`
-
-  ```bash
-  rails generate camaleon_cms:install
-  ```
-1. Start/restart Rails
-
-  ```bash
-  rails server
-  ```
-
 # Camaleon CMS (It adapts to your needs)
 
 Camaleon CMS is a dynamic and advanced content management system based on Ruby on Rails 4 and Ruby 1.9.3+. This CMS is an alternative to wordpress for Ruby on Rails developers to manage advanced contents easily.  
@@ -105,19 +72,22 @@ It was released on July, 2015 and tested previously with more than 20 projects b
 ## With Camaleon you can do:
 * Multiples sites in the same installation
 * Multilanguage sites
+* Design and create the architecture of your project without programming by dynamic contents and fields
 * Extend or customize the functionalities by plugins
 * Manage your content visualization by themes
 * Advanced User roles
+* Integrate into existent rails 4 projects
 * Other features:
   - Shortcodes
   - Widgets
   - Drag and Drop / Sortable / Multi level menus
-  - Templates for pages
+  - Templates/Layouts for pages
   - Easy migration from wordpress
 
 ## Some features are:
 * Easy administration
   Camaleon CMS permit you to adapt the CMS to all your needs and not you adapt to the CMS.
+I.E. you can create your custom architecture with all attributes that you need for each kind of content.
 * Security
   - Remote code execution
   - SQL injections
@@ -130,13 +100,12 @@ It was released on July, 2015 and tested previously with more than 20 projects b
     - Cache contents
     - Cache queries
     - Manifests (compress and join asset files)
-  Customize your content for Desktop, Mobile and Tablet
+    - Customize your content visualization for Desktop, Mobile and Tablet
 * SEO & HTML5
-  - Automatic Sitemap generations
+  - Sitemap generations
   - Seo Configuration
   - Seo for social media
-  - Customize your content for Desktop, Mobile and Tablet
-  - All generated content is compatible with HTML5
+  - All generated content is compatible with HTML5 and bootstrap 3
 
 ## Camaleon CMS come with basic and important plugins like:
 * Ecommerce
@@ -166,7 +135,8 @@ http://camaleon.tuzitio.com/license.html/
 
 ## Coming soon
 * Documentation and Videos
-* Create more basic plugins and themes
+* Create/Update Manuals
+* TDD (rspec)
 
 
 ## Contributing
@@ -179,18 +149,15 @@ http://camaleon.tuzitio.com/license.html/
 Visit the web site for more information: http://camaleon.tuzitio.com/
 
 ## Version History
-* Version 1.0.8
-  - Fix logo size on admin panel
-  - Fixed: Raise error when visiting unexisting urls. Example: Random troll writes domain.com/asdasdasd/adfasdasd.
-  - Allow email domains up to 10 characters in the contact form plugin
-  - Added advanced shortcodes to print data in any content:Permit to generate specific data of a post. (see more details in link below)
-  - fixed vertical scroll for multiple modals- added a library to create inline field to upload fields.
-  - Added control to clean cache after restart server.
-  - Added hook to include custom links from plugins or themes.
-  - changed custom sitemap into hash.
-  - added sitemap skippers to filter private elements.
-  - fixed the_breadcrumb for current_site.
-  - Unify current_user removing current_resource_owner. Solved bug with login_user_with_password.
-  - Added generic API response methods, render_json_error & render_json_ok.
+* Version 2.0
+  -   Support to integrate into existent Ruby in Rails 4 projects
+  -   Moved all files into separated folder to avoid overwritten problems, such as: models, controllers, helpers, ... and also you can define the prefix for your datatables
+  -   Added support to define the prefix url for your the CMS, like: http://localhost.com/blog/
+  -   Improved SQL performance and Javascript performance for admin panel
+  -   Added native support for AWS S3 to manage cloud files
+  -   Added control to define layouts and templates by admin panel
+  -   Rebuilt Media Manager and removed elfinder library
+  -   Added support of multiples permalinks, I.E. you can define the permalink structure for each of content type
+  -   Added PT-br language
 
 See more here: http://camaleon.tuzitio.com/version-history.html

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

@@ -6,7 +6,7 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-class Plugins::Attack::AdminController < Apps::PluginsAdminController
+class Plugins::Attack::AdminController < CamaleonCms::Apps::PluginsAdminController
   def settings
     @attack = current_site.get_meta("attack_config")
   end

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

@@ -43,7 +43,7 @@ module Plugins::Attack::AttackHelper
   end
 
   def attack_app_before_load()
-    cache_ban = Rails.cache.read(get_session_id)
+    cache_ban = Rails.cache.read(cama_get_session_id)
     if cache_ban.present? # render banned message if it was banned
       render text: cache_ban, layout: false
       return
@@ -56,7 +56,7 @@ module Plugins::Attack::AttackHelper
   private
   def attack_check_request
     config = current_site.get_meta("attack_config")
-    q = current_site.attack.where(browser_key: get_session_id, path: attack_request_key)
+    q = current_site.attack.where(browser_key: cama_get_session_id, path: attack_request_key)
     return unless config.present?
 
     # clear past requests
@@ -70,7 +70,7 @@ module Plugins::Attack::AttackHelper
     if (request.post? || request.patch?)
       r = q.where(created_at: config[:post][:sec].to_i.seconds.ago..Time.now)
       if r.count > config[:post][:max].to_i
-        Rails.cache.write(get_session_id, config[:msg], expires_in: config[:ban].to_i.minutes)
+        Rails.cache.write(cama_get_session_id, config[:msg], expires_in: config[:ban].to_i.minutes)
         # send an email to administrator with request info (ip, browser, if logged then send user info
         render text: config[:msg]
         return
@@ -80,7 +80,7 @@ module Plugins::Attack::AttackHelper
     else
       r = q.where(created_at: config[:get][:sec].to_i.seconds.ago..Time.now)
       if r.count > config[:get][:max].to_i
-        Rails.cache.write(get_session_id, config[:msg], expires_in: config[:ban].to_i.minutes)
+        Rails.cache.write(cama_get_session_id, config[:msg], expires_in: config[:ban].to_i.minutes)
         render text: config[:msg]
         return
       end

data/app/apps/plugins/attack/config/config.json

@@ -20,7 +20,7 @@
     "on_inactive": [
       "attack_on_inactive"
     ],
-    "app_before_load": [
+    "front_before_load": [
       "attack_app_before_load"
     ],
     "plugin_options":[

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

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

data/app/apps/plugins/attack/views/admin/settings.html.erb

@@ -41,8 +41,8 @@
             </div>
         </div>
         <div class="panel-footer">
-            <a class="btn btn-default" href="<%= url_for admin_plugins_path %>"><%= t('admin.button.back') %></a>
-            <button class="btn btn-primary pull-right" type="submit"><%= t('admin.button.submit') %></button>
+            <a class="btn btn-default" href="<%= url_for cama_admin_plugins_path %>"><%= t('camaleon_cms.admin.button.back') %></a>
+            <button class="btn btn-primary pull-right" type="submit"><%= t('camaleon_cms.admin.button.submit') %></button>
         </div>
     </div>
 

data/app/apps/plugins/contact_form/admin_forms_controller.rb

@@ -6,8 +6,9 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-class Plugins::ContactForm::AdminFormsController < Apps::PluginsAdminController
+class Plugins::ContactForm::AdminFormsController < CamaleonCms::Apps::PluginsAdminController
   before_action :set_form, only: ['show','edit','update','destroy']
+  add_breadcrumb I18n.t("plugin.contact_form.contact_form"), :admin_plugins_contact_form_admin_forms_path
 
   def index
     # here your actions for admin panel
@@ -16,8 +17,9 @@ class Plugins::ContactForm::AdminFormsController < Apps::PluginsAdminController
   end
 
   def edit
-    admin_breadcrumb_add("#{t('admin.button.edit')}")
-    append_asset_libraries({"plugin_contact_form"=> { js: [plugin_asset_path("contact_form", "js/contact_form.js")], css: [plugin_asset_path("contact_form", "css/contact-form.css")] }})
+    add_breadcrumb I18n.t("camaleon_cms.admin.button.edit")
+    append_asset_libraries({"plugin_contact_form"=> { js: [plugin_asset_path("js/contact_form.js")], css: [plugin_asset_path("css/contact-form.css")] }})
+    render "edit"
   end
 
   def update
@@ -27,11 +29,10 @@ class Plugins::ContactForm::AdminFormsController < Apps::PluginsAdminController
       current_site.contact_forms.where(id: @form.id).update_or_create({settings: fix_meta_value(settings)})
       current_site.contact_forms.where(id: @form.id).update_or_create({value: params[:meta]})
 
-      flash[:notice] = t('admin.message.updated_success')
+      flash[:notice] = t('camaleon_cms.admin.message.updated_success')
       redirect_to action: :edit, id: @form.id
     else
-      append_asset_libraries({"plugin_contact_form"=> { js: [plugin_asset_path("contact_form", "js/contact_form.js")], css: [plugin_asset_path("contact_form", "css/contact-form.css")] }})
-      render 'edit'
+      edit
     end
   end
 
@@ -78,7 +79,7 @@ class Plugins::ContactForm::AdminFormsController < Apps::PluginsAdminController
       @form = current_site.contact_forms.find_by_id(params[:id])
     rescue
       flash[:error] = "Error form class"
-      redirect_to admin_path
+      redirect_to cama_admin_path
     end
   end
 end

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

@@ -1,3 +1,3 @@
-Site.class_eval do
+CamaleonCms::Site.class_eval do
   has_many :contact_forms, :class_name => "Plugins::ContactForm::Models::ContactForm", foreign_key: :site_id, dependent: :destroy
 end

data/app/apps/plugins/contact_form/contact_form_helper.rb

@@ -78,12 +78,11 @@ module Plugins::ContactForm::ContactFormHelper
   end
 
   def contact_form_app_before_load
-    shortcode_add('forms', plugin_view("contact_form", "forms_shorcode"), "This is a shortocode for contact form to permit you to put your contact form in any content.
-    Sample: [forms slug='key-for-my-form']")
+    shortcode_add('forms', plugin_view("forms_shorcode"), "This is a shortocode for contact form to permit you to put your contact form in any content. Sample: [forms slug='key-for-my-form']")
   end
 
   def contact_form_front_before_load
-    append_asset_libraries({"plugin_contact_form" => {css: [plugin_asset_path("contact_form", "css/front/railsform")]}})
+    append_asset_libraries({"plugin_contact_form"=> { css: [plugin_asset_path("css/front/railsform")] }})
   end
 
   def perform_save_form(form, values, fields, settings, success, errors)
@@ -153,13 +152,13 @@ module Plugins::ContactForm::ContactFormHelper
             validate = false
           end
           if f[:field_type].to_s == "email"
-            if !fields[cid].match(/\b[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,10}\z/)
+            if !fields[cid].match(/@/)
               errors << "#{label}: #{settings[:railscf_message][:invalid_email]}"
               validate = false
             end
           end
         when 'captcha'
-          unless captcha_verified?
+          unless cama_captcha_verified?
             errors << "#{label}: #{settings[:railscf_message][:captcha_not_match]}"
             validate = false
           end

data/app/apps/plugins/contact_form/contact_form_html_helper.rb

@@ -52,7 +52,7 @@ module Plugins::ContactForm::ContactFormHtmlHelper
 
       case ob[:field_type].to_s
         when 'paragraph','textarea'
-          temp2 = "<textarea #{ob[:custom_attrs].to_attr_format} name=\"#{f_name}\" maxlength=\"#{field_options[:maxlength]}\"  class=\"#{ob[:custom_class]}  \">#{values[cid]}</textarea>"
+          temp2 = "<textarea #{ob[:custom_attrs].to_attr_format} name=\"#{f_name}\" maxlength=\"#{field_options[:maxlength] || 500 }\"  class=\"#{ob[:custom_class]}  \">#{values[cid]}</textarea>"
         when 'radio'
           temp2=  form_select_multiple_bootstrap(ob, ob[:label], ob[:field_type],values)
         when 'checkboxes'
@@ -63,7 +63,7 @@ module Plugins::ContactForm::ContactFormHtmlHelper
           class_type = "railscf-field-#{ob[:field_type]}" if ob[:field_type]=="email"
           temp2 = "<input #{ob[:custom_attrs].to_attr_format} type=\"#{ob[:field_type]}\" value=\"#{values[cid]}\" name=\"#{f_name}\"  class=\"#{ob[:custom_class]} #{class_type}\">"
         when 'captcha'
-          temp2 = captcha_tag(5, {}, {class: "#{ob[:custom_class]} field-captcha required"}.merge(ob[:custom_attrs]))
+          temp2 = cama_captcha_tag(5, {}, {class: "#{ob[:custom_class]} field-captcha required"}.merge(ob[:custom_attrs]))
         when 'file'
           class_type = "railscf-field-#{ob[:field_type]}" if ob[:field_type]=="website"
           temp2 = "<input multiple=\"multiple\" type=\"file\" value=\"\" name=\"#{f_name}\" #{ob[:custom_attrs].to_attr_format} class=\"#{class_type} #{ob[:custom_class]}\">"

data/app/apps/plugins/contact_form/front_controller.rb

@@ -6,7 +6,7 @@
   This program is distributed in the hope that it will be useful,  but WITHOUT ANY WARRANTY; without even the implied warranty of  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
-class Plugins::ContactForm::FrontController < Apps::PluginsFrontController
+class Plugins::ContactForm::FrontController < CamaleonCms::Apps::PluginsFrontController
   before_filter :append_view_paths
 
   def index

data/app/apps/plugins/contact_form/views/admin_forms/_form.html.erb

@@ -3,23 +3,23 @@
      @form = current_site.contact_forms.new
    end
 %>
-<%= form_for @form, url:{action: @form.new_record? ? :create : :update}, html:{class: 'validate-forms'} do |f| %>
+<%= form_for @form, url:{action: @form.new_record? ? :create : :update}, html:{class: 'validate-forms cama_ajax_request'} do |f| %>
     <input id="plugins_contact_form_models_contact_form_site_id" type="hidden" name="plugins_contact_form_models_contact_form[site_id]" value="<%= current_site.id %>" />
 
     <%= f.hidden_field :id  %>
     <div class="panel-body">
-      <%#= render partial: 'layouts/admin/form_error', locals: {data: @form} %>
+      <%#= render partial: 'layouts/camaleon_cms/admin/form_error', locals: {data: @form} %>
         <div class="form-group">
-          <%= f.label t('admin.table.name') %><br>
+          <%= f.label t('camaleon_cms.admin.table.name') %><br>
           <%= f.text_field :name, :class => "form-control required" %>
         </div>
         <div class="form-group">
-            <%= f.label t('admin.table.slug') %><br>
+            <%= f.label t('camaleon_cms.admin.table.slug') %><br>
             <%= f.text_field :slug, :class => "form-control slug", "data-parent" => "plugins_contact_form_models_contact_form_name" %>
         </div>
 
         <div class="form-group">
-          <%= f.label t('admin.table.description') %><br>
+          <%= f.label t('camaleon_cms.admin.table.description') %><br>
           <%= f.text_area :description, :class => "form-control", :rows => 4 %>
         </div>
 

data/app/apps/plugins/contact_form/views/admin_forms/edit.html.erb

@@ -1,11 +1,6 @@
-<%
-   if @form.nil?
-     @form = current_site.contact_forms.new
-   end
-%>
-
+<% @form = current_site.contact_forms.new if @form.nil? %>
 <div class="page-title">
-  <h2><span class="fa fa-folder"></span>  <%= t('plugin.contact_form.contact_form') %></h2>
+  <h2><span class="fa fa-folder"></span>  <%= t('plugin.contact_form.contact_form') %> - <%= @form.name %></h2>
 </div>
 <div class="page-content-wrap">
 
@@ -20,35 +15,24 @@
 
             <div class="panel-heading">
               <div class="row">
-                <div class="col-md-12">
-                  <div class="form-group">
-                    <label><%= t('plugin.contact_form.edit') %> <%= @form.name %></label>
-                  </div>
-                  <div class="form-group">
+                <div class="col-md-6">
+                    <br>
                     <label><%= t('plugin.contact_form.copy_shortcode_post')%> </label>
-                    <span><%= form_shortcode(@form.slug) %></span>
-                  </div>
-                </div>
-                <div class="col-md-8">
+                    <%= raw cama_shortcode_print(form_shortcode(@form.slug)) %>
 
                 </div>
+                <div class="col-md-6 text-right">
+                    <a class="btn btn-default" href="<%= url_for action: :index %>"><%= t('plugin.contact_form.button.back') %></a>
+                    <button class="btn btn-primary" type="submit"><%= t('plugin.contact_form.button.submit') %></button>
+                </div>
               </div>
             </div>
 
             <div class="panel-body">
-                <%= render partial: 'layouts/admin/form_error', locals: {data: @form} %>
+                <%= render partial: 'layouts/camaleon_cms/admin/form_error', locals: {data: @form} %>
                 <div class="row">
                     <div class="code hidden"></div>
                 </div>
-                <div class="row">
-                    <div class="col-md-offset-10 col-md-2">
-                        <div class="form-group">
-                            <a class="btn btn-default" href="<%= url_for action: :index %>"><%= t('plugin.contact_form.button.back') %></a>
-                            <button class="btn btn-primary" type="submit"><%= t('plugin.contact_form.button.submit') %></button>
-                        </div>
-                    </div>
-                </div>
-                <hr>
                 <div class="row">
                     <div class="col-md-4" style="overflow: hidden">
 
@@ -62,12 +46,12 @@
                             <div class="panel-body">
                                 <div class="row">
                                     <div class="form-group">
-                                        <%= f.label nil, "#{t('admin.table.name')} <abbr title='required'>*</abbr>".html_safe, :class => ""  %><br>
+                                        <%= f.label nil, "#{t('camaleon_cms.admin.table.name')} <abbr title='required'>*</abbr>".html_safe, :class => ""  %><br>
                                         <%= f.text_field :name, :class => "form-control required", style: "" %>
                                     </div>
 
                                     <div class="form-group">
-                                        <%= f.label nil, "#{t('admin.table.slug')} <abbr title=\"required\">*</abbr>".html_safe, :class => ""  %>
+                                        <%= f.label nil, "#{t('camaleon_cms.admin.table.slug')} <abbr title=\"required\">*</abbr>".html_safe, :class => ""  %>
                                         <%= f.text_field :slug, :class => "form-control slug required", "data-parent" => "plugins_contact_form_models_contact_form_name", style: "" %>
                                     </div>
                                 </div>
@@ -299,13 +283,13 @@
             remove_option: '<%= t('plugin.contact_form.remove_option') %>',
             required: '<%= t('plugin.contact_form.required') %>',
             untitled: '<%= t('plugin.contact_form.untitled') %>',
-            text_box: '<%= t('admin.custom_field.fields.text_box') %>',
-            text_area: '<%= t('admin.custom_field.fields.text_area') %>',
-            select: '<%= t('admin.custom_field.fields.select') %>',
-            website: '<%= t('admin.custom_field.fields.website') %>',
-            email: '<%= t('admin.custom_field.fields.email') %>',
-            upload_file: '<%= t('admin.button.upload_file') %>',
-            multiple_choice: '<%= t('admin.custom_field.fields.multiple_choice') %>'
+            text_box: '<%= t('camaleon_cms.admin.custom_field.fields.text_box') %>',
+            text_area: '<%= t('camaleon_cms.admin.custom_field.fields.text_area') %>',
+            select: '<%= t('camaleon_cms.admin.custom_field.fields.select') %>',
+            website: '<%= t('camaleon_cms.admin.custom_field.fields.website') %>',
+            email: '<%= t('camaleon_cms.admin.custom_field.fields.email') %>',
+            upload_file: '<%= t('camaleon_cms.admin.button.upload_file') %>',
+            multiple_choice: '<%= t('camaleon_cms.admin.custom_field.fields.multiple_choice') %>'
 
         };