comfy_gallery 0.1.1 → 0.1.2

data/README.md

@@ -23,6 +23,17 @@ You probably want to set the admin controller to be something that handles user
 
 If you are using ComfyGallery in conjunction with ComfortableMexicanSofa everything will be configured automatically.
 
+There's no front-end to this engine. Feel free to access galleries like such: `Gallery::Gallery.find_by_identifier('my_gallery)` and cycle through the `photos`.
+
+Also you may use provided [ColorBox](http://jacklmoore.com/colorbox/) javascript to display galleries. Just declare these for asset pipeline
+    
+    // in app/assets/javascripts/application.js
+    //= require comfy_gallery/jquery.colorbox
+    
+    // in app/assets/stylesheets/application.css
+    //= require comfy_gallery/colorbox
+
+---
 
 CMS Gallery is released under the [MIT license](https://github.com/twg/sofa-gallery/raw/master/LICENSE) 
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/assets/javascripts/comfy_gallery/jquery.colorbox.js

@@ -0,0 +1,4 @@
+// ColorBox v1.3.19 - jQuery lightbox plugin
+// (c) 2011 Jack Moore - jacklmoore.com
+// License: http://www.opensource.org/licenses/mit-license.php
+(function(a,b,c){function Z(c,d,e){var g=b.createElement(c);return d&&(g.id=f+d),e&&(g.style.cssText=e),a(g)}function $(a){var b=y.length,c=(Q+a)%b;return c<0?b+c:c}function _(a,b){return Math.round((/%/.test(a)?(b==="x"?z.width():z.height())/100:1)*parseInt(a,10))}function ba(a){return K.photo||/\.(gif|png|jpe?g|bmp|ico)((#|\?).*)?$/i.test(a)}function bb(){var b;K=a.extend({},a.data(P,e));for(b in K)a.isFunction(K[b])&&b.slice(0,2)!=="on"&&(K[b]=K[b].call(P));K.rel=K.rel||P.rel||"nofollow",K.href=K.href||a(P).attr("href"),K.title=K.title||P.title,typeof K.href=="string"&&(K.href=a.trim(K.href))}function bc(b,c){a.event.trigger(b),c&&c.call(P)}function bd(){var a,b=f+"Slideshow_",c="click."+f,d,e,g;K.slideshow&&y[1]?(d=function(){F.text(K.slideshowStop).unbind(c).bind(j,function(){if(K.loop||y[Q+1])a=setTimeout(W.next,K.slideshowSpeed)}).bind(i,function(){clearTimeout(a)}).one(c+" "+k,e),r.removeClass(b+"off").addClass(b+"on"),a=setTimeout(W.next,K.slideshowSpeed)},e=function(){clearTimeout(a),F.text(K.slideshowStart).unbind([j,i,k,c].join(" ")).one(c,function(){W.next(),d()}),r.removeClass(b+"on").addClass(b+"off")},K.slideshowAuto?d():e()):r.removeClass(b+"off "+b+"on")}function be(b){U||(P=b,bb(),y=a(P),Q=0,K.rel!=="nofollow"&&(y=a("."+g).filter(function(){var b=a.data(this,e).rel||this.rel;return b===K.rel}),Q=y.index(P),Q===-1&&(y=y.add(P),Q=y.length-1)),S||(S=T=!0,r.show(),K.returnFocus&&a(P).blur().one(l,function(){a(this).focus()}),q.css({opacity:+K.opacity,cursor:K.overlayClose?"pointer":"auto"}).show(),K.w=_(K.initialWidth,"x"),K.h=_(K.initialHeight,"y"),W.position(),o&&z.bind("resize."+p+" scroll."+p,function(){q.css({width:z.width(),height:z.height(),top:z.scrollTop(),left:z.scrollLeft()})}).trigger("resize."+p),bc(h,K.onOpen),J.add(D).hide(),I.html(K.close).show()),W.load(!0))}function bf(){!r&&b.body&&(Y=!1,z=a(c),r=Z(X).attr({id:e,"class":n?f+(o?"IE6":"IE"):""}).hide(),q=Z(X,"Overlay",o?"position:absolute":"").hide(),s=Z(X,"Wrapper"),t=Z(X,"Content").append(A=Z(X,"LoadedContent","width:0; height:0; overflow:hidden"),C=Z(X,"LoadingOverlay").add(Z(X,"LoadingGraphic")),D=Z(X,"Title"),E=Z(X,"Current"),G=Z(X,"Next"),H=Z(X,"Previous"),F=Z(X,"Slideshow").bind(h,bd),I=Z(X,"Close")),s.append(Z(X).append(Z(X,"TopLeft"),u=Z(X,"TopCenter"),Z(X,"TopRight")),Z(X,!1,"clear:left").append(v=Z(X,"MiddleLeft"),t,w=Z(X,"MiddleRight")),Z(X,!1,"clear:left").append(Z(X,"BottomLeft"),x=Z(X,"BottomCenter"),Z(X,"BottomRight"))).find("div div").css({"float":"left"}),B=Z(X,!1,"position:absolute; width:9999px; visibility:hidden; display:none"),J=G.add(H).add(E).add(F),a(b.body).append(q,r.append(s,B)))}function bg(){return r?(Y||(Y=!0,L=u.height()+x.height()+t.outerHeight(!0)-t.height(),M=v.width()+w.width()+t.outerWidth(!0)-t.width(),N=A.outerHeight(!0),O=A.outerWidth(!0),r.css({"padding-bottom":L,"padding-right":M}),G.click(function(){W.next()}),H.click(function(){W.prev()}),I.click(function(){W.close()}),q.click(function(){K.overlayClose&&W.close()}),a(b).bind("keydown."+f,function(a){var b=a.keyCode;S&&K.escKey&&b===27&&(a.preventDefault(),W.close()),S&&K.arrowKey&&y[1]&&(b===37?(a.preventDefault(),H.click()):b===39&&(a.preventDefault(),G.click()))}),a("."+g,b).live("click",function(a){a.which>1||a.shiftKey||a.altKey||a.metaKey||(a.preventDefault(),be(this))})),!0):!1}var d={transition:"elastic",speed:300,width:!1,initialWidth:"600",innerWidth:!1,maxWidth:!1,height:!1,initialHeight:"450",innerHeight:!1,maxHeight:!1,scalePhotos:!0,scrolling:!0,inline:!1,html:!1,iframe:!1,fastIframe:!0,photo:!1,href:!1,title:!1,rel:!1,opacity:.9,preloading:!0,current:"image {current} of {total}",previous:"previous",next:"next",close:"close",open:!1,returnFocus:!0,reposition:!0,loop:!0,slideshow:!1,slideshowAuto:!0,slideshowSpeed:2500,slideshowStart:"start slideshow",slideshowStop:"stop slideshow",onOpen:!1,onLoad:!1,onComplete:!1,onCleanup:!1,onClosed:!1,overlayClose:!0,escKey:!0,arrowKey:!0,top:!1,bottom:!1,left:!1,right:!1,fixed:!1,data:undefined},e="colorbox",f="cbox",g=f+"Element",h=f+"_open",i=f+"_load",j=f+"_complete",k=f+"_cleanup",l=f+"_closed",m=f+"_purge",n=!a.support.opacity&&!a.support.style,o=n&&!c.XMLHttpRequest,p=f+"_IE6",q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K,L,M,N,O,P,Q,R,S,T,U,V,W,X="div",Y;if(a.colorbox)return;a(bf),W=a.fn[e]=a[e]=function(b,c){var f=this;b=b||{},bf();if(bg()){if(!f[0]){if(f.selector)return f;f=a("<a/>"),b.open=!0}c&&(b.onComplete=c),f.each(function(){a.data(this,e,a.extend({},a.data(this,e)||d,b))}).addClass(g),(a.isFunction(b.open)&&b.open.call(f)||b.open)&&be(f[0])}return f},W.position=function(a,b){function i(a){u[0].style.width=x[0].style.width=t[0].style.width=a.style.width,t[0].style.height=v[0].style.height=w[0].style.height=a.style.height}var c=0,d=0,e=r.offset(),g=z.scrollTop(),h=z.scrollLeft();z.unbind("resize."+f),r.css({top:-9e4,left:-9e4}),K.fixed&&!o?(e.top-=g,e.left-=h,r.css({position:"fixed"})):(c=g,d=h,r.css({position:"absolute"})),K.right!==!1?d+=Math.max(z.width()-K.w-O-M-_(K.right,"x"),0):K.left!==!1?d+=_(K.left,"x"):d+=Math.round(Math.max(z.width()-K.w-O-M,0)/2),K.bottom!==!1?c+=Math.max(z.height()-K.h-N-L-_(K.bottom,"y"),0):K.top!==!1?c+=_(K.top,"y"):c+=Math.round(Math.max(z.height()-K.h-N-L,0)/2),r.css({top:e.top,left:e.left}),a=r.width()===K.w+O&&r.height()===K.h+N?0:a||0,s[0].style.width=s[0].style.height="9999px",r.dequeue().animate({width:K.w+O,height:K.h+N,top:c,left:d},{duration:a,complete:function(){i(this),T=!1,s[0].style.width=K.w+O+M+"px",s[0].style.height=K.h+N+L+"px",K.reposition&&setTimeout(function(){z.bind("resize."+f,W.position)},1),b&&b()},step:function(){i(this)}})},W.resize=function(a){S&&(a=a||{},a.width&&(K.w=_(a.width,"x")-O-M),a.innerWidth&&(K.w=_(a.innerWidth,"x")),A.css({width:K.w}),a.height&&(K.h=_(a.height,"y")-N-L),a.innerHeight&&(K.h=_(a.innerHeight,"y")),!a.innerHeight&&!a.height&&(A.css({height:"auto"}),K.h=A.height()),A.css({height:K.h}),W.position(K.transition==="none"?0:K.speed))},W.prep=function(b){function g(){return K.w=K.w||A.width(),K.w=K.mw&&K.mw<K.w?K.mw:K.w,K.w}function h(){return K.h=K.h||A.height(),K.h=K.mh&&K.mh<K.h?K.mh:K.h,K.h}if(!S)return;var c,d=K.transition==="none"?0:K.speed;A.remove(),A=Z(X,"LoadedContent").append(b),A.hide().appendTo(B.show()).css({width:g(),overflow:K.scrolling?"auto":"hidden"}).css({height:h()}).prependTo(t),B.hide(),a(R).css({"float":"none"}),o&&a("select").not(r.find("select")).filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one(k,function(){this.style.visibility="inherit"}),c=function(){function q(){n&&r[0].style.removeAttribute("filter")}var b,c,g=y.length,h,i="frameBorder",k="allowTransparency",l,o,p;if(!S)return;l=function(){clearTimeout(V),C.hide(),bc(j,K.onComplete)},n&&R&&A.fadeIn(100),D.html(K.title).add(A).show();if(g>1){typeof K.current=="string"&&E.html(K.current.replace("{current}",Q+1).replace("{total}",g)).show(),G[K.loop||Q<g-1?"show":"hide"]().html(K.next),H[K.loop||Q?"show":"hide"]().html(K.previous),K.slideshow&&F.show();if(K.preloading){b=[$(-1),$(1)];while(c=y[b.pop()])o=a.data(c,e).href||c.href,a.isFunction(o)&&(o=o.call(c)),ba(o)&&(p=new Image,p.src=o)}}else J.hide();K.iframe?(h=Z("iframe")[0],i in h&&(h[i]=0),k in h&&(h[k]="true"),h.name=f+ +(new Date),K.fastIframe?l():a(h).one("load",l),h.src=K.href,K.scrolling||(h.scrolling="no"),a(h).addClass(f+"Iframe").appendTo(A).one(m,function(){h.src="//about:blank"})):l(),K.transition==="fade"?r.fadeTo(d,1,q):q()},K.transition==="fade"?r.fadeTo(d,0,function(){W.position(0,c)}):W.position(d,c)},W.load=function(b){var c,d,e=W.prep;T=!0,R=!1,P=y[Q],b||bb(),bc(m),bc(i,K.onLoad),K.h=K.height?_(K.height,"y")-N-L:K.innerHeight&&_(K.innerHeight,"y"),K.w=K.width?_(K.width,"x")-O-M:K.innerWidth&&_(K.innerWidth,"x"),K.mw=K.w,K.mh=K.h,K.maxWidth&&(K.mw=_(K.maxWidth,"x")-O-M,K.mw=K.w&&K.w<K.mw?K.w:K.mw),K.maxHeight&&(K.mh=_(K.maxHeight,"y")-N-L,K.mh=K.h&&K.h<K.mh?K.h:K.mh),c=K.href,V=setTimeout(function(){C.show()},100),K.inline?(Z(X).hide().insertBefore(a(c)[0]).one(m,function(){a(this).replaceWith(A.children())}),e(a(c))):K.iframe?e(" "):K.html?e(K.html):ba(c)?(a(R=new Image).addClass(f+"Photo").error(function(){K.title=!1,e(Z(X,"Error").text("This image could not be loaded"))}).load(function(){var a;R.onload=null,K.scalePhotos&&(d=function(){R.height-=R.height*a,R.width-=R.width*a},K.mw&&R.width>K.mw&&(a=(R.width-K.mw)/R.width,d()),K.mh&&R.height>K.mh&&(a=(R.height-K.mh)/R.height,d())),K.h&&(R.style.marginTop=Math.max(K.h-R.height,0)/2+"px"),y[1]&&(K.loop||y[Q+1])&&(R.style.cursor="pointer",R.onclick=function(){W.next()}),n&&(R.style.msInterpolationMode="bicubic"),setTimeout(function(){e(R)},1)}),setTimeout(function(){R.src=c},1)):c&&B.load(c,K.data,function(b,c,d){e(c==="error"?Z(X,"Error").text("Request unsuccessful: "+d.statusText):a(this).contents())})},W.next=function(){!T&&y[1]&&(K.loop||y[Q+1])&&(Q=$(1),W.load())},W.prev=function(){!T&&y[1]&&(K.loop||Q)&&(Q=$(-1),W.load())},W.close=function(){S&&!U&&(U=!0,S=!1,bc(k,K.onCleanup),z.unbind("."+f+" ."+p),q.fadeTo(200,0),r.stop().fadeTo(300,0,function(){r.add(q).css({opacity:1,cursor:"auto"}).hide(),bc(m),A.remove(),setTimeout(function(){U=!1,bc(l,K.onClosed)},1)}))},W.remove=function(){a([]).add(r).add(q).remove(),r=null,a("."+g).removeData(e).removeClass(g).die()},W.element=function(){return a(P)},W.settings=d})(jQuery,document,this);

data/app/assets/stylesheets/comfy_gallery/colorbox.css

@@ -0,0 +1,61 @@
+/*
+    ColorBox Core Style:
+    The following CSS is consistent between example themes and should not be altered.
+*/
+#colorbox, #cboxOverlay, #cboxWrapper{position:absolute; top:0; left:0; z-index:9999; overflow:hidden;}
+#cboxOverlay{position:fixed; width:100%; height:100%;}
+#cboxMiddleLeft, #cboxBottomLeft{clear:left;}
+#cboxContent{position:relative;}
+#cboxLoadedContent{overflow:auto;}
+#cboxTitle{margin:0;}
+#cboxLoadingOverlay, #cboxLoadingGraphic{position:absolute; top:0; left:0; width:100%; height:100%;}
+#cboxPrevious, #cboxNext, #cboxClose, #cboxSlideshow{cursor:pointer;}
+.cboxPhoto{float:left; margin:auto; border:0; display:block;}
+.cboxIframe{width:100%; height:100%; display:block; border:0;}
+
+/* 
+    User Style:
+    Change the following styles to modify the appearance of ColorBox.  They are
+    ordered & tabbed in a way that represents the nesting of the generated HTML.
+*/
+#cboxOverlay{background:url(/assets/comfy_gallery/overlay.png) repeat 0 0;}
+#colorbox{}
+    #cboxTopLeft{width:21px; height:21px; background:url(/assets/comfy_gallery/controls.png) no-repeat -101px 0;}
+    #cboxTopRight{width:21px; height:21px; background:url(/assets/comfy_gallery/controls.png) no-repeat -130px 0;}
+    #cboxBottomLeft{width:21px; height:21px; background:url(/assets/comfy_gallery/controls.png) no-repeat -101px -29px;}
+    #cboxBottomRight{width:21px; height:21px; background:url(/assets/comfy_gallery/controls.png) no-repeat -130px -29px;}
+    #cboxMiddleLeft{width:21px; background:url(/assets/comfy_gallery/controls.png) left top repeat-y;}
+    #cboxMiddleRight{width:21px; background:url(/assets/comfy_gallery/controls.png) right top repeat-y;}
+    #cboxTopCenter{height:21px; background:url(/assets/comfy_gallery/border.png) 0 0 repeat-x;}
+    #cboxBottomCenter{height:21px; background:url(/assets/comfy_gallery/border.png) 0 -29px repeat-x;}
+    #cboxContent{background:#fff; overflow:hidden;}
+        .cboxIframe{background:#fff;}
+        #cboxError{padding:50px; border:1px solid #ccc;}
+        #cboxLoadedContent{margin-bottom:28px;}
+        #cboxTitle{position:absolute; bottom:4px; left:0; text-align:center; width:100%; color:#949494;}
+        #cboxCurrent{position:absolute; bottom:4px; left:58px; color:#949494;}
+        #cboxSlideshow{position:absolute; bottom:4px; right:30px; color:#0092ef;}
+        #cboxPrevious{position:absolute; bottom:0; left:0; background:url(/assets/comfy_gallery/controls.png) no-repeat -75px 0; width:25px; height:25px; text-indent:-9999px;}
+        #cboxPrevious:hover{background-position:-75px -25px;}
+        #cboxNext{position:absolute; bottom:0; left:27px; background:url(/assets/comfy_gallery/controls.png) no-repeat -50px 0; width:25px; height:25px; text-indent:-9999px;}
+        #cboxNext:hover{background-position:-50px -25px;}
+        #cboxLoadingOverlay{background:url(/assets/comfy_gallery/loading_background.png) no-repeat center center;}
+        #cboxLoadingGraphic{background:url(/assets/comfy_gallery/loading.gif) no-repeat center center;}
+        #cboxClose{position:absolute; bottom:0; right:0; background:url(/assets/comfy_gallery/controls.png) no-repeat -25px 0; width:25px; height:25px; text-indent:-9999px;}
+        #cboxClose:hover{background-position:-25px -25px;}
+
+/*
+  The following fixes a problem where IE7 and IE8 replace a PNG's alpha transparency with a black fill
+  when an alpha filter (opacity change) is set on the element or ancestor element.  This style is not applied to or needed in IE9.
+  See: http://jacklmoore.com/notes/ie-transparency-problems/
+*/
+.cboxIE #cboxTopLeft,
+.cboxIE #cboxTopCenter,
+.cboxIE #cboxTopRight,
+.cboxIE #cboxBottomLeft,
+.cboxIE #cboxBottomCenter,
+.cboxIE #cboxBottomRight,
+.cboxIE #cboxMiddleLeft,
+.cboxIE #cboxMiddleRight {
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#00FFFFFF,endColorstr=#00FFFFFF);
+}

data/app/helpers/gallery/application_helper.rb

@@ -9,22 +9,4 @@ module Gallery::ApplicationHelper
     )
   end
   
-  def render_gallery(slug, type = 'thumbnails')
-    @gallery = Gallery::Gallery.find_by_slug(slug)
-    if (@gallery)
-      render :partial => "gallery/#{type}"
-    else
-      render :text => 'Gallery not found', :status => 404
-    end
-  end
-  
-  def render_galleries(type = 'list_galleries')
-    @galleries = Gallery::Gallery.all
-    if (@galleries)
-      render :partial => "gallery/#{type}"
-    else
-      render :text => 'Gallery not found', :status => 404
-    end
-  end
-  
 end

data/app/views/admin/gallery/galleries/index.html.erb

@@ -10,8 +10,6 @@
   <tr>
     <th> Preview </th>
     <th> Name </th>
-    <th> URL </th>
-    <th> Embed Code </th>
     <th> Actions </th>
   </tr>
   <% @galleries.each do |gallery| %>
@@ -24,12 +22,6 @@
       <td class='main'>
         <%= link_to gallery.title, admin_gallery_gallery_photos_path(gallery) %>
       </td>
-      <td>
-        <%= link_to gallery_path(gallery), gallery_path(gallery), :target => '_blank' %>
-      </td>
-      <td class='embed'>
-        {{ cms:helper:render_gallery:<%= gallery.identifier  %> }}
-      </td>
       <td class='action_links'>
         <%= link_to 'Show Photos', admin_gallery_gallery_photos_path(gallery) %>
         <%= link_to 'Edit', edit_admin_gallery_gallery_path(gallery) %>

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

@@ -7,6 +7,6 @@
   <% end %>
 <% end %>
 <%= form.file_field :image, :multiple => true %>
-<%= form.text_area :description %>
+<%= form.text_area :description, :class => 'short' %>
 
 <%= form.submit 'Save' %>

data/comfy_gallery.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comfy_gallery"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   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 = "2012-02-10"
+  s.date = "2012-02-22"
   s.description = ""
   s.email = "oleg@twg.ca"
   s.extra_rdoc_files = [
@@ -24,74 +24,23 @@ Gem::Specification.new do |s|
     "README.md",
     "Rakefile",
     "VERSION",
+    "app/assets/images/comfy_gallery/border.png",
+    "app/assets/images/comfy_gallery/controls.png",
     "app/assets/images/comfy_gallery/jcrop.gif",
-    "app/assets/images/comfy_gallery/orbit/bullets.jpg",
-    "app/assets/images/comfy_gallery/orbit/left-arrow.png",
-    "app/assets/images/comfy_gallery/orbit/loading.gif",
-    "app/assets/images/comfy_gallery/orbit/mask-black.png",
-    "app/assets/images/comfy_gallery/orbit/pause-black.png",
-    "app/assets/images/comfy_gallery/orbit/right-arrow.png",
-    "app/assets/images/comfy_gallery/orbit/rotator-black.png",
-    "app/assets/images/comfy_gallery/orbit/timer-black.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/btnNext.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/btnPrevious.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/contentPattern.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/default_thumbnail.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/loader.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/sprite.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/btnNext.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/btnPrevious.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/contentPattern.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/default_thumbnail.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/loader.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/dark_square/sprite.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/default/default_thumb.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/default/loader.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite_next.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite_prev.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite_x.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/default/sprite_y.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/facebook/btnNext.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/facebook/btnPrevious.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternBottom.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternLeft.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternRight.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternTop.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/facebook/default_thumbnail.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/facebook/loader.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/facebook/sprite.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/btnNext.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/btnPrevious.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/default_thumbnail.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/loader.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_rounded/sprite.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_square/btnNext.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_square/btnPrevious.png",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_square/default_thumbnail.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_square/loader.gif",
-    "app/assets/images/comfy_gallery/prettyPhoto/light_square/sprite.png",
-    "app/assets/javascripts/comfy_gallery/admin.js",
-    "app/assets/javascripts/comfy_gallery/application.js",
+    "app/assets/images/comfy_gallery/loading.gif",
+    "app/assets/images/comfy_gallery/loading_background.png",
+    "app/assets/images/comfy_gallery/overlay.png",
+    "app/assets/javascripts/comfy_gallery/jquery.colorbox.js",
     "app/assets/javascripts/comfy_gallery/jquery.jcrop.js",
-    "app/assets/javascripts/comfy_gallery/jquery.orbit-1.2.3.min.js",
-    "app/assets/javascripts/comfy_gallery/thumbnails.js",
-    "app/assets/stylesheets/comfy_gallery/admin.css",
-    "app/assets/stylesheets/comfy_gallery/application.css",
-    "app/assets/stylesheets/comfy_gallery/carousel.css.erb",
-    "app/assets/stylesheets/comfy_gallery/gallery_list.css",
+    "app/assets/stylesheets/comfy_gallery/colorbox.css",
     "app/assets/stylesheets/comfy_gallery/jquery.jcrop.css",
-    "app/assets/stylesheets/comfy_gallery/reset.css",
-    "app/assets/stylesheets/comfy_gallery/thumbnails.css.erb",
     "app/controllers/admin/gallery/base_controller.rb",
     "app/controllers/admin/gallery/galleries_controller.rb",
     "app/controllers/admin/gallery/photos_controller.rb",
     "app/controllers/application_controller.rb",
-    "app/controllers/gallery/galleries_controller.rb",
     "app/helpers/gallery/application_helper.rb",
     "app/models/gallery/gallery.rb",
     "app/models/gallery/photo.rb",
-    "app/views/admin/gallery/_html_head.html.erb",
     "app/views/admin/gallery/_navigation.html.erb",
     "app/views/admin/gallery/galleries/_form.html.erb",
     "app/views/admin/gallery/galleries/edit.html.erb",
@@ -102,11 +51,6 @@ Gem::Specification.new do |s|
     "app/views/admin/gallery/photos/edit.html.erb",
     "app/views/admin/gallery/photos/index.html.erb",
     "app/views/admin/gallery/photos/new.html.erb",
-    "app/views/gallery/_carousel.html.erb",
-    "app/views/gallery/_list_galleries.html.erb",
-    "app/views/gallery/_thumbnails.html.erb",
-    "app/views/gallery/galleries/index.html.erb",
-    "app/views/gallery/galleries/show.html.erb",
     "app/views/layouts/gallery/application.html.erb",
     "comfy_gallery.gemspec",
     "config.ru",
@@ -138,7 +82,6 @@ Gem::Specification.new do |s|
     "test/fixtures/gallery/photos.yml",
     "test/functional/admin/gallery/galleries_controller_test.rb",
     "test/functional/admin/gallery/photos_controller_test.rb",
-    "test/functional/gallery/galleries_controller_test.rb",
     "test/test_helper.rb",
     "test/unit/configuration_test.rb",
     "test/unit/gallery_test.rb",

data/config/routes.rb

@@ -10,8 +10,4 @@ Rails.application.routes.draw do
       end
     end
   end unless ComfyGallery.config.admin_route_prefix.blank?
-  
-  scope :module => :gallery do
-    resources :galleries, :only => [:show, :index]
-  end
 end

data/lib/comfy_gallery/engine.rb

@@ -15,7 +15,6 @@ module ComfyGallery
         end
         # applying nav elements
         ComfortableMexicanSofa::ViewHooks.add(:navigation, '/admin/gallery/navigation')
-        ComfortableMexicanSofa::ViewHooks.add(:html_head, '/admin/gallery/html_head')
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfy_gallery
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-10 00:00:00.000000000Z
+date: 2012-02-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70321662930880 !ruby/object:Gem::Requirement
+  requirement: &70340615127900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70321662930880
+  version_requirements: *70340615127900
 - !ruby/object:Gem::Dependency
   name: paperclip
-  requirement: &70321662930060 !ruby/object:Gem::Requirement
+  requirement: &70340615127020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70321662930060
+  version_requirements: *70340615127020
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70321662929320 !ruby/object:Gem::Requirement
+  requirement: &70340615126300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 1.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70321662929320
+  version_requirements: *70340615126300
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70321662849200 !ruby/object:Gem::Requirement
+  requirement: &70340615125700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321662849200
+  version_requirements: *70340615125700
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70321662848460 !ruby/object:Gem::Requirement
+  requirement: &70340615125080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,7 +67,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70321662848460
+  version_requirements: *70340615125080
 description: ''
 email: oleg@twg.ca
 executables: []
@@ -83,74 +83,23 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- app/assets/images/comfy_gallery/border.png
+- app/assets/images/comfy_gallery/controls.png
 - app/assets/images/comfy_gallery/jcrop.gif
-- app/assets/images/comfy_gallery/orbit/bullets.jpg
-- app/assets/images/comfy_gallery/orbit/left-arrow.png
-- app/assets/images/comfy_gallery/orbit/loading.gif
-- app/assets/images/comfy_gallery/orbit/mask-black.png
-- app/assets/images/comfy_gallery/orbit/pause-black.png
-- app/assets/images/comfy_gallery/orbit/right-arrow.png
-- app/assets/images/comfy_gallery/orbit/rotator-black.png
-- app/assets/images/comfy_gallery/orbit/timer-black.png
-- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/btnNext.png
-- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/btnPrevious.png
-- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/contentPattern.png
-- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/default_thumbnail.gif
-- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/loader.gif
-- app/assets/images/comfy_gallery/prettyPhoto/dark_rounded/sprite.png
-- app/assets/images/comfy_gallery/prettyPhoto/dark_square/btnNext.png
-- app/assets/images/comfy_gallery/prettyPhoto/dark_square/btnPrevious.png
-- app/assets/images/comfy_gallery/prettyPhoto/dark_square/contentPattern.png
-- app/assets/images/comfy_gallery/prettyPhoto/dark_square/default_thumbnail.gif
-- app/assets/images/comfy_gallery/prettyPhoto/dark_square/loader.gif
-- app/assets/images/comfy_gallery/prettyPhoto/dark_square/sprite.png
-- app/assets/images/comfy_gallery/prettyPhoto/default/default_thumb.png
-- app/assets/images/comfy_gallery/prettyPhoto/default/loader.gif
-- app/assets/images/comfy_gallery/prettyPhoto/default/sprite.png
-- app/assets/images/comfy_gallery/prettyPhoto/default/sprite_next.png
-- app/assets/images/comfy_gallery/prettyPhoto/default/sprite_prev.png
-- app/assets/images/comfy_gallery/prettyPhoto/default/sprite_x.png
-- app/assets/images/comfy_gallery/prettyPhoto/default/sprite_y.png
-- app/assets/images/comfy_gallery/prettyPhoto/facebook/btnNext.png
-- app/assets/images/comfy_gallery/prettyPhoto/facebook/btnPrevious.png
-- app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternBottom.png
-- app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternLeft.png
-- app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternRight.png
-- app/assets/images/comfy_gallery/prettyPhoto/facebook/contentPatternTop.png
-- app/assets/images/comfy_gallery/prettyPhoto/facebook/default_thumbnail.gif
-- app/assets/images/comfy_gallery/prettyPhoto/facebook/loader.gif
-- app/assets/images/comfy_gallery/prettyPhoto/facebook/sprite.png
-- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/btnNext.png
-- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/btnPrevious.png
-- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/default_thumbnail.gif
-- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/loader.gif
-- app/assets/images/comfy_gallery/prettyPhoto/light_rounded/sprite.png
-- app/assets/images/comfy_gallery/prettyPhoto/light_square/btnNext.png
-- app/assets/images/comfy_gallery/prettyPhoto/light_square/btnPrevious.png
-- app/assets/images/comfy_gallery/prettyPhoto/light_square/default_thumbnail.gif
-- app/assets/images/comfy_gallery/prettyPhoto/light_square/loader.gif
-- app/assets/images/comfy_gallery/prettyPhoto/light_square/sprite.png
-- app/assets/javascripts/comfy_gallery/admin.js
-- app/assets/javascripts/comfy_gallery/application.js
+- app/assets/images/comfy_gallery/loading.gif
+- app/assets/images/comfy_gallery/loading_background.png
+- app/assets/images/comfy_gallery/overlay.png
+- app/assets/javascripts/comfy_gallery/jquery.colorbox.js
 - app/assets/javascripts/comfy_gallery/jquery.jcrop.js
-- app/assets/javascripts/comfy_gallery/jquery.orbit-1.2.3.min.js
-- app/assets/javascripts/comfy_gallery/thumbnails.js
-- app/assets/stylesheets/comfy_gallery/admin.css
-- app/assets/stylesheets/comfy_gallery/application.css
-- app/assets/stylesheets/comfy_gallery/carousel.css.erb
-- app/assets/stylesheets/comfy_gallery/gallery_list.css
+- app/assets/stylesheets/comfy_gallery/colorbox.css
 - app/assets/stylesheets/comfy_gallery/jquery.jcrop.css
-- app/assets/stylesheets/comfy_gallery/reset.css
-- app/assets/stylesheets/comfy_gallery/thumbnails.css.erb
 - app/controllers/admin/gallery/base_controller.rb
 - app/controllers/admin/gallery/galleries_controller.rb
 - app/controllers/admin/gallery/photos_controller.rb
 - app/controllers/application_controller.rb
-- app/controllers/gallery/galleries_controller.rb
 - app/helpers/gallery/application_helper.rb
 - app/models/gallery/gallery.rb
 - app/models/gallery/photo.rb
-- app/views/admin/gallery/_html_head.html.erb
 - app/views/admin/gallery/_navigation.html.erb
 - app/views/admin/gallery/galleries/_form.html.erb
 - app/views/admin/gallery/galleries/edit.html.erb
@@ -161,11 +110,6 @@ files:
 - app/views/admin/gallery/photos/edit.html.erb
 - app/views/admin/gallery/photos/index.html.erb
 - app/views/admin/gallery/photos/new.html.erb
-- app/views/gallery/_carousel.html.erb
-- app/views/gallery/_list_galleries.html.erb
-- app/views/gallery/_thumbnails.html.erb
-- app/views/gallery/galleries/index.html.erb
-- app/views/gallery/galleries/show.html.erb
 - app/views/layouts/gallery/application.html.erb
 - comfy_gallery.gemspec
 - config.ru
@@ -197,7 +141,6 @@ files:
 - test/fixtures/gallery/photos.yml
 - test/functional/admin/gallery/galleries_controller_test.rb
 - test/functional/admin/gallery/photos_controller_test.rb
-- test/functional/gallery/galleries_controller_test.rb
 - test/test_helper.rb
 - test/unit/configuration_test.rb
 - test/unit/gallery_test.rb
@@ -217,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -686661673297130780
+      hash: -2844457145724189053
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: