sofa_gallery 0.0.5 → 0.0.6

data/.travis.yml

@@ -1 +1,2 @@
+rvm: 1.9.2
 script: "bundle exec rake db:drop db:create db:migrate test"

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/app/assets/javascripts/sofa_gallery/jquery.orbit-1.2.3.min.js

@@ -0,0 +1,17 @@
+/*
+ * jQuery Orbit Plugin 1.2.3
+ * www.ZURB.com/playground
+ * Copyright 2010, ZURB
+ * Free to use under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+*/
+
+(function(d){d.fn.orbit=function(a){a=d.extend({animation:"horizontal-push",animationSpeed:600,timer:!0,advanceSpeed:4E3,pauseOnHover:!1,startClockOnMouseOut:!1,startClockOnMouseOutAfter:1E3,directionalNav:!0,captions:!0,captionAnimation:"fade",captionAnimationSpeed:600,bullets:!1,bulletThumbs:!1,bulletThumbLocation:"",afterSlideChange:function(){}},a);return this.each(function(){function q(){if(!a.timer||a.timer=="false")return!1;else r.is(":hidden")?s=setInterval(function(){l("next")},a.advanceSpeed):
+(o=!0,x.removeClass("active"),s=setInterval(function(){var a="rotate("+m+"deg)";m+=2;t.css({"-webkit-transform":a,"-moz-transform":a,"-o-transform":a});m>180&&(t.addClass("move"),y.addClass("move"));m>360&&(t.removeClass("move"),y.removeClass("move"),m=0,l("next"))},a.advanceSpeed/180))}function n(){if(!a.timer||a.timer=="false")return!1;else o=!1,clearInterval(s),x.addClass("active")}function z(){if(!a.captions||a.captions=="false")return!1;else{var c=e.eq(b).data("caption");(_captionHTML=d(c).html())?
+(j.attr("id",c).html(_captionHTML),a.captionAnimation=="none"&&j.show(),a.captionAnimation=="fade"&&j.fadeIn(a.captionAnimationSpeed),a.captionAnimation=="slideOpen"&&j.slideDown(a.captionAnimationSpeed)):(a.captionAnimation=="none"&&j.hide(),a.captionAnimation=="fade"&&j.fadeOut(a.captionAnimationSpeed),a.captionAnimation=="slideOpen"&&j.slideUp(a.captionAnimationSpeed))}}function A(){if(a.bullets)C.children("li").removeClass("active").eq(b).addClass("active");else return!1}function l(c){function d(){e.eq(f).css({"z-index":1});
+u=!1;a.afterSlideChange.call(this)}var f=b,g=c;if(f==g)return!1;if(e.length=="1")return!1;u||(u=!0,c=="next"?(b++,b==p&&(b=0)):c=="prev"?(b--,b<0&&(b=p-1)):(b=c,f<b?g="next":f>b&&(g="prev")),A(),e.eq(f).css({"z-index":2}),a.animation=="fade"&&e.eq(b).css({opacity:0,"z-index":3}).animate({opacity:1},a.animationSpeed,d),a.animation=="horizontal-slide"&&(g=="next"&&e.eq(b).css({left:h,"z-index":3}).animate({left:0},a.animationSpeed,d),g=="prev"&&e.eq(b).css({left:-h,"z-index":3}).animate({left:0},a.animationSpeed,
+d)),a.animation=="vertical-slide"&&(g=="prev"&&e.eq(b).css({top:v,"z-index":3}).animate({top:0},a.animationSpeed,d),g=="next"&&e.eq(b).css({top:-v,"z-index":3}).animate({top:0},a.animationSpeed,d)),a.animation=="horizontal-push"&&(g=="next"&&(e.eq(b).css({left:h,"z-index":3}).animate({left:0},a.animationSpeed,d),e.eq(f).animate({left:-h},a.animationSpeed)),g=="prev"&&(e.eq(b).css({left:-h,"z-index":3}).animate({left:0},a.animationSpeed,d),e.eq(f).animate({left:h},a.animationSpeed))),z())}var b=0,
+p=0,h,v,u,f=d(this).addClass("orbit"),c=f.wrap('<div class="orbit-wrapper" />').parent();f.add(h).width("1px").height("1px");var e=f.children("img, a, div");e.each(function(){var a=d(this),b=a.width(),a=a.height();b>f.width()&&(f.add(c).width(b),h=f.width());a>f.height()&&(f.add(c).height(a),v=f.height());p++});if(e.length==1)a.directionalNav=!1,a.timer=!1,a.bullets=!1;e.eq(b).css({"z-index":3}).fadeIn(function(){e.css({display:"block"})});if(a.timer){c.append('<div class="timer"><span class="mask"><span class="rotator"></span></span><span class="pause"></span></div>');
+var r=c.children("div.timer"),o;if(r.length!=0){var t=d("div.timer span.rotator"),y=d("div.timer span.mask"),x=d("div.timer span.pause"),m=0,s;q();r.click(function(){o?n():q()});if(a.startClockOnMouseOut){var B;c.mouseleave(function(){B=setTimeout(function(){o||q()},a.startClockOnMouseOutAfter)});c.mouseenter(function(){clearTimeout(B)})}}}a.pauseOnHover&&c.mouseenter(function(){n()});if(a.captions){c.append('<div class="orbit-caption"></div>');var j=c.children(".orbit-caption");z()}if(a.directionalNav){if(a.directionalNav==
+"false")return!1;c.append('<div class="slider-nav"><span class="right">Right</span><span class="left">Left</span></div>');var k=c.children("div.slider-nav").children("span.left"),w=c.children("div.slider-nav").children("span.right");k.click(function(){n();l("prev")});w.click(function(){n();l("next")})}if(a.bullets){c.append('<ul class="orbit-bullets"></ul>');var C=c.children("ul.orbit-bullets");for(i=0;i<p;i++){k=d("<li>"+(i+1)+"</li>");if(a.bulletThumbs&&(w=e.eq(i).data("thumb")))k=d('<li class="has-thumb">'+
+i+"</li>"),k.css({background:"url("+a.bulletThumbLocation+w+") no-repeat"});c.children("ul.orbit-bullets").append(k);k.data("index",i);k.click(function(){n();l(d(this).data("index"))})}A()}})}})(jQuery);

data/app/assets/stylesheets/sofa_gallery/admin.css

@@ -12,10 +12,46 @@
   margin: 0 5px;
 }
 
+/* -- Table --------------------------------------------------------------- */
+
 #cms_body table.formatted td.preview  {
   height: 45px;
 }
 
 #cms_body table.formatted td.embed {
   font-size: 8px;
-}
+}
+
+#cms_body table.formatted {
+  width: 100%;
+}
+  
+#cms_body table.formatted th, td {
+  white-space: nowrap;
+  padding: 6px;
+  background-color: #f1f1f1;
+  border-bottom: 2px solid #e6e6e6;
+}
+
+    
+
+#cms_body table.formatted th.main, td.main {
+  white-space: normal;
+  width: 100%;
+}
+#cms_body table.formatted th {
+      background-color: #252525;
+      color: #f7f7f7;
+      font-size: 12px;
+}
+#cms_body table.formatted th:first-child {
+  border-radius: 5px 0px 0px 5px;
+}
+#cms_body table.formatted th:last-child {
+  border-radius: 0px 5px 5px 0px
+}
+
+#cms_body table.formatted tr:hover td {
+  background-color: #fff
+}
+      

