camaleon_cms 2.7.5 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db43005ef92c135dec7d3ef6871aeac761dd01d904e3f5707bee706f2dd65aa3
-  data.tar.gz: e99b9643fba7ab169ede5758bedfd1b8c7c569c7972363782f79ec91770da3da
+  metadata.gz: 6c57a186f81cc44f2311424539229759e1dc5a95605dc6a109c0d1ebbaf25723
+  data.tar.gz: '086922b2cfae7224ff3825408337292376ab32efd810fb9efae9838bf3f8e680'
 SHA512:
-  metadata.gz: 7e4d609bf25dfbfe2c994f1393dbfe7bc9aa060f07e10bd6446f3273fbecc1646868a1efcae9b14dd32dd206c64a986e0210ea1199c3f1e2cda680953824ada2
-  data.tar.gz: fb39191112e373c198578073e5b317bd94749b4ef2956afd2e3baa07a98e91d3a30af9c1f5c9e98822f9338a8ab5f86aea6be405335a71794c55317bc68e285e
+  metadata.gz: 5093f50d36c20a5f59cb88036ed7b9786e4c1fb293f1e51f212ea896390b8ce5d3e645965087ca7cd57f0aa6f4e9a4cf4848f3da5da21b6cd382e3bbb6354d9a
+  data.tar.gz: b34b4f71e8eb82317c09b2ff2f687751f2c03af864824d8468eb108248b59570d88313e691bc959251dcaf74d218d4f0a2ec76558068fd5e5087465c20bdf02e

data/README.md

@@ -1,15 +1,15 @@
 # CAMALEON CMS
 
