suite

Gemfile

@@ -1,17 +1,16 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.20'
+gem 'rails', '4.2.10'
 
 # Bundle edge Rails instead:
-# gem 'rails',     :git => 'git://github.com/rails/rails.git'
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'sqlite3'
+#gem 'sqlite3', "~> 1.3.5"
-gem 'yaml_db'
-gem 'mysql2', '< 0.3'
 
+gem 'mysql2', "0.4.10"
 # Asset template engines
 
-gem 'sass'
+gem 'sass-rails', "4.0.5"
 
 gem 'jquery-rails'
 
@@ -40,12 +39,12 @@ gem 'carrierwave'
 
 gem 'mimetype-fu'
 
-gem "cancan"
+#gem "cancan"
 
-gem "meta_where"
+#gem "meta_where"
-gem 'meta_search'
+#gem 'meta_search'
 
-gem "devise"  
+#gem "devise" , "1.4.3"
 gem "haml", ">= 3.0.0"  
 
 gem 'unicorn'

Gemfile.lock

@@ -1,121 +1,154 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
+    actionmailer (4.2.10)
-    actionmailer (3.0.20)
+      actionpack (= 4.2.10)
-      actionpack (= 3.0.20)
+      actionview (= 4.2.10)
-      mail (~> 2.2.19)
+      activejob (= 4.2.10)
-    actionpack (3.0.20)
+      mail (~> 2.5, >= 2.5.4)
-      activemodel (= 3.0.20)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      activesupport (= 3.0.20)
+    actionpack (4.2.10)
-      builder (~> 2.1.2)
+      actionview (= 4.2.10)
-      erubis (~> 2.6.6)
+      activesupport (= 4.2.10)
-      i18n (~> 0.5.0)
+      rack (~> 1.6)
-      rack (~> 1.2.5)
+      rack-test (~> 0.6.2)
-      rack-mount (~> 0.6.14)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rack-test (~> 0.5.7)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-      tzinfo (~> 0.3.23)
+    actionview (4.2.10)
-    activemodel (3.0.20)
+      activesupport (= 4.2.10)
-      activesupport (= 3.0.20)
+      builder (~> 3.1)
-      builder (~> 2.1.2)
+      erubis (~> 2.7.0)
-      i18n (~> 0.5.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
-    activerecord (3.0.20)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-      activemodel (= 3.0.20)
+    activejob (4.2.10)
-      activesupport (= 3.0.20)
+      activesupport (= 4.2.10)
-      arel (~> 2.0.10)
+      globalid (>= 0.3.0)
-      tzinfo (~> 0.3.23)
+    activemodel (4.2.10)
-    activeresource (3.0.20)
+      activesupport (= 4.2.10)
-      activemodel (= 3.0.20)
+      builder (~> 3.1)
-      activesupport (= 3.0.20)
+    activerecord (4.2.10)
-    activesupport (3.0.20)
+      activemodel (= 4.2.10)
-    acts_as_list (0.1.2)
+      activesupport (= 4.2.10)
-    acts_as_tree (0.1.1)
+      arel (~> 6.0)
-    arel (2.0.10)
+    activesupport (4.2.10)
-    bcrypt-ruby (2.1.4)
+      i18n (~> 0.7)
-    builder (2.1.2)
+      minitest (~> 5.1)
-    cancan (1.6.4)
+      thread_safe (~> 0.3, >= 0.3.4)
-    carrierwave (0.5.3)
+      tzinfo (~> 1.1)
-      activesupport (~> 3.0)
+    acts_as_list (0.9.19)
-    devise (1.3.4)
+      activerecord (>= 3.0)
-      bcrypt-ruby (~> 2.1.2)
+    acts_as_tree (2.9.1)
-      orm_adapter (~> 0.0.3)
+      activerecord (>= 3.0.0)
-      warden (~> 1.0.3)
+    arel (6.0.4)
-    erubis (2.6.6)
+    builder (3.2.4)
-      abstract (>= 1.0.0)
+    carrierwave (1.3.2)
-    formtastic (1.2.3)
+      activemodel (>= 4.0.0)
-      actionpack (>= 2.3.7)
+      activesupport (>= 4.0.0)
-      activesupport (>= 2.3.7)
+      mime-types (>= 1.16)
-      i18n (~> 0.4)
+      ssrf_filter (~> 1.0)
-    haml (3.1.1)
+    concurrent-ruby (1.1.8)
-    i18n (0.5.4)
+    crass (1.0.6)
-    jquery-rails (1.0.2)
+    erubis (2.7.0)
-      railties (~> 3.0)
+    formtastic (3.1.5)
-      thor (~> 0.14)
+      actionpack (>= 3.2.13)
-    json (1.8.2)
+    globalid (0.4.2)
-    kaminari (0.12.4)
+      activesupport (>= 4.2.0)
-      rails (>= 3.0.0)
+    haml (5.2.1)
-    kgio (2.9.3)
+      temple (>= 0.8.0)
-    mail (2.2.20)
+      tilt
-      activesupport (>= 2.3.6)
+    hike (1.2.3)
-      i18n (>= 0.4.0)
+    i18n (0.9.5)
-      mime-types (~> 1.16)
+      concurrent-ruby (~> 1.0)
-      treetop (~> 1.4.8)
+    jquery-rails (4.4.0)
-    meta_search (1.0.5)
+      rails-dom-testing (>= 1, < 3)
-      actionpack (~> 3.0.2)
+      railties (>= 4.2.0)
-      activerecord (~> 3.0.2)
+      thor (>= 0.14, < 2.0)
-      activesupport (~> 3.0.2)
+    kaminari (1.2.1)
-      arel (~> 2.0.2)
+      activesupport (>= 4.1.0)
-    meta_where (1.0.4)
+      kaminari-actionview (= 1.2.1)
-      activerecord (~> 3.0.0)
+      kaminari-activerecord (= 1.2.1)
-      activesupport (~> 3.0.0)
+      kaminari-core (= 1.2.1)
-      arel (~> 2.0.7)
+    kaminari-actionview (1.2.1)
-    mime-types (1.25.1)
+      actionview
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
+      activerecord
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
+    kgio (2.11.3)
+    loofah (2.9.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2021.0225)
     mimetype-fu (0.1.2)
-    mysql2 (0.2.24)
+    mini_mime (1.1.0)
-    orm_adapter (0.0.5)
+    mini_portile2 (2.4.0)
-    polyglot (0.3.5)
+    minitest (5.14.4)
-    rack (1.2.8)
+    multi_json (1.15.0)
-    rack-mount (0.6.14)
+    mysql2 (0.4.10)
-      rack (>= 1.0.0)
+    nokogiri (1.10.10)
-    rack-test (0.5.7)
+      mini_portile2 (~> 2.4.0)
+    rack (1.6.13)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (3.0.20)
+    rails (4.2.10)
-      actionmailer (= 3.0.20)
+      actionmailer (= 4.2.10)
-      actionpack (= 3.0.20)
+      actionpack (= 4.2.10)
-      activerecord (= 3.0.20)
+      actionview (= 4.2.10)
-      activeresource (= 3.0.20)
+      activejob (= 4.2.10)
-      activesupport (= 3.0.20)
+      activemodel (= 4.2.10)
-      bundler (~> 1.0)
+      activerecord (= 4.2.10)
-      railties (= 3.0.20)
+      activesupport (= 4.2.10)
-    railties (3.0.20)
+      bundler (>= 1.3.0, < 2.0)
-      actionpack (= 3.0.20)
+      railties (= 4.2.10)
-      activesupport (= 3.0.20)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.4)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (4.2.10)
+      actionpack (= 4.2.10)
+      activesupport (= 4.2.10)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
+      thor (>= 0.18.1, < 2.0)
-      thor (~> 0.14.4)
+    raindrops (0.19.1)
-    raindrops (0.13.0)
+    rake (13.0.3)
-    rake (10.4.2)
+    rmagick (4.2.2)
-    rdoc (3.12.2)
+    sass (3.2.19)
-      json (~> 1.4)
+    sass-rails (4.0.5)
-    rmagick (2.16.0)
+      railties (>= 4.0.0, < 5.0)
-    sass (3.1.1)
+      sass (~> 3.2.2)
-    simple-navigation (3.2.0)
+      sprockets (~> 2.8, < 3.0)
+      sprockets-rails (~> 2.0)
+    simple-navigation (4.3.0)
       activesupport (>= 2.3.2)
