From d2bf1e6e9d55d53d1d6915102371e17302b38c09 Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Fri, 8 Jul 2011 18:12:27 +0200 Subject: [PATCH] jsfdgdfggdf --- app/assets/javascripts/admin/admin.js | 2 +- app/views/layouts/admin.html.haml | 2 +- app/views/layouts/connexion.html.haml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/admin/admin.js b/app/assets/javascripts/admin/admin.js index a1517a3..5823b58 100644 --- a/app/assets/javascripts/admin/admin.js +++ b/app/assets/javascripts/admin/admin.js @@ -1,6 +1,6 @@ /* -*= require jquery + *= require jquery-ui *= require jquery_ujs *=require jquery-reject diff --git a/app/views/layouts/admin.html.haml b/app/views/layouts/admin.html.haml index c6325cc..64d7137 100644 --- a/app/views/layouts/admin.html.haml +++ b/app/views/layouts/admin.html.haml @@ -13,7 +13,7 @@ - + =javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" =javascript_include_tag 'admin/admin', :debug => true diff --git a/app/views/layouts/connexion.html.haml b/app/views/layouts/connexion.html.haml index 3cc78de..be720d4 100644 --- a/app/views/layouts/connexion.html.haml +++ b/app/views/layouts/connexion.html.haml @@ -10,6 +10,7 @@ = csrf_meta_tag + =javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" =javascript_include_tag "connexion" = stylesheet_link_tag 'connexion'