forgeos_core 1.9.4 → 1.9.5.rc1

data/app/views/admin/settings/_mailer.html.haml

@@ -1,40 +1,34 @@
-= f.fields_for :mailer do |mailer_form|
-  = mailer_form.label :delivery_method
-  %div
-    = mailer_form.select :delivery_method, [['SMTP','smtp'],['sendmail','sendmail'],['Test','test']], { :prompt => t(:please_select) }
+- mailer = f.object.mailer || {}
+
+= f.fields_for :mailer do |mailer_fields|
+  = mailer_fields.label :delivery_method
+  = mailer_fields.select :delivery_method, options_for_select([['SMTP','smtp'],['sendmail','sendmail'],['Test','test']], mailer[:delivery_method]), { :prompt => t(:please_select) }
   .clear
-#smtp.delivery_method_settings.hidden
-  = f.fields_for :smtp_settings do |smtp|
-    = smtp.label :address
-    %div
-      = smtp.text_field :address
-    = smtp.label :port
-    %div
-      = smtp.text_field :port
-    = smtp.label :domain
-    %div
-      = smtp.text_field :domain
-    = smtp.label :authentication
-    %div
-      = smtp.select :authentication, [['none', 'none'],['plain','plain'],['login','login'],['cran_md5','cran_md5']], {}, :onchange => "if(this.value == 'none'){$('#authentication').addClass('hidden');} else {$('#authentication').removeClass('hidden');}"
-    .clear
-    - authentication_class = (smtp.object and smtp.object.authentication ? nil : 'hidden')
-    #authentication{ :class => authentication_class }
-      = smtp.label :user_name
-      %div
-        = smtp.text_field :user_name
-      = smtp.label :password
-      %div
-        = smtp.text_field :password
-    = smtp.label :enable_starttls_auto
-    %div
-      = smtp.check_box :enable_starttls_auto
-#sendmail.delivery_method_settings.hidden
-  = f.fields_for :sendmail_settings do |sendmail|
-    = sendmail.label :location
-    %div
-      = sendmail.text_field :location
-    = sendmail.label :arguments
-    %div
-      = sendmail.text_field :arguments
+
+#smtp.delivery_method_settings.hidden.fieldset.grid_7
+  %h2 SMTP Configuration
+
+  - smtp_settings = f.object.smtp_settings || {}
+
+  = f.fields_for :smtp_settings do |smtp_fields|
+    = serialized_field smtp_fields, smtp_settings, :text_field, :address
+    = serialized_field smtp_fields, smtp_settings, :text_field, :port
+    = serialized_field smtp_fields, smtp_settings, :text_field, :domain
+    = serialized_field smtp_fields, smtp_settings, :check_box, :enable_starttls_auto
+
+    = smtp_fields.label :authentication
+    %br
+    = smtp_fields.select :authentication, options_for_select([['none', 'none'],['plain','plain'],['login','login'],['cran_md5','cran_md5']], smtp_settings[:authentication])
+
+    #authentication{ :class => (smtp_settings[:authentication] ? nil : 'hidden') }
+      = serialized_field smtp_fields, smtp_settings, :text_field, :user_name
+      = serialized_field smtp_fields, smtp_settings, :text_field, :password
+#sendmail.delivery_method_settings.hidden.fieldset.grid_7
+  %h2 Sendmail Configuration
+
+  - sendmail_settings = f.object.sendmail_settings || {}
+
+  = f.fields_for :sendmail_settings, sendmail_settings do |sendmail_fields|
+    = serialized_field sendmail_fields, sendmail_settings, :text_field, :location
+    = serialized_field sendmail_fields, sendmail_settings, :text_field, :arguments
 #test.delivery_method_settings.hidden

data/app/views/admin/sidebars/_left_sidebar.html.haml

@@ -25,5 +25,5 @@
     %h2.small-icons{ :class => icon_class }
       = link_to_function I18n.t(sidebar_title).capitalize, "select_all_elements_without_category()"
     .category-tree{ :id => tree_id }
