diff --git a/Gemfile b/Gemfile index 0cd6e11..a13e176 100644 --- a/Gemfile +++ b/Gemfile @@ -60,3 +60,6 @@ gem 'bootstrap-sass' # Pagination gem 'kaminari' + +# Lightbox image viewer for full-sized images +gem 'fancybox2-rails', '~> 0.2.4' diff --git a/Gemfile.lock b/Gemfile.lock index 6b895d0..68548cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,6 +48,8 @@ GEM erubis (2.7.0) execjs (1.4.0) multi_json (~> 1.0) + fancybox2-rails (0.2.4) + railties (>= 3.1.0) hike (1.2.3) i18n (0.6.4) jbuilder (1.4.2) @@ -133,6 +135,7 @@ DEPENDENCIES binding_of_caller bootstrap-sass coffee-rails (~> 4.0.0) + fancybox2-rails (~> 0.2.4) jbuilder (~> 1.2) jquery-rails kaminari diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index d6925fa..828d085 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -12,5 +12,6 @@ // //= require jquery //= require jquery_ujs +//= require fancybox //= require turbolinks //= require_tree . diff --git a/app/assets/javascripts/packages.js.coffee b/app/assets/javascripts/packages.js.coffee index 24f83d1..cdb34e1 100644 --- a/app/assets/javascripts/packages.js.coffee +++ b/app/assets/javascripts/packages.js.coffee @@ -1,3 +1,15 @@ # Place all the behaviors and hooks related to the matching controller here. # All this logic will automatically be available in application.js. # You can use CoffeeScript in this file: http://coffeescript.org/ + +jQuery -> + $("a.fancybox").fancybox({ + openEffect : 'elastic', + closeEffect : 'elastic', + + helpers : { + title : { + type : 'inside' + } + } + }) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c92dff8..16f277e 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -10,6 +10,7 @@ * *= require_self *= require_tree . + *= require fancybox */ -//= require bootstrap \ No newline at end of file +//= require bootstrap diff --git a/app/views/packages/_packages_search_results.html.erb b/app/views/packages/_packages_search_results.html.erb index 17816a1..a41cb9f 100644 --- a/app/views/packages/_packages_search_results.html.erb +++ b/app/views/packages/_packages_search_results.html.erb @@ -7,15 +7,24 @@
  • <% if package.screenshots.length>0 %> + <% screenshot = package.screenshots.first %>
    - <%= link_to (image_tag package.screenshots.first.image_url('small')), - package.screenshots.first.image_url('large') %> + <%= link_to ( + image_tag(screenshot.image_url('small')) + ), + screenshot.image_url('large'), + :class => 'fancybox', + :title => ( + "#{package.description}" + + (screenshot.description.blank? ? '' : " (#{screenshot.description})") + ) + %>

    <%= package.name %>

    <%= package.description %>

    <% else %>
    - <%= link_to (image_tag "/thumbnail-404.png"), + <%= link_to image_tag("/thumbnail-404.png"), "/path/to/upload/package" %>

    <%= package.name %>