camaleon_cms 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 131a13eefc84861802b2115956ae6dd952a34b04
-  data.tar.gz: f66a3b0b3b430310afd29eea8f2ab31ff5520ab0
+  metadata.gz: 8e67f1be72288c728d249247f0dfe7f6caea78f3
+  data.tar.gz: 75092f52ee20f970a60b5f3fccd28905d1d21304
 SHA512:
-  metadata.gz: 149b43772e79e4f34b89606db246b88122f7e3aad450b657d7fc0a0f097722b0ce0b56ad1eb3b6a7d38bab04042890210b4f82493c2d3302ca1bc40fb7bd6058
-  data.tar.gz: 5c86f3f41673b761f2d78616a4afe158c5f499b4055520d5a4b6016781540977d65d9556955d1d5343bf0a50c2514a636cac91ca586b84948015f8ce105d5d71
+  metadata.gz: a20628ee74729584fccc227a9c1c1c80748449a9ddfa780ad21c9ec7328efd507e6da8150895dd4fe28689fe3a4ccdea49acee34133aa27514e6d61dd74b12ce
+  data.tar.gz: 5265b4b7ebeed15f0c1f35e99f961560dfcc29c9bf73b67c9275269f248019fa7030a7cc39b15dfe00ffca48cdecb0be7a130bb701a49a0188abebc9c592728b

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

@@ -78,11 +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']")
   end
 
   def contact_form_front_before_load
-    shortcode_add('forms',  plugin_view("contact_form", "forms_shorcode"))
     append_asset_libraries({"plugin_contact_form"=> { css: [plugin_asset_path("contact_form", "css/front/railsform")] }})
   end
 end

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

@@ -37,7 +37,7 @@ class Plugins::ContactForm::FrontController < Apps::PluginsFrontController
           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,4}\z/)
+          if !fields[cid].match(/\b[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,10}\z/)
             errors << "#{label}: #{settings[:railscf_message][:invalid_email]}"
             validate = false
           end

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

@@ -0,0 +1,3 @@
+Site.all.each do |site|
+  site.set_option("refresh_cache", true)
+end

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

@@ -10,7 +10,13 @@ module Plugins::FrontCache::FrontCacheHelper
 
   # save as cache all pages configured on settings of this plugin for public users
   def front_cache_front_before_load
-    return if signin?
+    if current_site.get_option("refresh_cache") # clear cache every restart server
+      front_cache_clean
+      current_site.set_option("refresh_cache", false)
+    end
+
+    return if signin? # avoid cache if current visitor is logged in
+
     cache_key = front_cache_get_key
     ActionController::Base.page_cache_directory = Rails.root.join("tmp", "cache", "pages")
     if page_cache_exist?(cache_key) # recover cache file

data/app/assets/javascripts/admin/actions.js

@@ -80,4 +80,14 @@ Object.size = function(obj) {
     }
     return size;
 };
-/* EOF NEW OBJECT(GET SIZE OF ARRAY) */
+/* EOF NEW OBJECT(GET SIZE OF ARRAY) */
+
+// this is a fix for multiples modals when a modal was closed (reactivate scroll for next modal)
+function modal_fix_multiple(){
+    var activeModal = $('.modal.in:last', 'body').data('bs.modal');
+    if (activeModal) {
+        activeModal.$body.addClass('modal-open');
+        activeModal.enforceFocus();
+        activeModal.handleUpdate();
+    }
+}

data/app/assets/javascripts/admin/elfinder/upload_elfinder.js

@@ -186,6 +186,7 @@
             });
             modal_elfinder.on('hidden.bs.modal', function (e){
                 $("#modal_elfinder").remove();
+                try{ modal_fix_multiple(); }catch(e){}
             });
         }
 

data/app/assets/javascripts/admin/libraries.js

@@ -122,6 +122,30 @@ var init_form_validations = function(form){
             if($that.val()) set_texts($that.val())
         });
     };
+
+    // create inline input file uploader with an icon to upload file
+    // options: all options needed for uploader
+    // you can add an attribute "data-format" in the input to define the file formats required
+    $.fn.input_upload_field = function(options){
+        this.each(function(){
+            var input = $(this);
+            var def = {
+                type: (input.attr("data-format") || "image"),
+                selected: function(res){
+                    var file = _.first(res);
+                    input.val(file.url.to_url());
+                }
+            };
+            if(!input.parent().hasClass("input-group")){
+                input.wrap('<div class="group-input-fields-content input-group"></div>');
+                input.after('<span class="input-group-addon btn_upload"><i class="fa fa-upload"></i> </span>');
+                input.addClass("form-control");
+            }
+            input.next("span").click(function(){
+                $.fn.upload_elfinder($.extend({}, def, (options || {})));
+            });
+        });
+    }
 })(jQuery);
 
 // jquery custom validations and default values