-    = form_for [forgeos_core, :admin, Category.new], :html => { :multipart => true } do |f|
-      =render :partial => 'admin/sidebars/attachments_popups', :locals => {:form => f}
+    = form_for [forgeos_core, :admin, Category.new], :html => { :multipart => true, "data-object_name" => Category.model_name.singular } do |f|
+      = render :partial => 'attachments_popups'

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

@@ -1,4 +1,4 @@
-= form_for [forgeos_core, :admin, user], :html => { :id => 'wrap', :autocomplete => 'off' } do |f|
+= form_for [forgeos_core, :admin, user], :html => { :id => 'wrap', :autocomplete => 'off', "data-object_name" => user.class.model_name.singular } do |f|
   .backgrounds.big-header
     = f.select :civility, t('civility.select'), { :prompt => t(:please_select) }
     = f.text_field :firstname, :title => t('firstname'), :class => 'defaultValue field_name firstname'

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

@@ -1 +1 @@
-toggleActivate('#show_user_<%= @user.id -%>');
+toggleActivate('#<%= polymorphic_html_id @user, 'show' -%>');

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

@@ -1 +1 @@
-removedataTablesRow('#destroy_user_<%= @user.id -%>');
+removedataTablesRow('#<%= polymorphic_html_id @user, 'destroy' -%>');

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

@@ -4,11 +4,10 @@
     :iTotalRecords => @users.total_entries || 0,
     :iTotalDisplayRecords => @users.size,
     :aaData => @users.collect do |user|
-      link_id = "user_#{user.id}"
       klass = user.active? ? 'see-on' : 'see-off'
       table =
       [
-      content_tag(:div, tag(:div, :class=>'handler') + tag(:div, :class => 'small-icons user-ico'), :id => link_id, :class => 'handler_container'),
+      content_tag(:div, tag(:div, :class=>'handler') + tag(:div, :class => 'small-icons user-ico'), :id => polymorphic_html_id(user), :class => 'handler_container'),
       content_tag(:div, (params[:mode] == 'selection' ? user.fullname : link_to(user.fullname, [forgeos_core, :admin, user])), :class => 'user-name'),
       content_tag(:div, (params[:mode] == 'selection' ? user.email : mail_to(user.email, user.email, :class => 'truncate', :title => user.email)), :class => 'email'),
       ]
@@ -19,7 +18,7 @@
           :remote => true,
           :method => :post,
           :class => "small-icons #{klass}",
-          :id => "show_#{link_id}"
+          :id => polymorphic_html_id(user, 'show')
         ) <<
         link_to('', [forgeos_core, :edit, :admin, user], :class => 'small-icons edit-link') +
         link_to('', [forgeos_core, :admin, user],
@@ -27,7 +26,7 @@
           :method => :delete,
           :confirm => I18n.t('user.destroy.confirm').capitalize,
           :class => 'small-icons destroy-link',
-          :id => "destroy_#{link_id}"
+          :id => polymorphic_html_id(user, 'destroy')
         )
       else
         table << user.id

data/app/views/layouts/admin.html.haml

@@ -4,8 +4,8 @@
   %head
     %meta{ :content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }
     %link{ :href => "/assets/forgeos/admin/favicon.gif", :rel => "shortcut icon", :type => "image/gif" }
-    = stylesheet_link_tag 'forgeos/960', 'forgeos/jquery-ui/themes/forgeos', 'forgeos/admin/base', :cache => 'forgeos/admin'
-    = javascript_include_tag 'jquery', 'forgeos/swfobject'
+    = stylesheet_link_tag 'forgeos/admin/base'
+    = javascript_include_tag 'forgeos/admin/base'
     = csrf_meta_tag
     %title= "#{I18n.t(:forgeos)} - #{I18n.t(controller.controller_name, :scope => ['back_office', 'menu']).capitalize}"
   %body
