forgeos_core 1.9.4 → 1.9.5.rc1

data/app/assets/stylesheets/forgeos/jstree/themes/association_categories/style.css.sass

@@ -1,48 +1,72 @@
-.jstree-association_categories
-  .jstree-locked li a
-    color: gray
-  ul
-    margin: 0
-    padding: 0
-
+.jstree-association_page
+  li, ins
+    background-color: transparent
   li
-    float: none !important
-    margin: 2px 0 !important
-
-    &.jstree-open
-      ins
-        background: url("dark-blue-minus.png") 0 0 no-repeat
-    &.jstree-closed
-      ins
-        background: url("dark-blue-plus.png") 0 0 no-repeat
-      ul
-        display: none
-    &.jstree-checked
-      ins.jstree-checkbox
-        background: url("check-checked.png") 0px 0 no-repeat
-    &.jstree-unchecked
-      ins.jstree-checkbox
-        background: url("check-unchecked.png") 0 0 no-repeat
-
-    ul li > ins.jstree-icon
+    &.jstree-last
+      background: transparent
+  .jstree-open > ins
+    background: image_url("forgeos/jstree/themes/association_categories/dark-blue-minus.png") 0 0 no-repeat
+  .jstree-closed > ins
+    background: image_url("forgeos/jstree/themes/association_categories/dark-blue-plus.png") 0 0 no-repeat
+  .jstree-leaf
+    padding-left: 0!important
+  .jstree-hovered
+    background-color: #FDD794
+    color: #F16028
+  .jstree-clicked
+    background: transparent
+    color: #F16028
+  a
+    color: #75491B
+    font-size: 0.8em
+    font-weight: bold
+    padding-right: 10px
+    .jstree-icon
+      margin: 0
+      background-image: image_url("forgeos/admin/big-icons-24-24-verti.png")
+      background-repeat: no-repeat
+      width: 25px
+      background-position: 0 -273px
+    &.jstree-loading .jstree-icon
       background: none
+    &:hover
+      background: transparent
+  &.jstree-focused
+    background: transparent
+  .jstree-no-dots
+    li, .jstree-leaf > ins
+      background: transparent
+    .jstree-open > ins
+      background-position: -18px 0
+    .jstree-closed > ins
+      background-position: 0 0
+  .jstree-no-icons a .jstree-icon
+    display: none
+  .jstree-search
+    font-style: italic
+  .jstree-no-icons .jstree-checkbox
+    display: inline-block
+  .jstree-no-checkboxes .jstree-checkbox
+    display: none !important
+  .jstree-checked
     a
-      display: inline !important
-      color: #557383 !important
-      font-weight: bold
-      font-size: 1em
-      -moz-border-radius: 3px
-      -webkit-border-radius: 3px
-      border-radius: 3px
-      height: 20px
-      &.jstree-hovered
-        background-color: #8fc864
-        color: #FFF !important
-      ins.jstree-icon
-        background: url("folder.png") -4px -4px no-repeat
-    li
-      padding-left: 15px
-
+      .jstree-checkbox
+        &:hover
+          background-position: 0 1px!important
+  .jstree-unchecked
+    a
+      .jstree-checkbox
+        &:hover
+          background-position: 0 1px!important
+  .jstree-undetermined
+    a
+      .jstree-checkbox
+        background: url("/assets/forgeos/jstree/themes/association_page/check-unchecked.png") no-repeat scroll left top transparent
+    background-position: -20px -19px
+  .jstree-checked > a > .jstree-checkbox:hover
+    background-position: -38px -37px
+  .jstree-unchecked > a > .jstree-checkbox:hover
+    background-position: -2px -37px
+  .jstree-undetermined > a > .jstree-checkbox:hover
+    background-position: -20px -37px
 
-.jstree-leaf
-  padding-left: 5px !important

data/app/assets/stylesheets/forgeos/jstree/themes/categories/style.css.sass

@@ -1,81 +1,102 @@
-.jstree.jstree-categories
-  ul
-    padding: 0
-    margin: 0
+.jstree-categories
+  li, ins
+    background-color: transparent
   li
-    margin: 2px 0
-    width: auto !important
-    float: none !important
+    &.jstree-last
+      background: transparent
+  .jstree-open > ins
+    background: image_url("forgeos/jstree/themes/categories/brown-minus.png") 0px 3px no-repeat
+  .jstree-closed > ins
+    background: image_url("forgeos/jstree/themes/categories/brown-plus.png") 0 3px no-repeat
+  .jstree-leaf > ins
 
