forgeos_cms 1.9.4 → 1.9.5.rc1

data/app/controllers/admin/widgets_controller.rb

@@ -14,14 +14,17 @@ class Admin::WidgetsController < Admin::BaseController
   end
 
   def destroy
-    if request.delete?
-      @widget.destroy
+    if @widget.destroy
       flash[:notice] = I18n.t('widget.destroy.success').capitalize
     else
-      flash[:error] = @widget.errors if @widget
       flash[:error] = I18n.t('widget.destroy.failed').capitalize
     end
-    render :nothing => true
+    respond_to do |wants|
+      wants.html do
+        redirect_to([forgeos_cms, :admin, :widgets])
+      end
+      wants.js
+    end
   end
 
 private

data/app/helpers/admin/base_helper.rb

@@ -1,16 +1,16 @@
 load File.join(Gem.loaded_specs['forgeos_core'].full_gem_path, 'app', 'helpers', 'admin', 'base_helper.rb')
 
 module Admin::BaseHelper
-  def block_container(model_name, block_name, block, &proc)
+  def block_container(object_name, block_name, block, &proc)
     content_tag :div, :class => 'block-container ui-corner-all' do
       content_tag(:span, :class => 'block-type') do
-        content_tag(:span, content_tag(:span, ' ', :class => 'inner'), :class => 'handler') +
-        block.model_name.human
+        content_tag(:span, content_tag(:span, '', :class => 'inner'), :class => 'handler') +
+        block.class.to_s
       end +
       content_tag(:span, capture(&proc), :class => 'block-name') +
-      link_to('', [:edit, :admin, block], :class => 'small-icons edit-link', :popup => true) +
+      link_to('', [:edit, forgeos_cms, :admin, block], :class => 'small-icons edit-link', :popup => true) +
       link_to('', '#', :class => 'big-icons gray-destroy') +
-      hidden_field_tag("#{model_name}[#{block_name}_ids][]", block.id, :class => 'block-selected')
+      hidden_field_tag("#{object_name}[#{block_name}_ids][]", block.id, :class => 'block-selected')
     end
   end
 end

data/app/models/block.rb

@@ -58,7 +58,7 @@ private
   # if the block contains a single_key, it can not be destroyed
   def check_has_no_single_key
     if !self.single_key.blank?
-      errors.add(:the_block, :has_single_key)
+      errors.add(:single_key, :no_destroy)
       return false
     end
   end

data/app/models/page_sweeper.rb

@@ -38,7 +38,7 @@ class PageSweeper < ActionController::Caching::Sweeper
 
   def expire_cache_for_page(page)
     page.page_urls.each do |url|
-      expire_page forgeos_cms.page_path(url)
+      expire_page url
     end
 
     page.menu_links.each do |link|

data/app/views/admin/actualities/_form.html.haml

@@ -1,4 +1,4 @@
-= form_for [forgeos_cms, :admin, actuality], :html => { :id => 'wrap', :autocomplete => 'off', :multipart=>true } do |f|
+= form_for [forgeos_cms, :admin, actuality], :html => { "data-object_name" => actuality.class.model_name.singular, :id => 'wrap', :autocomplete => 'off', :multipart=>true } do |f|
   .backgrounds.big-header
     = f.text_field :title, :title => t('actuality.name').capitalize, :class => 'element_form_name defaultValue'
 
@@ -35,4 +35,4 @@
         %div
           = display_visual(f.object_name, actuality.picture)
 
-  = render :partial => 'admin/visual/visual_popup.html.haml', :locals => {:form => f}
+  = render :partial => 'attachments_popups'

data/app/views/admin/actualities/activate.js.erb

@@ -0,0 +1 @@
+toggleActivate('#<%= polymorphic_html_id @actuality, 'show' -%>');

data/app/views/admin/actualities/destroy.js.erb

@@ -0,0 +1 @@
+removedataTablesRow('#<%= polymorphic_html_id @actuality, 'destroy' -%>');

data/app/views/admin/actualities/index.json.erb

