camaleon_cms 2.4.5.8 → 2.4.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a8976824a5f6bd62eb80d61020ac7beb62be9c42
-  data.tar.gz: 4703e813d777c89caa0b00fd6ae1b72677de7288
+SHA256:
+  metadata.gz: 9bf07b929fdbe26db480e4e15c75da77962e3f5b3e2a756d06df6c8c8d3e52b8
+  data.tar.gz: 459486f3e3972460710bb67fccb573cc93c5798882398ccac4a7e96b21fada25
 SHA512:
-  metadata.gz: efaf8c70638bcc23e864e88341519a6065667d8c85ba324b2a23d8b8a9c2cd319256254d974a133993bffc9914006e63dfa6eaa92cf749273ff45135f1e44b8d
-  data.tar.gz: 62d294f76ddaf5cd089296e0be55db5eaa8eaecb0463ab7335705e82702e0eefc38fc131020b6c0673381790df991929c60915102124f290568703aba2b4fdc3
+  metadata.gz: 47304ac32cccfe35a3e44aa6d5fbc64b02235173c886a773bb5449019d1475e432420088233c598b49097b3e428601d15e681ad7a69ccade3936d31f66cbea60
+  data.tar.gz: 19b2e90cd910cf0428b49ae7a648d24f10e3bc7ffd0e0eb2309f4c082b16caf93685af9b48e22dd104b73637839aae40a579b7cebd8fa2caa419383059dda059

data/README.md

