passage rails 3.1 suite

app/assets/javascripts/admin/browser.js

@@ -1,11 +1,11 @@
 $(document).ready(function ($) {
-
+	
 	var browser_test = $.reject({
 		header: "Le navigateur que vous utilisez actuellement n'est pas pris en charge", // Header Text  
 		paragraph1: "Notre interface d'administration étant conçu pour être la plus ergonomique et agréable à utiliser nécéssite l'usage d'un navigateur récent et respectueux des standards.", // Paragraph 1  
 		paragraph2: "Nous vous remercions d'installer l'un des navigateurs suivant :", // Paragraph 2  
 		
-		imagePath:"/images/browser/",
+		imagePath:"/assets/browser/",
 		
 		
 		close:false,
@@ -41,7 +41,7 @@ $(document).ready(function ($) {
 		browserInfo: {  
 			safari: { 
 			text: 'Safari 5+', 
-			img: "/browser/safari.png",
+			img: "/assets/browser/safari.png",
 			url: 'http://www.apple.com/fr/safari/download/' 
 		} ,
 		chrome: {

app/assets/javascripts/connexion.js

@@ -0,0 +1,6 @@
+//=require jquery
+//=require jquery_ujs
+//=require jquery.reject.min
+//=require admin/browser
+
+

app/assets/stylesheets/connexion.css.scss

@@ -1,9 +1,10 @@
 /*
-*=require admin/core/reset
+
 *= require_self
-*= require admin/core/forms
-*= require admin/core/elements
-*= require admin/core/general
+*= require qi/forms
+
+*= require qi/general
+
 
 
 

app/views/layouts/admin.html.haml

@@ -6,52 +6,21 @@
 		%title
 			Administration
 
-		:javascript
-			GENTICS_Aloha_base = "/aloha/"
+
 		
 		= csrf_meta_tag 
 		
 
-		=javascript_include_tag "/assets/javascripts/core/jquery-1.6.1.min.js"
-		
-		=javascript_include_tag "/assets/javascripts/core/jquery.reject.min.js"
-		=javascript_include_tag "/assets/javascripts/core/rails.js"
-		
 
-		
 	
 		
-		=javascript_include_tag "/assets/javascripts/core/jquery-ui.min.js"
 		
-		=javascript_include_tag "/assets/javascripts/core/jcarousellite_1.0.1.min.js"
-		=javascript_include_tag "/assets/javascripts/core/jquery.easing.compatibility.js"
-		=javascript_include_tag "/assets/javascripts/core/jquery.prettyPhoto.js"
-		
-		=javascript_include_tag "/assets/javascripts/core/jquery.fileupload.js"
-		=javascript_include_tag "/assets/javascripts/core/jquery.fileupload-ui.js"
-		=javascript_include_tag "/assets/javascripts/core/tiny_mce/jquery.tinymce.js"
+		=javascript_include_tag 'admin/admin'
+
 		
 		
-		
-		=javascript_include_tag '/assets/javascripts/admin/admin'
-		=javascript_include_tag '/assets/javascripts/admin/pane_hover'
-		=javascript_include_tag '/assets/javascripts/admin/menu_items'
-		=javascript_include_tag '/assets/javascripts/admin/block'
-				
-		=javascript_include_tag '/assets/javascripts/admin/manager/data_files'
-		=javascript_include_tag '/assets/javascripts/admin/manager/image_files'
-		=javascript_include_tag '/assets/javascripts/admin/manager/manager'
-		=javascript_include_tag '/assets/javascripts/admin/manager/uploads'
-		
-		
-		= stylesheet_link_tag '/assets/stylesheets/admin/admin' 
-		= stylesheet_link_tag '/assets/stylesheets/qi/general' 
-		= stylesheet_link_tag '/assets/stylesheets/qi/forms'
-		= stylesheet_link_tag '/assets/stylesheets/qi/qi'
-		
-		= stylesheet_link_tag '/assets/stylesheets_core/jquery.fileupload-ui.css'
-		= stylesheet_link_tag '/assets/stylesheets_core/ui-lightness/jquery-ui-1.8.11.custom.css'
-		= stylesheet_link_tag '/assets/stylesheets_core/formtastic'
+		= stylesheet_link_tag 'admin/admin' 
+
 		
 		
 	

app/views/layouts/public.html.haml

@@ -7,17 +7,12 @@
 		
 	
 		
-		= stylesheet_link_tag '/assets/stylesheets/public/public' 
+		= stylesheet_link_tag 'public/public' 
 		
-		= stylesheet_link_tag '/assets/stylesheets_core/prettyPhoto.css'
+
+
 		
-		
-		=javascript_include_tag "/assets/javascripts/core/jquery-1.6.1.min.js"
-		=javascript_include_tag "/assets/javascripts/core/jcarousellite_1.0.1.min.js"
-		=javascript_include_tag "/assets/javascripts/core/jquery.easing.compatibility.js"
-		=javascript_include_tag "/assets/javascripts/core/jquery.prettyPhoto.js"
-		
-		=javascript_include_tag '/assets/javascripts/public/public'
+		=javascript_include_tag 'public/public'
 		
 		
 		

config/initializers/wrap_parameters.rb

@@ -0,0 +1,12 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActionController::Base.wrap_parameters format: [:json]
+
+# Disable root element in JSON by default.
+if defined?(ActiveRecord)
+  ActiveRecord::Base.include_root_in_json = false
+end

config/locales/en.yml

@@ -0,0 +1,5 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  hello: "Hello world"

config/routes.rb

@@ -1,5 +1,4 @@
 # -*- encoding : utf-8 -*-
-PharmacieboissierCom::Application.routes.draw do
 Pharma::Application.routes.draw do
 
 

test/functional/notification_test.rb

@@ -1,12 +0,0 @@
-require 'test_helper'
-
-class NotificationTest < ActionMailer::TestCase
-  test "prescription_received" do
-    mail = Notification.prescription_received
-    assert_equal "Prescription received", mail.subject
-    assert_equal ["to@example.org"], mail.to
-    assert_equal ["from@example.com"], mail.from
-    assert_match "Hi", mail.body.encoded
-  end
-
-end