@@ -4,29 +4,26 @@
     :iTotalRecords => @actualities.total_entries || 0,
     :iTotalDisplayRecords => @actualities.size,
     :aaData => @actualities.collect do |actuality|
-      link_id = "actuality_#{actuality.id}"
       picture = actuality.picture.public_filename(:thumb) if actuality.picture
       klass = actuality.active? ? 'see-on' : 'see-off'
       author = actuality.administrator.lastname if actuality.administrator
       [
-        content_tag(:div, tag(:div, :class=>'handler') + image_tag(picture || 'forgeos/admin/no-image.png'), :id => link_id, :class => 'handler_container'),
+        content_tag(:div, tag(:div, :class=>'handler') + image_tag(picture || 'forgeos/admin/no-image.png'), :id => polymorphic_html_id(actuality), :class => 'handler_container'),
         content_tag(:div, actuality.date),
         content_tag(:div, link_to(actuality.title, [forgeos_cms, :admin, actuality]), :class => 'actuality-name'),
         content_tag(:div, author || 'not found'),
         link_to('', [forgeos_cms, :activate, :admin, actuality],
          :remote => true,
-         :complete => "toggleActivate('#show_#{link_id}')",
          :class => "small-icons #{klass}",
-         :id => "show_#{link_id}"
+         :id => polymorphic_html_id(actuality, 'show')
         ),
         link_to('', [forgeos_cms, :edit, :admin, actuality], :class => 'small-icons edit-link') +
         link_to('', [forgeos_cms, :admin, actuality],
           :remote => true,
           :method => :delete,
           :confirm => t('actuality.destroy.confirm').capitalize,
-          :success => "removedataTablesRow('#destroy_#{link_id}')",
           :class => 'small-icons destroy-link',
-          :id => "destroy_#{link_id}"
+          :id => polymorphic_html_id(actuality, 'destroy')
         )
       ]
     end

data/app/views/admin/carousels/_form.html.haml

@@ -1,6 +1,6 @@
 = render :partial => 'admin/menus/lang_switcher'
 = render :partial => 'admin/widgets/tabs'
-= form_for [forgeos_cms, :admin, carousel], :html => { :id => 'wrap' } do |f|
+= form_for [forgeos_cms, :admin, carousel], :html => { "data-object_name" => carousel.class.model_name.singular, :id => 'wrap' } do |f|
   = hidden_field_tag 'page_id', page_id if defined?(page_id) && !page_id.blank?
 
   .backgrounds.big-header
@@ -42,7 +42,7 @@
       .clear
   .clear
 
-  = render :partial => 'attachments_popups', :locals => {:form => f}
+  = render :partial => 'attachments_popups'
 
 = form_for [forgeos_cms, :admin, carousel], :html => {:method => :put, :multipart => true, :id => "hidden_form"} do |hidden_form|
   .item_form.hidden

data/app/views/admin/categories/_block.html.haml

@@ -2,3 +2,4 @@
 - link_class += ' active' if page.page_cols.map(&:blocks).flatten.uniq.include?(block)
 %li{ :rel => 'file', :id => "block_#{block.id}" }
   = link_to block.title.to_s + '<span class="small-icons"></span>', '#', :class => link_class, :title => block.class.model_name.human.capitalize
+

data/app/views/admin/menus/_form.html.haml

@@ -1,6 +1,6 @@
 = render :partial => 'admin/menus/lang_switcher'
 = render :partial => 'tabs'
-= form_for [forgeos_cms, :admin, menu], :html => { :id => 'wrap' } do |f|
+= form_for [forgeos_cms, :admin, menu], :html => { "data-object_name" => menu.class.model_name.singular, :id => 'wrap' } do |f|
   .backgrounds.big-header
     = f.text_field :name, :class => 'field_name'
     = Forgeos_save_buttons forgeos_cms.admin_menus_path

data/app/views/admin/menus/_form_menu_links.html.haml

@@ -48,6 +48,7 @@
           = link_to content_tag(:span, t(:save_changes), :class => 'small-icons save'), '#', :class => 'backgrounds action-button'
           = t('or')
           = link_to t('cancel').capitalize, '#', :class => 'back-link'