data/app/assets/stylesheets/sofa_gallery/carousel.css.erb

@@ -0,0 +1,208 @@
+/* CSS for jQuery Orbit Plugin 1.2.3
+ * www.ZURB.com/playground
+ * Copyright 2010, ZURB
+ * Free to use under the MIT license.
+ * http://www.opensource.org/licenses/mit-license.php
+ 
+ 
+ 
+/* PUT IN YOUR SLIDER ID AND SIZE TO MAKE LOAD BEAUTIFULLY
+   ================================================== */
+#featured { 
+	width: 960px;
+	height: 480px;
+	background: #000 url(<%= asset_path('sofa_gallery/orbit/loading.gif') %>) no-repeat center center;
+	overflow: hidden; }
+#featured>img,  
+#featured>div,
+#featured>a { display: none; }
+
+
+/* CONTAINER
+   ================================================== */
+
+div.orbit-wrapper {
+    width: 1px;
+    height: 1px;
+    position: relative; }
+
+div.orbit {
+    width: 1px;
+    height: 1px;
+    position: relative;
+    overflow: hidden }
+
+div.orbit>img {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: none; }
+
+div.orbit>a {
+    border: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    line-height: 0; 
+    display: none; }
+
+.orbit>div {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%; }
+
+/* Note: If your slider only uses content or anchors, you're going to want to put the width and height declarations on the ".orbit>div" and "div.orbit>a" tags in addition to just the .orbit-wrapper */
+
+
+/* TIMER
+   ================================================== */
+
+div.timer {
+    width: 40px;
+    height: 40px;
+    overflow: hidden;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    opacity: .6;
+    cursor: pointer;
+    z-index: 1001; }
+
+span.rotator {
+    display: block;
+    width: 40px;
+    height: 40px;
+    position: absolute;
+    top: 0;
+    left: -20px;
+    background: url(<%= asset_path('sofa_gallery/orbit/rotator-black.png') %>) no-repeat;
+    z-index: 3; }
+
+span.mask {
+    display: block;
+    width: 20px;
+    height: 40px;
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 2;
+    overflow: hidden; }
+
+span.rotator.move {
+    left: 0 }
+
+span.mask.move {
+    width: 40px;
+    left: 0;
+    background: url(<%= asset_path('sofa_gallery/orbit/timer-black.png') %>) repeat 0 0; }
+
+span.pause {
+    display: block;
+    width: 40px;
+    height: 40px;
+    position: absolute;
+    top: 0;
+    left: 0;
+    background: url(<%= asset_path('sofa_gallery/orbit/pause-black.png') %>) no-repeat;
+    z-index: 4;
+    opacity: 0; }
+
+span.pause.active {
+    background: url(<%= asset_path('sofa_gallery/orbit/pause-black.png') %>) no-repeat 0 -40px }
+
+div.timer:hover span.pause,
+span.pause.active {
+    opacity: 1 }
+
+
+/* CAPTIONS
+   ================================================== */
+
+.orbit-caption {
+    display: none; }
+
+.orbit-wrapper .orbit-caption {
+    background: #000;
+    background: rgba(0,0,0,.6);
+    z-index: 1000;
+    color: #fff;
+	text-align: center;
+	padding: 7px 0;
+    font-size: 13px;
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    width: 100%; }
+
+
+/* DIRECTIONAL NAV
+   ================================================== */
+
+div.slider-nav {
+    display: block;
+    overflow: hidden; }
+
+div.slider-nav span {
+    width: 78px;
+    height: 100px;
+    text-indent: -9999px;
+    position: absolute;
+    z-index: 1000;
+    top: 50%;
+    top: 0;
+/*    margin-top: -50px;*/
+    cursor: pointer; }
+
+div.slider-nav span.right {
+  width: 45%;
+  height: 100%;
+  right: 0; }
+
+div.slider-nav span.right:hover {
+  background: url(<%= asset_path('sofa_gallery/orbit/right-arrow.png') %>) center right no-repeat; }
+
+div.slider-nav span.left {
+  width: 45%;
+  height: 100%;
+  left: 0; }
+  
+div.slider-nav span.left:hover {
+  background: url(<%= asset_path('sofa_gallery/orbit/left-arrow.png') %>) center left no-repeat; }
+
+/* BULLET NAV
+   ================================================== */
+
+.orbit-bullets {
+    position: absolute;
+    z-index: 1000;
+    list-style: none;
+    bottom: -40px;
+    left: 50%;
+	margin-left: -50px;
+    padding: 0; }
+
+.orbit-bullets li {
+    float: left;
+    margin-left: 5px;
+    cursor: pointer;
+    color: #999;
+    text-indent: -9999px;
+    background: url(<%= asset_path('sofa_gallery/orbit/bullets.jpg') %>) no-repeat 4px 0;
+    width: 13px;
+    height: 12px;
+    overflow: hidden; }
+
+.orbit-bullets li.active {
+    color: #222;
+    background-position: -8px 0; }
+    
+.orbit-bullets li.has-thumb {
+    background: none;
+    width: 100px;
+    height: 75px; }
+
+.orbit-bullets li.active.has-thumb {
+    background-position: 0 0;
+    border-top: 2px solid #000; }

data/app/controllers/sofa_gallery/admin/photos_controller.rb

@@ -13,7 +13,27 @@ class SofaGallery::Admin::PhotosController < SofaGallery::Admin::BaseController
   end
   
   def create
-    @photo.save!
+    file_array  = params[:sofa_gallery_photo][:image] || [nil]
+    
+    file_array.each_with_index do |file, i|
+      file_params = params[:sofa_gallery_photo].merge(:image => file)
+      
+      title = (file_params[:title].blank? && file_params[:image] ? 
+        file_params[:image].original_filename : 
+        file_params[:title]
+      )
+      title = title + " #{i + 1}" if file_params[:title] == title && file_array.size > 1
+      
+      slug = (file_params[:slug].blank? && file_params[:image] ? 
+        file_params[:image].original_filename.parameterize : 
+        file_params[:slug]
+      )
+      slug = (slug + "-#{i + 1}") if file_params[:slug] == slug && file_array.size > 1
+      
+      @photo = SofaGallery::Photo.new({:gallery => @gallery}.merge(file_params.merge(:title => title, :slug => slug) || {}))
+      @photo.save!
+    end
+    
     flash[:notice] = 'Photo created'
     redirect_to :action => :index
   rescue ActiveRecord::RecordInvalid
@@ -26,7 +46,7 @@ class SofaGallery::Admin::PhotosController < SofaGallery::Admin::BaseController
   end
   
   def update
-    @photo.update_attributes!(params[:photo])
+    @photo.update_attributes!(params[:sofa_gallery_photo])
     flash[:notice] = 'Photo updated'
     redirect_to :action => :index
   rescue ActiveRecord::RecordInvalid
@@ -70,7 +90,7 @@ protected
   end
   
   def build_photo
-    @photo = SofaGallery::Photo.new({:gallery => @gallery}.merge(params[:photo] || {}))
+    @photo = SofaGallery::Photo.new({:gallery => @gallery}.merge(params[:sofa_gallery_photo] || {}))
   end
   
 end

data/app/helpers/sofa_gallery_helper.rb

@@ -18,4 +18,13 @@ module SofaGalleryHelper
     end
   end
   
+  def render_galleries(type = 'list_galleries')
+    @galleries = SofaGallery::Gallery.all
+    if (@galleries)
+      render :partial => "sofa_gallery/#{type}"
+    else
+      render :text => 'Gallery not found.', :status => 404
+    end
+  end
+  
 end

data/app/models/sofa_gallery/photo.rb

@@ -30,6 +30,10 @@ class SofaGallery::Photo < ActiveRecord::Base
   # -- Validations ----------------------------------------------------------
   validates :gallery_id,
     :presence => true
+  validates :slug,
+    :presence   => true,
+    :uniqueness => true,
+    :format     => { :with =>  /^\w[a-z0-9_-]*$/i }
   validates_attachment_presence :image,
     :message      => 'There was no file uploaded!'
   validates_attachment_content_type :image,
@@ -37,9 +41,6 @@ class SofaGallery::Photo < ActiveRecord::Base
     :message      => 'Please only upload .jpg, .jpeg, .gif or .png files.'
   validates_attachment_size :image,
     :less_than    => 5.megabytes
-      
-  # -- Scopes ---------------------------------------------------------------
-  default_scope order(:position)
   
   # -- Instance Methods -----------------------------------------------------
   def image_geometry(style = :original)

data/app/views/sofa_gallery/_carousel.html.erb

@@ -1,17 +1,31 @@
 <% if @gallery %>
+  <!--[if IE]>
+       <style type="text/css">
+           .timer { display: none !important; }
+           div.caption { background:transparent; filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000,endColorstr=#99000000);zoom: 1; }
+      </style>
+  <![endif]-->
   <% content_for :head do %>
-    <%= stylesheet_link_tag "/assets/sofa_gallery/sofa_gallery_carousel.css" %>
-    <%= javascript_include_tag "/assets/sofa_gallery/sofa_gallery_carousel.js" %>
+    <%= javascript_include_tag "sofa_gallery/jquery.orbit-1.2.3.min.js" %>
+    <%= stylesheet_link_tag "sofa_gallery/carousel.css" %>
   <% end %>
-  <ul id="cms_carousel" class="jcarousel-skin-tango">
-    <% @gallery.photos.each do |photo| %>
-      <li id="<%= dom_id(photo) %>">
-        <div class="photo">
-          <%= link_to image_tag(photo.image.url(:full), :alt => photo.description), photo.url %>
-        </div>
-      </li>
+  <% content_for :doc_ready do %>
+    $('#featured').orbit();
+  <% end %>
+  <% if @gallery.photos.count > 0 %>
+    <div id="featured">
+      <% @gallery.photos.order(:position).each do |photo| %>
+        <%= photo.image.url(:full), :alt => photo.description, :id => dom_id(photo), :"data-caption" => "##{dom_id(photo)}htmlCaption" %>
+      <% end %>
+    </div>
+    <% @gallery.photos.reject{|p| p.description.blank?}.each do |photo| %>
+      <span class="orbit-caption" id="<%=dom_id(photo)%>htmlCaption">
+        <%= photo.description %>
+      </span>
     <% end %>
-  </ul>
+  <% else %>
+    <em>No photos in this gallery.</em>
+  <% end %>
 <% else %>
-  Gallery not found.
+  No images were found.
 <% end %>

data/app/views/sofa_gallery/_list_galleries.html.erb

@@ -5,7 +5,7 @@
   <% @galleries.each do |gallery| %>
     <div class="sofa_gallery">
       <div class="photo_preview">
-        <% gallery.photos.limit(6).each do |photo| %>
+        <% gallery.photos.order(:position).limit(6).each do |photo| %>
           <%= image_tag(photo.image.url(:admin_thumb), :alt => photo.description) %>
         <% end %>
       </div>

data/app/views/sofa_gallery/_thumbnails.html.erb

@@ -8,7 +8,7 @@
     <p><%= @gallery.description %></p>
     <br />
     <% if @gallery.photos.count > 0 %>
-      <% @gallery.photos.each do |photo| %>
+      <% @gallery.photos.order(:position).each do |photo| %>
         <li id="<%= dom_id(photo) %>">
           <div class="photo" style="width: <%= @gallery.thumb_width %>px; height: <%= @gallery.thumb_height %>px;">
             <%= link_to photo.image.url(:full), :rel => "prettyPhoto[pp_gal]", :title => photo.description do %>

data/app/views/sofa_gallery/admin/_navigation.html.erb

@@ -2,4 +2,4 @@
   <%= stylesheet_link_tag "sofa_gallery/sofa_gallery_admin.css" %>
 <% end %>
 
-<li><%= active_link_to 'Galleries', gallery_admin_galleries_path %></li>
+<li><%= active_link_to 'Galleries', sofa_gallery_admin_galleries_path %></li>

data/app/views/sofa_gallery/admin/photos/_form.html.erb

@@ -1,13 +1,13 @@
 <%= form.text_field :title, :id => (@photo.new_record?? 'slugify' : nil) %>
 <%= form.text_field :slug, :id => 'slug' %>
-<% if @photo.image? %>
+<% if @photo.image? && @photo.id.present? %>
   <%= form.simple_field 'Current Image' do %>
     <%= image_tag(@photo.image.url(:thumb)) %>
     <br/>
     <%= link_to 'Crop Image', crop_sofa_gallery_admin_gallery_photo_path(@gallery, @photo) if @photo.force_aspect? %>
   <% end %>
 <% end %>
-<%= form.file_field :image %>
+<%= form.file_field :image, :multiple => true %>
 <%= form.text_area :description %>
 <%= form.simple_field nil, nil, :class => 'submit_element' do %>
   <%= link_to "Cancel", sofa_gallery_admin_gallery_photos_path(@photo.gallery), :id => 'cancel_btn' %>

data/app/views/sofa_gallery/admin/photos/new.html.erb

@@ -1,5 +1,5 @@
 <h1>New Photo</h1>
 
-<%= sofa_gallery_form_for @photo, :as => :photo, :url => {:action => :create}, :html => {:multipart => true} do |form|%>
+<%= sofa_gallery_form_for @photo, :url => {:action => :create}, :html => {:multipart => true} do |form|%>
   <%= render :partial => form %>
 <% end -%>

data/sofa_gallery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sofa_gallery"
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "Stephen McLeod", "The Working Group Inc."]
-  s.date = "2011-10-03"
+  s.date = "2011-10-11"
   s.description = ""
   s.email = "stephen@theworkinggroup.ca"
   s.extra_rdoc_files = [
@@ -25,6 +25,14 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/assets/images/sofa_gallery/jcrop.gif",
+    "app/assets/images/sofa_gallery/orbit/bullets.jpg",
+    "app/assets/images/sofa_gallery/orbit/left-arrow.png",
+    "app/assets/images/sofa_gallery/orbit/loading.gif",
+    "app/assets/images/sofa_gallery/orbit/mask-black.png",
+    "app/assets/images/sofa_gallery/orbit/pause-black.png",
+    "app/assets/images/sofa_gallery/orbit/right-arrow.png",
+    "app/assets/images/sofa_gallery/orbit/rotator-black.png",
+    "app/assets/images/sofa_gallery/orbit/timer-black.png",
     "app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/btnNext.png",
     "app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/btnPrevious.png",
     "app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/contentPattern.png",
@@ -65,20 +73,15 @@ Gem::Specification.new do |s|
     "app/assets/images/sofa_gallery/prettyPhoto/light_square/sprite.png",
     "app/assets/javascripts/sofa_gallery/admin.js",
     "app/assets/javascripts/sofa_gallery/application.js",
-    "app/assets/javascripts/sofa_gallery/carousel.js",
     "app/assets/javascripts/sofa_gallery/jquery.jcrop.js",
+    "app/assets/javascripts/sofa_gallery/jquery.orbit-1.2.3.min.js",
     "app/assets/javascripts/sofa_gallery/thumbnails.js",
     "app/assets/stylesheets/sofa_gallery/admin.css",
     "app/assets/stylesheets/sofa_gallery/application.css",
-    "app/assets/stylesheets/sofa_gallery/carousel.css",
+    "app/assets/stylesheets/sofa_gallery/carousel.css.erb",
     "app/assets/stylesheets/sofa_gallery/gallery_list.css",
     "app/assets/stylesheets/sofa_gallery/jquery.jcrop.css",
     "app/assets/stylesheets/sofa_gallery/reset.css",
-    "app/assets/stylesheets/sofa_gallery/tango/credits.txt",
-    "app/assets/stylesheets/sofa_gallery/tango/next-horizontal.png",
-    "app/assets/stylesheets/sofa_gallery/tango/next-vertical.png",
-    "app/assets/stylesheets/sofa_gallery/tango/prev-horizontal.png",
-    "app/assets/stylesheets/sofa_gallery/tango/prev-vertical.png",
     "app/assets/stylesheets/sofa_gallery/thumbnails.css.erb",
     "app/controllers/application_controller.rb",
     "app/controllers/sofa_gallery/admin/base_controller.rb",

data/test/functional/admin/photos_controller_test.rb

@@ -25,28 +25,85 @@ class SofaGallery::Admin::PhotosControllerTest < ActionController::TestCase
     assert_select "form[action='/admin/galleries/#{gallery.id}/photos']"
   end
 
-  def test_creation
+  def test_create
     assert_difference 'SofaGallery::Photo.count' do
-      post :create, :gallery_id => sofa_gallery_galleries(:default), :photo => {
+      post :create, :gallery_id => sofa_gallery_galleries(:default), :sofa_gallery_photo => {
         :title  => 'Test Photo',
         :slug   => 'test-photo',
-        :image  => fixture_file_upload('/files/default.jpg', 'image/jpeg')
+        :image  => [fixture_file_upload('/files/default.jpg', 'image/jpeg')]
       }
       assert_response :redirect
       assert_redirected_to :action => :index
       assert_equal 'Photo created', flash[:notice]
+      
+      photo = SofaGallery::Photo.last
+      assert_equal 'Test Photo', photo.title
+      assert_equal 'test-photo', photo.slug
+    end
+  end
+  
+  def test_create_without_title_or_slug
+    assert_difference 'SofaGallery::Photo.count', 2 do
+      post :create, :gallery_id => sofa_gallery_galleries(:default), :sofa_gallery_photo => {
+        :image  => [fixture_file_upload('/files/default.jpg', 'image/jpeg')]
+      }
+      assert_response :redirect
+      assert_redirected_to :action => :index
+      assert_equal 'Photo created', flash[:notice]
+      
+      photo = SofaGallery::Photo.last
+      assert_equal 'default.jpg', photo.title
+      assert_equal 'default-jpg', photo.slug
+      
+      post :create, :gallery_id => sofa_gallery_galleries(:default), :sofa_gallery_photo => {
+        :slug   => 'Testrrr',
+        :image  => [fixture_file_upload('/files/default.jpg', 'image/jpeg')]
+      }
+      
+      photo = SofaGallery::Photo.last
+      assert_equal 'default.jpg', photo.title
+      assert_equal 'Testrrr', photo.slug
     end
   end
 
-  def test_creation_fail
+  def test_create_failure
     assert_no_difference 'SofaGallery::Photo.count' do
-      post :create, :gallery_id => sofa_gallery_galleries(:default), :photo => { }
+      post :create, :gallery_id => sofa_gallery_galleries(:default), :sofa_gallery_photo => { }
       assert_response :success
       assert_template 'new'
       assert_equal 'Failed to create Photo', flash[:error]
     end
   end
   
+  
+  def test_create_multiple
+    SofaGallery::Photo.delete_all
+    
+    assert_difference 'SofaGallery::Photo.count', 2 do
+      post :create, :gallery_id => sofa_gallery_galleries(:default), :sofa_gallery_photo => {
+        :title  => 'Test Photo',
+        :slug   => 'test-photo',
+        :image  => [
+          fixture_file_upload('/files/default.jpg', 'image/jpeg'),
+          fixture_file_upload('/files/default.jpg', 'image/jpeg')
+        ]
+      }
+      assert_response :redirect
+      assert_redirected_to :action => :index
+      
+      photo_a, photo_b = SofaGallery::Photo.all
+      
+      assert_equal 'default.jpg', photo_a.image_file_name
+      assert_equal 'default.jpg', photo_b.image_file_name
+      assert_equal 'Test Photo 1', photo_a.title
+      assert_equal 'Test Photo 2', photo_b.title
+      assert_equal 'test-photo-1', photo_a.slug
+      assert_equal 'test-photo-2', photo_b.slug
+      assert_equal 'Photo created', flash[:notice]
+    end
+  end
+  
+  
   def test_get_edit
     photo = sofa_gallery_photos(:default)
     get :edit, :gallery_id => photo.gallery, :id => photo
@@ -64,7 +121,7 @@ class SofaGallery::Admin::PhotosControllerTest < ActionController::TestCase
   
   def test_update
     photo = sofa_gallery_photos(:default)
-    put :update, :gallery_id => photo.gallery, :id => photo, :photo => {
+    put :update, :gallery_id => photo.gallery, :id => photo, :sofa_gallery_photo => {
       :title => 'Updated Title'
     }
     assert_response :redirect
@@ -77,7 +134,7 @@ class SofaGallery::Admin::PhotosControllerTest < ActionController::TestCase
   
   def test_update_failure
     photo = sofa_gallery_photos(:default)
-    put :update, :gallery_id => photo.gallery, :id => photo, :photo => {
+    put :update, :gallery_id => photo.gallery, :id => photo, :sofa_gallery_photo => {
       :title => 'Updated Title',
       :image => fixture_file_upload('/files/default.txt', 'text/plain')
     }

data/test/unit/photo_test.rb

@@ -11,7 +11,7 @@ class PhotoTest < ActiveSupport::TestCase
   def test_validations
     photo = SofaGallery::Photo.new
     assert photo.invalid?
-    assert_has_errors_on photo, :image_file_name
+    assert_has_errors_on photo, {:gallery_id=>["can't be blank"], :slug=>["can't be blank", "is invalid"], :image_file_name=>["There was no file uploaded!"]}
   end
   
   def test_creation

metadata

@@ -1,81 +1,84 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: sofa_gallery
-version: !ruby/object:Gem::Version
-  version: 0.0.5
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.6
 platform: ruby
-authors:
+authors: 
 - Oleg Khabarov
 - Stephen McLeod
 - The Working Group Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-03 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-10-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rails
-  requirement: &70146921382500 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70146921382500
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: paperclip
-  requirement: &70146921381820 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70146921381820
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: jquery-rails
-  requirement: &70146921381220 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         version: 1.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70146921381220
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &70146921380600 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70146921380600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &70146921379900 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :development
   prerelease: false
-  version_requirements: *70146921379900
-description: ''
+  version_requirements: *id005
+description: ""
 email: stephen@theworkinggroup.ca
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - LICENSE
 - README.md
-files:
+files: 
 - .document
 - .travis.yml
 - Gemfile
@@ -84,6 +87,14 @@ files:
 - Rakefile
 - VERSION
 - app/assets/images/sofa_gallery/jcrop.gif
+- app/assets/images/sofa_gallery/orbit/bullets.jpg
+- app/assets/images/sofa_gallery/orbit/left-arrow.png
+- app/assets/images/sofa_gallery/orbit/loading.gif
+- app/assets/images/sofa_gallery/orbit/mask-black.png
+- app/assets/images/sofa_gallery/orbit/pause-black.png
+- app/assets/images/sofa_gallery/orbit/right-arrow.png
+- app/assets/images/sofa_gallery/orbit/rotator-black.png
+- app/assets/images/sofa_gallery/orbit/timer-black.png
 - app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/btnNext.png
 - app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/btnPrevious.png
 - app/assets/images/sofa_gallery/prettyPhoto/dark_rounded/contentPattern.png
@@ -124,20 +135,15 @@ files:
 - app/assets/images/sofa_gallery/prettyPhoto/light_square/sprite.png
 - app/assets/javascripts/sofa_gallery/admin.js
 - app/assets/javascripts/sofa_gallery/application.js
-- app/assets/javascripts/sofa_gallery/carousel.js
 - app/assets/javascripts/sofa_gallery/jquery.jcrop.js
+- app/assets/javascripts/sofa_gallery/jquery.orbit-1.2.3.min.js
 - app/assets/javascripts/sofa_gallery/thumbnails.js
 - app/assets/stylesheets/sofa_gallery/admin.css
 - app/assets/stylesheets/sofa_gallery/application.css
-- app/assets/stylesheets/sofa_gallery/carousel.css
+- app/assets/stylesheets/sofa_gallery/carousel.css.erb
 - app/assets/stylesheets/sofa_gallery/gallery_list.css
 - app/assets/stylesheets/sofa_gallery/jquery.jcrop.css
 - app/assets/stylesheets/sofa_gallery/reset.css
-- app/assets/stylesheets/sofa_gallery/tango/credits.txt
-- app/assets/stylesheets/sofa_gallery/tango/next-horizontal.png
-- app/assets/stylesheets/sofa_gallery/tango/next-vertical.png
-- app/assets/stylesheets/sofa_gallery/tango/prev-horizontal.png
-- app/assets/stylesheets/sofa_gallery/tango/prev-vertical.png
 - app/assets/stylesheets/sofa_gallery/thumbnails.css.erb
 - app/controllers/application_controller.rb
 - app/controllers/sofa_gallery/admin/base_controller.rb
@@ -198,31 +204,34 @@ files:
 - test/unit/gallery_test.rb
 - test/unit/photo_test.rb
 homepage: http://github.com/twg/sofa-gallery
-licenses:
+licenses: 
 - MIT
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: -3072931636190028721
+      segments: 
       - 0
-      hash: -3729767750666364040
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: SofaGallery is an image gallery engine for Rails 3.1 apps (and ComfortableMexicanSofa)
 test_files: []
+

data/app/assets/javascripts/sofa_gallery/carousel.js

@@ -1,44 +0,0 @@
-/*!
- * jCarousel - Riding carousels with jQuery
- *   http://sorgalla.com/jcarousel/
- *
- * Copyright (c) 2006 Jan Sorgalla (http://sorgalla.com)
- * Dual licensed under the MIT (http://www.opensource.org/licenses/mit-license.php)
- * and GPL (http://www.opensource.org/licenses/gpl-license.php) licenses.
- *
- * Built on top of the jQuery library
- *   http://jquery.com
- *
- * Inspired by the "Carousel Component" by Bill Scott
- *   http://billwscott.com/carousel/
- */
-
-(function(g){var q={vertical:!1,rtl:!1,start:1,offset:1,size:null,scroll:3,visible:null,animation:"normal",easing:"swing",auto:0,wrap:null,initCallback:null,setupCallback:null,reloadCallback:null,itemLoadCallback:null,itemFirstInCallback:null,itemFirstOutCallback:null,itemLastInCallback:null,itemLastOutCallback:null,itemVisibleInCallback:null,itemVisibleOutCallback:null,animationStepCallback:null,buttonNextHTML:"<div></div>",buttonPrevHTML:"<div></div>",buttonNextEvent:"click",buttonPrevEvent:"click", buttonNextCallback:null,buttonPrevCallback:null,itemFallbackDimension:null},m=!1;g(window).bind("load.jcarousel",function(){m=!0});g.jcarousel=function(a,c){this.options=g.extend({},q,c||{});this.autoStopped=this.locked=!1;this.buttonPrevState=this.buttonNextState=this.buttonPrev=this.buttonNext=this.list=this.clip=this.container=null;if(!c||c.rtl===void 0)this.options.rtl=(g(a).attr("dir")||g("html").attr("dir")||"").toLowerCase()=="rtl";this.wh=!this.options.vertical?"width":"height";this.lt=!this.options.vertical? this.options.rtl?"right":"left":"top";for(var b="",d=a.className.split(" "),f=0;f<d.length;f++)if(d[f].indexOf("jcarousel-skin")!=-1){g(a).removeClass(d[f]);b=d[f];break}a.nodeName.toUpperCase()=="UL"||a.nodeName.toUpperCase()=="OL"?(this.list=g(a),this.clip=this.list.parents(".jcarousel-clip"),this.container=this.list.parents(".jcarousel-container")):(this.container=g(a),this.list=this.container.find("ul,ol").eq(0),this.clip=this.container.find(".jcarousel-clip"));if(this.clip.size()===0)this.clip= this.list.wrap("<div></div>").parent();if(this.container.size()===0)this.container=this.clip.wrap("<div></div>").parent();b!==""&&this.container.parent()[0].className.indexOf("jcarousel-skin")==-1&&this.container.wrap('<div class=" '+b+'"></div>');this.buttonPrev=g(".jcarousel-prev",this.container);if(this.buttonPrev.size()===0&&this.options.buttonPrevHTML!==null)this.buttonPrev=g(this.options.buttonPrevHTML).appendTo(this.container);this.buttonPrev.addClass(this.className("jcarousel-prev"));this.buttonNext= g(".jcarousel-next",this.container);if(this.buttonNext.size()===0&&this.options.buttonNextHTML!==null)this.buttonNext=g(this.options.buttonNextHTML).appendTo(this.container);this.buttonNext.addClass(this.className("jcarousel-next"));this.clip.addClass(this.className("jcarousel-clip")).css({position:"relative"});this.list.addClass(this.className("jcarousel-list")).css({overflow:"hidden",position:"relative",top:0,margin:0,padding:0}).css(this.options.rtl?"right":"left",0);this.container.addClass(this.className("jcarousel-container")).css({position:"relative"}); !this.options.vertical&&this.options.rtl&&this.container.addClass("jcarousel-direction-rtl").attr("dir","rtl");var j=this.options.visible!==null?Math.ceil(this.clipping()/this.options.visible):null,b=this.list.children("li"),e=this;if(b.size()>0){var h=0,i=this.options.offset;b.each(function(){e.format(this,i++);h+=e.dimension(this,j)});this.list.css(this.wh,h+100+"px");if(!c||c.size===void 0)this.options.size=b.size()}this.container.css("display","block");this.buttonNext.css("display","block");this.buttonPrev.css("display", "block");this.funcNext=function(){e.next()};this.funcPrev=function(){e.prev()};this.funcResize=function(){e.resizeTimer&&clearTimeout(e.resizeTimer);e.resizeTimer=setTimeout(function(){e.reload()},100)};this.options.initCallback!==null&&this.options.initCallback(this,"init");!m&&g.browser.safari?(this.buttons(!1,!1),g(window).bind("load.jcarousel",function(){e.setup()})):this.setup()};var f=g.jcarousel;f.fn=f.prototype={jcarousel:"0.2.8"};f.fn.extend=f.extend=g.extend;f.fn.extend({setup:function(){this.prevLast= this.prevFirst=this.last=this.first=null;this.animating=!1;this.tail=this.resizeTimer=this.timer=null;this.inTail=!1;if(!this.locked){this.list.css(this.lt,this.pos(this.options.offset)+"px");var a=this.pos(this.options.start,!0);this.prevFirst=this.prevLast=null;this.animate(a,!1);g(window).unbind("resize.jcarousel",this.funcResize).bind("resize.jcarousel",this.funcResize);this.options.setupCallback!==null&&this.options.setupCallback(this)}},reset:function(){this.list.empty();this.list.css(this.lt, "0px");this.list.css(this.wh,"10px");this.options.initCallback!==null&&this.options.initCallback(this,"reset");this.setup()},reload:function(){this.tail!==null&&this.inTail&&this.list.css(this.lt,f.intval(this.list.css(this.lt))+this.tail);this.tail=null;this.inTail=!1;this.options.reloadCallback!==null&&this.options.reloadCallback(this);if(this.options.visible!==null){var a=this,c=Math.ceil(this.clipping()/this.options.visible),b=0,d=0;this.list.children("li").each(function(f){b+=a.dimension(this, c);f+1<a.first&&(d=b)});this.list.css(this.wh,b+"px");this.list.css(this.lt,-d+"px")}this.scroll(this.first,!1)},lock:function(){this.locked=!0;this.buttons()},unlock:function(){this.locked=!1;this.buttons()},size:function(a){if(a!==void 0)this.options.size=a,this.locked||this.buttons();return this.options.size},has:function(a,c){if(c===void 0||!c)c=a;if(this.options.size!==null&&c>this.options.size)c=this.options.size;for(var b=a;b<=c;b++){var d=this.get(b);if(!d.length||d.hasClass("jcarousel-item-placeholder"))return!1}return!0}, get:function(a){return g(">.jcarousel-item-"+a,this.list)},add:function(a,c){var b=this.get(a),d=0,p=g(c);if(b.length===0)for(var j,e=f.intval(a),b=this.create(a);;){if(j=this.get(--e),e<=0||j.length){e<=0?this.list.prepend(b):j.after(b);break}}else d=this.dimension(b);p.get(0).nodeName.toUpperCase()=="LI"?(b.replaceWith(p),b=p):b.empty().append(c);this.format(b.removeClass(this.className("jcarousel-item-placeholder")),a);p=this.options.visible!==null?Math.ceil(this.clipping()/this.options.visible): null;d=this.dimension(b,p)-d;a>0&&a<this.first&&this.list.css(this.lt,f.intval(this.list.css(this.lt))-d+"px");this.list.css(this.wh,f.intval(this.list.css(this.wh))+d+"px");return b},remove:function(a){var c=this.get(a);if(c.length&&!(a>=this.first&&a<=this.last)){var b=this.dimension(c);a<this.first&&this.list.css(this.lt,f.intval(this.list.css(this.lt))+b+"px");c.remove();this.list.css(this.wh,f.intval(this.list.css(this.wh))-b+"px")}},next:function(){this.tail!==null&&!this.inTail?this.scrollTail(!1): this.scroll((this.options.wrap=="both"||this.options.wrap=="last")&&this.options.size!==null&&this.last==this.options.size?1:this.first+this.options.scroll)},prev:function(){this.tail!==null&&this.inTail?this.scrollTail(!0):this.scroll((this.options.wrap=="both"||this.options.wrap=="first")&&this.options.size!==null&&this.first==1?this.options.size:this.first-this.options.scroll)},scrollTail:function(a){if(!this.locked&&!this.animating&&this.tail){this.pauseAuto();var c=f.intval(this.list.css(this.lt)), c=!a?c-this.tail:c+this.tail;this.inTail=!a;this.prevFirst=this.first;this.prevLast=this.last;this.animate(c)}},scroll:function(a,c){!this.locked&&!this.animating&&(this.pauseAuto(),this.animate(this.pos(a),c))},pos:function(a,c){var b=f.intval(this.list.css(this.lt));if(this.locked||this.animating)return b;this.options.wrap!="circular"&&(a=a<1?1:this.options.size&&a>this.options.size?this.options.size:a);for(var d=this.first>a,g=this.options.wrap!="circular"&&this.first<=1?1:this.first,j=d?this.get(g): this.get(this.last),e=d?g:g-1,h=null,i=0,k=!1,l=0;d?--e>=a:++e<a;){h=this.get(e);k=!h.length;if(h.length===0&&(h=this.create(e).addClass(this.className("jcarousel-item-placeholder")),j[d?"before":"after"](h),this.first!==null&&this.options.wrap=="circular"&&this.options.size!==null&&(e<=0||e>this.options.size)))j=this.get(this.index(e)),j.length&&(h=this.add(e,j.clone(!0)));j=h;l=this.dimension(h);k&&(i+=l);if(this.first!==null&&(this.options.wrap=="circular"||e>=1&&(this.options.size===null||e<= this.options.size)))b=d?b+l:b-l}for(var g=this.clipping(),m=[],o=0,n=0,j=this.get(a-1),e=a;++o;){h=this.get(e);k=!h.length;if(h.length===0){h=this.create(e).addClass(this.className("jcarousel-item-placeholder"));if(j.length===0)this.list.prepend(h);else j[d?"before":"after"](h);if(this.first!==null&&this.options.wrap=="circular"&&this.options.size!==null&&(e<=0||e>this.options.size))j=this.get(this.index(e)),j.length&&(h=this.add(e,j.clone(!0)))}j=h;l=this.dimension(h);if(l===0)throw Error("jCarousel: No width/height set for items. This will cause an infinite loop. Aborting..."); this.options.wrap!="circular"&&this.options.size!==null&&e>this.options.size?m.push(h):k&&(i+=l);n+=l;if(n>=g)break;e++}for(h=0;h<m.length;h++)m[h].remove();i>0&&(this.list.css(this.wh,this.dimension(this.list)+i+"px"),d&&(b-=i,this.list.css(this.lt,f.intval(this.list.css(this.lt))-i+"px")));i=a+o-1;if(this.options.wrap!="circular"&&this.options.size&&i>this.options.size)i=this.options.size;if(e>i){o=0;e=i;for(n=0;++o;){h=this.get(e--);if(!h.length)break;n+=this.dimension(h);if(n>=g)break}}e=i-o+ 1;this.options.wrap!="circular"&&e<1&&(e=1);if(this.inTail&&d)b+=this.tail,this.inTail=!1;this.tail=null;if(this.options.wrap!="circular"&&i==this.options.size&&i-o+1>=1&&(d=f.intval(this.get(i).css(!this.options.vertical?"marginRight":"marginBottom")),n-d>g))this.tail=n-g-d;if(c&&a===this.options.size&&this.tail)b-=this.tail,this.inTail=!0;for(;a-- >e;)b+=this.dimension(this.get(a));this.prevFirst=this.first;this.prevLast=this.last;this.first=e;this.last=i;return b},animate:function(a,c){if(!this.locked&& !this.animating){this.animating=!0;var b=this,d=function(){b.animating=!1;a===0&&b.list.css(b.lt,0);!b.autoStopped&&(b.options.wrap=="circular"||b.options.wrap=="both"||b.options.wrap=="last"||b.options.size===null||b.last<b.options.size||b.last==b.options.size&&b.tail!==null&&!b.inTail)&&b.startAuto();b.buttons();b.notify("onAfterAnimation");if(b.options.wrap=="circular"&&b.options.size!==null)for(var c=b.prevFirst;c<=b.prevLast;c++)c!==null&&!(c>=b.first&&c<=b.last)&&(c<1||c>b.options.size)&&b.remove(c)}; this.notify("onBeforeAnimation");if(!this.options.animation||c===!1)this.list.css(this.lt,a+"px"),d();else{var f=!this.options.vertical?this.options.rtl?{right:a}:{left:a}:{top:a},d={duration:this.options.animation,easing:this.options.easing,complete:d};if(g.isFunction(this.options.animationStepCallback))d.step=this.options.animationStepCallback;this.list.animate(f,d)}}},startAuto:function(a){if(a!==void 0)this.options.auto=a;if(this.options.auto===0)return this.stopAuto();if(this.timer===null){this.autoStopped= !1;var c=this;this.timer=window.setTimeout(function(){c.next()},this.options.auto*1E3)}},stopAuto:function(){this.pauseAuto();this.autoStopped=!0},pauseAuto:function(){if(this.timer!==null)window.clearTimeout(this.timer),this.timer=null},buttons:function(a,c){if(a==null&&(a=!this.locked&&this.options.size!==0&&(this.options.wrap&&this.options.wrap!="first"||this.options.size===null||this.last<this.options.size),!this.locked&&(!this.options.wrap||this.options.wrap=="first")&&this.options.size!==null&& this.last>=this.options.size))a=this.tail!==null&&!this.inTail;if(c==null&&(c=!this.locked&&this.options.size!==0&&(this.options.wrap&&this.options.wrap!="last"||this.first>1),!this.locked&&(!this.options.wrap||this.options.wrap=="last")&&this.options.size!==null&&this.first==1))c=this.tail!==null&&this.inTail;var b=this;this.buttonNext.size()>0?(this.buttonNext.unbind(this.options.buttonNextEvent+".jcarousel",this.funcNext),a&&this.buttonNext.bind(this.options.buttonNextEvent+".jcarousel",this.funcNext), this.buttonNext[a?"removeClass":"addClass"](this.className("jcarousel-next-disabled")).attr("disabled",a?!1:!0),this.options.buttonNextCallback!==null&&this.buttonNext.data("jcarouselstate")!=a&&this.buttonNext.each(function(){b.options.buttonNextCallback(b,this,a)}).data("jcarouselstate",a)):this.options.buttonNextCallback!==null&&this.buttonNextState!=a&&this.options.buttonNextCallback(b,null,a);this.buttonPrev.size()>0?(this.buttonPrev.unbind(this.options.buttonPrevEvent+".jcarousel",this.funcPrev), c&&this.buttonPrev.bind(this.options.buttonPrevEvent+".jcarousel",this.funcPrev),this.buttonPrev[c?"removeClass":"addClass"](this.className("jcarousel-prev-disabled")).attr("disabled",c?!1:!0),this.options.buttonPrevCallback!==null&&this.buttonPrev.data("jcarouselstate")!=c&&this.buttonPrev.each(function(){b.options.buttonPrevCallback(b,this,c)}).data("jcarouselstate",c)):this.options.buttonPrevCallback!==null&&this.buttonPrevState!=c&&this.options.buttonPrevCallback(b,null,c);this.buttonNextState= a;this.buttonPrevState=c},notify:function(a){var c=this.prevFirst===null?"init":this.prevFirst<this.first?"next":"prev";this.callback("itemLoadCallback",a,c);this.prevFirst!==this.first&&(this.callback("itemFirstInCallback",a,c,this.first),this.callback("itemFirstOutCallback",a,c,this.prevFirst));this.prevLast!==this.last&&(this.callback("itemLastInCallback",a,c,this.last),this.callback("itemLastOutCallback",a,c,this.prevLast));this.callback("itemVisibleInCallback",a,c,this.first,this.last,this.prevFirst, this.prevLast);this.callback("itemVisibleOutCallback",a,c,this.prevFirst,this.prevLast,this.first,this.last)},callback:function(a,c,b,d,f,j,e){if(!(this.options[a]==null||typeof this.options[a]!="object"&&c!="onAfterAnimation")){var h=typeof this.options[a]=="object"?this.options[a][c]:this.options[a];if(g.isFunction(h)){var i=this;if(d===void 0)h(i,b,c);else if(f===void 0)this.get(d).each(function(){h(i,this,d,b,c)});else for(var a=function(a){i.get(a).each(function(){h(i,this,a,b,c)})},k=d;k<=f;k++)k!== null&&!(k>=j&&k<=e)&&a(k)}}},create:function(a){return this.format("<li></li>",a)},format:function(a,c){for(var a=g(a),b=a.get(0).className.split(" "),d=0;d<b.length;d++)b[d].indexOf("jcarousel-")!=-1&&a.removeClass(b[d]);a.addClass(this.className("jcarousel-item")).addClass(this.className("jcarousel-item-"+c)).css({"float":this.options.rtl?"right":"left","list-style":"none"}).attr("jcarouselindex",c);return a},className:function(a){return a+" "+a+(!this.options.vertical?"-horizontal":"-vertical")}, dimension:function(a,c){var b=g(a);if(c==null)return!this.options.vertical?b.outerWidth(!0)||f.intval(this.options.itemFallbackDimension):b.outerHeight(!0)||f.intval(this.options.itemFallbackDimension);else{var d=!this.options.vertical?c-f.intval(b.css("marginLeft"))-f.intval(b.css("marginRight")):c-f.intval(b.css("marginTop"))-f.intval(b.css("marginBottom"));g(b).css(this.wh,d+"px");return this.dimension(b)}},clipping:function(){return!this.options.vertical?this.clip[0].offsetWidth-f.intval(this.clip.css("borderLeftWidth"))- f.intval(this.clip.css("borderRightWidth")):this.clip[0].offsetHeight-f.intval(this.clip.css("borderTopWidth"))-f.intval(this.clip.css("borderBottomWidth"))},index:function(a,c){if(c==null)c=this.options.size;return Math.round(((a-1)/c-Math.floor((a-1)/c))*c)+1}});f.extend({defaults:function(a){return g.extend(q,a||{})},intval:function(a){a=parseInt(a,10);return isNaN(a)?0:a},windowLoaded:function(){m=!0}});g.fn.jcarousel=function(a){if(typeof a=="string"){var c=g(this).data("jcarousel"),b=Array.prototype.slice.call(arguments, 1);return c[a].apply(c,b)}else return this.each(function(){var b=g(this).data("jcarousel");b?(a&&g.extend(b.options,a),b.reload()):g(this).data("jcarousel",new f(this,a))})}})(jQuery);
-
-
-function mycarousel_initCallback(carousel)
-{
-    // Disable autoscrolling if the user clicks the prev or next button.
-    carousel.buttonNext.bind('click', function() {
-        carousel.startAuto(0);
-    });
-
-    carousel.buttonPrev.bind('click', function() {
-        carousel.startAuto(0);
-    });
-
-    // Pause autoscrolling if the user moves with the cursor over the clip.
-    carousel.clip.hover(function() {
-        carousel.stopAuto();
-    }, function() {
-        carousel.startAuto();
-    });
-};
-
-jQuery(document).ready(function() {
-    jQuery('#cms_carousel').jcarousel({
-        auto: 2,
-        wrap: 'last',
-        initCallback: mycarousel_initCallback
-    });
-});

data/app/assets/stylesheets/sofa_gallery/carousel.css

@@ -1,186 +0,0 @@
-.jcarousel-skin-tango .jcarousel-container {
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-   border-radius: 10px;
-    background: #F0F6F9;
-    border: 1px solid #346F97;
-}
-
-.jcarousel-skin-tango .jcarousel-direction-rtl {
-	direction: rtl;
-}
-
-.jcarousel-skin-tango .jcarousel-container-horizontal {
-    width: 245px;
-    padding: 20px 40px;
-}
-
-.jcarousel-skin-tango .jcarousel-container-vertical {
-    width: 75px;
-    height: 245px;
-    padding: 40px 20px;
-}
-
-.jcarousel-skin-tango .jcarousel-clip {
-    overflow: hidden;
-}
-
-.jcarousel-skin-tango .jcarousel-clip-horizontal {
-    width:  245px;
-    height: 75px;
-}
-
-.jcarousel-skin-tango .jcarousel-clip-vertical {
-    width:  75px;
-    height: 245px;
-}
-
-.jcarousel-skin-tango .jcarousel-item {
-    width: 75px;
-    height: 75px;
-}
-
-.jcarousel-skin-tango .jcarousel-item-horizontal {
-	margin-left: 0;
-    margin-right: 10px;
-}
-
-.jcarousel-skin-tango .jcarousel-direction-rtl .jcarousel-item-horizontal {
-	margin-left: 10px;
-    margin-right: 0;
-}
-
-.jcarousel-skin-tango .jcarousel-item-vertical {
-    margin-bottom: 10px;
-}
-
-.jcarousel-skin-tango .jcarousel-item-placeholder {
-    background: #fff;
-    color: #000;
-}
-
-/**
- *  Horizontal Buttons
- */
-.jcarousel-skin-tango .jcarousel-next-horizontal {
-    position: absolute;
-    top: 43px;
-    right: 5px;
-    width: 32px;
-    height: 32px;
-    cursor: pointer;
-    background: transparent url((/assets/sofa_gallery/tango/next-horizontal.png) no-repeat 0 0;
-}
-
-.jcarousel-skin-tango .jcarousel-direction-rtl .jcarousel-next-horizontal {
-    left: 5px;
-    right: auto;
-    background-image: url((/assets/sofa_gallery/tango/prev-horizontal.png);
-}
-
-.jcarousel-skin-tango .jcarousel-next-horizontal:hover,
-.jcarousel-skin-tango .jcarousel-next-horizontal:focus {
-    background-position: -32px 0;
-}
-
-.jcarousel-skin-tango .jcarousel-next-horizontal:active {
-    background-position: -64px 0;
-}
-
-.jcarousel-skin-tango .jcarousel-next-disabled-horizontal,
-.jcarousel-skin-tango .jcarousel-next-disabled-horizontal:hover,
-.jcarousel-skin-tango .jcarousel-next-disabled-horizontal:focus,
-.jcarousel-skin-tango .jcarousel-next-disabled-horizontal:active {
-    cursor: default;
-    background-position: -96px 0;
-}
-
-.jcarousel-skin-tango .jcarousel-prev-horizontal {
-    position: absolute;
-    top: 43px;
-    left: 5px;
-    width: 32px;
-    height: 32px;
-    cursor: pointer;
-    background: transparent url((/assets/sofa_gallery/tango/prev-horizontal.png) no-repeat 0 0;
-}
-
-.jcarousel-skin-tango .jcarousel-direction-rtl .jcarousel-prev-horizontal {
-    left: auto;
-    right: 5px;
-    background-image: url((/assets/sofa_gallery/tango/next-horizontal.png);
-}
-
-.jcarousel-skin-tango .jcarousel-prev-horizontal:hover, 
-.jcarousel-skin-tango .jcarousel-prev-horizontal:focus {
-    background-position: -32px 0;
-}
-
-.jcarousel-skin-tango .jcarousel-prev-horizontal:active {
-    background-position: -64px 0;
-}
-
-.jcarousel-skin-tango .jcarousel-prev-disabled-horizontal,
-.jcarousel-skin-tango .jcarousel-prev-disabled-horizontal:hover,
-.jcarousel-skin-tango .jcarousel-prev-disabled-horizontal:focus,
-.jcarousel-skin-tango .jcarousel-prev-disabled-horizontal:active {
-    cursor: default;
-    background-position: -96px 0;
-}
-
-/**
- *  Vertical Buttons
- */
-.jcarousel-skin-tango .jcarousel-next-vertical {
-    position: absolute;
-    bottom: 5px;
-    left: 43px;
-    width: 32px;
-    height: 32px;
-    cursor: pointer;
-    background: transparent url((/assets/sofa_gallery/tango/next-vertical.png) no-repeat 0 0;
-}
-
-.jcarousel-skin-tango .jcarousel-next-vertical:hover,
-.jcarousel-skin-tango .jcarousel-next-vertical:focus {
-    background-position: 0 -32px;
-}
-
-.jcarousel-skin-tango .jcarousel-next-vertical:active {
-    background-position: 0 -64px;
-}
-
-.jcarousel-skin-tango .jcarousel-next-disabled-vertical,
-.jcarousel-skin-tango .jcarousel-next-disabled-vertical:hover,
-.jcarousel-skin-tango .jcarousel-next-disabled-vertical:focus,
-.jcarousel-skin-tango .jcarousel-next-disabled-vertical:active {
-    cursor: default;
-    background-position: 0 -96px;
-}
-
-.jcarousel-skin-tango .jcarousel-prev-vertical {
-    position: absolute;
-    top: 5px;
-    left: 43px;
-    width: 32px;
-    height: 32px;
-    cursor: pointer;
-    background: transparent url((/assets/sofa_gallery/tango/prev-vertical.png) no-repeat 0 0;
-}
-
-.jcarousel-skin-tango .jcarousel-prev-vertical:hover,
-.jcarousel-skin-tango .jcarousel-prev-vertical:focus {
-    background-position: 0 -32px;
-}
-
-.jcarousel-skin-tango .jcarousel-prev-vertical:active {
-    background-position: 0 -64px;
-}
-
-.jcarousel-skin-tango .jcarousel-prev-disabled-vertical,
-.jcarousel-skin-tango .jcarousel-prev-disabled-vertical:hover,
-.jcarousel-skin-tango .jcarousel-prev-disabled-vertical:focus,
-.jcarousel-skin-tango .jcarousel-prev-disabled-vertical:active {
-    cursor: default;
-    background-position: 0 -96px;
-}

data/app/assets/stylesheets/sofa_gallery/tango/credits.txt

@@ -1 +0,0 @@
-Button images copyright by Tango Icon Library Team (http://tango.freedesktop.org/Tango_Icon_Library)