-    sqlite3 (1.3.3)
+    sprockets (2.12.5)
-    thor (0.14.6)
+      hike (~> 1.2)
-    treetop (1.4.15)
+      multi_json (~> 1.0)
-      polyglot
+      rack (~> 1.0)
-      polyglot (>= 0.3.1)
+      tilt (~> 1.1, != 1.3.0)
-    tzinfo (0.3.44)
+    sprockets-rails (2.3.3)
-    unicorn (4.9.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (>= 2.8, < 4.0)
+    ssrf_filter (1.0.7)
+    temple (0.8.2)
+    thor (1.1.0)
+    thread_safe (0.3.6)
+    tilt (1.4.1)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+    unicorn (6.0.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
-    warden (1.0.4)
-      rack (>= 1.0)
-    yaml_db (0.3.0)
-      rails (>= 3.0, < 4.3)
-      rake (>= 0.8.7)
 
 PLATFORMS
   ruby
@@ -123,24 +156,18 @@ PLATFORMS
 DEPENDENCIES
   acts_as_list
   acts_as_tree
-  cancan
   carrierwave
-  devise
   formtastic
   haml (>= 3.0.0)
   jquery-rails
   kaminari
-  meta_search
-  meta_where
   mimetype-fu
-  mysql2 (< 0.3)
+  mysql2 (= 0.4.10)
-  rails (= 3.0.20)
+  rails (= 4.2.10)
   rmagick
-  sass
+  sass-rails (= 4.0.5)
   simple-navigation
-  sqlite3
   unicorn
-  yaml_db
 
 BUNDLED WITH
-   1.16.1
+   1.17.3

app/controllers/admin/admins_controller.rb

@@ -3,7 +3,7 @@ class Admin::AdminsController < ApplicationController
 	before_filter :authenticate_admin!
 	layout "admin"
 	
-	navigation :admins
+	##navigation :admins
 
   
 	def index

app/controllers/admin/albums_controller.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Admin::AlbumsController < ApplicationController
-	load_and_authorize_resource
+	#load_and_authorize_resource
 
 	def index
 		@albums = Album.all(:order => :name)

app/controllers/admin/blocks_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Admin::BlocksController < ApplicationController
   	before_filter :authenticate_admin!
-	load_and_authorize_resource
+	#load_and_authorize_resource
 	
 	layout "admin"
 

app/controllers/admin/dashboard_controller.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Admin::DashboardController < ApplicationController
-	navigation :dahsboard
+	#navigation :dahsboard
 	before_filter :authenticate_admin!
 
 

app/controllers/admin/data_files_controller.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 	class Admin::DataFilesController < ApplicationController
 		before_filter :authenticate_admin!
-	#	load_and_authorize_resource
+	#	#load_and_authorize_resource
 	
 	layout "admin"
-	navigation :data_files
+	#navigation :data_files
 	def index
 		params[:file_folder_id] = params[:file_folder_id] || 1
 

app/controllers/admin/file_folders_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Admin::FileFoldersController < ApplicationController
 	before_filter :authenticate_admin!
-	load_and_authorize_resource
+	#load_and_authorize_resource
 	
 
 	def index

app/controllers/admin/folders_controller.rb

@@ -1,11 +1,11 @@
 # -*- encoding : utf-8 -*-
 class Admin::FoldersController < ApplicationController
   	before_filter :authenticate_admin!
-	load_and_authorize_resource
+	#load_and_authorize_resource
 	
 	layout "admin"
 
-	navigation :folders
+	#navigation :folders
 
 
 	def index
@@ -13,12 +13,12 @@ class Admin::FoldersController < ApplicationController
 	end
 
 	def new
-		current_navigation :new_folders
+		#current_navigation :new_folders
 		@folder = Folder.new
 	end
 	
 	def create
-		current_navigation :new_folders
+		#current_navigation :new_folders
 		
 		@folder = Folder.new(params[:folder])
 		
@@ -43,14 +43,14 @@ class Admin::FoldersController < ApplicationController
 
 
 	def edit
-		current_navigation :edit_folders
+		#current_navigation :edit_folders
 		
 		@folder = Folder.find(params[:id])
 
 	end
 
 	def update
-		current_navigation :edit_folders
+		#current_navigation :edit_folders
 		
 		@folder = Folder.find(params[:id])
 		

app/controllers/admin/foyers_controller.rb

@@ -5,7 +5,7 @@ class Admin::FoyersController < ApplicationController
 
 	
 	layout "admin"
-	navigation :foyers
+	#navigation :foyers
 
 
 	def index

app/controllers/admin/image_files_controller.rb

@@ -2,7 +2,7 @@
 	class Admin::ImageFilesController < ApplicationController
 	before_filter :authenticate_admin!
 	layout "admin"
-	navigation :image_files
+	#navigation :image_files
 
 	def index
 		params[:album_id] = params[:album_id] || 1

app/controllers/admin/menu_aliases_controller.rb

@@ -2,7 +2,7 @@
 class Admin::MenuAliasesController < ApplicationController
 
   	before_filter :authenticate_admin!
-	load_and_authorize_resource
+	#load_and_authorize_resource
 
 
 def edit

app/controllers/admin/menu_items_controller.rb

@@ -1,10 +1,10 @@
 # -*- encoding : utf-8 -*-
 class Admin::MenuItemsController < ApplicationController
 	before_filter :authenticate_admin!
-	#load_and_authorize_resource
+	##load_and_authorize_resource
 	
 	layout "admin"
-	navigation :menu_items
+	#navigation :menu_items
 	
 	
 	def index
@@ -38,7 +38,7 @@ class Admin::MenuItemsController < ApplicationController
 	end
 
 	def new
-		current_navigation :new_menu_items
+		#current_navigation :new_menu_items
 		
 		
 		@menu_item = MenuItem.new(:menu_id => params[:menu_id],:parent_id => params[:parent_id])
@@ -55,7 +55,7 @@ class Admin::MenuItemsController < ApplicationController
 
 	def create
 		
-		current_navigation :new_menu_items
+		#current_navigation :new_menu_items
 		params_content = params[:menu_item].delete(:menu_content_attributes)
 		content_type = params[:menu_item][:menu_content_type]
 		
@@ -87,13 +87,13 @@ class Admin::MenuItemsController < ApplicationController
 	end
 
 	def edit
-		current_navigation :edit_menu_items
+		#current_navigation :edit_menu_items
 		@menu_item= MenuItem.find(params[:id])
 		
 	end
 
 	def update
-		current_navigation :edit_menu_items
+		#current_navigation :edit_menu_items
 		@menu_item= MenuItem.find(params[:id])
 		
 		@menu = @menu_item.menu

app/controllers/admin/menu_urls_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Admin::MenuUrlsController < ApplicationController
   	before_filter :authenticate_admin!
-	load_and_authorize_resource
+	#load_and_authorize_resource
 
 def edit
 	

app/controllers/admin/menus_controller.rb

@@ -4,7 +4,7 @@ class Admin::MenusController < ApplicationController
 	layout "admin"
 
 	before_filter :authenticate_admin!
-	load_and_authorize_resource
+	#load_and_authorize_resource
 	
 
 	def index

app/controllers/admin/newsletters_controller.rb

@@ -5,7 +5,7 @@ class Admin::NewslettersController < ApplicationController
 
 	
 	layout "admin"
-	navigation :newsletters
+	#navigation :newsletters
 
 
 	def index

app/controllers/admin/pages_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class Admin::PagesController < ApplicationController
   	before_filter :authenticate_admin!
-	load_and_authorize_resource
+	#load_and_authorize_resource
 
 
 def edit

app/controllers/admin/studients_controller.rb

@@ -5,7 +5,7 @@ class Admin::StudientsController < ApplicationController
 
 	
 	layout "admin"
-	navigation :studients
+	#navigation :studients
 
 
 	

app/controllers/admins/passwords_controller.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-class Admins::PasswordsController < ::Devise::PasswordsController
+class Admins::PasswordsController  < ApplicationController
 	layout "connexion"
 
 	def create

app/controllers/admins/sessions_controller.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
-class Admins::SessionsController < ::Devise::SessionsController
+class Admins::SessionsController  < ApplicationController
 	layout "connexion"
 
 end

app/models/ability.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class Ability
-  include CanCan::Ability
+  #include CanCan::Ability
 
   def initialize(admin)
     admin ||= Admin.new # guest user

app/models/authentification_admin/admin.rb

@@ -2,11 +2,11 @@
 class Admin < ActiveRecord::Base
 
 	
-	devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable
+	#devise :database_authenticatable, :recoverable, :rememberable, :trackable, :validatable
 
 	attr_accessor :login
 
-	attr_accessible :login, :username, :surname, :firstname, :email, :password, :password_confirmation, :roles_mask, :roles, :super_admin
+	#attr_accessible :login, :username, :surname, :firstname, :email, :password, :password_confirmation, :roles_mask, :roles, :super_admin
 	
 	
 	validates :username, :presence => true, :uniqueness => true

app/models/cms/block.rb

@@ -4,7 +4,7 @@ class Block < ActiveRecord::Base
 
   belongs_to :blockable, :polymorphic => true
   
-  has_many :portlets, :order => :position, :dependent => :destroy
+  has_many :portlets,-> {order("position")}, :dependent => :destroy
   accepts_nested_attributes_for :portlets
 
 

app/models/portlets/gallery_content.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class GalleryContent < ActiveRecord::Base
-  has_many :gallery_images, :order => :position
+  has_many :gallery_images, -> {order("position")}
   
   has_one :portlet, :as => :content, :dependent => :destroy
   

app/models/portlets/table_content.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 class TableContent < ActiveRecord::Base
   has_one :portlet, :as => :content, :dependent => :destroy
-  has_many :table_rows, :include => :cel_tables, :order => :position
+  has_many :table_rows, -> {order("position")}
   has_many :cel_tables, :through => :table_rows
  
   

app/models/portlets/table_row.rb

@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 class TableRow < ActiveRecord::Base
-  has_many :cel_tables, :order => :position
+  has_many :cel_tables, -> {order("position")}
   belongs_to :table_content
   
   attr_accessor :skip_before_update

app/views/layouts/public.html.haml

@@ -35,7 +35,7 @@
 				=link_to image_tag( "/front/logo.png", :alt => "accescible spécialiste contrôle d'accès, interphones, haute savoie, suisse, genève, annemasse"), "/", :id => "logo", :title => "accescible spécialiste contrôle d'accès, interphones, haute savoie, suisse, genève, annemasse"
 				.menu_first_level
 					
-					-MenuItem.find(:all, :conditions => {:parent_id =>nil, :enabled => true}, :order => :position, :limit => 7).each do |mi|
+					-MenuItem.where(:parent_id =>nil, :enabled => true).order("position").limit(7).each do |mi|
 						-if mi.slug != "accueil"
 							=menu_item_link mi
 					
@@ -47,7 +47,7 @@
 					
 						#diapo{:style => "height:245px"}
 							-menu_item = MenuItem.find_by_slug('nos-installations') || MenuItem.first
-							-ImageFile.all(:conditions => {:home => true}).each do |sample|
+							-ImageFile.where(:home => true).each do |sample|
 					
 							
 								.item
@@ -97,7 +97,7 @@
 		
 	
 				.menu_first_level
-					-MenuItem.find(:all, :conditions => {:parent_id =>nil, :enabled => true}, :order => :position,:limit => 6, :offset => 7).each do |mi|
+					-MenuItem.where(:parent_id =>nil, :enabled => true).order("position").limit(6).offset(7).each do |mi|
 						=menu_item_link mi
 					%a{:href => "#back_to_top"} Retour en haut de page
 

config/database.yml

@@ -1,10 +1,13 @@
 # SQLite version 3.x
 #   gem install sqlite3
 development:
-  adapter: sqlite3
+  adapter: mysql2
-  database: ../sqlite3_databases/development.sqlite3
+  encoding: utf8
+  database: accescible_app
   pool: 5
-  timeout: 5000
+  username: root
+  socket: /tmp/mysql.sock 
+
 
 # Warning: The database defined as "test" will be erased and
 # re-generated from your development database when you run "rake".

config/env_init

@@ -1,5 +1,5 @@
 
-APP_RUBY=1.9.3-p0
+APP_RUBY=2.6.0
 ENV=production
 APP_ROOT=/srv/www/web/accescible_app/current/
 GEM_HOME=/srv/www/web/.rvm/gems/ruby-$APP_RUBY

config/environments/development.rb

@@ -5,14 +5,18 @@ PharmacieboissierCom::Application.configure do
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
-  config.cache_classes = false
+  
-
+  
+  config.eager_load = true
+  
+  
+  config.cache_classes = true
   # Log error messages when you accidentally call methods on nil.
   config.whiny_nils = true
 
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
-  config.action_view.debug_rjs             = true
+  #config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
 
   # Don't care if the mailer can't send

config/environments/production.rb

@@ -3,6 +3,9 @@ PharmacieboissierCom::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # Code is not reloaded between requests
+  config.eager_load = true
+  
+  
   config.cache_classes = true
 
   # Full error reports are disabled and caching is turned on

config/initializers/devise.rb

@@ -1,144 +1,146 @@
-# -*- encoding : utf-8 -*-
+if false
-# Use this hook to configure devise mailer, warden hooks and so forth. The first
+    # -*- encoding : utf-8 -*-
-# four configuration values can also be set straight in your models.
+  # Use this hook to configure devise mailer, warden hooks and so forth. The first
-Devise.setup do |config|
+  # four configuration values can also be set straight in your models.
-  # ==> Mailer Configuration
+  Devise.setup do |config|
-  # Configure the e-mail address which will be shown in DeviseMailer.
+    # ==> Mailer Configuration
-  config.mailer_sender = "n.bally@quartz-agence.com"
+    # Configure the e-mail address which will be shown in DeviseMailer.
+    config.mailer_sender = "n.bally@quartz-agence.com"
 
-  # Configure the class responsible to send e-mails.
+    # Configure the class responsible to send e-mails.
-  # config.mailer = "Devise::Mailer"
+    # config.mailer = "Devise::Mailer"
 
-  # ==> ORM configuration
+    # ==> ORM configuration
-  # Load and configure the ORM. Supports :active_record (default) and
+    # Load and configure the ORM. Supports :active_record (default) and
-  # :mongoid (bson_ext recommended) by default. Other ORMs may be
+    # :mongoid (bson_ext recommended) by default. Other ORMs may be
-  # available as additional gems.
+    # available as additional gems.
-  require 'devise/orm/active_record'
+    require 'devise/orm/active_record'
 
-  # ==> Configuration for any authentication mechanism
+    # ==> Configuration for any authentication mechanism
-  # Configure which keys are used when authenticating an user. By default is
+    # Configure which keys are used when authenticating an user. By default is
-  # just :email. You can configure it to use [:username, :subdomain], so for
+    # just :email. You can configure it to use [:username, :subdomain], so for
-  # authenticating an user, both parameters are required. Remember that those
+    # authenticating an user, both parameters are required. Remember that those
-  # parameters are used only when authenticating and not when retrieving from
+    # parameters are used only when authenticating and not when retrieving from
-  # session. If you need permissions, you should implement that in a before filter.
+    # session. If you need permissions, you should implement that in a before filter.
-  # config.authentication_keys = [ :email ]
+    # config.authentication_keys = [ :email ]
 
-  # Tell if authentication through request.params is enabled. True by default.
+    # Tell if authentication through request.params is enabled. True by default.
-  # config.params_authenticatable = true
+    # config.params_authenticatable = true
 
-  # Tell if authentication through HTTP Basic Auth is enabled. False by default.
+    # Tell if authentication through HTTP Basic Auth is enabled. False by default.
-  # config.http_authenticatable = false
+    # config.http_authenticatable = false
 
-  # Set this to true to use Basic Auth for AJAX requests.  True by default.
+    # Set this to true to use Basic Auth for AJAX requests.  True by default.
-  # config.http_authenticatable_on_xhr = true
+    # config.http_authenticatable_on_xhr = true
 
-  # The realm used in Http Basic Authentication
+    # The realm used in Http Basic Authentication
-  # config.http_authentication_realm = "Application"
+    # config.http_authentication_realm = "Application"
 
-  # ==> Configuration for :database_authenticatable
+    # ==> Configuration for :database_authenticatable
-  # For bcrypt, this is the cost for hashing the password and defaults to 10. If
+    # For bcrypt, this is the cost for hashing the password and defaults to 10. If
-  # using other encryptors, it sets how many times you want the password re-encrypted.
+    # using other encryptors, it sets how many times you want the password re-encrypted.
-  config.stretches = 10
+    config.stretches = 10
 
-  # Define which will be the encryption algorithm. Devise also supports encryptors
+    # Define which will be the encryption algorithm. Devise also supports encryptors
-  # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
+    # from others authentication tools as :clearance_sha1, :authlogic_sha512 (then
-  # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
+    # you should set stretches above to 20 for default behavior) and :restful_authentication_sha1
-  # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
+    # (then you should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
-  config.encryptor = :bcrypt
+    config.encryptor = :bcrypt
 
-  # Setup a pepper to generate the encrypted password.
+    # Setup a pepper to generate the encrypted password.
-  config.pepper = "04dcd46f0ea82d5d5238e37dd08d75529296d044c20e3311df2f09407337c859e340ef7d69fcf5f4d90625c66d7b0eb0e471efa36d9d43f1fe63f6b268a8021a"
+    config.pepper = "04dcd46f0ea82d5d5238e37dd08d75529296d044c20e3311df2f09407337c859e340ef7d69fcf5f4d90625c66d7b0eb0e471efa36d9d43f1fe63f6b268a8021a"
 
-  # ==> Configuration for :confirmable
+    # ==> Configuration for :confirmable
-  # The time you want to give your user to confirm his account. During this time
+    # The time you want to give your user to confirm his account. During this time
-  # he will be able to access your application without confirming. Default is nil.
+    # he will be able to access your application without confirming. Default is nil.
-  # When confirm_within is zero, the user won't be able to sign in without confirming. 
+    # When confirm_within is zero, the user won't be able to sign in without confirming. 
-  # You can use this to let your user access some features of your application 
+    # You can use this to let your user access some features of your application 
-  # without confirming the account, but blocking it after a certain period 
+    # without confirming the account, but blocking it after a certain period 
-  # (ie 2 days). 
+    # (ie 2 days). 
-  # config.confirm_within = 2.days
+    # config.confirm_within = 2.days
 
-  # ==> Configuration for :rememberable
+    # ==> Configuration for :rememberable
-  # The time the user will be remembered without asking for credentials again.
+    # The time the user will be remembered without asking for credentials again.
-  # config.remember_for = 2.weeks
+    # config.remember_for = 2.weeks
 
-  # If true, a valid remember token can be re-used between multiple browsers.
+    # If true, a valid remember token can be re-used between multiple browsers.
-  # config.remember_across_browsers = true
+    # config.remember_across_browsers = true
 
-  # If true, extends the user's remember period when remembered via cookie.
+    # If true, extends the user's remember period when remembered via cookie.
-  # config.extend_remember_period = false
+    # config.extend_remember_period = false
 
-  # ==> Configuration for :validatable
+    # ==> Configuration for :validatable
-  # Range for password length
+    # Range for password length
-  # config.password_length = 6..20
+    # config.password_length = 6..20
 
-  # Regex to use to validate the email address
+    # Regex to use to validate the email address
-  # config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
+    # config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i
 
-  # ==> Configuration for :timeoutable
+    # ==> Configuration for :timeoutable
-  # The time you want to timeout the user session without activity. After this
+    # The time you want to timeout the user session without activity. After this
-  # time the user will be asked for credentials again.
+    # time the user will be asked for credentials again.
-  # config.timeout_in = 10.minutes
+    # config.timeout_in = 10.minutes
 
-  # ==> Configuration for :lockable
+    # ==> Configuration for :lockable
-  # Defines which strategy will be used to lock an account.
+    # Defines which strategy will be used to lock an account.
-  # :failed_attempts = Locks an account after a number of failed attempts to sign in.
+    # :failed_attempts = Locks an account after a number of failed attempts to sign in.
-  # :none            = No lock strategy. You should handle locking by yourself.
+    # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
+    # config.lock_strategy = :failed_attempts
 
-  # Defines which strategy will be used to unlock an account.
+    # Defines which strategy will be used to unlock an account.
-  # :email = Sends an unlock link to the user email
+    # :email = Sends an unlock link to the user email
-  # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
+    # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
-  # :both  = Enables both strategies
+    # :both  = Enables both strategies
-  # :none  = No unlock strategy. You should handle unlocking by yourself.
+    # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
+    # config.unlock_strategy = :both
 
-  # Number of authentication tries before locking an account if lock_strategy
+    # Number of authentication tries before locking an account if lock_strategy
-  # is failed attempts.
+    # is failed attempts.
-  # config.maximum_attempts = 20
+    # config.maximum_attempts = 20
 
-  # Time interval to unlock the account if :time is enabled as unlock_strategy.
+    # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
+    # config.unlock_in = 1.hour
 
-  # ==> Configuration for :token_authenticatable
+    # ==> Configuration for :token_authenticatable
-  # Defines name of the authentication token params key
+    # Defines name of the authentication token params key
-  # config.token_authentication_key = :auth_token
+    # config.token_authentication_key = :auth_token
 
-  # ==> Scopes configuration
+    # ==> Scopes configuration
-  # Turn scoped views on. Before rendering "sessions/new", it will first check for
+    # Turn scoped views on. Before rendering "sessions/new", it will first check for
-  # "users/sessions/new". It's turned off by default because it's slower if you
+    # "users/sessions/new". It's turned off by default because it's slower if you
-  # are using only default views.
+    # are using only default views.
-  config.scoped_views = true
+    config.scoped_views = true
 
-  # Configure the default scope given to Warden. By default it's the first
+    # Configure the default scope given to Warden. By default it's the first
-  # devise role declared in your routes.
+    # devise role declared in your routes.
-  # config.default_scope = :user
+    # config.default_scope = :user
 
-  # Configure sign_out behavior. 
+    # Configure sign_out behavior. 
-  # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
+    # By default sign_out is scoped (i.e. /users/sign_out affects only :user scope).
-  # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
+    # In case of sign_out_all_scopes set to true any logout action will sign out all active scopes.
-  # config.sign_out_all_scopes = false
+    # config.sign_out_all_scopes = false
 
-  # ==> Navigation configuration
+    # ==> Navigation configuration
-  # Lists the formats that should be treated as navigational. Formats like
+    # Lists the formats that should be treated as navigational. Formats like
-  # :html, should redirect to the sign in page when the user does not have
+    # :html, should redirect to the sign in page when the user does not have
-  # access, but formats like :xml or :json, should return 401.
+    # access, but formats like :xml or :json, should return 401.
-  # If you have any extra navigational formats, like :iphone or :mobile, you
+    # If you have any extra navigational formats, like :iphone or :mobile, you
-  # should add them to the navigational formats lists. Default is [:html]
+    # should add them to the navigational formats lists. Default is [:html]
-  # config.navigational_formats = [:html, :iphone]
+    # config.navigational_formats = [:html, :iphone]
 
-  # ==> Warden configuration
+    # ==> Warden configuration
-  # If you want to use other strategies, that are not (yet) supported by Devise,
+    # If you want to use other strategies, that are not (yet) supported by Devise,
-  # you can configure them inside the config.warden block. The example below
+    # you can configure them inside the config.warden block. The example below
-  # allows you to setup OAuth, using http://github.com/roman/warden_oauth
+    # allows you to setup OAuth, using http://github.com/roman/warden_oauth
-  #
+    #
-  # config.warden do |manager|
+    # config.warden do |manager|
-  #   manager.oauth(:twitter) do |twitter|
+    #   manager.oauth(:twitter) do |twitter|
-  #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
+    #     twitter.consumer_secret = <YOUR CONSUMER SECRET>
-  #     twitter.consumer_key  = <YOUR CONSUMER KEY>
+    #     twitter.consumer_key  = <YOUR CONSUMER KEY>
-  #     twitter.options :site => 'http://twitter.com'
+    #     twitter.options :site => 'http://twitter.com'
-  #   end
+    #   end
-  #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
+    #   manager.default_strategies(:scope => :user).unshift :twitter_oauth
-  # end
+    # end
-	config.authentication_keys = [ :login ]
+  	config.authentication_keys = [ :login ]
-end
+  end
+end

config/initializers/sass.rb

@@ -1,3 +1,3 @@
-Sass::Plugin.options[:template_location] = {
+#Sass::Plugin.options[:template_location] = {
-  "#{RAILS_ROOT}/app/assets/stylesheets" => "#{RAILS_ROOT}/public/assets/stylesheets"
+#  "#{RAILS_ROOT}/app/assets/stylesheets" => "#{RAILS_ROOT}/public/assets/stylesheets"
-}
+#}

config/initializers/simple_navigation.rb

@@ -1,2 +1,2 @@
 # -*- encoding : utf-8 -*-
-require 'simple_navigation/rails_controller_methods'
+#require 'simple_navigation/rails_controller_methods'

config/routes.rb

@@ -32,7 +32,7 @@ PharmacieboissierCom::Application.routes.draw do
 
 
 
-		devise_for :admins, :controllers => {:sessions => "admins/sessions", :passwords => "admins/passwords"} 	
+		#devise_for :admins, :controllers => {:sessions => "admins/sessions", :passwords => "admins/passwords"} 	
 
 		namespace :portlet do
 			resources :break_contents
@@ -133,7 +133,7 @@ PharmacieboissierCom::Application.routes.draw do
 	  #     resources :products
 	  #   end
 	
-		match 'pages/*url.:f' => 'public/menu_items#show', :as => :menu_item, :f => "html"
+		get 'pages/*url.:f' => 'public/menu_items#show', :as => :menu_item, :f => "html"
 	  # You can have the root of your site routed with "root"
 	  # just remember to delete public/index.html.
 	  root :to => "public/menu_items#home"