-    &.jstree-open
-      ins
-        background: url("brown-minus.png") 0px 3px no-repeat
-    &.jstree-closed
-      ins
-        background: url("brown-plus.png") 0 3px no-repeat
-      ul
-        display: none
-    ul li > ins.jstree-icon
+  .jstree-hovered
+    background-color: #FDD794
+    color: #F16028
+  .jstree-clicked
+    background: #FDD794
+    color: #F16028
+  a
+    color: #75491B
+    font-size: 0.8em
+    font-weight: bold
+    padding-right: 10px
+    .jstree-icon
+      margin: 0
+      background-image: image_url("forgeos/admin/big-icons-24-24-verti.png")
+      background-repeat: no-repeat
+      width: 25px
+      background-position: 0 -273px
+    &.jstree-loading .jstree-icon
       background: none
-    a
-      color: #75491B
-      font-weight: bold
-      font-size: 0.8em
-      position: relative
-      &:hover, &.hover
-        background-color: #FDD794
-        color: #F16028
-
-      &.jstree-clicked
-        background-color: #FDD794
-        color: #F16028
-
-        &:hover
-          background-color: #FDD794
-          color: #F16028
-      ins.jstree-icon
-        margin: 0
-        background-image: url(/assets/forgeos/admin/big-icons-24-24-verti.png)
-        background-repeat: no-repeat
-        width: 25px
-        background-position: 0 -271px
-
-      span
-        float: right
-        height: 13px
-        width: 19px
-        font-size: 0.7em
-        background:
-          image: url("bubble-quantity-elements.png")
-          repeat: no-repeat
-          position: -1px -5px
-        text-align: center
-        color: #75491B
-        position: absolute
-        right: 5px
-        top: 5px
-        line-height: 1.4em
-        padding: 0px 5px 2px 1px
-      &.jstree-clicked
-        span
-          background-color: #FDD794
-          color: #F16028
-          padding: 0px 3px 0px 20px
-
-      &.jstree-loading
-        background: none
-
+  &.jstree-focused
+    background: transparent
+  .jstree-no-dots
+    li, .jstree-leaf > ins
+      background: transparent
+    .jstree-open > ins
+      background-position: -18px 0
+    .jstree-closed > ins
+      background-position: 0 0
+  .jstree-no-icons a .jstree-icon
+    display: none
+  .jstree-search
+    font-style: italic
+  .jstree-no-icons .jstree-checkbox
+    display: inline-block
+  .jstree-no-checkboxes .jstree-checkbox
+    display: none !important
+  .jstree-checked > a > .jstree-checkbox
+    background-position: -38px -19px
+  .jstree-unchecked > a > .jstree-checkbox
+    background-position: -2px -19px
+  .jstree-undetermined > a > .jstree-checkbox
+    background-position: -20px -19px
+  .jstree-checked > a > .jstree-checkbox:hover
+    background-position: -38px -37px
+  .jstree-unchecked > a > .jstree-checkbox:hover
+    background-position: -2px -37px
+  .jstree-undetermined > a > .jstree-checkbox:hover
+    background-position: -20px -37px
 
-.jstree-categories-context
+#vakata-contextmenu.jstree-categories-context
   width: 160px
-  background: white
-  border: 1px solid #aeb0b2
+  border: 0 none
   position: absolute
   border-bottom: 0
+  ul
+    padding: 0
+    border: 1px solid #979797
+    li
+      padding: 2px
+      padding-left: 5px
+      ins
+        margin-right: 5px
+      a
+        &:hover
+          background: transparent
+          color: #297EBD
+          border: 0 none
+
+      .create
+        background-image: image_url("forgeos/jstree/themes/categories/create.png")
+        background-position: -4px -2px
+      .rename
+        background-image: image_url("forgeos/jstree/themes/categories/rename.png")
+      .remove
+        background-image: image_url("forgeos/jstree/themes/categories/remove.png")
+      .image
+        background-image: image_url("forgeos/jstree/themes/categories/images.png")
+      &:hover
+        background-color: #D6EDF4
+        color: #297EBD
+        border-bottom: 1px solid #aeb0b2
+    .vakata-separator
+      padding: 0
   a
     display: block
     text-decoration: none
-    border-bottom: 1px solid #aeb0b2
+    border-bottom: 0 none
     color: black
     line-height: 20px
     margin: 0
@@ -87,10 +108,6 @@
       line-height: 20px
       padding: 1px 0 1px 25px
       margin: 0
-    &:hover
-      background-color: #d6edf4
-      color: #2973bd
-      border-bottom: 1px solid #aeb0b2
     &.jstree-disabled
       color: silver
       opacity: 0.5