+        .clear
 
       %span.action-links.hidden
         = link_to '', '#', :class => 'small-icons add-green-plus'
@@ -56,3 +57,4 @@
     - unless menu_link.children.nil? or menu_link.children.blank?
       %ul
         = render :partial => 'form_menu_links', :locals => { :form => menu_link_form, :has_parent => true }
+

data/app/views/admin/menus/activate.js.erb

@@ -0,0 +1 @@
+toggleActivate('#<%= polymorphic_html_id @menu, 'show' -%>');

data/app/views/admin/menus/destroy.js.erb

@@ -0,0 +1 @@
+removedataTablesRow('#<%= polymorphic_html_id @menu, 'destroy' -%>');

data/app/views/admin/menus/index.json.erb

@@ -4,16 +4,14 @@
     :iTotalRecords => @menus.total_entries || 0,
     :iTotalDisplayRecords => @menus.size,
     :aaData => @menus.collect do |menu|
-      link_id = menu.id
       klass = menu.active? ? 'see-on' : 'see-off'
       [
-        content_tag(:div, content_tag(:div, tag(:span, :class => "small-icons menu-ico"), :class=>"image"), :id => link_id),
+        content_tag(:div, content_tag(:div, tag(:span, :class => "small-icons menu-ico"), :class=>"image"), :id => polymorphic_html_id(menu)),
         content_tag(:div, link_to(menu.name, [forgeos_cms, :edit, :admin, menu]), :class => 'menu-name'),
         link_to('', [forgeos_cms, :activate, :admin, menu],
          :remote => true,
-         :complete => "toggleActivate('#show_#{link_id}')",
          :class => "small-icons #{klass}",
-         :id => "show_#{link_id}"
+         :id => polymorphic_html_id(menu, 'show')
         ),
         link_to('', [forgeos_cms, :duplicate, :admin, menu], :class => 'small-icons duplicate-link') +
         link_to('', [forgeos_cms, :edit, :admin, menu], :class => 'small-icons edit-link') +
@@ -21,8 +19,8 @@
           :remote => true,
           :method => :delete,
           :confirm => t('menu.destroy.confirm').capitalize,
-          :success => "removedataTablesRow('#destroy_#{link_id}')",
-          :class => 'small-icons destroy-link', :id => "destroy_#{link_id}"
+          :class => 'small-icons destroy-link',
+          :id => polymorphic_html_id(menu, 'destroy')
         )
       ]
     end

data/app/views/admin/newsletters/_form.html.haml

@@ -1,4 +1,4 @@
-= form_for [forgeos_cms, :admin , newsletter], :html => { :id => 'wrap' } do |f|
+= form_for [forgeos_cms, :admin , newsletter], :html => { "data-object_name" => newsletter.class.model_name.singular, :id => 'wrap' } do |f|
   .backgrounds.big-header
 
     .interact-links

data/app/views/admin/newsletters/destroy.js.erb

@@ -0,0 +1 @@
+removedataTablesRow('#<%= polymorphic_html_id @newsletter, 'destroy' -%>');

data/app/views/admin/newsletters/index.json.erb

@@ -4,7 +4,6 @@
     :iTotalRecords => @newsletters.total_entries || 0,
     :iTotalDisplayRecords => @newsletters.size,
     :aaData => @newsletters.collect do |newsletter|
-      link_id = newsletter.id
       [
         content_tag(:div, link_to(newsletter.email, [forgeos_cms, :edit, :admin, newsletter])),
         content_tag(:div, newsletter.created_at.to_s),
@@ -13,9 +12,8 @@
           :remote => true,
           :method => :delete,
           :confirm => t('menu.destroy.confirm').capitalize,
-          :success => "removedataTablesRow('#destroy_#{link_id}')",
           :class => 'small-icons destroy-link',
-          :id => "destroy_#{link_id}"
+          :id => polymorphic_html_id(newsletter, 'destroy')
         )
       ]
     end

data/app/views/admin/pages/_form.html.haml