data/app/assets/javascripts/admin/modal.js

@@ -103,6 +103,7 @@ function open_modal(settings){
     // on modal hide
     modal.on("hidden.bs.modal", function(e){
         if(!$(e["currentTarget"]).attr("data-skip_destroy")) $(e["currentTarget"]).remove();
+        modal_fix_multiple();
     });
 
     if(settings.zindex) modal.css("z-index", settings.zindex);

data/app/assets/javascripts/admin/nav-menu.js

@@ -18,7 +18,7 @@ function do_add_item_menu(data){
 
     }
     // custom fields icon
-    if(main_menus_panel.attr("data-fields_support")) link_data += '<a class="text-edit" title="'+I18n("button.settings")+'" href="'+data.url_content+'" onclick="do_settings_menu(this); return false;" rel="1"><i class="fa fa-cog"></i></a>';
+    if(main_menus_panel.attr("data-fields_support") == "true") link_data += '<a class="text-edit" title="'+I18n("button.settings")+'" href="'+data.url_content+'" onclick="do_settings_menu(this); return false;" rel="1"><i class="fa fa-cog"></i></a>';
 
     var item = $('<li class="dd-item dd3-item" data-type="'+type+'" data-id="'+id+'" data-parent="'+(parent_id ? parent_id : "")+'"><div class="dd-handle dd3-handle"></div> <div class="dd3-content"><span>'+text + "</span> " + extra_html +' <span class="label">'+type+'</span> '+ link_data +' <a href="#" onclick="do_delete_menu(this); return false;" class="text-danger" title="'+I18n("button.delete")+'"><i class="fa fa-times-circle"></i></a> </div></li>');
     item.attr("data-fields", data.fields).attr("data-label", text).attr("data-link", link);
@@ -60,6 +60,19 @@ function manage_external_links(){
         f[0].reset();
         return false;
     });
+
+    // custom menus
+    main_menus_panel.find(".add_links_custom_to_menu").click(function(){
+        var $parent = $(this).parents(".panel");
+        $parent.find(":checkbox").filter(":checked").each(function()
+        {
+            var data = $(this).parents(".class_type").data();
+            var data_l = $(this).parents(".class_slug").data();
+            do_add_item_menu({type: 'external', link: $(this).val(), text: $(this).parent().text(), url_content: RENDER_FORM});
+            $(this).removeAttr("checked");
+        });
+        return false;
+    });
 }
 
 function do_delete_menu(link){

data/app/assets/stylesheets/admin/custom_admin.css.scss

@@ -141,8 +141,19 @@
     //margin-top: -25px;
   }
 