@@ -103,19 +120,10 @@
         -ms-filter: "alpha(opacity=50)"
         filter: alpha(opacity = 50)
         zoom: 1
-    ins
-      &.create
-        background-image: url(create.png)
-        background-position: -4px -3px
-      &.rename
-        background-image: url(rename.png)
-      &.remove
-        background-image: url(remove.png)
-      &.image
-        background-image: url(images.png)
     span
       margin: 0 !important
   .separator
     display: none !important
 #jstree-dragged.jstree-categories li li.open
-  background: url("brown-plus.png") 0 3px no-repeat
+  background: image_url("forgeos/jstree/themes/categories/brown-plus.png") 0 3px no-repeat
+

data/app/controllers/admin/attachments_controller.rb

@@ -79,9 +79,8 @@ class Admin::AttachmentsController < Admin::BaseController
             end
 
             if params[:parent_id]
-              parent_category = Category.find_by_id(params[:parent_id])
-              if parent_category
-               @media.attachment_categories << parent_category
+              if parent_category = Category.find_by_id(params[:parent_id])
+                @media.categories << parent_category
               end
             end
 

data/app/controllers/admin/base_controller.rb

@@ -1,33 +1,11 @@
-class Admin::BaseController < Forgeos::ApplicationController
+class Admin::BaseController < ApplicationController
   layout 'admin'
-  helper_method :forgeos_js_functions_files, :forgeos_js_inits_files
   before_filter :login_required, :edition_locale, :except => [:notifications, :url]
-  before_filter :forgeos_core_javascripts_files
   skip_after_filter :log_visit
   protect_from_forgery
 
 private
 
-  def forgeos_core_javascripts_files
-    @forgeos_js_functions_files = forgeos_javascripts_files('forgeos_core', 'forgeos/admin/functions')
-    @forgeos_js_inits_files = forgeos_javascripts_files('forgeos_core', 'forgeos/admin/inits')
-  end
-
-  def forgeos_javascripts_files(plugin_name, dir)
-    asset_dir = File.join(Gem.loaded_specs[plugin_name].full_gem_path, 'app', 'assets', 'javascripts')
-    Dir[File.join([asset_dir, dir, '**','*.js'].compact)].collect do |file|
-      file[-(file.size - asset_dir.size - 1)..-1].sub(/\.\w+$/, '')
-    end.sort
-  end
-
-  def forgeos_js_functions_files
-    @forgeos_js_functions_files || []
-  end
-
-  def forgeos_js_inits_files
-    @forgeos_js_inits_files || []
-  end
-
   def login_required
     unless current_user.is_a?(Administrator)
       store_location
@@ -49,7 +27,7 @@ private
 
   def edition_locale
     if session[:lang]
-      ActiveRecord::Base.locale = session[:lang]
+      Globalize.locale = session[:lang]
     end
   end
 end

data/app/controllers/admin/cachings_controller.rb

@@ -2,59 +2,46 @@ class Admin::CachingsController < Admin::BaseController
   autoload :FileUtils, 'fileutils'
 
   def index
-    @files = []
-    directory = Rails.configuration.action_controller.page_cache_directory
-    if directory
-      get_file(directory)
+    respond_to do |wants|
+      wants.html
+      wants.json do
+        if params[:id] == '0'
+          @files = [Rails.configuration.action_controller.page_cache_directory, Rails.cache.cache_path]
+        else
+          get_files(params[:id])
+        end
+      end
     end
   end
 
   def create
     if params[:commit] == t('caching.delete.all').capitalize
-      files = params[:hidden_files]
+      get_files(Rails.configuration.action_controller.page_cache_directory)
+      get_files(Rails.cache.cache_path)
     else
-      files = params[:file]
+      @files = params[:files]
     end
 
-    if files
-      files.values.each do |file|
-        unless File.delete(file)
+    if @files
+      @files.each do |file|
+        unless FileUtils.rm_rf(file)
           flash[:error] = t('caching.delete.failed').capitalize
-          return redirect_to :action => 'index'
         end
       end
     else
-      return redirect_to :action => 'index'
       flash[:error] = t('caching.no_files').capitalize
     end
 
-
-    begin
-      FileUtils.remove_dir(Rails.cache.cache_path, true)
-    rescue
-      p 'This cache directory does not exist'
-    end
-
     flash[:success] = t('caching.delete.create').capitalize
-    return redirect_to :action => 'index'
+    return redirect_to([forgeos_core, :admin, :cachings])
   end
 
 
 private
 