@@ -24,10 +24,10 @@
         = yield
       #footer
       #dialog
-      = javascript_include_tag 'forgeos/admin/customselects', 'forgeos/admin/jquery-cookie-plugin', :cache => 'forgeos/admin/no-concat-lib'
-      = javascript_include_tag 'forgeos/tiny_mce/jquery.tinymce.js', 'jquery-ui', 'jquery_ujs', 'forgeos/jquery.dataTables.min.js', 'forgeos/jquery.dataSlides.js', 'forgeos/jstree/jquery.jstree.js', 'forgeos/jquery.uploadify.js', :cache => 'forgeos/admin/lib'
-      = eval("javascript_include_tag '#{forgeos_js_functions_files.join("','")}', :cache => 'forgeos/admin/functions'")
-      = eval("javascript_include_tag '#{forgeos_js_inits_files.join("','")}', :cache => 'forgeos/admin/inits'")
+      = javascript_include_tag 'jquery.cookie'
+      = javascript_include_tag 'forgeos/admin/libs'
+      = javascript_include_tag 'forgeos/admin/functions'
+      = javascript_include_tag 'forgeos/admin/inits'
       :javascript
         window._forgeos_js_vars = {
          "session_key": '#{Rails.application.config.session_options[:key]}',
@@ -36,6 +36,5 @@
          "token": encodeURIComponent('#{form_authenticity_token.inspect}')
         }
         jQuery(document).ready(function(){
-          InitCustomSelects();
           display_notifications();
         });

data/app/views/layouts/admin_login.html.haml

@@ -4,12 +4,12 @@
   %head
     %meta{ :content => 'text/html; charset=utf-8', 'http-equiv' => 'Content-Type' }
     %link{ :href => '/assets/forgeos/admin/favicon.gif', :rel => 'shortcut icon', :type => 'image/gif' }
-    = stylesheet_link_tag 'forgeos/960', 'forgeos/admin/login'
+    = stylesheet_link_tag 'forgeos/admin/login'
     = javascript_include_tag 'jquery'
     %title= I18n.t(:login, :scope => ['back_office', 'menu'])
   %body
     = yield