@@ -1,6 +1,6 @@
 = render :partial => 'admin/menus/lang_switcher'
 = render :partial => 'tabs'
-= form_for [forgeos_cms, :admin, page], :html => { :id => 'wrap' } do |f|
+= form_for [forgeos_cms, :admin, page], :html => { "data-object_name" => page.class.model_name.singular, :id => 'wrap' } do |f|
   #blocks-header.ui-tabs.ui-widget.ui-widget-content.ui-corner-all
     %ul.ui-tabs-nav.ui-helper-reset.ui-helper-clearfix.ui-widget-header.ui-corner-all
       %li.ui-state-default.ui-corner-top.ui-tabs-selected.ui-state-active= link_to t(:general), '#general', :class => 'selected'

data/app/views/admin/pages/_page_url.html.haml

@@ -0,0 +1 @@
+= f.text_field :url

data/app/views/admin/pages/_seo.html.haml

@@ -4,8 +4,7 @@
       = t('permalink').capitalize
       \:
     .option-panel-content
-      = forgeos_cms.page_url("_")
-      = f.text_field :url
+      = render :partial => 'page_url', :locals => {:f => f}
   .fieldset.open
     %h3= t(:meta_info,:count => 1)
     .option-panel-content.meta

data/app/views/admin/pages/destroy.js.erb

@@ -0,0 +1 @@
+removedataTablesRow('#<%= polymorphic_html_id @page, 'destroy' -%>');

data/app/views/admin/pages/index.json.erb

@@ -4,20 +4,19 @@
     :iTotalRecords => @pages.total_entries || 0,
     :iTotalDisplayRecords => @pages.size,
     :aaData => @pages.collect do |page|
-      link_id = "page_#{page.id}"
       # status = [['published', 'published'], ['draft', 'draft'], ['to validate', 'to-validate']]
       status = [[I18n.t('page.published'), 'published'], [I18n.t('page.draft'), 'draft']]
 
       if params[:mode] && params[:mode].eql?('menu_link')
         [
-          content_tag(:div, content_tag(:div, '',:class=>'handler')+content_tag(:div, '', :class=>'small-icons page'), :id => link_id, :class => 'handler_container'),
+          content_tag(:div, content_tag(:div, '',:class=>'handler')+content_tag(:div, '', :class=>'small-icons page'), :id => polymorphic_html_id(page), :class => 'handler_container'),
           content_tag(:div, page.title, :class => 'page-name'),
           page.id,
           link_to(page.title, [forgeos_cms, :admin, page])
         ]
       else
         [
-          content_tag(:div, content_tag(:div, '', :class=>'handler')+content_tag(:div, '', :class=>'small-icons page'), :id => link_id, :class => 'handler_container'),
+          content_tag(:div, content_tag(:div, '', :class=>'handler')+content_tag(:div, '', :class=>'small-icons page'), :id => polymorphic_html_id(page), :class => 'handler_container'),
           content_tag(:div, link_to(page.title, [forgeos_cms, :admin, page]), :class => 'page-name'),
           '',
           '',
@@ -29,9 +28,8 @@
             :remote => true,
             :method => 'delete',
             :confirm => I18n.t('page.destroy.confirm').capitalize,
-            :success => "removedataTablesRow('#destroy_#{link_id}')});",
             :class => 'small-icons destroy-link',
-            :id => "destroy_#{link_id}"
+            :id => polymorphic_html_id(page, 'destroy')
           )
         ]
       end

data/app/views/admin/static_content_blocks/_form.html.haml

@@ -1,6 +1,6 @@
 = render :partial => 'admin/menus/lang_switcher'
 = render :partial => 'admin/blocks/tabs'
-= form_for [forgeos_cms, :admin, static_content_block], :html => { :id => 'wrap' } do |f|
+= form_for [forgeos_cms, :admin, static_content_block], :html => { "data-object_name" => static_content_block.class.model_name.singular, :id => 'wrap' } do |f|
   .backgrounds.big-header
     = f.text_field :title, :class => 'field_name'
     .interact-links