-  def get_file(directory)
-    dir = Dir.new(directory)
-    dir.each do |file|
-      path = "#{directory}/#{file}"
-      if File.directory?(path)
-        @files.delete(path)
-        unless file == '.' || file == '..'
-          get_file(path)
-        end
-      else
-        @files << [file, path]
-      end
-    end
+  def get_files(directory)
+    @files ||= []
+    @files += Dir.glob("#{directory}/*")
   end
 
-end
+end

data/app/controllers/admin/categories_controller.rb

@@ -16,7 +16,11 @@ class Admin::CategoriesController < Admin::BaseController
         else
           # list categories like a tree
           klass = params[:type].camelize.constantize
-          @categories = klass.roots
+          @categories = if params[:id] and params[:id] != '0'
+            klass.find_by_id(params[:id]).children
+          else
+            klass.roots
+          end
 
           render :json => @categories.collect(&:to_jstree).to_json
         end
@@ -35,13 +39,12 @@ class Admin::CategoriesController < Admin::BaseController
   def create
     if @category.save
       flash[:notice] = t('category.create.success').capitalize
-      respond_to do |format|
-        format.html { redirect_to [forgeos_core, :edit, :admin, @category] }
-        format.json { render :text => @category.id }
-      end
     else
       flash[:error] = t('category.create.failed').capitalize
-      render :action => 'new'
+    end
+    respond_to do |format|
+      format.html { redirect_to [forgeos_core, :edit, :admin, @category] }
+      format.json { render :text => @category.id }
     end
   end
 

data/app/controllers/admin/import_controller.rb

@@ -1,6 +1,6 @@
+#coding: utf-8
 class Admin::ImportController < Admin::BaseController
   include MapFields
-  UPLOAD_PROGRESS_FILE = File.join(Rails.root,'tmp','import_progress.txt')
   before_filter :save_import_set, :except => :index
   map_fields :create_user, User.new.attributes.keys
   before_filter :models, :only => :index
@@ -11,78 +11,32 @@ class Admin::ImportController < Admin::BaseController
     create_model(User,'email')
   end
 
-  def progress
-    if File.exist?(UPLOAD_PROGRESS_FILE)
-      render :text => File.open(UPLOAD_PROGRESS_FILE,'r').read
-    else
-      render :nothing => true
-    end
-  end
-
   private
 
   def models
     @models = ['user']
   end
 
-  def create_model(klass, uniq_field = nil, &block)
-    File.open(UPLOAD_PROGRESS_FILE, 'w') {|f| f.write(0) }
+  def create_model(klass, uniq_field = nil, modify_attributes_method = :modify_import_attributes)
     if fields_mapped?
-      total = mapped_fields.size
-      created = 0
-      updated = 0
-      errors = []
-      methods = self.class.read_inheritable_attribute("map_fields_fields_#{params[:action]}")
-      mapped_fields.each do |row|
-        logger.debug("\033[01;33m Number : #{row.number} / #{total}\033[0m")
-
-        attributes = ActiveSupport::OrderedHash.new
-        methods.each_with_index do |attribute,i|
-          exist = params[:fields].values.include?((i+1).to_s)
-          attributes[attribute.to_sym] = row[i] if exist
-        end
-
-        if block_given?
-          attributes = yield(attributes) || {}
-        end
-
-        uniq_field_index = methods.index(uniq_field)
-
-        if uniq_field != nil && row[uniq_field_index] != nil && object = klass.send("find_by_#{uniq_field}",row[uniq_field_index])
-          if object.update_attributes(attributes)
-            updated+=1
-          else
-            errors << object.errors
-            logger.debug("\033[01;33m#{object.errors.inspect}\033[0m")
-          end
-        else
-          object = klass.new(attributes)
-          if object.save
-            created+=1
-          else
-            errors << object.errors
-            logger.debug("\033[01;33m#{object.errors.inspect}\033[0m")
-          end
-        end
-        File.open(UPLOAD_PROGRESS_FILE, 'w') {|f| f.write((row.number.to_f / total.to_f) * 100.0) } if row.number.modulo(10).zero?
-      end
-
-      flash[:notice] = t('import.create.success', :model => t(klass.to_s.underscore, :count => created), :nb => "#{created}/#{total}") if created != 0
-      flash[:warning] = t('import.update.success', :model => t(klass.to_s.underscore, :count => updated), :nb => "#{updated}/#{total}") if updated != 0
-      errors_count = errors.flatten.size
-      flash[:error] = t('import.failed.errors', :model => t(klass.to_s.underscore, :count => errors_count), :nb =>"#{ errors_count}/#{total}") unless errors.empty?
-      File.open(UPLOAD_PROGRESS_FILE, 'w') {|f| f.write(100.0) }
-      render(:nothing => true)
+      runner = MapFields::Runner.new
+      runner.import(
+        mapped_fields,
+        self.class.read_inheritable_attribute("map_fields_fields_#{params[:action]}"),
+        current_user.email,
+        klass.to_s,
+        uniq_field,
+        modify_attributes_method
+      )
+      flash[:notice] = "Un email vous sera envoyé lorsque l'import sera fini"
+      redirect_to([forgeos_core, :admin, :import])
     else
       render(:action => 'create')
     end
