Enhanced startup gallery.

fredwu · Jul 18, 2011 · d901bd5 · d901bd5
1 parent 40aca11
commit d901bd5
Show file tree

Hide file tree

Showing 29 changed files with 418 additions and 10 deletions.
diff --git a/app/assets/javascripts/concerns/gallery.js.coffee b/app/assets/javascripts/concerns/gallery.js.coffee
@@ -1,9 +1,11 @@
 jQuery ->
-  $("#slideshow").livequery(->
+  $('#slideshow').livequery(->
     $(@).slideshow(
       pauseSeconds: 5
       width: window.settings.group.logo.full.width
       height: window.settings.group.logo.full.height
       caption: false
     )
+
+    $('> a', @).fancybox()
   )
diff --git a/app/assets/javascripts/libs/jquery/jquery.fancybox.pack.js b/app/assets/javascripts/libs/jquery/jquery.fancybox.pack.js
diff --git a/app/assets/javascripts/libs/jquery/jquery.slideshow.lite.js b/app/assets/javascripts/libs/jquery/jquery.slideshow.lite.js
@@ -81,7 +81,7 @@
 
       var i = 1;
       $("a", target).each(function(){
-        $(this).attr("rel", i++);
+        $(this).attr("data-seq", i++);
       });
 
       // ----------------------------------------
@@ -150,12 +150,12 @@
         });
 
         // pagination highlight
-        paginationHighlight(currentItem.attr("rel")-1);
+        paginationHighlight(currentItem.data("seq")-1);
 
         // show caption
         if (options.caption == true)
         {
-          showCaption(currentItem.attr("rel")-1);
+          showCaption(currentItem.data("seq")-1);
         }
 
         currentItem.css("z-index", 2);

diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -11,4 +11,5 @@
 @import 'inc/960_12_10_10.css';
 @import 'inc/jquery.autoSuggest.css';
 @import 'inc/jquery.slideshow.lite.css';
+@import '/stylesheets/fancybox/jquery.fancybox.css';
 @import 'style.css';
diff --git a/app/uploaders/startup_photo_uploader.rb b/app/uploaders/startup_photo_uploader.rb
@@ -23,15 +23,15 @@ def store_dir
   # end
 
   # Process files as they are uploaded:
-  process :resize_to_fill => [Settings.group.logo.full.width, Settings.group.logo.full.height]
+  process :resize_to_fill => [Settings.group.logo.gallery.width, Settings.group.logo.gallery.height]
 
   # def scale(width, height)
   #   # do something
   # end
 
   # Create different versions of your uploaded files:
-  version :gallery do
-    process :resize_to_fill => [Settings.group.logo.gallery.width, Settings.group.logo.gallery.height]
+  version :slideshow do
+    process :resize_to_fill => [Settings.group.logo.full.width, Settings.group.logo.full.height]
   end
 
   # Add a white list of extensions which are allowed to be uploaded.

diff --git a/app/views/startups/_photos.html.slim b/app/views/startups/_photos.html.slim
@@ -2,6 +2,6 @@
   #slideshow
     - if startup.photos.any?
       - startup.photos.each do |photo|
-        = image_tag(photo.photo.url)
+        = link_to image_tag(photo.photo.slideshow), photo.photo.url, :rel => 'startup_slideshow'
     - else
       = image_tag(startup.logo_full)
diff --git a/app/views/startups/upload_photos.html.slim b/app/views/startups/upload_photos.html.slim
@@ -10,6 +10,6 @@
       = p.input :photo_cache, :as => :hidden
       .input
         = label_tag ''
-        = image_tag(photo.photo.url)
+        = image_tag(photo.photo.slideshow)
   = f.button :submit
 .clear
diff --git a/public/stylesheets/fancybox/blank.gif b/public/stylesheets/fancybox/blank.gif
diff --git a/public/stylesheets/fancybox/fancy_close.png b/public/stylesheets/fancybox/fancy_close.png
diff --git a/public/stylesheets/fancybox/fancy_loading.png b/public/stylesheets/fancybox/fancy_loading.png
diff --git a/public/stylesheets/fancybox/fancy_nav_left.png b/public/stylesheets/fancybox/fancy_nav_left.png
diff --git a/public/stylesheets/fancybox/fancy_nav_right.png b/public/stylesheets/fancybox/fancy_nav_right.png
diff --git a/public/stylesheets/fancybox/fancy_shadow_e.png b/public/stylesheets/fancybox/fancy_shadow_e.png
diff --git a/public/stylesheets/fancybox/fancy_shadow_n.png b/public/stylesheets/fancybox/fancy_shadow_n.png
diff --git a/public/stylesheets/fancybox/fancy_shadow_ne.png b/public/stylesheets/fancybox/fancy_shadow_ne.png
diff --git a/public/stylesheets/fancybox/fancy_shadow_nw.png b/public/stylesheets/fancybox/fancy_shadow_nw.png
diff --git a/public/stylesheets/fancybox/fancy_shadow_s.png b/public/stylesheets/fancybox/fancy_shadow_s.png
diff --git a/public/stylesheets/fancybox/fancy_shadow_se.png b/public/stylesheets/fancybox/fancy_shadow_se.png
diff --git a/public/stylesheets/fancybox/fancy_shadow_sw.png b/public/stylesheets/fancybox/fancy_shadow_sw.png
diff --git a/public/stylesheets/fancybox/fancy_shadow_w.png b/public/stylesheets/fancybox/fancy_shadow_w.png
diff --git a/public/stylesheets/fancybox/fancy_title_left.png b/public/stylesheets/fancybox/fancy_title_left.png
diff --git a/public/stylesheets/fancybox/fancy_title_main.png b/public/stylesheets/fancybox/fancy_title_main.png
diff --git a/public/stylesheets/fancybox/fancy_title_over.png b/public/stylesheets/fancybox/fancy_title_over.png
diff --git a/public/stylesheets/fancybox/fancy_title_right.png b/public/stylesheets/fancybox/fancy_title_right.png
diff --git a/public/stylesheets/fancybox/fancybox-x.png b/public/stylesheets/fancybox/fancybox-x.png
diff --git a/public/stylesheets/fancybox/fancybox-y.png b/public/stylesheets/fancybox/fancybox-y.png
diff --git a/public/stylesheets/fancybox/fancybox.png b/public/stylesheets/fancybox/fancybox.png