-    = javascript_include_tag 'forgeos/admin/functions/forgeos_core/notifications', 'forgeos/admin/inits/forgeos_core/clicks', :cache => 'forgeos/admin/login'
+    = javascript_include_tag 'forgeos/admin/login'
     :javascript
       window._forgeos_js_vars = {
        "locale": '#{I18n.locale}'

data/app/views/person_sessions/_new_form.html.haml

@@ -1,4 +1,4 @@
-= form_for PersonSession.new, :url => [:forgeos, :core, :engine, :person, :session], :html => { :autocomplete => 'off', :class => 'login_form' } do |f|
+= form_for [forgeos_core, PersonSession.new], :url => [:forgeos, :core, :engine, :person, :session], :html => { :autocomplete => 'off', :class => 'login_form' } do |f|
   = f.label :email, t(:email).capitalize
   = f.text_field :email
   = f.label :password, t(:password).capitalize

data/app/views/user_notifier/import_finished.html.haml

@@ -0,0 +1,18 @@
+%strong total :
+= @results[:total]
+%br
+%strong created :
+= @results[:created]
+%br
+%strong updated :
+= @results[:updated]
+
+- if errors_count = @results[:errors].flatten.size and errors_count > 0
+  %br
+  %h4 errors :
+  %strong total :
+  = errors_count
+  %br
+  %ul
+    - @results[:errors].each do |error|
+      %li= error.inspect

data/config/initializers/load_settings.rb

@@ -1,7 +1,7 @@
 if ActiveRecord::Base.connection.tables.include?(Setting.table_name) and settings = Setting.current
   Time.zone = settings.time_zone
   I18n.default_locale = settings.lang.to_sym
-  ActionMailer::Base.delivery_method = settings.mailer ? settings.mailer.delivery_method : :test
-  ActionMailer::Base.smtp_settings = settings.smtp_settings.marshal_dump if settings.smtp_settings
-  ActionMailer::Base.sendmail_settings = settings.sendmail_settings.marshal_dump if settings.sendmail_settings
+  ActionMailer::Base.delivery_method = (settings.mailer[:delivery_method] || :test).to_sym
+  ActionMailer::Base.smtp_settings = settings.smtp_settings || {}
+  ActionMailer::Base.sendmail_settings = settings.sendmail_settings || {}
 end

data/config/initializers/sass.rb

@@ -0,0 +1,4 @@
+Rails.configuration.sass.tap do |config|
+ config.load_paths << "#{Gem.loaded_specs['compass'].full_gem_path}/frameworks/compass/stylesheets"
+end
+

data/config/initializers/squeel.rb

@@ -0,0 +1,3 @@
+Squeel.configure do |config|
+  config.load_core_extensions :hash, :symbol
+end

data/config/locales/admin/admin/en.yml

@@ -3,11 +3,13 @@ en:
     one: caching
     two: cachings
     no_files: there is no caching pages to delete
+    tmp_directory: segment's cache directory
+    public_directory: plain pages cache directory
     delete:
       success: The cache was successfully deleted
       failed: a problem occured during the cache deletion
-      one: delete those pages
-      all: delete all the pages
+      one: delete selected cached pages
+      all: delete the entire cache
   admin:
     one: user
     other: users

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

@@ -3,11 +3,13 @@ fr:
     one: cache
     two: caches
     no_files: il n'y a pas de pages à supprimer
+    tmp_directory: Répertoire de cache partiel
+    public_directory: Répertoire de cache de pages entières
     delete:
       success: Le cache a été supprimé
       failed: "un problème est survenu lors de la mise à suppression du cache"
-      one: supprimer ces pages
-      all: supprimer toutes les pages
+      one: supprimer le cache des pages sélectionnées
+      all: supprimer la totalité du cache
   admin:
     one: administrateur
     other: administrateurs

data/config/locales/common/en.yml

@@ -121,9 +121,15 @@ en:
       '1': Ms
       '2': Mss
     select:
-      - [Mr, 0]
-      - [Ms, 1]
-      - [Mss, 2]
+      -
+        - Mr
+        - 0
+      -
+        - Ms
+        - 1
+      -
+        - Mss
+        - 2
   newsletter:
     one: newsletter
     other: newsletters

data/config/locales/common/fr.yml

@@ -120,9 +120,15 @@ fr:
       '1': Mme
       '2': Mlle
     select:
-      - [M, 0]
-      - [Mme, 1]
-      - [Mlle, 2]
+      -
+        - M
+        - 0
+      -
+        - Mme
+        - 1
+      -
+        - Mlle
+        - 2
   newsletter:
     one: newsletter
     other: newsletters

data/config/locales/date/en.yml

@@ -9,11 +9,54 @@ en:
       long: "%B %e, %Y"
       only_day: "%e"
 
-    day_names: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday, Saturday]
-    abbr_day_names: [Sun, Mon, Tue, Wed, Thu, Fri, Sat]
-    month_names: [~, January, February, March, April, May, June, July, August, September, October, November, December]
-    abbr_month_names: [~, Jan, Feb, Mar, Apr, May, Jun, Jul, Aug, Sep, Oct, Nov, Dec]
-    order: [ :year, :month, :day ]
+    day_names:
+      - Sunday
+      - Monday
+      - Tuesday
+      - Wednesday
+      - Thursday
+      - Friday
+      - Saturday
+    abbr_day_names:
+      - Sun
+      - Mon
+      - Tue
+      - Wed
+      - Thu
+      - Fri
+      - Sat
+    month_names:
+      - ~
+      - January
+      - February
+      - March
+      - April
+      - May
+      - June
+      - July
+      - August
+      - September
+      - October
+      - November
+      - December
+    abbr_month_names:
+      - ~
+      - Jan
+      - Feb
+      - Mar
+      - Apr
+      - May
+      - Jun
+      - Jul
+      - Aug
+      - Sep
+      - Oct
+      - Nov
+      - Dec
+    order:
+      - :year
+      - :month
+      - :day
     day: day
     month: month
     year: year