-    rescue StandardError => error
-      File.open(UPLOAD_PROGRESS_FILE, 'w') {|f| f.write(100.0) }
-      render(:text => error.inspect, :status => 500)
+    #rescue StandardError => error
+    #  render(:text => error.inspect, :status => 500)
   end
 
-  private
-
   def save_import_set
     @set = ImportSet.find_by_id(params[:set_id])
     if params[:save_set]

data/app/controllers/admin/person_sessions_controller.rb

@@ -27,7 +27,7 @@ class Admin::PersonSessionsController < Admin::BaseController
     if user
       generated_password = generate_password(8)
       if user.update_attributes(:password => generated_password, :password_confirmation => generated_password)
-        UserNotifier.deliver_reset_password(user,generated_password)
+        UserNotifier.delay.reset_password(user,generated_password)
         flash[:notice] = t('admin.reset_password.success').capitalize
       else
         flash[:error] = t('admin.reset_password.failed').capitalize

data/app/controllers/{forgeos/application_controller.rb → application_controller.rb}

@@ -1,15 +1,17 @@
-class Forgeos::ApplicationController < ActionController::Base
+class ApplicationController < ActionController::Base
+  helper :application
   helper_method :current_user_session, :current_user
 
   before_filter :set_locale, :set_time_zone
-  after_filter :discard_flash_if_xhr, :log_visit
+  after_filter :keep_flash, :log_visit
 
   def notifications
-    @notifications = {}
-    [:error, :notice, :warning].each do |key|
-      @notifications[key] = flash[key] unless flash[key].blank?
-    end
-    render :json => @notifications.to_json
+    render :json => {
+      :notice => notice,
+      :alert => alert,
+      :error => flash[:error],
+      :warning => flash[:warning]
+    }
   end
 
   private
@@ -78,7 +80,11 @@ class Forgeos::ApplicationController < ActionController::Base
     end
   end
 
-  def discard_flash_if_xhr
-    flash.discard if request.xhr?
+  def keep_flash
+    if action_name != 'notifications'
+      flash.keep(:notice)
+      flash.keep(:error)
+      flash.keep(:warning)
+    end
   end
 end

data/app/controllers/person_sessions_controller.rb

@@ -1,4 +1,4 @@
-class PersonSessionsController < Forgeos::ApplicationController
+class PersonSessionsController < ApplicationController
   def new
     @person_session = PersonSession.new
   end

data/app/controllers/search_controller.rb

@@ -1,4 +1,4 @@
-class SearchController < Forgeos::ApplicationController
+class SearchController < ApplicationController
   before_filter :init_index, :only => :index
   def index
     search_keyword = SearchKeyword.find_by_keyword(@keywords) || SearchKeyword.create(:keyword => @keywords)

data/app/helpers/admin/attachment_helper.rb

@@ -9,7 +9,7 @@ module Admin::AttachmentHelper
         picture.nil? ? picture_id = '' : picture_id = picture.id
         hidden_field_tag("#{object_name}[#{name}_id]", picture_id, :id => name) +
         link_to(content_tag(:span, label,:class => 'big-icons add-picture'),
-                '#', :class => "add-#{name}picture backgrounds button right") +
+                '#', :class => "add-image backgrounds button right", 'data-callback' => 'add_picture_to_element', 'data-input_name' => "##{name}") +
         content_tag(:div, :class => 'grid_9', :id => "#{name}-picture") do
           content_tag(:ul, :class => 'sortable') do
             unless picture.nil?
@@ -32,7 +32,7 @@ module Admin::AttachmentHelper
       content_tag(:div, :class =>'option-panel-content') do
         link_to(content_tag(:span, t("add_picture").capitalize,
                               :class => 'big-icons add-picture'),
-                  '#', :class => 'add-visualpictures backgrounds button right') +
+                  '#', :class => 'add-image backgrounds button right', 'data-callback' => 'add_picture_to_visuals') +
         content_tag(:div, :class => 'grid_9', :id => 'visuals-picture') do
           content_tag(:ul, :class => 'sortable') do
             pictures.collect{ |picture|