Merge branch 'master' of github.com:marlonglopes/upload

marlonglopes · Dec 1, 2010 · 7fadcca · 7fadcca
2 parents 4fc5548 + 291477e
commit 7fadcca
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 2 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -4,9 +4,10 @@
   <head>
     <title><%= h(yield(:title) || "Untitled") %></title>
 
-	<%= stylesheet( 'application', 'uploadify') %>
-	<%= javascript( 'jquery-1.4.2.min') %>
+		<%= stylesheet_link_tag 'application' %>
 
+		<%= stylesheet( 'application', 'uploadify') %>
+		<%= javascript( 'jquery-1.3.2.min') %>
 
     <%= yield(:head) %>
   </head>

diff --git a/public/javascripts/jquery-1.3.2.min.js b/public/javascripts/jquery-1.3.2.min.js
diff --git a/public/javascripts/uploadify/jquery.uploadify.v2.1.0.min.js b/public/javascripts/uploadify/jquery.uploadify.v2.1.0.min.js