data/app/views/admin/static_content_blocks/destroy.js.erb

@@ -0,0 +1 @@
+removedataTablesRow('#<%= polymorphic_html_id @static_content_block, 'destroy' -%>');

data/app/views/admin/static_content_blocks/index.json.erb

@@ -4,14 +4,12 @@
     :iTotalRecords => @blocks.total_entries || 0,
     :iTotalDisplayRecords => @blocks.size,
     :aaData => @blocks.collect do |block|
-      link_id = "block_#{block.id}"
       nb_pages = block.page_cols.count
       [
-        content_tag(:div, '<div class="image">&nbsp;<span class="small-icons block">&nbsp;</span></div>', :id => link_id, :class => 'some-variants plus'),
+        content_tag(:div, content_tag(:div, content_tag(:span, '', :class => 'small-icons block'), :class=>'image'), :id => polymorphic_html_id(block), :class => 'some-variants plus'),
         content_tag(:div, link_to(block.title, [forgeos_cms, :edit, :admin, block]), :class => 'page-name'),
 
-        content_tag(:span,"#{nb_pages.to_s} #{I18n.t('page', :count => nb_pages)}", :class=>'linked_to') +
-        render(:partial => 'admin/blocks/pages.html.haml', :locals => { :link_id => link_id, :block => block }),
+        content_tag(:span,"#{nb_pages.to_s} #{I18n.t('page', :count => nb_pages)}", :class=>'linked_to'),
 
         link_to('', forgeos_cms.duplicate_admin_static_content_block_path(block), :class => 'small-icons duplicate-link') +
         link_to('', [forgeos_cms, :edit, :admin, block], :class => 'small-icons edit-link') +
@@ -19,9 +17,8 @@
           :remote => true,
           :method => :delete,
           :confirm => I18n.t('static_content_block.destroy.confirm').capitalize,
-          :success => "removedataTablesRow('#destroy_#{link_id}')",
           :class => 'small-icons destroy-link',
-          :id => "destroy_#{link_id}"
+          :id => polymorphic_html_id(block, 'destroy')
         )
       ]
     end

data/app/views/admin/widget_actualities/_form.html.haml

@@ -1,4 +1,4 @@
-= form_for [forgeos_cms, :admin, widget_actuality], :html => { :id => 'wrap' } do |f|
+= form_for [forgeos_cms, :admin, widget_actuality], :html => { "data-object_name" => widget_actuality.class.model_name.singular, :id => 'wrap' } do |f|
   = hidden_field_tag 'page_id', page_id if defined?(page_id) && !page_id.blank?
 
   .backgrounds.big-header

data/app/views/admin/widget_faqs/_form.html.haml

@@ -1,4 +1,4 @@
-= form_for [forgeos_cms, :admin, widget_faq], :html => { :id => 'wrap' } do |f|
+= form_for [forgeos_cms, :admin, widget_faq], :html => { "data-object_name" => widget_faq.class.model_name.singular, :id => 'wrap' } do |f|
 
   .backgrounds.big-header
     = f.text_field :title,:class => 'element_form_name defaultValue'

data/app/views/admin/widgets/destroy.js.erb

@@ -0,0 +1 @@
+removedataTablesRow('#<%= polymorphic_html_id @widget, 'destroy' -%>');

data/app/views/admin/widgets/index.json.erb

@@ -4,10 +4,9 @@
     :iTotalRecords => @widgets.total_entries || 0,
     :iTotalDisplayRecords => @widgets.size,
     :aaData => @widgets.collect do |widget|
