forgeos_core 1.9.1 → 1.9.2

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

@@ -0,0 +1 @@
+removedataTablesRow('#destroy_attachment_<%= @media.id -%>');

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

@@ -14,14 +14,13 @@
         "#{media.size/1024} #{I18n.t('media.byte.kilo')}" <<
         "N/A" <<
         link_to('', [forgeos_core, :edit, :admin, media], :class => 'small-icons edit-link') +
-        link_to('', :url => [forgeos_core, :admin, media],
+        link_to('', [forgeos_core, :admin, media],
           :remote => true,
           :method => :delete,
           :confirm => I18n.t('media.destroy.confirm').capitalize,
-          :success => "removedataTablesRow('#destroy_#{link_id}')",
-          :html => {
-          :class => 'small-icons destroy-link', :id => "destroy_#{link_id}"
-        })
+          :class => 'small-icons destroy-link',
+          :id => "destroy_#{link_id}"
+        )
       end
       media_array << media.public_filename << media.id << media.filename
     end

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

@@ -3,19 +3,15 @@
 - unless defined?(level)
   - level = 0
 
-- unless categories.nil? or categories.blank?
+- unless categories.blank?
   - categories.each do |category|
-    %li{ :id => "#{object_name}_category_#{category.id}", :class => category_ids.include?(category.id) ? 'clicked' : nil}
+    %li{ :id => "#{object_name}_category_#{category.id}", :class => category_ids.include?(category.id) ? 'jstree-checked' : 'jstree-unchecked'}
       - if category_ids.include?(category.id)
-        - link_to '#', :class => 'clicked big-icons folder' do
-          = category.name
-          %span  
+        = link_to category.name, '#'
         - if category_ids.include?(category.id)
           = hidden_field_tag "#{object_name}[#{association_id}][]", category.id, :id => "#{association_id}_#{category.id}"
       - else
-        - link_to '#', :class => 'big-icons folder' do
-          = category.name
-          %span  
+        = link_to category.name, '#'
       - unless category.children.empty?
         %ul
           - category.children.each do |child|

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

@@ -7,7 +7,7 @@
         content_tag(:div, tag(:div, :class=>'handler') + tag(:div, :class=>'small-icons category'), :id => link_id, :class => 'handler_container'),
         content_tag(:div, category.name, :class => 'category-name'),
         category.id,
-        link_to(category.name, [forgeos_core, :admin, category])
+        link_to(category.name, '#')#[forgeos_core, :admin, category])
       ]
     end
   }

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

@@ -0,0 +1 @@
+removedataTablesRow('#destroy_right_<%= @right.id -%>');

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

@@ -6,21 +6,20 @@
       [
         content_tag(:div,
           tag(:div, :class => 'handler') +
-          content_tag(:div, ' ', :id => link_id, :class => 'small-icons right-ico'),
+          tag(:div, :id => link_id, :class => 'small-icons right-ico'),
           :class => 'handler_container'),
         content_tag(:div, right.name, :class => 'right-name'),
         right.controller_name,
         right.action_name,
         content_tag(:span, ' ', :class => 'small-icons duplicate-link duplicate-right') +
         content_tag(:span, ' ', :class => 'small-icons edit-link edit-right') +
-        link_to('', :url => [forgeos_core, :admin, right],
+        link_to('', [forgeos_core, :admin, right],
           :remote => true,
           :method => :delete,
           :confirm => I18n.t('right.destroy.confirm').capitalize,
-          :success => "removedataTablesRow('#destroy_#{link_id}')",
-          :html => {
-          :class => 'small-icons destroy-link', :id => "destroy_#{link_id}"
-        })
+          :class => 'small-icons destroy-link',
+          :id => "destroy_#{link_id}"
+        )
       ]
     end
  }

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

@@ -0,0 +1 @@
+toggleActivate('#show_role_<%= @role.id -%>');

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

@@ -0,0 +1 @@
+removedataTablesRow('#destroy_role_<%= @role.id -%>');

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