data/config/locales/date/fr.yml

@@ -12,11 +12,54 @@ fr:
       long_ordinal: "%e %B %Y"
       only_day: "%e"
 
-    day_names: [dimanche, lundi, mardi, mercredi, jeudi, vendredi, samedi]
-    abbr_day_names: [dim, lun, mar, mer, jeu, ven, sam]
-    month_names: [~, janvier, février, mars, avril, mai, juin, juillet, août, septembre, octobre, novembre, décembre]
-    abbr_month_names: [~, jan., fév., mar., avr., mai, juin, juil., août, sept., oct., nov., déc.]
-    order: [ :day, :month, :year ]
+    day_names:
+      - dimanche
+      - lundi
+      - mardi
+      - mercredi
+      - jeudi
+      - vendredi
+      - samedi
+    abbr_day_names:
+      - dim
+      - lun
+      - mar
+      - mer
+      - jeu
+      - ven
+      - sam
+    month_names:
+      - ~
+      - janvier
+      - février
+      - mars
+      - avril
+      - mai
+      - juin
+      - juillet
+      - août
+      - septembre
+      - octobre
+      - novembre
+      - décembre
+    abbr_month_names:
+      - ~
+      - jan.
+      - fév.
+      - mar.
+      - avr.
+      - mai
+      - juin
+      - juil.
+      - août
+      - sept.
+      - oct.
+      - nov.
+      - déc.
+    order:
+      - :day
+      - :month
+      - :year
     day: jour
     month: mois
     year: année

data/config/locales/number/fr.yml

@@ -11,13 +11,8 @@ fr:
         format: '%n %u'
     human:
       format:
-        # These three are to override number.format and are optional
-        # separator:
         delimiter: ""
         precision: 2
-      # Rails <= v2.2.2
-      # storage_units: [octet, kb, Mb, Gb, Tb]
-      # Rails >= v2.3
       storage_units:
         format: "%n %u"
         units:

data/config/routes.rb

@@ -9,12 +9,15 @@ Forgeos::Core::Engine.routes.draw do
   namespace :admin do
     root :to => 'dashboard#index'
     match 'dashboard' => 'dashboard#index', :as => :dashboard
+    match 'dashboard/change_lang' => 'dashboard#change_lang', :as => :change_lang
     match 'logout' => 'person_sessions#destroy', :as => :logout
     match 'login' => 'person_sessions#new', :as => :login
     match '/notifications' => 'base#notifications', :as => :notifications
     match '/statistics' => 'statistics#index', :as => :statistics
     match '/statistics/graph' => 'statistics#graph', :as => :statistics_graph
+
     match '/import' => 'import#index', :as => :import
+    match '/import/create_user' => 'import#create_user', :as => :import_create_user
 
     resources :cachings
     resource :person_session do
@@ -48,7 +51,11 @@ Forgeos::Core::Engine.routes.draw do
       end
     end
 
-    resources :categories
+    resources :categories do
+      member do
+        post :add_element
+      end
+    end
 
     %w(media picture doc pdf audio video attachment admin role right user menu).each do |category|
       resources "#{category}_categories", :controller => 'categories', :type => "#{category}_category" do

data/db/fixtures/settings.yml

@@ -2,13 +2,10 @@ main_setting:
   name: Forgeos
   lang: en
   time_zone: UTC