@@ -1,46 +1,128 @@
-![](https://img.shields.io/badge/Rails-4.2%2B-green.svg)
-![](https://img.shields.io/badge/Ruby-2.2%2B-green.svg)
-![](https://img.shields.io/badge/SQLITE-100%25-green.svg)
-![](https://img.shields.io/badge/Mysql-100%25-green.svg)
-![](https://img.shields.io/badge/Postgres-100%25-green.svg)
-![](https://img.shields.io/badge/TDD-70%25-yellowgreen.svg)
-![](https://img.shields.io/badge/DOCS-60%25-yellow.svg)
-![](https://img.shields.io/badge/Support-Inmediate-green.svg)
-[![Build Status](https://travis-ci.org/owen2345/camaleon-cms.svg?branch=master)](https://travis-ci.org/owen2345/camaleon-cms)
+# CAMALEON CMS
 
 ![](http://camaleon.tuzitio.com/media/132/logo2.png)
 
-# CAMALEON CMS V2
+[![Build Status](https://travis-ci.org/owen2345/camaleon-cms.svg?branch=master)](https://travis-ci.org/owen2345/camaleon-cms)
+![](https://img.shields.io/badge/Support-Immediate-green.svg)
+
 [Website](http://camaleon.tuzitio.com/)
 
+[Documentation](http://camaleon.tuzitio.com/docs.html)
+
 [Demonstration](http://camaleon.tuzitio.com/plugins/demo_manage/)
 
+## About
+
+Camaleon CMS is a dynamic and advanced content management system based on Ruby on Rails that adapts to your needs. This CMS is an alternative to Wordpress for Ruby on Rails developers to manage advanced content easier.
 
-# Sponsor
+Camaleon CMS is a flexible manager where you can build your custom content structure without coding anything by custom fields and custom contents type.
 
-[ButterCMS](https://buttercms.com/?utm_source=github&utm_medium=sponsorship-link&utm_campaign=camaleon) is an API-based CMS and blogging platform built for developers.
+To download or publish themes go to Theme store:
+http://camaleon.tuzitio.com/store/themes
+
+To download or publish plugins go to Plugin store:
+http://camaleon.tuzitio.com/store/plugins
+
+![](screenshot.png)
 
-# Requirements
-* Rails 4.2+
-* MySQL 5+ or SQlite or PostgreSQL
+## With Camaleon you can do:
+* Integrate into existing Rails projects
+* Multiples sites in the same installation
+* Multi-language sites
+* Design and create the architecture of your project without programming by dynamic contents and fields
+* Extend or customize the functionality using plugins
+* Manage your content visualization using themes
+* Easier administration. Camaleon CMS permits you to adapt the CMS to all your needs and not you adapt to the CMS. You can create your custom architecture with any custom attributes that you need for all content types.
+
+## Some features
+* Camaleon CMS is FREE and Open source
+* Shortcodes
+* Widgets
+* Drag and Drop / Sortable / Multi level menus
+* Templates/Layouts for pages
+* Advanced User roles
+* File Uploads with built in Local and Amazon S3 support
+* Easy migration from Wordpress
+* Security
+  - Remote code execution
+  - SQL injections
+  - Advanced sessions security
+  - Cross Site Scripting
+  - Control of abusive requests
+  - Cross-Site Request Forgery
+* Site Speed
+  Camaleon CMS include a lot of cache strategies to optimize the site access velocity:
+    - Cache contents
+    - Cache queries
+    - Manifests (compress and join asset files)
+    - Customize your content visualization for Desktop, Mobile and Tablet
+* SEO & HTML5
+  - Sitemap generations
+  - Seo configuration
+  - Seo for social media
+  - All generated content is compatible with HTML5 and Bootstrap 3
+
+## Camaleon CMS has many useful Plugins such as:
+* Content Cache (Included By Default)
+* Web Attack Control (Included By Default)
+* Post Visibility (Included By Default)
+* Contact Forms (Included By Default) - https://github.com/owen2345/cama_contact_form
+* SEO (Included By Default) - https://github.com/owen2345/camaleon-cms-seo
+* E-commerce - https://github.com/owen2345/camaleon-ecommerce
+* Language / Translation Editor - https://github.com/owen2345/camaleon-cms-language-editor
+* Subscriber (Email Subscriptions) - https://github.com/owen2345/cama_subscriber
+* Stripe Donation - https://github.com/owen2345/cama-stripe-donation
+* Star Rating - https://github.com/aspirewit/camaleon_cms_rating
+* Post Order - https://github.com/owen2345/camaleon-post-order-plugin
+* Post Created At - https://github.com/owen2345/camaleon_post_created_at
+* Post Clone - https://github.com/owen2345/camaleon-post-clone
+* Sitemap Customizer - https://github.com/brian-kephart/camaleon_sitemap_customizer
+* Image Optimizer - https://github.com/brian-kephart/camaleon_image_optimizer
+* Import / Export - https://github.com/owen2345/camaleon_export_import
+* Lightbox - https://github.com/owen2345/CamaImageLightbox
+* Autocomplete - https://github.com/gaelfokou/cama_autocomplete
+* Permissions for External Menus - https://github.com/owen2345/cama_external_menu
+* TinyMCE Template Integration - https://github.com/owen2345/Camaleon-Tinymce-Templates
+* Download Manager - https://github.com/max2320/camaleon-download
+* OAuth - https://github.com/owen2345/camaleon_oauth
+* Visual Editor - Paid Plugin ($) - http://camaleon.tuzitio.com/store/plugins/camaleon_editor
+* Spree Commerce Integration - Paid Plugin ($) - http://camaleon.tuzitio.com/store/plugins/camaleon-spree
+* Admin AJAX - Paid Plugin ($) - http://camaleon.tuzitio.com/store/plugins/admin_ajax
+* **See here for a complete Gemfile**: https://github.com/owen2345/camaleon-cms/blob/master/doc/example_gemfile.rb
+
+## Camaleon CMS has many useful frontend Themes such as:
+* Default Theme (Built in)
+* Clean Theme (Built in)
+* Wordpress Theme (Built in)
+* eCommerce - https://github.com/owen2345/cama-ecommerce-theme
+* eFashion - http://camaleon.tuzitio.com/store/themes/eFashion (Github: https://github.com/mazharoddin/camaleon-cms-efashion)
+* Shoppy - http://camaleon.tuzitio.com/store/themes/shoppy (Github: https://github.com/mazharoddin/camaleon-cms-shoppy)
+* CV - Paid Theme ($) - http://camaleon.tuzitio.com/store/themes/cv
+* Camaleon Site - Paid Them ($) - http://camaleon.tuzitio.com/store/themes/camaleon_cms
+* Sky - Paid Theme ($) - http://camaleon.tuzitio.com/store/themes/sky
+
+
+## Requirements
+* Rails 4.2 or 5+
+* PostgreSQL, MySQL 5+ or SQlite
 * Ruby 2.2+
 * Imagemagick
 
-# Installation
-* Install Ruby on Rails 4.2+
-  [Visit here.](http://railsapps.github.io/installing-rails.html)
+## Installation
+* Install Ruby on Rails
 * Create your rails project
 
   ```
   rails new my_project
   ```
-* Add the gem in your Gemfile (Stable versions 2.4.4.5, 2.4.3.10, 2.3.6, 2.2.1, 2.1.1)
+* Add the gem in your Gemfile 
 
   ```
-  gem "camaleon_cms",  '>= 2.4.5'
-  # gem "camaleon_cms", github: 'owen2345/camaleon-cms' # current development version
-  # gem 'draper', '~> 3' # only for Rails 5
-  # verify (gem 'sass-rails', '~> 5.0') only for Rails 5
+  gem "camaleon_cms",  '>= 2.4.5' # (Current stable versions are 2.4.4.5, 2.4.3.10, 2.3.6, 2.2.1, 2.1.1)
+  # OR
+  # gem "camaleon_cms", github: 'owen2345/camaleon-cms' # latest development version
+
+  # gem 'draper', '~> 3' # for Rails 5+
   ```
 
 * Install required Gem and dependencies
@@ -53,7 +135,7 @@
   ```
   rails generate camaleon_cms:install
   ```
-* (Optional) Before continue you can configure your CMS settings in (my_app/config/system.json), [here](config/system.json) you can see the full settings.  
+* (Optional) Before continue you can configure your CMS settings in (my_app/config/system.json), [here](config/system.json) you can see the full settings.
 * Create database structure
   ```
   rake camaleon_cms:generate_migrations
@@ -64,88 +146,24 @@
 * Start your server
 
   ```
-  rails server # and then go to your browser http://localhost:3000/
+  rails server
   ```
-  Previous stable version (1x): https://github.com/owen2345/camaleon-cms/tree/version_1x
-
-
-# Camaleon CMS (It adapts to your needs)
-
-Camaleon CMS is a dynamic and advanced content management system based on Ruby on Rails 4.2+ and Ruby 2.2+. This CMS is an alternative to Wordpress for Ruby on Rails developers to manage advanced contents easily.
-Camaleon CMS is a flexible manager where you can build your custom content structure without coding anything by custom fields and custom contents type.
-
-To download or publish themes go to themes store:
-http://camaleon.tuzitio.com/store/themes
-
-To download or publish plugins go to plugins store:
-http://camaleon.tuzitio.com/store/plugins
 
-## Camaleon CMS is FREE and Open source
-It was released on July, 2015 and tested previously with more than 20 projects by 6 months and on August 22, 2015 was published as a gem.
+* Go to your browser and visit http://localhost:3000/
 
-![](screenshot.png)
-
-## With Camaleon you can do:
-* Multiples sites in the same installation
-* Multi-language 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/Layouts for pages
-  - Easy migration from Wordpress
-
-## Some features are:
-* Integrate into existent Ruby on Rails Projects
-* Easy administration
-  Camaleon CMS permits 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
-  - Advanced sessions security
-  - Cross Site Scripting
-  - Control of abusive requests
-  - Cross-Site Request Forgery
-* Site Speed
-  Camaleon CMS include a lot of cache strategies to optimize the site access velocity:
-    - Cache contents
-    - Cache queries
-    - Manifests (compress and join asset files)
-    - Customize your content visualization for Desktop, Mobile and Tablet
-* SEO & HTML5
-  - Sitemap generations
-  - Seo configuration
-  - Seo for social media
-  - All generated content is compatible with HTML5 and Bootstrap 3
-
-## Camaleon CMS come with basic and important plugins like:
-* E-commerce
-* Visibility of content
-* Web attack control
-* Contact forms
-* Content cache
-* Content reorder
-* many others [here.](https://github.com/owen2345/Camaleon-CMS-Sample)
-
-## Demonstration
+## Sample App / Demonstration
 * [Camaleon Server (current version)](http://camaleon.tuzitio.com/plugins/demo_manage/)
-* [Deploy in Heroku](https://heroku.com/deploy?template=https://github.com/owen2345/Camaleon-CMS-Sample)
+* [Sample App](https://github.com/owen2345/Camaleon-CMS-Sample)
+* [Deploy Sample App in Heroku](https://heroku.com/deploy?template=https://github.com/owen2345/Camaleon-CMS-Sample)
 
 ## Support
 If you have problems, please enter an issue [here.](https://github.com/owen2345/camaleon-cms/issues)
 If you need support, need some extra functionality or need plugins, please contact us on:
-* Site: http://camaleon.tuzitio.com/
+* Gitter: https://gitter.im/camaleoncms/Lobby
 * Email: owenperedo@gmail.com
 * Skype: owen-2345
-* Stack Overflow: Use "camaleon" as tag to ask questions related to this CMS (don't forget to include cms version + rails version).  
-* Gitter: https://gitter.im/camaleoncms/Lobby
-
+* Stack Overflow: Use "camaleon" as tag to ask questions related to this CMS (don't forget to include cms version + rails version).
+* Site: http://camaleon.tuzitio.com/
 
 ## Author
 Owen Peredo Diaz
@@ -153,20 +171,13 @@ Owen Peredo Diaz
 ## License
 http://camaleon.tuzitio.com/license.html
 
-## Coming soon
-* Documentation and Videos
-* Create/Update Manuals
-* TDD (rspec)
-
 ## Testing
 * Init DB
 ```
 RAILS_ENV=test bundle exec rake app:db:migrate
 RAILS_ENV=test bundle exec rake app:db:test:prepare
 ```
-* Configure/Install Poltergeist and change your phanthomjs path in spec/spec_helper.rb
-
-* Run testing
+* Run tests
 ```
 bundle exec rspec
 ```
@@ -178,7 +189,10 @@ bundle exec rspec
 * Push to the branch (git push origin my_feature_branch)
 * Create a pull request from your branch into master (Please be sure to provide enough detail for us to understand what this change is doing)
 
-Visit the web site for more information: http://camaleon.tuzitio.com/
-
 ## Version History
+
 http://camaleon.tuzitio.com/version-history.html
+
+Previous stable version (v1.x): https://github.com/owen2345/camaleon-cms/tree/version_1x
+
+Camaleon CMS was originally released in July 2015 and tested previously with more than 20 projects by 6 months and on August 22, 2015 was published as a gem.

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

@@ -27,6 +27,7 @@ function cama_get_tinymce_settings(settings){
                 }
             });
         },
+        fix_list_elements: true,
         setup: function (editor) {
             editor.on('blur', function () {
                 tinymce.triggerSave();

data/app/assets/stylesheets/camaleon_cms/admin/lte/_admin.css.scss

@@ -3195,8 +3195,8 @@ table.text-center th {
   margin-bottom: 25px;
   font-weight: 300;
   img{
-    max-width: 100%;
-    max-height: 200px;
+    width: 100%;
+    height: 150px;
   }
 }
 .login-logo a,
@@ -3209,8 +3209,8 @@ table.text-center th {
 }
 .login-box,
 .register-box {
-  margin-top: 7%;
-  margin-bottom: 7%;
+  margin-top: 20px;
+  margin-bottom: 20px;
 }
 @media (max-width: 768px) {
   .login-box,

data/app/assets/stylesheets/camaleon_cms/admin/lte/skins/skin-blue.css

@@ -66,7 +66,7 @@
   color: #fff;
 }
 .skin-blue .sidebar-menu > li.header {
-  color: #4b646f;
+  color: #D2D4D5;
   background: #1a2226;
 }
 .skin-blue .sidebar-menu > li > a {

data/app/assets/stylesheets/camaleon_cms/admin/lte/skins/skin-purple.css

@@ -69,6 +69,7 @@
   color: #4b646f;
   background: #1a2226;
 }
+
 .skin-purple .sidebar-menu > li > a {
   border-left: 3px solid transparent;
 }

data/app/controllers/camaleon_cms/admin/media_controller.rb

@@ -24,12 +24,12 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
 
   # download private files
   def download_private_file
-    f_path = CamaleonCmsLocalUploader::private_file_path(params[:file], current_site)
-    if File.exist?(f_path)
-      send_file f_path, disposition: 'inline'
-    else
-      raise ActionController::RoutingError, 'File not found'
-    end
+    cama_uploader.enable_private_mode!
+
+    file = cama_uploader.fetch_file("private/#{params[:file]}")
+
+    send_file file, disposition: 'inline'
+
   end
 
   # render media for modal content
@@ -92,9 +92,13 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
   end
 
   private
+
   # init basic media variables
   def init_media_vars
-    @cama_uploader = CamaleonCmsLocalUploader.new({current_site: current_site, private: true}) if params[:private].present?
+    # @cama_uploader = CamaleonCmsLocalUploader.new({current_site: current_site, private: true})
+
+    cama_uploader.enable_private_mode! if params[:private].present?
+
     cama_uploader.clear_cache if params[:cama_media_reload] == 'clear_cache'
     cama_uploader.reload if params[:cama_media_reload] == 'reload'
     @media_formats = (params[:media_formats] || "").sub("media", ",video,audio").sub("all", "").split(",")

data/app/controllers/camaleon_cms/admin/posts_controller.rb

@@ -27,9 +27,13 @@ class CamaleonCms::Admin::PostsController < CamaleonCms::AdminController
 
     if params[:q].present?
       params[:q] = (params[:q] || '').downcase
-      posts_all = posts_all.where("LOWER(#{CamaleonCms::Post.table_name}.title) LIKE ?", "%#{params[:q]}%")
+      posts_all = posts_all.where(
+        "LOWER(#{CamaleonCms::Post.table_name}.title) LIKE ? OR LOWER(#{CamaleonCms::Post.table_name}.slug LIKE ?)", 
+        "%#{params[:q]}%", 
+        "%#{params[:q]}%"
+      )  
     end
-    
+
     posts_all = posts_all.where(user_id: cama_current_user) if cannot?(:edit_other, @post_type) # filter only own contents 
     
     @posts = posts_all

data/app/decorators/camaleon_cms/post_tag_decorator.rb

@@ -43,3 +43,9 @@ class CamaleonCms::PostTagDecorator < CamaleonCms::TermTaxonomyDecorator
     h.breadcrumb_add(self.the_title)
   end
 end
+
+CamaleonCms::FrontendController.class_eval do
+  def search
+    my_custom_code_here
+  end
+end

data/app/helpers/camaleon_cms/admin/application_helper.rb

@@ -5,19 +5,6 @@ module CamaleonCms::Admin::ApplicationHelper
   include CamaleonCms::Admin::CategoryHelper
   include CamaleonCms::Admin::CustomFieldsHelper
 
-  # load system notification
-  def admin_system_notifications(args)
-    if Date.parse(current_site.get_option("date_notified", 2.days.ago).to_s) < Date.today
-      current_site.set_option("date_notified", Date.today)
-      url = "http://camaleon.tuzitio.com/plugins/camaleon_notification/?version=#{CamaleonCms::VERSION}&admin_locale=#{current_site.get_admin_language}&site=#{current_site.the_url}"
-      Thread.new do
-        current_site.set_meta("date_notified_message", open(url).read)
-        ActiveRecord::Base.connection.close #closing connection
-      end
-    end
-    args[:content] << current_site.get_meta("date_notified_message", "")
-  end
-
   # render pagination for current items
   # items is a will pagination object
   # sample: <%= raw cama_do_pagination(@posts) %>

data/app/models/camaleon_cms/media.rb

@@ -2,7 +2,7 @@ class CamaleonCms::Media < ActiveRecord::Base
   self.table_name = "#{PluginRoutes.static_system_info['db_prefix']}media"
   belongs_to :site, class_name: 'CamaleonCms::Site'
   validates :name, uniqueness: {
-    scope: [:site_id, :is_folder, :folder_path],
+    scope: [:site_id, :is_folder, :folder_path, :is_public],
     message: 'Duplicates not allowed'
   }
   scope :only_folder, ->{ where(is_folder: true) }
@@ -18,7 +18,7 @@ class CamaleonCms::Media < ActiveRecord::Base
       where('name like ?', "%#{search_expression}%")
     end
   end
-  
+
   # search file or folder by key
   def self.find_by_key(key)
     key = key.cama_fix_media_key
@@ -28,13 +28,13 @@ class CamaleonCms::Media < ActiveRecord::Base
       where(folder_path: File.dirname(key), name: File.basename(key))
     end
   end
-  
+
   # return all items of current folder
   def items
     coll = is_public ? site.public_media : site.private_media
     coll.where(folder_path: "#{folder_path}/#{name}".cama_fix_media_key)
   end
-  
+
   private
   # recover folder or file format
   def create_parent_folders
@@ -46,7 +46,7 @@ class CamaleonCms::Media < ActiveRecord::Base
       _p.push(f_name)
     end
   end
-  
+
   # return all children items
   def delete_folder_items
     items.destroy_all if is_folder