camaleon_cms 2.1.2.1 → 2.2.0

data/app/assets/javascripts/camaleon_cms/admin/momentjs/{pt_br.js → pt-BR.js}

@@ -10,7 +10,7 @@
 }(this, function (moment) { 'use strict';
 
 
-    var pt_br = moment.defineLocale('pt-br', {
+    var pt_br = moment.defineLocale('pt-BR', {
         months : 'Janeiro_Fevereiro_Março_Abril_Maio_Junho_Julho_Agosto_Setembro_Outubro_Novembro_Dezembro'.split('_'),
         monthsShort : 'Jan_Fev_Mar_Abr_Mai_Jun_Jul_Ago_Set_Out_Nov_Dez'.split('_'),
         weekdays : 'Domingo_Segunda-Feira_Terça-Feira_Quarta-Feira_Quinta-Feira_Sexta-Feira_Sábado'.split('_'),

data/app/assets/javascripts/camaleon_cms/admin/nav_menu.js.coffee

@@ -42,6 +42,20 @@ $ ->
     save_menu(data)
     return false
 
+  # add custom menu items (non-external)
+  menu_items_available.find(".add_links_custom_to_menu").click ->
+    data = {custom_items: [], authenticity_token: menu_form.find('[name="authenticity_token"]').val()}
+    flag =false
+    $(this).closest('.panel').find('input:checkbox:checked').each(->
+      flag = true
+      data['custom_items'].push({url: $(this).val(), label: $(this).attr('data-label')})
+    ).prop('checked', false)
+
+    unless flag
+      return false
+    save_menu(data)
+    return false
+
   # add external link
   menu_items_available.find('.form-custom-link').submit ->
     form = $(this)
@@ -65,7 +79,7 @@ $ ->
           return false
         showLoading()
         $.post(form.attr('action'), form.serialize(), (res)->
-          link.closest('li').replaceWith(res)
+          link.closest('li').replaceWith($(res).html())
           modal.modal("hide")
           hideLoading()
         )

data/app/assets/javascripts/camaleon_cms/admin/tinymce/langs/{pt_br.js → pt-BR.js}

@@ -1,4 +1,4 @@
-tinymce.addI18n('pt_br',{
+tinymce.addI18n('pt-BR',{
 "Cut": "Recortar",
 "Heading 5": "Cabe\u00e7alho 5",
 "Header 2": "Cabe\u00e7alho 2",

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

@@ -12,7 +12,7 @@ window["cama_init_media"] = (media_panel) ->
       "<div class='p_thumb'></div>" +
         "<div class='p_label'><b>"+I18n("button.name")+": </b><br> <span>"+data["name"]+"</span></div>" +
         "<div class='p_body'>" +
-        "<div><b>"+I18n("button.url")+":</b><br> <a target='_blank' href='"+data["url"]+"'>"+data["url"]+"</a></div>" +
+        "<div style='overflow: auto;'><b>"+I18n("button.url")+":</b><br> <a target='_blank' href='"+data["url"]+"'>"+data["url"]+"</a></div>" +
         "<div><b>"+I18n("button.size")+":</b> <span>"+cama_humanFileSize(data["size"])+"</span></div>" +
         "</div>"
 
@@ -59,7 +59,7 @@ window["cama_init_media"] = (media_panel) ->
   ########## file uploader
   p_upload = media_panel.find(".cama_media_fileuploader")
   customFileData = ->
-    return {folder: media_panel.attr("data-folder").replace(/\/{2,}/g, '/'), formats: media_panel.attr("data-formats"), versions: media_panel.attr("data-versions"), thumb_size: media_panel.attr("data-thumb_size") }
+    return cama_media_get_custom_params()
 
   p_upload.uploadFile({
     url: p_upload.attr("data-url"),
@@ -123,7 +123,7 @@ window["cama_init_media"] = (media_panel) ->
     media_link_tab_upload.click()
 
     showLoading()
-    $.get(media_panel.attr("data-url"), {folder: folder.replace(/\/{2,}/g, '/'), partial: true, media_formats: media_panel.attr("data-formats")}, (res)->
+    $.get(media_panel.attr("data-url"), cama_media_get_custom_params({partial: true, folder: folder}), (res)->
       media_panel.find(".media_browser_list").html(res)
       hideLoading()
     )
@@ -137,7 +137,7 @@ window["cama_init_media"] = (media_panel) ->
   # search file
   media_panel.find('#cama_search_form').submit ->
     showLoading()
-    $.get(media_panel.attr("data-url"), {search: $(this).find('input:text').val(), partial: true, media_formats: media_panel.attr("data-formats")}, (res)->
+    $.get(media_panel.attr("data-url"), cama_media_get_custom_params({search: $(this).find('input:text').val(), partial: true}), (res)->
       media_panel.find(".media_browser_list").html(res)
       hideLoading()
     )
@@ -146,7 +146,7 @@ window["cama_init_media"] = (media_panel) ->
   # reload current directory
   media_panel.find('.cam_media_reload').click (e)->
     showLoading()
-    $.get(media_panel.attr("data-url"), {partial: true, media_formats: media_panel.attr("data-formats"), folder: media_panel.attr("data-folder"), cama_media_reload: $(this).attr('data-action')}, (res)->
+    $.get(media_panel.attr("data-url"), cama_media_get_custom_params({partial: true, cama_media_reload: $(this).attr('data-action')}), (res)->
       media_panel.find(".media_browser_list").html(res)
       hideLoading()
     )
@@ -154,7 +154,7 @@ window["cama_init_media"] = (media_panel) ->
 
   # element actions
   media_panel.on("click", "a.add_folder", ->
-    content = $("<form><div><label for=''>"+I18n('button.folder')+": </label> <div class='input-group'><input name='folder' class='form-control required' placeholder='Folder name..'><span class='input-group-btn'><button class='btn btn-primary' type='submit'>"+I18n('button.create')+"</button></span></div></div> </form>")
+    content = $("<form id='add_folder_form'><div><label for=''>"+I18n('button.folder')+": </label> <div class='input-group'><input name='folder' class='form-control required' placeholder='Folder name..'><span class='input-group-btn'><button class='btn btn-primary' type='submit'>"+I18n('button.create')+"</button></span></div></div> </form>")
     callback = (modal)->
       btn = modal.find(".btn-primary")
       input = modal.find("input").keyup(->
@@ -165,7 +165,7 @@ window["cama_init_media"] = (media_panel) ->
       ).trigger("keyup")
       modal.find("form").submit ->
         showLoading()
-        $.post(media_panel.attr("data-url_actions"), {folder: media_panel.attr("data-folder")+"/"+input.val().replace(/\/{2,}/g, '/'), media_action: "new_folder"}, (res)->
+        $.post(media_panel.attr("data-url_actions"), cama_media_get_custom_params({folder: media_panel.attr("data-folder")+"/"+input.val(), media_action: "new_folder"}), (res)->
           hideLoading()
           modal.modal("hide")
           if res.search("folder_item") >= 0 # success upload
@@ -174,7 +174,7 @@ window["cama_init_media"] = (media_panel) ->
             $.fn.alert({type: 'error', content: res, title: "Error"})
         )
         return false
-    open_modal({title: "New Folder", content: content, callback: callback})
+    open_modal({title: "New Folder", content: content, callback: callback, zindex: 9999999})
     return false
   )
 
@@ -185,7 +185,7 @@ window["cama_init_media"] = (media_panel) ->
     link = $(this)
     item = link.closest(".media_item")
     showLoading()
-    $.post(media_panel.attr("data-url_actions"), {folder: media_panel.attr("data-folder")+"/"+item.attr("data-key").replace(/\/{2,}/g, '/'), media_action: if link.hasClass("del_folder") then "del_folder" else "del_file"}, (res)->
+    $.post(media_panel.attr("data-url_actions"), cama_media_get_custom_params({folder: media_panel.attr("data-folder")+"/"+item.attr("data-key"), media_action: if link.hasClass("del_folder") then "del_folder" else "del_file"}), (res)->
       hideLoading()
       if res
         $.fn.alert({type: 'error', content: res, title: I18n("button.error")})
@@ -208,15 +208,26 @@ window["cama_init_media"] = (media_panel) ->
     return false
   ).validate()
 
+# return extra attributes for media panel
+window['cama_media_get_custom_params'] = (custom_settings)->
+  media_panel = $("#cama_media_gallery")
+  r = eval("("+media_panel.attr('data-extra-params')+")")
+  r['folder'] = media_panel.attr("data-folder")
+  if custom_settings
+    $.extend(r, custom_settings)
+  r['folder'] = r['folder'].replace(/\/{2,}/g, '/')
+  return r
+
 $ ->
   # sample: $.fn.upload_url({url: 'http://camaleon.tuzitio.com/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
   $.fn.upload_url = (args)->
     media_panel = $("#cama_media_gallery")
-    data = {folder: media_panel.attr("data-folder").replace(/\/{2,}/g, '/'), media_action: "crop_url", formats: media_panel.attr("data-formats"), versions: media_panel.attr("data-versions"), thumb_size: media_panel.attr("data-thumb_size"), onerror: (message) ->
+    data = cama_media_get_custom_params({media_action: "crop_url", onerror: (message) ->
       $.fn.alert({type: 'error', content: message, title: I18n("msg.error_uploading")})
-    }
+    })
     $.extend(data, args); on_error = data["onerror"]; delete data["onerror"];
     showLoading()
     $.post(media_panel.attr("data-url_actions"), data, (res_upload)->
@@ -237,9 +248,10 @@ $ ->
   # sample: $.fn.upload_filemanager({title: "My title", formats: "image,video", dimension: "30x30", versions: '100x100,200x200', thumb_size: '100x100', selected: function(file){ alert(file["name"]) }})
   # file structure: {"name":"422.html","size":1547, "url":"http://localhost:3000/media/1/422.html", "format":"doc","type":"text/html"}
   # dimension: dimension: "30x30" | "x30" | dimension: "30x"
+  # private: (boolean) if true => browser private files that are not possible access by public url
   $.fn.upload_filemanager = (args)->
     args = args || {}
-    open_modal({title: args["title"] || I18n("msg.media_title"), id: 'cama_modal_file_uploader', modal_size: "modal-lg", mode: "ajax", url: root_admin_url+"/media/ajax", ajax_params: {media_formats: args["formats"], dimension: args["dimension"], versions: args["versions"], thumb_size: args["thumb_size"] }, callback: (modal)->
+    open_modal({title: args["title"] || I18n("msg.media_title"), id: 'cama_modal_file_uploader', modal_size: "modal-lg", mode: "ajax", url: root_admin_url+"/media/ajax", ajax_params: {media_formats: args["formats"], dimension: args["dimension"], versions: args["versions"], thumb_size: args["thumb_size"], private: args['private'] }, callback: (modal)->
       if args["selected"]
         window["callback_media_uploader"] = args["selected"]
       modal.css("z-index", args["zindex"] || 99999).children(".modal-dialog").css("width", "90%")

data/app/assets/stylesheets/camaleon_cms/admin/_custom_admin.css.scss

@@ -191,6 +191,15 @@
       }
     }
   }
+  .custom_sortable_grouped .header-field-grouped{
+    padding: 5px;
+    margin-bottom: 3px;
+    .fa{
+      @include link_round;
+      display: inline-block;
+      float: none;
+    }
+  }
 }
 
 //************** Main Header && intro js custom

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

@@ -30,7 +30,7 @@ body {
 .wrapper {
   min-height: 100%;
   position: relative;
-  overflow: hidden;
+  overflow: visible;
 }
 .wrapper:before,
 .wrapper:after {

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

@@ -107,6 +107,13 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
       items << item
     end
 
+    if params[:custom_items].present? # custom menu items
+      params[:custom_items].each do |index, item|
+        item = @nav_menu.append_menu_item({label: item['label'], link: item['url'], type: 'external'})
+        items << item
+      end
+    end
+
     if params[:items].present?
       params[:items].each do |index, item|
         item = @nav_menu.append_menu_item({label: 'auto', link: item['id'], type: item['kind']})
@@ -119,19 +126,19 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
   private
   def parse_menu_item(nav_menu_item)
     begin
-      case nav_menu_item.get_option('type')
+      case nav_menu_item.kind
         when 'post'
-          post = CamaleonCms::Post.find(nav_menu_item.get_option('object_id')).decorate
+          post = CamaleonCms::Post.find(nav_menu_item.url).decorate
           return false unless post.status == 'published'
           {name: post.the_title(locale: @frontend_locale), url_edit: post.the_edit_url }
         when 'category'
-          category = CamaleonCms::Category.find(nav_menu_item.get_option('object_id')).decorate
+          category = CamaleonCms::Category.find(nav_menu_item.url).decorate
           {name: category.the_title, url_edit: category.the_edit_url}
         when 'post_tag'
-          post_tag = CamaleonCms::PostTag.find(nav_menu_item.get_option('object_id')).decorate
+          post_tag = CamaleonCms::PostTag.find(nav_menu_item.url).decorate
           {name: post_tag.the_title, url_edit: post_tag.the_edit_url}
         when 'post_type'
-          post_type = CamaleonCms::PostType.find(nav_menu_item.get_option('object_id')).decorate
+          post_type = CamaleonCms::PostType.find(nav_menu_item.url).decorate
           {name: post_type.the_title, url_edit: post_type.the_edit_url}
         when 'external'
           {name: nav_menu_item.name.to_s}
@@ -146,6 +153,6 @@ class CamaleonCms::Admin::Appearances::NavMenusController < CamaleonCms::AdminCo
   helper_method :parse_menu_item
 
   def check_menu_permission
-    authorize! :manager, :menu
+    authorize! :manage, :menu
   end
 end

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

@@ -12,7 +12,7 @@ class CamaleonCms::Admin::Appearances::ThemesController < CamaleonCms::AdminCont
   def index
     add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.themes")
     PluginRoutes.reload
-    authorize! :manager, :themes
+    authorize! :manage, :themes
     if params[:set].present?
       site_install_theme(params[:set])
       flash.now[:notice] = t('camaleon_cms.admin.themes.message.updated')

data/app/controllers/camaleon_cms/admin/appearances/widgets/assign_controller.rb

@@ -43,7 +43,7 @@ class CamaleonCms::Admin::Appearances::Widgets::AssignController < CamaleonCms::
   end
 
   def check_permission_role
-    authorize! :manager, :widgets
+    authorize! :manage, :widgets
   end
 
 end

data/app/controllers/camaleon_cms/admin/appearances/widgets/main_controller.rb

@@ -58,6 +58,6 @@ class CamaleonCms::Admin::Appearances::Widgets::MainController < CamaleonCms::Ad
   end
 
   def check_permission_role
-    authorize! :manager, :widgets
+    authorize! :manage, :widgets
   end
 end

data/app/controllers/camaleon_cms/admin/appearances/widgets/sidebar_controller.rb

@@ -58,7 +58,7 @@ class CamaleonCms::Admin::Appearances::Widgets::SidebarController < CamaleonCms:
   end
 
   def check_permission_role
-    authorize! :manager, :widgets
+    authorize! :manage, :widgets
   end
 
 end

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

@@ -92,6 +92,6 @@ class CamaleonCms::Admin::CommentsController < CamaleonCms::AdminController
   end
 
   def validate_role
-    authorize! :manager, :comments
+    authorize! :manage, :comments
   end
 end

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

@@ -7,14 +7,13 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
-  skip_before_filter :cama_authenticate, only: :img
-  skip_before_filter :admin_logged_actions, except: [:index, :search]
+  skip_before_filter :admin_logged_actions, except: [:index, :download_private_file]
   skip_before_filter :verify_authenticity_token, only: :upload
-  before_action :init_media_vars
+  before_action :init_media_vars, except: :download_private_file
 
   # render media section
   def index
-    authorize! :manager, :media
+    authorize! :manage, :media
     @show_file_actions = true
     add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.media")
   end
@@ -28,6 +27,16 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
     render text: res["url"]
   end
 
+  # 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
+  end
+
   # render media for modal content
   def ajax
     @tree = cama_uploader.search(params[:search]) if params[:search].present?
@@ -40,7 +49,7 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
   # do background actions in fog
   def actions
     if params[:media_action] != 'crop_url'
-      authorize! :manager, :media
+      authorize! :manage, :media
     end
     params[:folder] = params[:folder].gsub("//", "/") if params[:folder].present?
     case params[:media_action]
@@ -77,6 +86,7 @@ class CamaleonCms::Admin::MediaController < CamaleonCms::AdminController
   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.clear_cache if params[:cama_media_reload].present? && params[:cama_media_reload] == 'clear_cache'
     @media_formats = (params[:media_formats] || "").sub("media", ",video,audio").sub("all", "").split(",")
     @tree = cama_uploader.objects(@folder = params[:folder] || "/")

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

@@ -53,6 +53,6 @@ class CamaleonCms::Admin::PluginsController < CamaleonCms::AdminController
   private
 
   def validate_role
-    authorize! :manager, :plugins
+    authorize! :manage, :plugins
   end
 end

data/app/controllers/camaleon_cms/admin/settings/custom_fields_controller.rb

@@ -32,10 +32,7 @@ class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin:
   end
 
   def update
-    if @field_group.update(@post_data)
-      @field_group.add_fields(params[:fields], params[:field_options])
-      @field_group.set_option('caption', @post_data[:caption])
-      flash[:notice] = t('camaleon_cms.admin.custom_field.message.custom_updated')
+    if @field_group.update(@post_data) && _save_fields(@field_group)
       redirect_to action: :edit, id: @field_group.id
     else
       render 'form'
@@ -51,10 +48,7 @@ class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin:
   # create a new custom field group
   def create
     @field_group = current_site.custom_field_groups.new(@post_data)
-    if @field_group.save
-      @field_group.add_fields(params[:fields], params[:field_options])
-      @field_group.set_option('caption', @post_data[:caption])
-      flash[:notice] = t('camaleon_cms.admin.custom_field.message.custom_created')
+    if @field_group.save && _save_fields(@field_group)
       redirect_to action: :edit, id: @field_group.id
     else
       new
@@ -92,4 +86,16 @@ class CamaleonCms::Admin::Settings::CustomFieldsController < CamaleonCms::Admin:
       redirect_to cama_admin_path
     end
   end
+
+  # return boolean: true if all fields were saved successfully
+  def _save_fields(group)
+    errors_saved, all_fields = group.add_fields(params[:fields], params[:field_options])
+    group.set_option('caption', @post_data[:caption])
+    if errors_saved.present?
+      flash[:error] = "<b>#{t('camaleon_cms.errors_found_msg', default: 'Several errors were found, please check.')}</b><br>#{errors_saved.map{|field| "#{field.name}: " + "#{field.errors.messages.map{|k,v| "#{k.to_s.titleize}: #{v.join('|')}"}.join(', ')}" }.join('<br>')}"
+    else
+      flash[:notice] = t('camaleon_cms.admin.custom_field.message.custom_updated')
+    end
+    true
+  end
 end

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

@@ -7,7 +7,8 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class CamaleonCms::Admin::SettingsController < CamaleonCms::AdminController
-  before_action :validate_role
+  before_action :validate_role, except: [:theme, :save_theme]
+  before_action :validate_role_theme, only: [:theme, :save_theme]
   add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.settings")
 
   def index
@@ -15,6 +16,7 @@ class CamaleonCms::Admin::SettingsController < CamaleonCms::AdminController
   end
 
   def site
+    return redirect_to cama_admin_settings_theme_path if params[:tab].present? && params[:tab] == 'theme'
     add_breadcrumb I18n.t("camaleon_cms.admin.sidebar.general_site")
     @site = current_site
   end
@@ -25,12 +27,7 @@ class CamaleonCms::Admin::SettingsController < CamaleonCms::AdminController
       @site.set_options(params[:meta]) if params[:meta].present?
       @site.set_multiple_options(params[:options])
       @site.set_field_values(params[:field_options])
-      theme = @site.get_theme.decorate
-      theme.set_field_values(params[:theme_fields]) if params[:theme_fields].present?
-      theme.set_options(params[:theme_option]) if params[:theme_option].present?
-      theme.set_metas(params[:theme_meta]) if params[:theme_meta].present?
       flash[:notice] = t('camaleon_cms.admin.settings.message.site_updated')
-      hook_run(theme.settings, "on_theme_settings", theme)
       redirect_to action: :site
     else
       render 'site'
@@ -58,9 +55,27 @@ class CamaleonCms::Admin::SettingsController < CamaleonCms::AdminController
     redirect_to action: :languages
   end
 
+  def theme
+    add_breadcrumb I18n.t("camaleon_cms.admin.settings.theme_setting", default: 'Theme Settings')
+  end
+
+  def save_theme
+    current_theme.set_field_values(params[:theme_fields]) if params[:theme_fields].present?
+    current_theme.set_options(params[:theme_option]) if params[:theme_option].present?
+    current_theme.set_metas(params[:theme_meta]) if params[:theme_meta].present?
+    current_theme.set_field_values(params[:field_options])
+    hook_run(current_theme.settings, "on_theme_settings", current_theme)# permit to save extra/custom values by this hook
+    flash[:notice] = t('camaleon_cms.admin.message.updated_success', default: 'Theme updated successfully')
+    redirect_to action: :theme
+  end
+
   private
 
   def validate_role
-    authorize! :manager, :settings
+    authorize! :manage, :settings
+  end
+
+  def validate_role_theme
+    authorize! :manage, :theme_settings
   end
 end