@@ -2,7 +2,7 @@
   output = {
     :iTotalDisplayRecords => @roles.total_entries || 0,
     :aaData => @roles.collect do |role|
-      link_id = role.id
+      link_id = "role_#{role.id}"
       klass = role.active? ? 'see-on' : 'see-off'
       [
         content_tag(:div, '<div class="image">&nbsp;<span class="small-icons role-ico">&nbsp;</span></div>', :id => link_id, :class => role.administrators.count > 0 ? 'some-variants plus' : ''),
@@ -10,23 +10,21 @@
           content_tag(:p,role.administrators.all.collect{ |admin| link_to("#{admin.firstname} #{admin.lastname}", [forgeos_core, :admin, admin]) }.join('<br />') , :style=>'display:none'),
         role.administrators.count,
         role.created_at.to_s(:short),
-        link_to('', :url => forgeos_core.activate_admin_role_path(role),
+        link_to('', [forgeos_core, :activate ,:admin, role],
           :remote => true,
-          :complete => "toggleActivate('#show_#{link_id}')",
-          :html => {
-            :class => "small-icons #{klass}",
-            :id => "show_#{link_id}"
-        }),
+          :method => :post,
+          :class => "small-icons #{klass}",
+          :id => "show_#{link_id}"
+        ),
         #link_to('', [:duplicate, :admin, role], :class => 'small-icons duplicate-link') +
         link_to('', [forgeos_core, :edit, :admin, role], :class => 'small-icons edit-link') +
-        link_to('', :url => [forgeos_core, :admin, role],
+        link_to('', [forgeos_core, :admin, role],
           :remote => true,
           :method => :delete,
           :confirm => I18n.t('role.destroy.confirm').capitalize,
-          :success => "removedataTablesRow('#destroy_#{link_id}')",
-          :html => {
-          :class => 'small-icons destroy-link', :id => "destroy_#{link_id}"
-        })
+          :class => 'small-icons destroy-link',
+          :id => "destroy_#{link_id}"
+        )
       ]
     end
   }

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

@@ -1,9 +1,3 @@
 %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('setting.global').capitalize, '#content'
   %li.ui-state-default.ui-corner-top= link_to t(:notification, :count => 2).capitalize, '#'
-#blocks-header.backgrounds.settings.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, :scope => :setting).capitalize, '#general', :class => 'selected'
-    %li.ui-state-default.ui-corner-top= link_to t(:mailer, :scope => :setting).capitalize, '#mailer'
-    %li.ui-state-default.ui-corner-top= link_to t(:display, :scope => :setting).capitalize, '#display'
-    %li.ui-state-default.ui-corner-top= link_to t(:backup, :scope => :setting).capitalize, '#backup'

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

@@ -1,18 +1,21 @@
 = render :partial => 'tabs'
 = form_for @setting, :url => [forgeos_core, :admin, :setting] do |f|
-  .backgrounds.big-header
-    = f.text_field :name, :class => 'defaultValue field_name', :title => t('setting.shop_name')
-    .interact-links
-      = Forgeos_save_buttons [forgeos_core, :admin, :setting]
-  #content.grid_16.alpha.omega
-    .grid_16.alpha
-      .padding-wrap
-        #general.content_setting_div
-          = render :partial => 'general', :locals => { :f => f }
-        #mailer.content_setting_div
-          = render :partial => 'mailer', :locals => { :f => f }
-        #display.content_setting_div
-          = render :partial => 'display', :locals => { :f => f }
-        #backup.content_setting_div
-          = render :partial => 'backup', :locals => { :f => f }
-        .clear
+  #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, :scope => :setting).capitalize, '#general', :class => 'selected'
+      %li.ui-state-default.ui-corner-top= link_to t(:mailer, :scope => :setting).capitalize, '#mailer'
+      %li.ui-state-default.ui-corner-top= link_to t(:display, :scope => :setting).capitalize, '#display'
+      %li.ui-state-default.ui-corner-top= link_to t(:backup, :scope => :setting).capitalize, '#backup'
+    .backgrounds.big-header
+      = f.text_field :name, :class => 'defaultValue field_name', :title => t('setting.shop_name')
+      .interact-links
+        = Forgeos_save_buttons [forgeos_core, :admin, :setting]
+    #general.grid_16.alpha.omega
+      = render :partial => 'general', :locals => { :f => f }
+    #mailer
+      = render :partial => 'mailer', :locals => { :f => f }
+    #display
+      = render :partial => 'display', :locals => { :f => f }
+    #backup
+      = render :partial => 'backup', :locals => { :f => f }
+    .clear

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