-  mailer: !ruby/object:OpenStruct
-    table:
-      :delivery_method: test
-  smtp_settings: !ruby/object:OpenStruct
-    table: nil
-  sendmail_settings: !ruby/object:OpenStruct
-    table: nil
+  mailer: !map:ActiveSupport::HashWithIndifferentAccess
+    delivery_method: test
+  smtp_settings: !map:ActiveSupport::HashWithIndifferentAccess
+  sendmail_settings: !map:ActiveSupport::HashWithIndifferentAccess
   attachments:
     picture:
       storage: :file_system

data/db/migrate/20091030163643_create_settings.rb

@@ -9,7 +9,7 @@ class CreateSettings < ActiveRecord::Migration
         :email
       t.text :mailer,
         :smtp_settings,
-        :sendmail_settings
+        :sendmail_settings, :null => false
       t.belongs_to :address
     end
   end

data/db/migrate/20110913094637_create_delayed_jobs.rb

@@ -0,0 +1,21 @@
+class CreateDelayedJobs < ActiveRecord::Migration
+  def self.up
+    create_table :delayed_jobs, :force => true do |table|
+      table.integer  :priority, :default => 0      # Allows some jobs to jump to the front of the queue
+      table.integer  :attempts, :default => 0      # Provides for retries, but still fail eventually.
+      table.text     :handler                      # YAML-encoded string of the object that will do work
+      table.text     :last_error                   # reason for last failure (See Note below)
+      table.datetime :run_at                       # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+      table.datetime :locked_at                    # Set when a client is working on this object
+      table.datetime :failed_at                    # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string   :locked_by                    # Who is working on this object (if locked)
+      table.timestamps
+    end
+	
+    add_index :delayed_jobs, [:priority, :run_at], :name => 'delayed_jobs_priority'
+  end
+  
+  def self.down
+    drop_table :delayed_jobs  
+  end
+end

data/lib/extensions/routing.rb

@@ -0,0 +1,26 @@
+module ActionDispatch
+  module Routing
+    class Mapper
+      module Base
+        private
+          def define_generate_prefix(app, name)
+            return unless app.respond_to?(:routes) && app.routes.respond_to?(:define_mounted_helper)
+
+            _route = @set.named_routes.routes[name.to_sym]
+            _routes = @set
+            app.routes.define_mounted_helper(name)
+            app.routes.class_eval do
+              define_method :_generate_prefix do |options|
+                prefix_options = options.slice(*_route.segment_keys)
+                # we must actually delete prefix segment keys to avoid passing them to next url_for
+                _route.segment_keys.each { |k| options.delete(k) }
+                mount_path = _routes.url_helpers.send("#{name}_path", prefix_options)
+                mount_path == '/' ? '' : mount_path
+              end
+            end
+          end
+
+      end
+    end
+  end
+end

data/lib/extensions.rb

@@ -1,2 +1,2 @@
-require File.join(File.dirname(__FILE__), 'extensions', 'i18n_fallbacks_config')
 require File.join(File.dirname(__FILE__), 'extensions', 'form_helper_extensions')
+require File.join(File.dirname(__FILE__), 'extensions', 'routing')

data/lib/forgeos/core/engine.rb

@@ -1,9 +1,23 @@
 require 'rails'
+require 'globalize3'
+require 'acts-as-taggable-on'
+require 'acts_as_list'
+require 'acts_as_tree'
+require 'bcrypt'
+require 'haml'
+require 'sass'
+require 'thinking-sphinx'
+require 'webpulser-habtm_list'
+require 'will_paginate'
+require 'authlogic'
+require 'squeel'
+require 'delayed_job'
 
 module Forgeos
   module Core
     class Engine < Rails::Engine
       paths["config/locales"] << 'config/locales/**'
+      paths["app/assets"] << 'vendor/assets'
     end
   end
 end

data/lib/forgeos/core/version.rb

@@ -0,0 +1,5 @@
+module Forgeos
+  module Core
+    VERSION = "1.9.5.rc1"
+  end
+end