add uploader

barthezslavik · Dec 20, 2012 · 4d9af90 · 4d9af90
1 parent a8e1f26
commit 4d9af90
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 9 deletions.
diff --git a/Gemfile b/Gemfile
@@ -22,6 +22,7 @@ group :assets do
 end
 
 gem 'jquery-rails'
+gem "jquery-fileupload-rails"
 
 # To use ActiveModel has_secure_password
 # gem 'bcrypt-ruby', '~> 3.0.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -49,6 +49,9 @@ GEM
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
+    jquery-fileupload-rails (0.4.0)
+      actionpack (>= 3.1)
+      railties (>= 3.1)
     jquery-rails (2.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
@@ -112,6 +115,7 @@ PLATFORMS
 DEPENDENCIES
   coffee-rails (~> 3.2.1)
   haml-rails
+  jquery-fileupload-rails
   jquery-rails
   mysql2
   rails (= 3.2.9)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -13,3 +13,14 @@
 //= require jquery
 //= require jquery_ujs
 //= require_tree .
+
+//= require jquery-fileupload
+//=require jquery-fileupload/vendor/jquery.ui.widget
+//=require jquery-fileupload/vendor/load-image
+//=require jquery-fileupload/vendor/canvas-to-blob
+//=require jquery-fileupload/vendor/tmpl
+//=require jquery-fileupload/jquery.iframe-transport
+//=require jquery-fileupload/jquery.fileupload
+//=require jquery-fileupload/jquery.fileupload-fp
+//=require jquery-fileupload/jquery.fileupload-ui
+//=require jquery-fileupload/locale
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -11,3 +11,5 @@
  *= require_self
  *= require_tree .
  */
+
+//= require jquery.fileupload-ui
diff --git a/app/views/samples/show.html.haml b/app/views/samples/show.html.haml
@@ -1,12 +1,7 @@
 %p#notice= notice
 
-%p
+%h2= @sample.name
-  %b Name:
+%p= @sample.description
-  = @sample.name
-%p
-  %b Description:
-  = @sample.description
 
-= link_to 'Edit', edit_sample_path(@sample)
+/= link_to 'Edit', edit_sample_path(@sample)
-\|
+/= link_to 'Back', samples_path
-= link_to 'Back', samples_path