diff --git a/Gemfile b/Gemfile index a83dee3..f653a62 100755 --- a/Gemfile +++ b/Gemfile @@ -73,6 +73,7 @@ gem "cancan" # Fileupload gem 'paperclip' ,'~>3.4.0' +gem 'blueimp-gallery' gem 'git' gem 'haml' @@ -91,7 +92,7 @@ gem "simple_calendar", "~> 0.1.9" gem 'rmagick' gem 'bootstrap-addons-rails' -gem "jquery-fileupload-rails" +gem "jquery-fileupload-rails", "0.4.1" gem "jquery-ui-rails","~> 4.1.1" gem "font-awesome-rails" gem "jquery-datetimepicker-rails" @@ -115,4 +116,4 @@ gem 'sunspot_solr' gem 'sitemap_generator' gem 'whenever' gem 'yaml_db' -gem 'etherpad-lite' \ No newline at end of file +gem 'etherpad-lite' diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb index 88ddcc2..6d65392 100644 --- a/app/views/galleries/show.html.erb +++ b/app/views/galleries/show.html.erb @@ -39,45 +39,35 @@
-
- - - - -<%= render 'layouts/pretty_toolbar' %> - - - - - - - - - - diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1318273..fb611d0 100755 Binary files a/app/views/layouts/application.html.erb and b/app/views/layouts/application.html.erb differ