+  // custom fields render in forms
   .item-custom-field{
     margin-bottom: 15px;
+    > label{
+      display: block;
+      .shortcode_field{
+        display: none;
+        font-weight: normal;
+      }
+    }
+    &:hover > label .shortcode_field{
+      display: block;
+    }
     .actions{
       overflow: hidden;
       width: 67px;
@@ -159,13 +170,24 @@
 }
 
 // intro js custom
-.main-header.introjs-fixParent{
-  width: 100%;
-  .navbar{
+.main-header{
+  &.introjs-fixParent{
     width: 100%;
+    .navbar{
+      width: 100%;
+    }
+  }
+  .logo img{
+    max-width: 100%;
+    max-height: 100%;
   }
 }
 //.introjs-skipbutton{ display: none; }
 #modal_elfinder{
   z-index: 99999;
+}
+
+// fix tinymce fullscreen
+div.mce-fullscreen{
+  z-index: 9999;
 }

data/app/controllers/admin/settings_controller.rb

@@ -37,6 +37,11 @@ class Admin::SettingsController < AdminController
   def languages
   end
 
+  # render the list of shortcodes
+  def shortcodes
+
+  end
+
   # save language customizations
   def save_languages
     current_site.set_meta("languages_site", params[:lang])

data/app/controllers/api/api_controller.rb

@@ -1,28 +1,25 @@
-class Api::ApiController < ActionController::Base
-  include CamaleonHelper
-  include SessionHelper
-  include SiteHelper
-  include HtmlHelper
-  include UserRolesHelper
-  include ShortCodeHelper
-  include PluginsHelper
-  include ThemeHelper
-  include HooksHelper
-  include ContentHelper
-  include CaptchaHelper
-  include UploaderHelper
-
-  before_action -> { doorkeeper_authorize! :client }
-  respond_to :json
+class Api::ApiController < CamaleonController
+  #before_action -> { doorkeeper_authorize! :client }
 
   def account
-    render json: current_resource_owner
+    render json: current_user
   end
 
-  private
+  def render_json_error(internal_message = 'Unexpected error', code = 100, status = 404, user_message = 'Unexpected error')
+    error = {
+        'userMessage': user_message,
+    'internalMessage': internal_message,
+    'code': code
+    }
+    render :json => error, :status => status
+  end
 
-  def current_resource_owner
-    User.find(doorkeeper_token.resource_owner_id) if doorkeeper_token
+  def render_json_ok(message = 'Success', status = 200, more_info = {})
+    msg = {
+        message: message,
+        more_info: more_info
+    }
+    render :json => msg, :status => status
   end
 
 end

data/app/controllers/concerns/frontend_concern.rb

@@ -8,10 +8,14 @@
 =end
 module FrontendConcern extend ActiveSupport::Concern
   # visiting sitemap.xml
+  # With hook "on_render_sitemap" you can skip post_types, categories, tags or posts
+  #   you can change render file and layout
+  #   you can add custom sitemap elements in the attr "custom", like: https://github.com/owen2345/camaleon-cms/issues/106#issuecomment-146232211
+  #   you can customize your content for html or xml format
   def sitemap
-    r = {layout: (params[:format] == "html" ? (self.send :_layout) : false), render: "sitemap", custom: "", format: params[:format]}
+    r = {layout: (params[:format] == "html" ? (self.send :_layout) : false), render: "sitemap", custom: {a: a}, format: params[:format], skip_post_ids: [], skip_posttype_ids: [], skip_cat_ids: [], skip_tag_ids: []}
     hooks_run("on_render_sitemap", r)
-    @custom_sitemap = r[:custom]
+    @r = r
     render r[:render], layout: r[:layout]
   end
 

data/app/decorators/site_decorator.rb

@@ -68,8 +68,8 @@ class SiteDecorator < TermTaxonomyDecorator
 
   # return the category object with id or slug = slug_or_id from this site
   def the_category(slug_or_id)
-    return the_full_categories.where(id: slug_or_id).first if slug_or_id.is_a?(Integer)
-    return the_full_categories.find_by_slug(slug_or_id) if slug_or_id.is_a?(String)
+    return the_full_categories.where(id: slug_or_id).first.decorate rescue nil if slug_or_id.is_a?(Integer)
+    return the_full_categories.find_by_slug(slug_or_id).decorate rescue nil if slug_or_id.is_a?(String)
   end
 
   # return all categories for ths site (include all children categories)
@@ -82,6 +82,18 @@ class SiteDecorator < TermTaxonomyDecorator
     object.post_tags
   end
 
+  # return the post_tag object with id or slug = slug_or_id from this site
+  def the_tag(slug_or_id)
+    return object.post_tags.where(id: slug_or_id).first.decorate rescue nil if slug_or_id.is_a?(Integer)
+    return object.post_tags.find_by_slug(slug_or_id).decorate rescue nil if slug_or_id.is_a?(String)
+  end
+
+  # return the user object with id or username = id_or_username from this site
+  def the_user(id_or_username)
+    return object.users.where(id: id_or_username).first.decorate rescue nil if id_or_username.is_a?(Integer)
+    return object.users.find_by_username(id_or_username).decorate rescue nil if id_or_username.is_a?(String)
+  end
+
   # return all post types for this site
   def the_post_types
     object.post_types.eager_load(:metas)
@@ -145,6 +157,11 @@ class SiteDecorator < TermTaxonomyDecorator
     h.url_to_fixed("root_url", args)
   end
 
+  # draw bread crumb for current site
+  def generate_breadcrumb(add_post_type = true)
+    h.breadcrumb_add(self.the_title)
+  end
+
   # =============================== ADMIN =======================
   # admin root url for this site
   def the_admin_url

data/app/helpers/admin/menus_helper.rb

@@ -57,6 +57,7 @@ module Admin::MenusHelper
       items << {icon: "files-o", title: t('admin.sidebar.content_groups'), url: admin_settings_post_types_path, datas: "data-intro='#{t("admin.intro.post_type")}' data-position='right'"}
       items << {icon: "cog", title: t('admin.sidebar.custom_fields'), url: admin_settings_custom_fields_path, datas: "data-intro='#{t("admin.intro.custom_fields")}' data-position='right'"}
       items << {icon: "language", title: t('admin.sidebar.languages'), url: admin_settings_languages_path, datas: "data-intro='#{t("admin.intro.languages")}' data-position='right'"}
+      items << {icon: "code", title: t('admin.table.shorcodes', default: "Shortcodes"), url: admin_settings_shortcodes_path, datas: "data-intro='#{t("admin.intro.shortcodes")}' data-position='right'"}
       admin_menu_add_menu("settings", {icon: "cogs", title: t('admin.sidebar.settings'), url: "", items: items, datas: "data-intro='#{t("admin.intro.settings")}' data-position='right' data-wait='500'"})
     end
 

data/app/helpers/camaleon_helper.rb

@@ -77,8 +77,10 @@ module CamaleonHelper
   def cama_sitemap_cats_generator(cats)
     res = []
     cats.decorate.each do |cat|
+      next if @r[:skip_cat_ids].include?(cat.id)
       res_posts = []
       cat.the_posts.decorate.each do |post|
+        next if @r[:skip_post_ids].include?(post.id)
         res_posts << "<li><a href='#{post.the_url}'>#{post.the_title}</a></li>"
       end
       res << "<li><h4><a href='#{cat.the_url}'>#{cat.the_title}</a></h4><ul>#{res_posts.join("")}</ul></li>"

data/app/helpers/session_helper.rb

@@ -33,19 +33,10 @@ module SessionHelper
     end
   end
 
-  def login_user_with_password(username, password, remember_me=false, redirect_url = nil)
-    data_user = {}
-    cipher = Gibberish::AES::CBC.new(get_session_id)
-    data_user[:password] = cipher.decrypt(password) rescue nil
+  def login_user_with_password(username, password)
     @user = current_site.users.find_by_username(username)
-    r = {user: @user, params: params, password: data_user[:password], captcha_validate: true}; hooks_run('user_before_login', r)
-    if @user && @user.authenticate(data_user[:password])
-      login_user(@user, remember_me, redirect_url)
-    else
-      #TODO change flash error
-      #flash[:error] =  t('admin.login.message.fail')
-    end
-    @user if @user
+    r = {user: @user, params: params, password: password, captcha_validate: true}; hooks_run('user_before_login', r)
+    @user && @user.authenticate(password)
   end
 
   # check if current host is heroku
@@ -94,6 +85,10 @@ module SessionHelper
   # return current user logged in
   def current_user
     return @current_user if defined?(@current_user)
+    # api current user...
+    @current_user = calc_api_current_user
+    return @current_user unless @current_user.nil?
+
     return nil unless cookies[:auth_token].present?
     c = cookies[:auth_token].split("&")
     return nil unless c.size == 3
@@ -119,4 +114,10 @@ module SessionHelper
     session[:autor] = "Owen Peredo Diaz" unless request.session_options[:id].present?
     request.session_options[:id]
   end
-end
+
+  private
+
+  def calc_api_current_user
+    current_site.users_include_admins.find(doorkeeper_token.resource_owner_id).decorate if doorkeeper_token rescue nil
+  end
+end

data/app/helpers/short_code_helper.rb

@@ -13,32 +13,14 @@ module ShortCodeHelper
     @_shortcodes_template = {}
     @_shortcodes_descr = {}
 
-    # shortcode_add("load_libraries", nil, "Renderize the widget content in this place. Sample: [widget widget_key]")
+    shortcode_add("widget", nil, "Renderize the widget content in this place.
+                Don't forget to create and copy the shortcode of your widgets in appearance -> widgets
+                Sample: [widget widget_key]")
 
     shortcode_add("load_libraries",
                   lambda{|attrs, args| add_asset_library(*attrs["data"].to_s.split(",")); return ""; },
                   "Permit to load libraries on demand, sample: [load_libraries data='datepicker,tinymce']")
 
-    shortcode_add("custom_field",
-                  lambda{|attrs, args|
-                    post = args[:owner]
-                    post = current_site.the_posts.find_by_slug(attrs["post_slug"]).decorate rescue nil if attrs["post_slug"].present?
-                    return "" unless post.present?
-                    field = post.get_field_object(attrs["key"])
-                    if attrs["render"].present?
-                      return render :file => "custom_fields/#{field.options["field_key"]}", :locals => {object: post, field: field, field_key: attrs["key"], attibutes: attrs}
-                    else
-                      return post.the_field(attrs["key"])
-                    end
-                  },
-                  "Permit you to include your custom fields in anywhere.
-                  key: slug or key of the custom_field
-                  attrs: custom html attributes
-                  render: (true) enable to render the custom field as html. (Sample text_field: <span>my_field_value</span>)
-                  post_slug: (Optional, default current post) slug or key of a Post.
-                  Sample1: [custom_field key='subtitle']
-                  Sample2: [custom_field key='subtitle' post_slug='contact' render=true attrs='style=\"width: 50px;\"'] // return the custom field of page with slug = contact")
-
     shortcode_add("asset",
                   lambda{|attrs, args|
                     url = attrs["as_path"].present? ? ActionController::Base.helpers.asset_url(attrs["file"]) : ActionController::Base.helpers.asset_url(attrs["file"])
@@ -56,26 +38,27 @@ module ShortCodeHelper
                     add image='true' to generate the image tag with this url),
                   sample: <img src=\"[asset as_path='true' file='themes/my_theme/assets/img/signature.png']\" /> or [asset image='true' file='themes/my_theme/assets/img/signature.png' style='height: 50px;']")
 
-    shortcode_add("post_url",
+    shortcode_add("data",
                   lambda{|attrs, args|
-                    post = current_site.the_post(attrs["id"].to_i) if attrs["id"].present?
-                    post = current_site.the_post(attrs["key"].to_s) if attrs["key"].present?
-                    if post.present?
-                      if attrs["link"].present?
-                        return ActionController::Base.helpers.link_to(attrs["title"].present? ? attrs["title"].html_safe : post.the_title, post.the_url, target: attrs["target"])
-                      else
-                        return post.the_url
-                      end
-                    end
-                    return ""
+                    cama_shortcode_data(attrs, args) rescue ""
                   },
-                  "Permit to generate the url of a post (add path='' to generate the path and not the full url,
-                    add id='123' to use the POST ID,
-                    add key='my_slug' to use the POST SLUG,
-                    add link='true' to generate the full link,
-                    add title='my title' text of the link (default post title),
-                    add target='_blank' to open the link in a new window this is valid only if link is present),
-                  sample: [post_url id='122' link=true target='_blank']")
+                  "Permit to generate specific data of a post.
+                  Attributes:
+                    object: (String, defaut post) Model name: post | post_type | category | post_tag | site | user
+                    id: (Integer) Post id
+                    key: (String) Post slug
+                    field: (String) Custom field key, you can add render_field='true' to render field as html element, also you can add index=2 to indicate the value in position 2 for multitple values
+                    attr: (String) attribute name: title | created_at | excerpt | url | link | thumb | updated_at | author_name | author_url
+                    Note: If id and key is not present, then will be rendered of current model
+                  Sample:
+                    [data id='122' attr='title'] ==> return the title of post with id = 122
+                    [data key='contact' attr='url'] ==> return the url of post with slug = contact
+                    [data key='contact' attr='link'] ==> return the link with title as text of the link of post with slug = contact
+                    [data object='site' attr='url'] ==> return the url of currrent site
+                    [data key='page' object='post_type' attr='url'] ==> return the url of post_type with slug = page
+                    [data field=icon index=2] ==> return the second value (multiple values) for this custom field with key=icon of current object
+                    [data key='contact' field='sub_title'] ==> return the value of the custom_field with key=sub_title registered for post.slug = contact
+                    [data object='site' field='sub_title'] ==> return the value of the custom_field with key=sub_title registered for current_site")
   end
 
   # add shortcode
@@ -174,4 +157,86 @@ module ShortCodeHelper
     end
     res
   end
+
+  # execute shortcode data
+  def cama_shortcode_data(attrs, args)
+    res = ""
+    object = attrs["object"] || "post"
+    attr = attrs["attr"] || "title"
+    model = cama_shortcode_model_parser(object, attrs) || args[:owner]
+    return res unless model.present?
+    
+    if attrs["field"].present? # model custom fields
+      field = model.get_field_object(attrs["field"])
+      if attrs["render_field"].present?
+        return render :file => "custom_fields/#{field.options["field_key"]}", :locals => {object: model, field: field, field_key: attrs["field"], attibutes: attrs}
+      else
+        if attrs["index"]
+          res = model.the_fields(attrs["field"])[attrs["index"].to_i-1] rescue ""
+        else
+          res = model.the_field(attrs["field"])
+        end
+        return res
+      end
+
+    else # model attributes
+      case attr
+        when "title"
+          res = model.the_title
+        when "created_at"
+          res = model.the_created_at
+        when "updated_at"
+          res = model.the_updated_at
+        when "excerpt"
+          res = model.the_excerpt rescue ""
+        when "url"
+          res = model.the_url rescue ""
+        when "link"
+          res = model.the_link rescue ""
+        when "thumb"
+          case object
+            when "site"
+              res =  model.the_logo
+            when "user"
+              res =  model.the_avatar
+            else
+              res =  model.the_thumb_url
+          end
+        when "author_name"
+          res = object=="post" ? model.the_author.the_name : ""
+        when "author_url"
+          res = object=="post" ? model.the_author.the_url : ""
+      end
+    end
+    res
+  end
+
+  # return the model object according to the type
+  def cama_shortcode_model_parser(object, attrs)
+    model = nil
+    case object
+      when "post"
+        model = current_site.the_post(attrs["id"].to_i) if attrs["id"].present?
+        model = current_site.the_post(attrs["key"].to_s) if attrs["key"].present?
+
+      when "post_type"
+        model = current_site.the_post_type(attrs["id"].to_i) if attrs["id"].present?
+        model = current_site.the_post_type(attrs["key"].to_s) if attrs["key"].present?
+
+      when "category"
+        model = current_site.the_category(attrs["id"].to_i) if attrs["id"].present?
+        model = current_site.the_category(attrs["key"].to_s) if attrs["key"].present?
+
+      when "post_tag"
+        model = current_site.the_tag(attrs["id"].to_i) if attrs["id"].present?
+        model = current_site.the_tag(attrs["key"].to_s) if attrs["key"].present?
+
+      when "site"
+        model = current_site
+      when "user"
+        model = current_site.the_user(attrs["id"].to_i) if attrs["id"].present?
+        model = current_site.the_user(attrs["key"].to_s) if attrs["key"].present?
+    end
+    model
+  end
 end

data/app/views/admin/appearances/nav_menus/_custom_menus.html.erb

@@ -0,0 +1,29 @@
+<% r = {custom_menus: {}, menu: @nav_menu}; hooks_run("nav_menu_custom", r) %>
+<% if r[:custom_menus].present? %>
+    <div class="panel panel-default panel-toggled custom_menus">
+        <div class="panel-heading">
+            <h4 data-type="post_type" class="panel-title class_type">
+                <%= t("admin.menus.custom_menus", default: "Custom Menus") %>
+            </h4>
+            <ul class="panel-controls">
+                <li><a class="panel-collapse" href="#" title=""><span class="fa fa-angle-down"></span></a></li>
+            </ul>
+        </div>
+        <div class="panel-body">
+            <div class="tab-pane active class_type">
+                <ul class="">
+                    <% r[:custom_menus].each do |k, item| %>
+                        <li>
+                            <label class="class_slug">
+                                <input type="checkbox" value="<%= item[:url] %>"> <%= item[:title] %>
+                            </label>
+                        </li>
+                    <% end %>
+                </ul>
+            </div>
+            <div class="panel-footer">
+                <button type="" class="add_links_custom_to_menu btn btn-primary pull-right"><%= t('admin.button.add_menu') %> <i class="fa fa-arrow-right"></i></button>
+            </div>
+        </div>
+    </div>
+<% end %>

data/app/views/admin/appearances/nav_menus/index.html.erb

@@ -20,9 +20,7 @@
                                     <%= pt.the_title %>
                                 </h4>
                                 <ul class="panel-controls">
-                                    <!--<li><a href="#" class="panel-fullscreen"><span class="fa fa-expand"></span></a></li>-->
-                                    <li><a href="#" class="panel-collapse"><span class="fa fa-angle-down"></span></a>
-                                    </li>
+                                    <li><a href="#" class="panel-collapse"><span class="fa fa-angle-down"></span></a> </li>
                                 </ul>
                             </div>
                             <div class="panel-body nav-tabs-vertical0" id="acc-<%= pt.slug %>" style="padding: 0">
@@ -70,12 +68,14 @@
                                     </div>
                                 </div>
                                 <div class="panel-footer">
-                                    <button class="add_links_to_menu btn btn-primary pull-right" type=""><%= t('admin.button.add_menu') %>
-                                        <i class="fa fa-arrow-right"></i></button>
+                                    <button class="add_links_to_menu btn btn-primary pull-right" type=""><%= t('admin.button.add_menu') %><i class="fa fa-arrow-right"></i></button>
                                 </div>
                             </div>
                         </div>
                     <% end %>
+
+                    <%= render "custom_menus" %>
+
                     <div class="panel panel-default panel-toggled">
                         <div class="panel-heading">
                             <h4 class="panel-title"><%= t('admin.menus.external_link') %></h4>

data/app/views/admin/posts/form.html.erb

@@ -53,7 +53,7 @@
             </div>
 
             <!-- render all custom fields assigned to this post -->
-            <%= render partial: "admin/settings/custom_fields/render", locals: {record: @post, field_groups: @post.get_field_groups({kind: "Post", include_parent: true})} %>
+            <%= render partial: "admin/settings/custom_fields/render", locals: {record: @post, field_groups: @post.get_field_groups({kind: "Post", include_parent: true}), show_shortcode: true} %>
 
             <% unless @post.draft? || @post.new_record? %>
                 <% if @post.manage_comments?(@post_type) %>

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

@@ -30,11 +30,12 @@
                 <%= @field.the_name %>
                 <small class="hidden">(<%= @field.options[:field_key] %>)</small>
                 <%= raw "<em class='text-danger'>*</em>" if @field.options[:required].to_s.to_bool %>
+                <% if defined? show_shortcode %>
+                    <small class="pull-right shortcode_field"><code>[data field='<%= @field.slug %>']</code></small>
+                <% end %>
             </label><br>
             <% if @field.description.present? %>
-                <p>
-                    <small><%= @field.the_description %></small>
-                </p>
+                <p><small><%= @field.the_description %></small></p>
             <% end  %>
             <input name="<%= @field_name %>[<%= @field.slug %>][id]" type="hidden" value="<%= @field.id %>"/>
             <div id="content-field-<%= @rand %>" class="editor-custom-fields">

data/app/views/admin/settings/shortcodes.html.erb

@@ -0,0 +1,37 @@
+<div class="row">
+    <div class="col-md-12">
+        <div class="panel panel-default">
+            <div class="panel-heading">
+                <h3 class="panel-title"><%= t("admin.table.short_code") %></h3>
+            </div>
+            <div class="panel-body">
+                <table class="table" id="shortcodes_list">
+                    <thead>
+                    <tr>
+                        <th><%= t("admin.shortcodes.key", default: "Key") %></th>
+                        <th><%= t("admin.table.description") %></th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <% @_shortcodes.each do |code| %>
+                        <tr>
+                            <td>
+                                <code>[<%= code %>]</code>
+                            </td>
+                            <td class="col_descr"><%= @_shortcodes_descr[code] %></td>
+                        </tr>
+                    <% end %>
+                    </tbody>
+                </table>
+                <%= content_tag("div", t('admin.message.data_found_list'), class: "alert alert-warning") if @_shortcodes.empty? %>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    jQuery(function(){
+        $("#shortcodes_list .col_descr").each(function(){
+            $(this).html($(this).html().replace(/\n/g, "<br>"));
+        });
+    })
+</script>

data/app/views/default_theme/sitemap.html.erb

@@ -2,19 +2,22 @@
     <li>
         <h2><a href="<%= current_site.the_url %>"><%= current_site.the_title %></a></h2>
     </li>
-    <% current_site.post_types.decorate.each do |ptype| %>
+    <% current_site.post_types.decorate.each do |ptype| next if @r[:skip_posttype_ids].include?(ptype.id) %>
         <li>
             <h3><a href="<%= ptype.the_url %>"><%= ptype.the_title %></a></h3>
             <% if ptype.manage_categories? %>
                 <%= raw(cama_sitemap_cats_generator(ptype.the_categories)) %>
             <% else %>
                 <ul>
-                    <% ptype.the_posts.decorate.each do |post| %>
+                    <% ptype.the_posts.decorate.each do |post| next if @r[:skip_post_ids].include?(post.id) %>
                         <li><a href='<%= post.the_url %>'><%= post.the_title %></a></li>
                     <% end %>
                 </ul>
             <% end %>
         </li>
     <% end %>
-    <%= raw @custom_sitemap %>
+
+    <% @r[:custom].each do |key, item| %>
+        <li><a href='<%= item[:url] %>'><%= item[:title] %></a></li>
+    <% end %>
 </ul>

data/app/views/default_theme/sitemap.xml.builder

@@ -9,6 +9,7 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
     end
 
     for post in current_site.the_posts.decorate do
+      next if @r[:skip_post_ids].include?(post.id)
       xml.url do
         xml.loc post.the_url(locale: lang)
         xml.lastmod post.updated_at
@@ -18,6 +19,7 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
     end
 
     for cat in current_site.full_categories.no_empty.decorate do
+      next if @r[:skip_cat_ids].include?(cat.id)
       xml.url do
         xml.loc cat.the_url(locale: lang)
         xml.lastmod cat.updated_at
@@ -27,6 +29,7 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
     end
 
     for ptype in current_site.post_types.decorate do
+      next if @r[:skip_posttype_ids].include?(ptype.id)
       xml.url do
         xml.loc ptype.the_url(locale: lang)
         xml.lastmod ptype.updated_at
@@ -36,6 +39,7 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
     end
 
     for tag in current_site.post_tags.decorate do
+      next if @r[:skip_tag_ids].include?(tag.id)
       xml.url do
         xml.loc tag.the_url(locale: lang)
         xml.lastmod tag.updated_at
@@ -44,5 +48,13 @@ xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
       end
     end
   end
-  instance_eval(@custom_sitemap)
+
+  @r[:custom].each do |key, item|
+    xml.url do
+      xml.loc item[:url]
+      xml.lastmod item[:lastmod] || Date.today.to_s
+      xml.changefreq item[:changefreq] || "monthly"
+      xml.priority item[:priority] || "0.5"
+    end
+  end
 end

data/app/views/layouts/admin/_footer.html.erb

@@ -6,7 +6,7 @@
                 <a id="link_see_intro" href="#" onclick="init_intro(); return false;"><i class="fa fa-tv"></i> See Intro.</a>
             </div>
             <div class="pull-right">
-                <b>Version</b><%= CamaleonCms::VERSION %>
+                <b>Version </b><%= CamaleonCms::VERSION %>
             </div>
         </div>
     </div>

data/config/locales/admin/en.yml

@@ -485,6 +485,7 @@ en:
       youtube: 'Youtube'
       more_actions: 'More actions'
       more_actions_info: 'More actions...'
+      shorcodes: "Shortcodes"
     themes:
       footer_copyright: 'Footer Copyright'
       theme_select: 'Select Theme'
@@ -603,4 +604,5 @@ en:
       sites: "This module permit you to manage your sub sites, i.e. you can create unlimited sites like this (This is visible only for main site). Check /config/system.json to customize settings."
       custom_fields: "This section permit you to extend easily your contents, themes,... by custom fields."
       post_type: "In this module you can manage your content groups without programing anything."
-      languages: "This module permit you to manage all languages for your site. Also you can configure the language for your admin panel."
+      languages: "This module permit you to manage all languages for your site. Also you can configure the language for your admin panel."
+      shortcodes: "In this section you can see all available shortcodes to use in your contents."

data/config/routes/admin.rb

@@ -44,16 +44,15 @@ Rails.application.routes.draw do
 
     namespace :settings do
       resources :post_types
-
       resources :custom_fields do
         collection do
           post 'get_items/:key', action: :get_items, as: :get_items
           post "reorder"
         end
       end
-
       get 'site'
       get "languages"
+      get "shortcodes"
       post "languages" => :save_languages
       patch 'site_saved'
 

data/config/routes/frontend.rb

@@ -29,7 +29,7 @@ Rails.application.routes.draw do
 
     instance_eval(PluginRoutes.load("front"))
 
-    get "*slug" => 'frontend#post', format: true, :as => :post1, defaults: { format: :html }, constraints: { slug: /(?!admin)[a-zA-Z0-9\._=\s\-]+/}
-    get "*slug" => 'frontend#post', :as => :post, constraints: { slug: /(?!admin)[a-zA-Z0-9\._=\s\-]+/}
+    get "*slug" => 'frontend#post', format: true, :as => :post1, defaults: { format: :html }, constraints: { slug: /(?!admin)[a-zA-Z0-9\._=\s\-\/]+/}
+    get "*slug" => 'frontend#post', :as => :post, constraints: { slug: /(?!admin)[a-zA-Z0-9\._=\s\-\/]+/}
   end
 end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -268,6 +268,7 @@ files:
 - app/apps/plugins/contact_form/views/front/index.html.erb
 - app/apps/plugins/front_cache/admin_controller.rb
 - app/apps/plugins/front_cache/config/config.json
+- app/apps/plugins/front_cache/config/initializer.rb
 - app/apps/plugins/front_cache/config/locales/readme.txt
 - app/apps/plugins/front_cache/config/locales/translation.yml
 - app/apps/plugins/front_cache/config/routes_admin.txt
@@ -658,6 +659,7 @@ files:
 - app/models/widget/sidebar.rb
 - app/views/_flash_messages.html.erb
 - app/views/admin/appearances/nav_menus/_custom_fields.html.erb
+- app/views/admin/appearances/nav_menus/_custom_menus.html.erb
 - app/views/admin/appearances/nav_menus/_external_menu.html.erb
 - app/views/admin/appearances/nav_menus/_menu_form.html.erb
 - app/views/admin/appearances/nav_menus/_menu_list.html.erb
@@ -724,6 +726,7 @@ files:
 - app/views/admin/settings/post_types/_form.html.erb
 - app/views/admin/settings/post_types/edit.html.erb
 - app/views/admin/settings/post_types/index.html.erb
+- app/views/admin/settings/shortcodes.html.erb
 - app/views/admin/settings/site.html.erb
 - app/views/admin/settings/sites/form.html.erb
 - app/views/admin/settings/sites/index.html.erb