-      link_id = "block_#{widget.id}"
       nb_pages = widget.page_cols.count
       [
-        content_tag(:div, tag(:div, :class=>'handler')+content_tag(:div, tag(:span, :class=>'small-icons widget'), :class=>'image'), :id => link_id, :class => 'handler_container'),
+        content_tag(:div, tag(:div, :class=>'handler')+content_tag(:div, tag(:span, :class=>'small-icons widget'), :class=>'image'), :id => polymorphic_html_id(widget), :class => 'handler_container'),
         content_tag(:div, widget.class.model_name.human.upcase, :class => 'widget-type'),
         content_tag(:div, link_to(widget.title, [forgeos_cms, :edit, :admin, widget]), :class => 'widget-name'),
         content_tag(:span, "#{nb_pages.to_s} #{I18n.t('page', :count => nb_pages)}",  :class => 'linked_to'),
@@ -17,9 +16,8 @@
           :remote => true,
           :method => :delete,
           :confirm => I18n.t('widget.destroy.confirm').capitalize,
-          :success => "removedataTablesRow('#destroy_#{link_id}')",
           :class => 'small-icons destroy-link',
-          :id => "destroy_#{link_id}"
+          :id => polymorphic_html_id(widget, 'destroy')
         )
       ]
     end

data/config/forgeos_admin_menu.yml

@@ -0,0 +1,13 @@
+forgeos:
+  admin:
+    menu:
+      pages:
+        url:
+          - /admin/pages
+          - /admin/static_content_blocks
+          - /admin/widgets
+          - /admin/carousels
+          - /admin/widget_actualities
+          - /admin/menus
+        html:
+          class: left last

data/config/locales/activerecord/en.yml

@@ -28,7 +28,6 @@ en:
           password_confirmation: password confirmation
           email: email
         block:
-          the_block: a block
           title: title
           content: content
         page:

data/config/locales/activerecord/fr.yml

@@ -57,7 +57,6 @@ fr:
         password_confirmation: 'confirmation mot de passe'
         email: 'e-mail'
       block:
-        the_block: 'le bloc'
         title: 'titre'
         content: 'contenu'
       page:

data/config/locales/admin/page/fr.yml

@@ -4,12 +4,12 @@ fr:
   page_col_2: Toisième colonne
   codes: tags de code
   paste_code: "Collez vos codes Google analytics, Optimizer ou autre dans les champs ci-dessous :"
-  page_code: `Page Code` - Avant le HTML
+  page_code: "`Page Code` - Avant le HTML"
   page_code_explain: Ce code sera inséré avant la balise &lt;html&gt; de votre page.<br /> A utiliser pour coller vos codes de `Control` lors de vos tests A/B.
-  header_code: `Header Code`
+  header_code: "`Header Code`"
   header_code_explain: Ce code sera inséré dans la balise &lt;head&gt; de votre page.<br /> A utiliser pour coller vos codes de `Control` lors de vos test multivariables.
-  bottom_code: `Bottom Code`
-  bottom_code_explain: Ce code sera inséré juste avant la balise &lt;/body&gt; de votre page.<br /> A utiliser pour coller vos codes de tracking. 
+  bottom_code: "`Bottom Code`"
+  bottom_code_explain: Ce code sera inséré juste avant la balise &lt;/body&gt; de votre page.<br /> A utiliser pour coller vos codes de tracking.
   page:
     zero: page
     one: page
@@ -43,7 +43,7 @@ fr:
       update:
         failed: "erreur avec la mise à jour du bloc général"
     link:
-      update:    
+      update:
         success: 'les liens de cette page ont bien été modifiés'
         failed: 'un problème est survenu lors de la mise à jour des liens de la page'
     create:

data/config/routes.rb

@@ -1,6 +1,10 @@
 Forgeos::Cms::Engine.routes.draw do
-  resources :newsletters
   namespace :admin do
+    %w(page block).each do |model|
+      match "/import/create_#{model}" => "import#create_#{model}", :as => "import_create_#{model}"
+    end
+
+
     resources :actualities do
       member do
         post :activate
@@ -69,5 +73,4 @@ Forgeos::Cms::Engine.routes.draw do
       resources "#{category}_categories", :controller => 'categories', :type => "#{category}_category"
     end
   end
-  match '/*url' => 'pages#show', :as => :page
 end

data/lib/forgeos/cms.rb

@@ -4,5 +4,4 @@ module Forgeos
 end
 
 require 'forgeos/cms/engine'
-require 'forgeos/admin_menu'
 require 'forgeos/cms/statistics'