@@ -19,7 +19,7 @@
     .sidebar-content
       %h2{ :class => 'small-icons picture'}
         = link_to_function I18n.t('media.picture.all').capitalize, "select_all_elements_without_category('picture-attachment-tree')"
-      #picture-attachment-tree.init-tree.a-tree
+      #picture-attachment-tree
   .media-hoverlay-content.thumbnails
     #thumbnail-table.table.datatable.media.selectable_rows
   .media-hoverlay-content.table.hidden

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

@@ -24,6 +24,6 @@
   .sidebar-content
     %h2.small-icons{ :class => icon_class }
       = link_to_function I18n.t(sidebar_title).capitalize, "select_all_elements_without_category()"
-    .init-tree.a-tree.category-tree{ :id => tree_id }
+    .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}
+      =render :partial => 'admin/sidebars/attachments_popups', :locals => {:form => f}

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

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

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

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

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

@@ -13,23 +13,20 @@
 
       unless params[:mode] == 'selection'
         table <<
-        link_to('', :url => forgeos_core.activate_admin_user_path(user),
+        link_to('', [forgeos_core, :activate, :admin, user],
           :remote => true,
-          :complete => "toggleActivate('#show_#{link_id}')",
-          :html => {
-            :class => "small-icons #{klass}",
-            :id => "show_#{link_id}"
-         }
+          :method => :post,
+          :class => "small-icons #{klass}",
+          :id => "show_#{link_id}"
         ) <<
         link_to('', [forgeos_core, :edit, :admin, user], :class => 'small-icons edit-link') +
-        link_to('', :url => [forgeos_core, :admin, user],
+        link_to('', [forgeos_core, :admin, user],
           :remote => true,
           :method => :delete,
           :confirm => I18n.t('user.destroy.confirm').capitalize,
-          :success => "removedataTablesRow('#destroy_#{link_id}')",
-          :html => {
-            :class => 'small-icons destroy-link', :id => "destroy_#{link_id}"
-        })
+          :class => 'small-icons destroy-link',
+          :id => "destroy_#{link_id}"
+        )
       else
         table << user.id
       end

data/app/views/admin/visual/_visual_popup.html.haml

@@ -24,7 +24,7 @@
     .sidebar-content
       %h2{ :class => 'small-icons picture'}
         = link_to_function t('media.picture.all').capitalize, "select_all_elements_without_category('picture-attachment-tree')"
-      #picture-attachment-tree.init-tree.a-tree
+      #picture-attachment-tree
   .media-hoverlay-content.thumbnails
     #thumbnail-table-picture.table.datatable.media.selectable_rows
   .media-hoverlay-content.table.hidden
@@ -110,7 +110,7 @@
     .sidebar-content
       %h2{ :class => 'small-icons picture'}
         = link_to_function t('media.picture.all').capitalize, "select_all_elements_without_category('picture-attachment-tree')"
-      #picture-attachment-tree.init-tree.a-tree
+      #picture-attachment-tree
   .media-hoverlay-content.thumbnails
     #thumbnail-table-image.table.datatable.media.selectable_rows
   .media-hoverlay-content.table.hidden

data/app/views/admin/visual/_visuals_popup.html.haml

@@ -24,7 +24,7 @@
     .sidebar-content
       %h2{ :class => 'small-icons picture'}
         = link_to_function I18n.t('media.picture.all').capitalize, "select_all_elements_without_category('picture-attachment-tree')"
-      #picture-attachment-tree.init-tree.a-tree
+      #picture-attachment-tree
   .media-hoverlay-content.thumbnails
     #thumbnail-table-visuals.table.datatable.media.selectable_rows
   .media-hoverlay-content.table.hidden

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

@@ -3,9 +3,10 @@
 %html{ "xml:lang" => I18n.locale, :xmlns => "http://www.w3.org/1999/xhtml" }
   %head
     %meta{ :content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type" }
-    %link{ :href => "/forgeos/admin/favicon.gif", :rel => "shortcut icon", :type => "image/gif" }
-    = stylesheet_link_tag 'forgeos/960', 'forgeos/jquery-ui/themes/forgeos', 'forgeos/jquery.selectbox', 'forgeos/jstree/tree_component', 'forgeos/admin/base', :cache => 'forgeos/admin'
-    = javascript_include_tag 'forgeos/jquery', 'forgeos/swfobject'
+    %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'
+    = csrf_meta_tag
     %title= "#{I18n.t(:forgeos)} - #{I18n.t(controller.controller_name, :scope => ['back_office', 'menu']).capitalize}"
   %body
     #container.container_16
@@ -24,7 +25,7 @@
       #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', 'forgeos/jquery-ui', 'forgeos/jquery.dataTables.min', 'forgeos/jquery.dataSlides', 'forgeos/jstree/jquery.tree', 'forgeos/jstree/plugins/jquery.tree.contextmenu', 'forgeos/jquery.uploadify', :cache => 'forgeos/admin/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

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

@@ -3,16 +3,16 @@
 %html{ 'xml:lang' => I18n.locale, :xmlns => 'http://www.w3.org/1999/xhtml' }
   %head
     %meta{ :content => 'text/html; charset=utf-8', 'http-equiv' => 'Content-Type' }
-    %link{ :href => '/forgeos/admin/favicon.gif', :rel => 'shortcut icon', :type => 'image/gif' }
+    %link{ :href => '/assets/forgeos/admin/favicon.gif', :rel => 'shortcut icon', :type => 'image/gif' }
     = stylesheet_link_tag 'forgeos/960', 'forgeos/admin/login'
-    = javascript_include_tag 'forgeos/jquery'
+    = 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
       window._forgeos_js_vars = {
-       "locale": '#{I18n.locale}',
+       "locale": '#{I18n.locale}'
       }
       jQuery(document).ready(function(){
         display_notifications();

data/config/initializers/load_settings.rbc

@@ -0,0 +1,330 @@
+!RBIX
+5362583714419577066
+x
+M
+1
+n
+n
+x
+10
+__script__
+i
+168
+45
+0
+1
+43
+2
+49
+3
+0
+49
+4
+0
+45
+5
+6
+49
+7
+0
+49
+8
+1
+13
+9
+32
+15
+45
+5
+9
+49
+10
+0
+19
+0
+9
+164
+45
+11
+12
+20
+0
+49
+13
+0
+13
+18
+2
+49
+14
+1
+15
+15
+45
+15
+16
+20
+0
+49
+17
+0
+49
+18
+0
+13
+18
+2
+49
+19
+1
+15
+15
+45
+20
+21
+43
+2
+20
+0
+49
+22
+0
+9
+91
+20
+0
+49
+22
+0
+49
+23
+0
+8
+93
+7
+24
+13
+18
+2
+49
+25
+1
+15
+15
+20
+0
+49
+26
+0
+9
+130
+45
+20
+27
+43
+2
+20
+0
+49
+26
+0
+49
+28
+0
+13
+18
+2
+49
+29
+1
+15
+8
+131
+1
+15
+20
+0
+49
+30
+0
+9
+161
+45
+20
+31
+43
+2
+20
+0
+49
+30
+0
+49
+28
+0
+13
+18
+2
+49
+32
+1
+15
+8
+162
+1
+8
+165
+1
+15
+2
+11
+I
+4
+I
+1
+I
+0
+I
+0
+n
+p
+33
+x
+12
+ActiveRecord
+n
+x
+4
+Base
+x
+10
+connection
+x
+6
+tables
+x
+7
+Setting
+n
+x
+10
+table_name
+x
+8
+include?
+n
+x
+7
+current
+x
+4
+Time
+n
+x
+9
+time_zone
+x
+5
+zone=
+x
+4
+I18n
+n
+x
+4
+lang
+x
+6
+to_sym
+x
+15
+default_locale=
+x
+12
+ActionMailer
+n
+x
+6
+mailer
+x
+15
+delivery_method
+x
+4
+test
+x
+16
+delivery_method=
+x
+13
+smtp_settings
+n
+x
+12
+marshal_dump
+x
+14
+smtp_settings=
+x
+17
+sendmail_settings
+n
+x
+18
+sendmail_settings=
+p
+23
+I
+0
+I
+1
+I
+22
+I
+2
+I
+32
+I
+3
+I
+45
+I
+4
+I
+5d
+I
+0
+I
+65
+I
+5
+I
+83
+I
+0
+I
+84
+I
+6
+I
+a2
+I
+0
+I
+a4
+I
+1
+I
+a5
+I
+0
+I
+a8
+x
+90
+/home/cyrill62/Sites/fcorer3/vendor/gems/forgeos_core/config/initializers/load_settings.rb
+p
+1
+x
+8
+settings