-![](http://camaleon.tuzitio.com/media/132/logo2.png)
+![](https://camaleon.website/media/132/logo2.png)
 
 [![Test supported versions](https://github.com/owen2345/camaleon-cms/actions/workflows/current_support.yml/badge.svg)](https://github.com/owen2345/camaleon-cms/actions/workflows/current_support.yml)
 ![](https://img.shields.io/badge/Support-Immediate-green.svg)
 
-[Website](http://camaleon.tuzitio.com/)
+[Website](https://camaleon.website/)
 
-[Documentation](http://camaleon.tuzitio.com/docs.html)
+[Documentation](https://camaleon.website/docs.html)
 
-[Demonstration](http://camaleon.tuzitio.com/plugins/demo_manage/)
+[Demonstration](https://camaleon.website/plugins/demo_manage/)
 
 ## About
 
@@ -18,10 +18,10 @@ Camaleon CMS is a dynamic and advanced content management system based on Ruby o
 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 Theme store:
-http://camaleon.tuzitio.com/store/themes
+https://camaleon.website/store/themes
 
 To download or publish plugins go to Plugin store:
-http://camaleon.tuzitio.com/store/plugins
+https://camaleon.website/store/plugins
 
 ![](screenshot.png)
 
@@ -86,9 +86,9 @@ http://camaleon.tuzitio.com/store/plugins
 * 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
+* Visual Editor - Paid Plugin ($) - https://camaleon.website/store/plugins/camaleon_editor
+* Spree Commerce Integration - Paid Plugin ($) - https://camaleon.website/store/plugins/camaleon-spree
+* Admin AJAX - Paid Plugin ($) - https://camaleon.website/store/plugins/admin_ajax
 * **See here for a complete Gemfile**: https://github.com/owen2345/camaleon-cms/blob/master/docs/example_gemfile.rb
 
 ## Camaleon CMS has many useful frontend Themes such as:
@@ -96,17 +96,17 @@ http://camaleon.tuzitio.com/store/plugins
 * 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 Theme ($) - http://camaleon.tuzitio.com/store/themes/camaleon_cms
-* Sky - Paid Theme ($) - http://camaleon.tuzitio.com/store/themes/sky
+* eFashion - https://camaleon.website/store/themes/eFashion (Github: https://github.com/mazharoddin/camaleon-cms-efashion)
+* Shoppy - https://camaleon.website/store/themes/shoppy (Github: https://github.com/mazharoddin/camaleon-cms-shoppy)
+* CV - Paid Theme ($) - https://camaleon.website/store/themes/cv
+* Camaleon Site - Paid Theme ($) - https://camaleon.website/store/themes/camaleon_cms
+* Sky - Paid Theme ($) - https://camaleon.website/store/themes/sky
 
 
 ## Requirements
-* Rails 6.0+
+* Rails 6.1+
 * PostgreSQL, MySQL 5+ or SQlite
-* Ruby 2.7+
+* Ruby 3.0+
 * Imagemagick
 
 ## Installation
@@ -123,13 +123,6 @@ http://camaleon.tuzitio.com/store/plugins
   # OR
   # gem "camaleon_cms", github: 'owen2345/camaleon-cms' # latest development version
   ```
-  
-* Add initializer `config/initializers/sprockets_fix.rb` to fix "Bug Segmentation fault" (Only Ruby 3+ - [sprokets issue](https://github.com/rails/sprockets/issues/633#issuecomment-774762509))
-```ruby
-  Rails.application.config.assets.configure do |env|
-    env.export_concurrent = false
-  end
-```
 
 
 * Install required Gem and dependencies
@@ -160,7 +153,7 @@ http://camaleon.tuzitio.com/store/plugins
 * Go to your browser and visit http://localhost:3000/
 
 ## Sample App / Demonstration
-* [Camaleon Server (current version)](http://camaleon.tuzitio.com/plugins/demo_manage/)
+* [Camaleon Server (current version)](https://camaleon.website/plugins/demo_manage/)
 * [Sample App](https://github.com/brian-kephart/Camaleon-CMS-Sample)
 * [Deploy Sample App in Heroku](https://heroku.com/deploy?template=https://github.com/brian-kephart/Camaleon-CMS-Sample)
 
@@ -171,13 +164,13 @@ If you need support, need some extra functionality or need plugins, please conta
 * 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).
-* Site: http://camaleon.tuzitio.com/
+* Site: https://camaleon.website/
 
 ## Author
 Owen Peredo Diaz
 
 ## License
-http://camaleon.tuzitio.com/license.html
+https://camaleon.website/license.html
 
 ## Testing
 * Init DB
@@ -199,7 +192,7 @@ bundle exec rspec
 
 ## Version History
 
-http://camaleon.tuzitio.com/version-history.html
+https://camaleon.website/version-history.html
 
 Previous stable version (v1.x): https://github.com/owen2345/camaleon-cms/tree/version_1x
 

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

@@ -1,6 +1,6 @@
 {
   "title": "Attack",
-  "descr": "Please check documentation <a href='http://camaleon.tuzitio.com/store/plugins/2'>here.</a>",
+  "descr": "Please check documentation <a href='https://camaleon.website/store/plugins/2'>here.</a>",
   "version": "0.1",
   "key": "attack",
   "position": 1,
@@ -28,4 +28,4 @@
     ]
     //here you can add all your hooks (read documentation)
   }
-}
+}

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

@@ -8,12 +8,10 @@ module Plugins
       end
 
       def save_settings
-        current_site.set_meta('front_cache_elements', { paths: ((params[:cache][:paths] || []).delete_if do |a|
-                                                                  !a.present?
-                                                                end || []),
-                                                        posts: (params[:cache][:posts] || []),
-                                                        post_types: (params[:cache][:post_type] || []),
-                                                        skip_posts: (params[:cache][:skip_posts] || []),
+        current_site.set_meta('front_cache_elements', { paths: (params[:cache][:paths] || []).compact_blank || [],
+                                                        posts: params[:cache][:posts] || [],
+                                                        post_types: params[:cache][:post_type] || [],
+                                                        skip_posts: params[:cache][:skip_posts] || [],
                                                         cache_login: params[:cache][:cache_login],
                                                         home: params[:cache][:home],
                                                         preserve_cache_on_restart: params[:cache][:preserve_cache_on_restart],

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

@@ -1,6 +1,6 @@
 {
   "title": "Front Cache",
-  "descr": "Please check documentation <a href='http://camaleon.tuzitio.com/store/plugins/3'>here.</a>",
+  "descr": "Please check documentation <a href='https://camaleon.website/store/plugins/3'>here.</a>",
   "version": "0.2",
   "key": "front_cache",
   "position": 1,

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

@@ -5,7 +5,7 @@ en:
       button:
         add_new_path: 'Add new path'
       custom_url_paths: 'Custom url paths'
-      custom_url_samples: 'Enter paths/urls like /contact or /my_section?p=a&... or /static-pages/(.*) or /test-([0-9]+)/?\?owen=true&var2=([a-z]+) or http://static.mydomain.com/(.*)'
+      custom_url_samples: 'Enter paths/urls like /contact or /my_section?p=a&... or /static-pages/(.*) or /test-([0-9]+)/?\?owen=true&var2=([a-z]+) or https://static.mydomain.com/(.*)'
       clean_cache: 'Clean cache'
       title: 'Frontend cache pages'
       home_page: 'Home Page'

data/app/apps/plugins/front_cache/front_cache_helper.rb

@@ -26,8 +26,8 @@ module Plugins
         if @caches[:paths].include?(request.original_url) || @caches[:paths].include?(request.path_info) || front_cache_plugin_match_path_patterns?(request.original_url, request.path_info) || (params[:action] == 'index' && params[:controller] == 'camaleon_cms/frontend' && @caches[:home].present?) # cache paths and home page
           @_plugin_do_cache = true
         elsif params[:action] == 'post' && params[:controller] == 'camaleon_cms/frontend' && !params[:draft_id].present?
-          begin
-            post = current_site.the_posts.find_by_slug(params[:slug]).decorate
+          if (post = current_site.the_posts.find_by_slug(params[:slug]))
+            post = post.decorate
             if post.can_visit? && post.visibility != 'private'
               if (@caches[:skip_posts] || []).include?(post.id.to_s)
                 @_plugin_do_cache = false
@@ -35,9 +35,9 @@ module Plugins
                 @_plugin_do_cache = true
               end
             end
-          rescue StandardError # skip post not found
           end
         end
+
         response.headers['PLUGIN_FRONT_CACHE'] = 'TRUE' if @_plugin_do_cache
       end
 

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

@@ -1,6 +1,6 @@
 {
   "title": "Visibility Posts",
-  "descr": "Permit to manage the permission of visualization for your contents (Public, Private, Password, Date from visibility). More info: <a target='_blank' href='http://camaleon.tuzitio.com/store/plugins/visibility_posts'>here.</a>",
+  "descr": "Permit to manage the permission of visualization for your contents (Public, Private, Password, Date from visibility). More info: <a target='_blank' href='https://camaleon.website/store/plugins/visibility_posts'>here.</a>",
   "version": "0.1",
   "key": "visibility_post",
   "helpers": [
@@ -21,4 +21,4 @@
     "post_can_visit": ["plugin_visibility_can_visit"],
     "list_post_extra_columns": ["plugin_visibility_extra_columns"]
   }
-}
+}

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

@@ -10,7 +10,7 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
+//= require jquery2
 //= require camaleon_cms/bootstrap.min.js
 //= require ./modernizr.custom
 //= require ./magnific.min

data/app/apps/themes/camaleon_first/views/index.html.erb

@@ -19,7 +19,7 @@
             <!-- PORTFOLIO ITEM -->
             <div class="col-lg-4">
                 <a class="zoom green" href="<%= post.the_url %>" title="<%= post.the_title %>" >
-                    <img width="400" height="300" src="<%= post.the_thumb_url("http://gentsthemes.com/demo/stanleywp/wp-content/uploads/sites/5/2014/01/port03.jpg") %>" class="attachment-post-thumbnail wp-post-image" alt="post image" />    </a>
+                    <img width="400" height="300" src="<%= post.the_thumb_url("https://bootstrapwp.com/wp-content/uploads/edd/2016/01/stanleywp.jpg") %>" class="attachment-post-thumbnail wp-post-image" alt="post image" />    </a>
 
                 <p><%= post.the_title %></p>
             </div> <!-- /col -->

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

@@ -10,4 +10,4 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
+//= require jquery2

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

@@ -10,5 +10,5 @@
 // Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require jquery
+//= require jquery2
 //= require camaleon_cms/bootstrap.min

data/app/apps/themes/new/views/index.html.erb

@@ -12,19 +12,19 @@
             <!-- Wrapper for slides -->
             <div class="carousel-inner">
                 <div class="item active">
-                    <img src="http://placehold.it/800x400" alt="...">
+                    <img src="https://placehold.it/800x400" alt="...">
                     <div class="carousel-caption">
                         <h2>Heading</h2>
                     </div>
                 </div>
                 <div class="item">
-                    <img src="http://placehold.it/800x400" alt="...">
+                    <img src="https://placehold.it/800x400" alt="...">
                     <div class="carousel-caption">
                         <h2>Heading</h2>
                     </div>
                 </div>
                 <div class="item">
-                    <img src="http://placehold.it/800x400" alt="...">
+                    <img src="https://placehold.it/800x400" alt="...">
                     <div class="carousel-caption">
                         <h2>Heading</h2>
                     </div>
@@ -68,4 +68,4 @@
         </div>
 
     </div>
-</section>
+</section>

data/app/apps/themes/new/views/layouts/_footer.html.erb

@@ -4,7 +4,7 @@
 
             <ul class="list-inline">
                 <li class="pull-right"><a href="#top">Back to top</a></li>
-                <li><a href="http://feeds.feedburner.com/bootswatch">RSS</a></li>
+                <li><a href="https://feeds.feedburner.com/bootswatch">RSS</a></li>
                 <li><a href="https://twitter.com/bootswatch">Twitter</a></li>
                 <li><a href="https://github.com/thomaspark/bootswatch/">GitHub</a></li>
                 <li><a href="../help/#api">API</a></li>
@@ -14,4 +14,4 @@
         </div>
     </div>
 
-</footer>
+</footer>

data/app/assets/javascripts/camaleon_cms/admin/admin-basic-manifest.js

@@ -1,3 +1,3 @@
-//= require jquery
+//= require jquery2
 //= require camaleon_cms/bootstrap.min
-//= require ./jquery.validate
+//= require ./jquery.validate

data/app/assets/javascripts/camaleon_cms/admin/admin-manifest.js

@@ -10,7 +10,7 @@
 // Read Sprockets README (https://github.com/rails/sprockets) for details
 // about supported directives.
 //
-//= require jquery
+//= require jquery2
 //= require camaleon_cms/admin/_data
 //= require camaleon_cms/bootstrap.min
 //= require camaleon_cms/admin/_jquery-ui.min

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/de.js

@@ -121,7 +121,7 @@ tinymce.addI18n('de',{
 "Insert link": "Link einf\u00fcgen",
 "New window": "Neues Fenster",
 "None": "Keine",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "Diese Adresse scheint ein externer Link zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"http:\/\/\" voranstellen?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "Diese Adresse scheint ein externer Link zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"https:\/\/\" voranstellen?",
 "Target": "Ziel",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "Diese Adresse scheint eine E-Mail-Adresse zu sein. M\u00f6chten Sie das dazu ben\u00f6tigte \"mailto:\" voranstellen?",
 "Insert\/edit link": "Link einf\u00fcgen\/bearbeiten",
@@ -216,4 +216,4 @@ tinymce.addI18n('de',{
 "View": "Ansicht",
 "Table": "Tabelle",
 "Format": "Format"
-});
+});

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/en.js

@@ -91,7 +91,7 @@ tinymce.addI18n('en_GB',{
 "Insert link": "Insert link",
 "New window": "New window",
 "None": "None",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?",
 "Target": "Target",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
 "Insert\/edit link": "Insert\/edit link",
@@ -176,4 +176,4 @@ tinymce.addI18n('en_GB',{
 "View": "View",
 "Table": "Table",
 "Format": "Format"
-});
+});

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/fr.js

@@ -121,7 +121,7 @@ tinymce.addI18n('fr_FR',{
 "Insert link": "Ins\u00e9rer un lien",
 "New window": "Nouvelle fen\u00eatre",
 "None": "n\/a",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe http:\/\/ n\u00e9cessaire?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre un lien externe. Voulez-vous ajouter le pr\u00e9fixe https:\/\/ n\u00e9cessaire?",
 "Target": "Cible",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL que vous avez entr\u00e9e semble \u00eatre une adresse e-mail. Voulez-vous ajouter le pr\u00e9fixe mailto: n\u00e9cessaire?",
 "Insert\/edit link": "Ins\u00e9rer\/modifier un lien",
@@ -216,4 +216,4 @@ tinymce.addI18n('fr_FR',{
 "View": "Voir",
 "Table": "Tableau",
 "Format": "Format"
-});
+});

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/it.js

@@ -121,7 +121,7 @@ tinymce.addI18n('it',{
 "Insert link": "Inserisci il Link",
 "New window": "Nuova Finestra",
 "None": "No",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "L'URL inserito sembra essere un collegamento esterno. Vuoi aggiungere il prefisso necessario http:\/\/?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "L'URL inserito sembra essere un collegamento esterno. Vuoi aggiungere il prefisso necessario https:\/\/?",
 "Target": "Target",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "L'URL inserito sembra essere un indirizzo email. Vuoi aggiungere il prefisso necessario mailto:?",
 "Insert\/edit link": "Inserisci\/Modifica Link",
@@ -216,4 +216,4 @@ tinymce.addI18n('it',{
 "View": "Visualiza",
 "Table": "Tabella",
 "Format": "Formato"
-});
+});

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/nl.js

@@ -121,7 +121,7 @@ tinymce.addI18n('nl',{
 "Insert link": "Hyperlink invoegen",
 "New window": "Nieuw venster",
 "None": "Geen",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "De ingegeven URL verwijst naar een extern adres. Wil je er \"http:\/\/\" aan toevoegen?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "De ingegeven URL verwijst naar een extern adres. Wil je er \"https:\/\/\" aan toevoegen?",
 "Target": "Doel",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "De ingegeven URL lijkt op een e-mailadres. Wil je er \"mailto:\" aan toevoegen?",
 "Insert\/edit link": "Hyperlink invoegen\/bewerken",

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/pt-BR.js

@@ -121,7 +121,7 @@ tinymce.addI18n('pt-BR',{
 "Insert link": "Inserir link",
 "New window": "Nova janela",
 "None": "Nenhum",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "A URL que voc\u00ea informou parece ser um link externo. Deseja incluir o prefixo http:\/\/?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "A URL que voc\u00ea informou parece ser um link externo. Deseja incluir o prefixo https:\/\/?",
 "Target": "Alvo",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?",
 "Insert\/edit link": "Inserir\/editar link",
@@ -216,4 +216,4 @@ tinymce.addI18n('pt-BR',{
 "View": "Visualizar",
 "Table": "Tabela",
 "Format": "Formatar"
-});
+});

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/ru.js

@@ -121,7 +121,7 @@ tinymce.addI18n('ru',{
 "Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
 "New window": "\u0412 \u043d\u043e\u0432\u043e\u043c \u043e\u043a\u043d\u0435",
 "None": "\u041d\u0435\u0442",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0412\u0432\u0435\u0434\u0451\u043d\u043d\u044b\u0439 URL \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432\u043d\u0435\u0448\u043d\u0435\u0439 \u0441\u0441\u044b\u043b\u043a\u043e\u0439. \u0412\u044b \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u00abhttp:\/\/\u00bb?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "\u0412\u0432\u0435\u0434\u0451\u043d\u043d\u044b\u0439 URL \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u0432\u043d\u0435\u0448\u043d\u0435\u0439 \u0441\u0441\u044b\u043b\u043a\u043e\u0439. \u0412\u044b \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u00abhttps:\/\/\u00bb?",
 "Target": "\u041e\u0442\u043a\u0440\u044b\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0412\u0432\u0435\u0434\u0451\u043d\u043d\u044b\u0439 URL \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043a\u043e\u0440\u0440\u0435\u043a\u0442\u043d\u044b\u043c \u0430\u0434\u0440\u0435\u0441\u043e\u043c \u044d\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0439 \u043f\u043e\u0447\u0442\u044b. \u0412\u044b \u0436\u0435\u043b\u0430\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0435\u0444\u0438\u043a\u0441 \u00abmailto:\u00bb?",
 "Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u044c\/\u0440\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0441\u044b\u043b\u043a\u0443",
@@ -216,4 +216,4 @@ tinymce.addI18n('ru',{
 "View": "\u0412\u0438\u0434",
 "Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u0430",
 "Format": "\u0424\u043e\u0440\u043c\u0430\u0442"
-});
+});

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/uk.js

@@ -121,7 +121,7 @@ tinymce.addI18n('uk',{
 "Insert link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
 "New window": "\u0423 \u043d\u043e\u0432\u043e\u043c\u0443 \u0432\u0456\u043a\u043d\u0456",
 "None": "\u041d\u0456",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u0454 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 http:\/\/ \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0437\u043e\u0432\u043d\u0456\u0448\u043d\u0454 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 https:\/\/ \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
 "Target": "\u0412\u0456\u0434\u043a\u0440\u0438\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u0421\u0445\u043e\u0436\u0435, \u0449\u043e \u0432\u0438 \u0432\u0432\u0435\u043b\u0438 \u0430\u0434\u0440\u0435\u0441\u0443 \u0435\u043b\u0435\u043a\u0442\u0440\u043e\u043d\u043d\u043e\u0457 \u043f\u043e\u0448\u0442\u0438. \u0412\u0438 \u0431\u0430\u0436\u0430\u0454\u0442\u0435 \u0434\u043e\u0434\u0430\u0442\u0438 mailto: \u043f\u0440\u0435\u0444\u0456\u043a\u0441?",
 "Insert\/edit link": "\u0412\u0441\u0442\u0430\u0432\u0438\u0442\u0438\/\u0440\u0435\u0434\u0430\u0433\u0443\u0432\u0430\u0442\u0438 \u043f\u043e\u0441\u0438\u043b\u0430\u043d\u043d\u044f",
@@ -216,4 +216,4 @@ tinymce.addI18n('uk',{
 "View": "\u0412\u0438\u0433\u043b\u044f\u0434",
 "Table": "\u0422\u0430\u0431\u043b\u0438\u0446\u044f",
 "Format": "\u0424\u043e\u0440\u043c\u0430\u0442"
-});
+});

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/zh-CN.js

@@ -121,7 +121,7 @@ tinymce.addI18n('zh-CN',{
 "Insert link": "\u63d2\u5165\u94fe\u63a5",
 "New window": "\u5728\u65b0\u7a97\u53e3\u6253\u5f00",
 "None": "\u65e0",
-"The URL you entered seems to be an external link. Do you want to add the required http:\/\/ prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u5c5e\u4e8e\u5916\u90e8\u94fe\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttp:\/\/:\u524d\u7f00\u5417\uff1f",
+"The URL you entered seems to be an external link. Do you want to add the required https:\/\/ prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u5c5e\u4e8e\u5916\u90e8\u94fe\u63a5\uff0c\u9700\u8981\u52a0\u4e0ahttps:\/\/:\u524d\u7f00\u5417\uff1f",
 "Target": "\u6253\u5f00\u65b9\u5f0f",
 "The URL you entered seems to be an email address. Do you want to add the required mailto: prefix?": "\u4f60\u6240\u586b\u5199\u7684URL\u5730\u5740\u4e3a\u90ae\u4ef6\u5730\u5740\uff0c\u9700\u8981\u52a0\u4e0amailto:\u524d\u7f00\u5417\uff1f",
 "Insert\/edit link": "\u63d2\u5165\/\u7f16\u8f91\u94fe\u63a5",

data/app/assets/javascripts/camaleon_cms/admin/uploader/_media_manager.js

@@ -476,7 +476,7 @@ window.cama_init_media = function(mediaPanel) {
                     '<div class="alert alert-danger">' +
                       I18n(
                         'msg.cors_error',
-                        'Please verify the following: <ul><li>If the image exist: %{url_img}</li> <li>Check if cors configuration are defined well, only for external images: S3, cloudfront(if you are using cloudfront).</li></ul><br> More information about CORS: <a href="%{url_blog}" target="_blank">here.</a>', { url_img: data.url, url_blog: 'http://blog.celingest.com/en/2014/10/02/tutorial-using-cors-with-cloudfront-and-s3/' }
+                        'Please verify the following: <ul><li>If the image exist: %{url_img}</li> <li>Check if cors configuration are defined well, only for external images: S3, cloudfront(if you are using cloudfront).</li></ul><br> More information about CORS: <a href="%{url_blog}" target="_blank">here.</a>', { url_img: data.url, url_blog: 'https://blog.digitalis.io/how-to-add-cors-to-s3-with-cloudfront-1be59c74abaa' }
                       ) +
                       '</div>'
                   )
@@ -566,7 +566,7 @@ window.cama_media_get_custom_params = function(customSettings) {
 }
 
 $(() =>
-  // sample: $.fn.upload_url({url: 'http://camaleon.tuzitio.com/media/132/logo2.png', dimension: '120x120', versions: '200x200', folder: 'my_folder', thumb_size: '100x100'})
+  // sample: $.fn.upload_url({url: 'https://camaleon.website/media/132/logo2.png', dimension: '120x120', versions: '200x200', folder: 'my_folder', thumb_size: '100x100'})
   // dimension: default current dimension
   // folder: default current folder
   // private: (Boolean) if true => list private files

data/app/assets/stylesheets/camaleon_cms/admin/admin-manifest.css

@@ -22,7 +22,8 @@
  *= require ./uploader/uploader_manifest
  *= require ./_bootstrap-select
 
+ *= require ./colorpicker
+
  // post
  *= require ./_jquery.tagsinput
  */
-

data/app/assets/stylesheets/camaleon_cms/admin/{colorpicker.css.scss → colorpicker.css}

@@ -2,7 +2,7 @@
 .colorpicker-saturation {
     width: 100px;
     height: 100px;
-    background-image: asset-url("camaleon_cms/admin/img/colorpicker/saturation.png");
+    background-image: url("camaleon_cms/admin/img/colorpicker/saturation.png");
     cursor: crosshair;
     float: left;
 }
@@ -47,10 +47,10 @@
     margin-top: -1px;
 }
 .colorpicker-hue {
-    background-image: asset-url("camaleon_cms/admin/img/colorpicker/hue.png");
+    background-image: url("camaleon_cms/admin/img/colorpicker/hue.png");
 }
 .colorpicker-alpha {
-    background-image: asset-url("camaleon_cms/admin/img/colorpicker/alpha.png");
+    background-image: url("camaleon_cms/admin/img/colorpicker/alpha.png");
     display: none;
 }
 .colorpicker {
@@ -80,7 +80,7 @@
     height: 10px;
     margin-top: 5px;
     clear: both;
-    background-image: asset-url("camaleon_cms/admin/img/colorpicker/alpha.png");
+    background-image: url("camaleon_cms/admin/img/colorpicker/alpha.png");
     background-position: 0 100%;
 }
 .colorpicker-color div {
@@ -93,4 +93,4 @@
     height: 16px;
     vertical-align: text-bottom;
 }
-/* EOF BOOTSTRAP COLORPICKER */
+/* EOF BOOTSTRAP COLORPICKER */

data/app/controllers/camaleon_cms/admin/appearances/nav_menus_controller.rb

@@ -3,9 +3,11 @@ module CamaleonCms
     module Appearances
       class NavMenusController < CamaleonCms::AdminController
         include CamaleonCms::Frontend::NavMenuHelper
+
         add_breadcrumb I18n.t('camaleon_cms.admin.sidebar.appearance')
         add_breadcrumb I18n.t('camaleon_cms.admin.sidebar.menus')
         before_action :check_menu_permission
+
         def index
           @nav_menu = if params[:id].present?
                         current_site.nav_menus.find_by_id(params[:id])
@@ -64,7 +66,10 @@ module CamaleonCms
         # render edit external menu item
         def edit_menu_item
           render '_external_menu', layout: false,
-                                   locals: { nav_menu: current_site.nav_menus.find(params[:nav_menu_id]), menu_item: current_site.nav_menu_items.find(params[:id]) }
+                                   locals: {
+                                     nav_menu: current_site.nav_menus.find(params[:nav_menu_id]),
+                                     menu_item: current_site.nav_menu_items.find(params[:id])
+                                   }
         end
 
         # update an external menu item
@@ -98,22 +103,22 @@ module CamaleonCms
         def add_items
           items = []
           @nav_menu = current_site.nav_menus.find(params[:nav_menu_id])
-          if params[:external].present?
-            item = @nav_menu.append_menu_item(parse_external_menu(params[:external]))
-            item.set_options(params[:external].require(:options).permit!) if params[:external][:options].present?
-            items << item
+          external_params = params[:external]
+          if external_params.present?
+            external_item = @nav_menu.append_menu_item(parse_external_menu(external_params))
+            external_item.set_options(external_params.require(:options).permit!) if external_params[:options].present?
+            items << external_item
           end
 
           if params[:custom_items].present? # custom menu items
-            params[:custom_items].each do |_index, item|
-              type = item['kind'].present? ? item['kind'] : 'external'
-              item = @nav_menu.append_menu_item({ label: item['label'], link: item['url'], type: type })
-              items << item
+            params[:custom_items].each_value do |custom_item|
+              type = custom_item['kind'].present? ? custom_item['kind'] : 'external'
+              items << @nav_menu.append_menu_item({ label: custom_item['label'], link: custom_item['url'], type: type })
             end
           end
 
           if params[:items].present?
-            params[:items].each do |_index, item|
+            params[:items].each_value do |item|
               item = @nav_menu.append_menu_item({ label: 'auto', link: item['id'], type: item['kind'] })
               items << item
             end

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

@@ -27,7 +27,7 @@ module CamaleonCms
       def welcome; end
 
       def installer_verification
-        redirect_to cama_root_url unless CamaleonCms::Site.count.zero?
+        redirect_to cama_root_url unless CamaleonCms::Site.count == 0
       end
     end
   end