From aec1b53c84a082ae31fec875f39dff435824e6a1 Mon Sep 17 00:00:00 2001
From: Nicolas Bally <n.bally@quartz-agence.com>
Date: Wed, 6 Jul 2011 16:14:51 +0200
Subject: [PATCH] bug js

---
 app/assets/javascripts/admin/admin.js | 2 +-
 app/views/layouts/admin.html.haml     | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/admin.js b/app/assets/javascripts/admin/admin.js
index f63ce2a..d1cc668 100644
--- a/app/assets/javascripts/admin/admin.js
+++ b/app/assets/javascripts/admin/admin.js
@@ -1,7 +1,7 @@
 /*
 
 *= require jquery
-
+*= require jquery-ui.min
 *= require jquery_ujs
 *=require jquery.reject.min
 *=require tiny_mce/jquery.tinymce
diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml
index e64d352..c6325cc 100644
--- a/app/views/layouts/admin.html.haml
+++ b/app/views/layouts/admin.html.haml
@@ -16,7 +16,6 @@
 		
 		
 		=javascript_include_tag 'admin/admin', :debug => true
-		=javascript_include_tag "jquery-ui.min"