alchemy_cms 2.5.3.1 → 2.6.0.rc5

data/spec/models/user_spec.rb

@@ -6,9 +6,121 @@ module Alchemy
     let(:user) { FactoryGirl.build(:user) }
     let(:page) { FactoryGirl.create(:page) }
 
-    it "should have a role" do
+    it "should have at least registered role" do
       user.save!
-      user.role.should_not be_nil
+      user.roles.should_not be_blank
+      user.roles.should include('registered')
+    end
+
+    describe 'scopes' do
+      describe '.admins' do
+        before do
+          user.roles = 'admin'
+          user.save!
+        end
+
+        it "should only return users with admin role" do
+          User.admins.should include(user)
+        end
+      end
+    end
+
+    describe ".human_rolename" do
+      it "return a translated role name" do
+        ::I18n.locale = :de
+        User.human_rolename('registered').should == "Registriert"
+      end
+    end
+
+    describe "#human_roles_string" do
+      it "should return a humanized roles string." do
+        ::I18n.locale = :de
+        user.roles = ['registered', 'admin']
+        user.human_roles_string.should == "Registriert und Administrator"
+      end
+    end
+
+    describe '#role_symbols' do
+      it "should return an array of user role symbols" do
+        user.role_symbols.should == [:registered]
+      end
+    end
+
+    describe '#has_role?' do
+
+      context "with given role" do
+        it "should return true." do
+          user.has_role?('registered').should be_true
+        end
+      end
+
+      context "with role given as symbol" do
+        it "should return true." do
+          user.has_role?(:registered).should be_true
+        end
+      end
+
+      context "without given role" do
+        it "should return true." do
+          user.has_role?('admin').should be_false
+        end
+      end
+
+    end
+
+    describe '#role' do
+      context "when user doesn't have any roles" do
+        before { user.roles = [] }
+
+        it 'should return nil' do
+          user.role.should be_nil
+        end
+      end
+
+      context "when user has multiple roles" do
+        before { user.roles = ["admin", "registered"] }
+
+        it 'should return the first role' do
+          user.role.should == "admin"
+        end
+      end
+    end
+
+    describe '#roles' do
+      it "should return an array of user roles" do
+        user.roles.should == ["registered"]
+      end
+    end
+
+    describe '#roles=' do
+
+      it "should accept an array of user roles" do
+        user.roles = ["admin"]
+        user.roles.should == ["admin"]
+      end
+
+      it "should accept a string of user roles" do
+        user.roles = "admin registered"
+        user.roles.should == ["admin", "registered"]
+      end
+
+      it "should store the user roles as space seperated string" do
+        user.roles = ["admin", "registered"]
+        user.read_attribute(:roles).should == "admin registered"
+      end
+
+    end
+
+    describe "#add_role" do
+      it "should add the given role to roles array" do
+        user.add_role "member"
+        user.roles.should == ["registered", "member"]
+      end
+
+      it "should not add the given role twice" do
+        user.add_role "registered"
+        user.roles.should == ["registered"]
+      end
     end
 
     describe '#logged_in?' do
@@ -53,7 +165,7 @@ module Alchemy
 
     describe '#is_admin?' do
       it "should return true if the user has admin role" do
-        user.role = "admin"
+        user.roles = "admin"
         user.save!
         user.is_admin?.should be_true
       end

data/spec/{routing_spec.rb → routing/routing_spec.rb}

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe "The Routing", :type => :routing do
+describe "The Routing" do
 
-  before { @routes = Alchemy::Engine.routes }
+  routes { Alchemy::Engine.routes }
 
   context "for downloads" do
 
@@ -62,8 +62,7 @@ describe "The Routing", :type => :routing do
         }.should route_to(
           :controller => "alchemy/pages",
           :action => "show",
-          :level1 => "products",
-          :urlname => "my-product"
+          :urlname => "products/my-product"
         )
       end
 
@@ -75,8 +74,7 @@ describe "The Routing", :type => :routing do
           }.should route_to(
             :controller => "alchemy/pages",
             :action => "show",
-            :level1 => "products",
-            :urlname => "my-product",
+            :urlname => "products/my-product",
             :lang => "de"
           )
         end
@@ -93,9 +91,7 @@ describe "The Routing", :type => :routing do
         }.should route_to(
           :controller => "alchemy/pages",
           :action => "show",
-          :level1 => "catalog",
-          :level2 => "products",
-          :urlname => "my-product"
+          :urlname => "catalog/products/my-product"
         )
       end
 
@@ -107,9 +103,7 @@ describe "The Routing", :type => :routing do
           }.should route_to(
             :controller => "alchemy/pages",
             :action => "show",
-            :level1 => "catalog",
-            :level2 => "products",
-            :urlname => "my-product",
+            :urlname => "catalog/products/my-product",
             :lang => "de"
           )
         end
@@ -126,10 +120,7 @@ describe "The Routing", :type => :routing do
         }.should route_to(
           :controller => "alchemy/pages",
           :action => "show",
-          :level1 => "2011",
-          :level2 => "12",
-          :level3 => "08",
-          :urlname => "my-post"
+          :urlname => "2011/12/08/my-post"
         )
       end
 
@@ -141,10 +132,7 @@ describe "The Routing", :type => :routing do
           }.should route_to(
             :controller => "alchemy/pages",
             :action => "show",
-            :level1 => "2011",
-            :level2 => "12",
-            :level3 => "08",
-            :urlname => "my-post",
+            :urlname => "2011/12/08/my-post",
             :lang => "de"
           )
         end

data/spec/spec_helper.rb

@@ -1,10 +1,9 @@
+require 'simplecov'
+require 'coveralls'
 
-begin
-  require 'simplecov'
-  SimpleCov.start('rails') do
-    add_filter "/spec/"
-  end
-rescue LoadError => e
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+  add_filter '/spec/'
 end
 
 begin

data/spec/support/alchemy/specs_helpers.rb

@@ -66,5 +66,5 @@ module Alchemy
 end
 
 RSpec.configure do |c|
-  c.include Alchemy::Specs::Helpers, :type => :request
+  c.include Alchemy::Specs::Helpers, :type => :feature
 end

data/spec/support/ci/install_phantomjs

@@ -4,4 +4,4 @@ version=phantomjs-1.8.1-linux-i686
 cd
 wget http://phantomjs.googlecode.com/files/$version.tar.bz2
 tar xjf $version.tar.bz2
-mv $version phantomjs
+mv $version phantomjs

data/vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js

@@ -1,22 +1,22 @@
 /**
- * jquery.Jcrop.min.js v0.9.10 (build:20120429)
+ * jquery.Jcrop.min.js v0.9.12 (build:20130202)
  * jQuery Image Cropping Plugin - released under MIT License
- * Copyright (c) 2008-2012 Tapmodo Interactive LLC
+ * Copyright (c) 2008-2013 Tapmodo Interactive LLC
  * https://github.com/tapmodo/Jcrop
  */
-(function(a){a.Jcrop=function(b,c){function h(a){return a+"px"}function i(a){return d.baseClass+"-"+a}function j(){return a.fx.step.hasOwnProperty("backgroundColor")}function k(b){var c=a(b).offset();return[c.left,c.top]}function l(a){return[a.pageX-e[0],a.pageY-e[1]]}function m(b){typeof b!="object"&&(b={}),d=a.extend(d,b),a.each(["onChange","onSelect","onRelease","onDblClick"],function(a,b){typeof d[b]!="function"&&(d[b]=function(){})})}function n(a,b){e=k(E),bd.setCursor(a==="move"?a:a+"-resize");if(a==="move")return bd.activateHandlers(p(b),u);var c=ba.getFixed(),d=q(a),f=ba.getCorner(q(d));ba.setPressed(ba.getCorner(d)),ba.setCurrent(f),bd.activateHandlers(o(a,c),u)}function o(a,b){return function(c){if(!d.aspectRatio)switch(a){case"e":c[1]=b.y2;break;case"w":c[1]=b.y2;break;case"n":c[0]=b.x2;break;case"s":c[0]=b.x2}else switch(a){case"e":c[1]=b.y+1;break;case"w":c[1]=b.y+1;break;case"n":c[0]=b.x+1;break;case"s":c[0]=b.x+1}ba.setCurrent(c),bc.update()}}function p(a){var b=a;return be.watchKeys(),function(
-a){ba.moveOffset([a[0]-b[0],a[1]-b[1]]),b=a,bc.update()}}function q(a){switch(a){case"n":return"sw";case"s":return"nw";case"e":return"nw";case"w":return"ne";case"ne":return"sw";case"nw":return"se";case"se":return"nw";case"sw":return"ne"}}function r(a){return function(b){return d.disabled?!1:a==="move"&&!d.allowMove?!1:(e=k(E),X=!0,n(a,l(b)),b.stopPropagation(),b.preventDefault(),!1)}}function s(a,b,c){var d=a.width(),e=a.height();d>b&&b>0&&(d=b,e=b/a.width()*a.height()),e>c&&c>0&&(e=c,d=c/a.height()*a.width()),U=a.width()/d,V=a.height()/e,a.width(d).height(e)}function t(a){return{x:a.x*U,y:a.y*V,x2:a.x2*U,y2:a.y2*V,w:a.w*U,h:a.h*V}}function u(a){var b=ba.getFixed();b.w>d.minSelect[0]&&b.h>d.minSelect[1]?(bc.enableHandles(),bc.done()):bc.release(),bd.setCursor(d.allowSelect?"crosshair":"default")}function v(a){if(d.disabled)return!1;if(!d.allowSelect)return!1;X=!0,e=k(E),bc.disableHandles(),bd.setCursor("crosshair");var b=l(a);return ba.setPressed(b),bc.update(),bd.activateHandlers(w,u),be.watchKeys(),a.stopPropagation
-(),a.preventDefault(),!1}function w(a){ba.setCurrent(a),bc.update()}function z(){var b=a("<div></div>").addClass(i("tracker"));return a.browser.msie&&b.css({opacity:0,backgroundColor:"white"}),b}function bf(a){H.removeClass().addClass(i("holder")).addClass(a)}function bg(a,b){function t(){window.setTimeout(u,l)}var c=a[0]/U,e=a[1]/V,f=a[2]/U,g=a[3]/V;if(Y)return;var h=ba.flipCoords(c,e,f,g),i=ba.getFixed(),j=[i.x,i.y,i.x2,i.y2],k=j,l=d.animationDelay,m=h[0]-j[0],n=h[1]-j[1],o=h[2]-j[2],p=h[3]-j[3],q=0,r=d.swingSpeed;x=k[0],y=k[1],f=k[2],g=k[3],bc.animMode(!0);var s,u=function(){return function(){q+=(100-q)/r,k[0]=x+q/100*m,k[1]=y+q/100*n,k[2]=f+q/100*o,k[3]=g+q/100*p,q>=99.8&&(q=100),q<100?(bi(k),t()):(bc.done(),typeof b=="function"&&b.call(bt))}}();t()}function bh(a){bi([a[0]/U,a[1]/V,a[2]/U,a[3]/V]),d.onSelect.call(bt,t(ba.getFixed())),bc.enableHandles()}function bi(a){ba.setPressed([a[0],a[1]]),ba.setCurrent([a[2],a[3]]),bc.update()}function bj(){return t(ba.getFixed())}function bk(){return ba.getFixed()}function bl
-(a){m(a),bs()}function bm(){d.disabled=!0,bc.disableHandles(),bc.setCursor("default"),bd.setCursor("default")}function bn(){d.disabled=!1,bs()}function bo(){bc.done(),bd.activateHandlers(null,null)}function bp(){H.remove(),B.show(),a(b).removeData("Jcrop")}function bq(a,b){bc.release(),bm();var c=new Image;c.onload=function(){var e=c.width,f=c.height,g=d.boxWidth,h=d.boxHeight;E.width(e).height(f),E.attr("src",a),I.attr("src",a),s(E,g,h),F=E.width(),G=E.height(),I.width(F).height(G),N.width(F+M*2).height(G+M*2),H.width(F).height(G),bb.resize(F,G),bn(),typeof b=="function"&&b.call(bt)},c.src=a}function br(a,b,c){var e=b||d.bgColor;d.bgFade&&j()&&d.fadeTime&&!c?a.animate({backgroundColor:e},{queue:!1,duration:d.fadeTime}):a.css("backgroundColor",e)}function bs(a){d.allowResize?a?bc.enableOnly():bc.enableHandles():bc.disableHandles(),bd.setCursor(d.allowSelect?"crosshair":"default"),bc.setCursor(d.allowMove?"move":"default"),d.hasOwnProperty("trueSize")&&(U=d.trueSize[0]/F,V=d.trueSize[1]/G),d.hasOwnProperty("setSelect"
-)&&(bh(d.setSelect),bc.done(),delete d.setSelect),bb.refresh(),d.bgColor!=O&&(br(d.shade?bb.getShades():H,d.shade?d.shadeColor||d.bgColor:d.bgColor),O=d.bgColor),P!=d.bgOpacity&&(P=d.bgOpacity,d.shade?bb.refresh():bc.setBgOpacity(P)),Q=d.maxSize[0]||0,R=d.maxSize[1]||0,S=d.minSize[0]||0,T=d.minSize[1]||0,d.hasOwnProperty("outerImage")&&(E.attr("src",d.outerImage),delete d.outerImage),bc.refresh()}var d=a.extend({},a.Jcrop.defaults),e,f,g=!1;a.browser.msie&&a.browser.version.split(".")[0]==="6"&&(g=!0),typeof b!="object"&&(b=a(b)[0]),typeof c!="object"&&(c={}),m(c);var A={border:"none",visibility:"visible",margin:0,padding:0,position:"absolute",top:0,left:0},B=a(b),C=!0;if(b.tagName=="IMG"){if(B[0].width!=0&&B[0].height!=0)B.width(B[0].width),B.height(B[0].height);else{var D=new Image;D.src=B[0].src,B.width(D.width),B.height(D.height)}var E=B.clone().removeAttr("id").css(A).show();E.width(B.width()),E.height(B.height()),B.after(E).hide()}else E=B.css(A).show(),C=!1,d.shade===null&&(d.shade=!0);s(E,d.boxWidth,d.
-boxHeight);var F=E.width(),G=E.height(),H=a("<div />").width(F).height(G).addClass(i("holder")).css({position:"relative",backgroundColor:d.bgColor}).insertAfter(B).append(E);d.addClass&&H.addClass(d.addClass);var I=a("<div />"),J=a("<div />").width("100%").height("100%").css({zIndex:310,position:"absolute",overflow:"hidden"}),K=a("<div />").width("100%").height("100%").css("zIndex",320),L=a("<div />").css({position:"absolute",zIndex:600}).dblclick(function(){var a=ba.getFixed();d.onDblClick.call(bt,a)}).insertBefore(E).append(J,K);C&&(I=a("<img />").attr("src",E.attr("src")).css(A).width(F).height(G),J.append(I)),g&&L.css({overflowY:"hidden"});var M=d.boundary,N=z().width(F+M*2).height(G+M*2).css({position:"absolute",top:h(-M),left:h(-M),zIndex:290}).mousedown(v),O=d.bgColor,P=d.bgOpacity,Q,R,S,T,U,V,W=!0,X,Y,Z;e=k(E);var _=function(){function a(){var a={},b=["touchstart","touchmove","touchend"],c=document.createElement("div"),d;try{for(d=0;d<b.length;d++){var e=b[d];e="on"+e;var f=e in c;f||(c.setAttribute(e,"return;"
-),f=typeof c[e]=="function"),a[b[d]]=f}return a.touchstart&&a.touchend&&a.touchmove}catch(g){return!1}}function b(){return d.touchSupport===!0||d.touchSupport===!1?d.touchSupport:a()}return{createDragger:function(a){return function(b){return b.pageX=b.originalEvent.changedTouches[0].pageX,b.pageY=b.originalEvent.changedTouches[0].pageY,d.disabled?!1:a==="move"&&!d.allowMove?!1:(X=!0,n(a,l(b)),b.stopPropagation(),b.preventDefault(),!1)}},newSelection:function(a){return a.pageX=a.originalEvent.changedTouches[0].pageX,a.pageY=a.originalEvent.changedTouches[0].pageY,v(a)},isSupported:a,support:b()}}(),ba=function(){function h(d){d=n(d),c=a=d[0],e=b=d[1]}function i(a){a=n(a),f=a[0]-c,g=a[1]-e,c=a[0],e=a[1]}function j(){return[f,g]}function k(d){var f=d[0],g=d[1];0>a+f&&(f-=f+a),0>b+g&&(g-=g+b),G<e+g&&(g+=G-(e+g)),F<c+f&&(f+=F-(c+f)),a+=f,c+=f,b+=g,e+=g}function l(a){var b=m();switch(a){case"ne":return[b.x2,b.y];case"nw":return[b.x,b.y];case"se":return[b.x2,b.y2];case"sw":return[b.x,b.y2]}}function m(){if(!d.aspectRatio
-)return p();var f=d.aspectRatio,g=d.minSize[0]/U,h=d.maxSize[0]/U,i=d.maxSize[1]/V,j=c-a,k=e-b,l=Math.abs(j),m=Math.abs(k),n=l/m,r,s,t,u;return h===0&&(h=F*10),i===0&&(i=G*10),n<f?(s=e,t=m*f,r=j<0?a-t:t+a,r<0?(r=0,u=Math.abs((r-a)/f),s=k<0?b-u:u+b):r>F&&(r=F,u=Math.abs((r-a)/f),s=k<0?b-u:u+b)):(r=c,u=l/f,s=k<0?b-u:b+u,s<0?(s=0,t=Math.abs((s-b)*f),r=j<0?a-t:t+a):s>G&&(s=G,t=Math.abs(s-b)*f,r=j<0?a-t:t+a)),r>a?(r-a<g?r=a+g:r-a>h&&(r=a+h),s>b?s=b+(r-a)/f:s=b-(r-a)/f):r<a&&(a-r<g?r=a-g:a-r>h&&(r=a-h),s>b?s=b+(a-r)/f:s=b-(a-r)/f),r<0?(a-=r,r=0):r>F&&(a-=r-F,r=F),s<0?(b-=s,s=0):s>G&&(b-=s-G,s=G),q(o(a,b,r,s))}function n(a){return a[0]<0&&(a[0]=0),a[1]<0&&(a[1]=0),a[0]>F&&(a[0]=F),a[1]>G&&(a[1]=G),[a[0],a[1]]}function o(a,b,c,d){var e=a,f=c,g=b,h=d;return c<a&&(e=c,f=a),d<b&&(g=d,h=b),[e,g,f,h]}function p(){var d=c-a,f=e-b,g;return Q&&Math.abs(d)>Q&&(c=d>0?a+Q:a-Q),R&&Math.abs(f)>R&&(e=f>0?b+R:b-R),T/V&&Math.abs(f)<T/V&&(e=f>0?b+T/V:b-T/V),S/U&&Math.abs(d)<S/U&&(c=d>0?a+S/U:a-S/U),a<0&&(c-=a,a-=a),b<0&&(e-=b,b-=b),c<0&&
-(a-=c,c-=c),e<0&&(b-=e,e-=e),c>F&&(g=c-F,a-=g,c-=g),e>G&&(g=e-G,b-=g,e-=g),a>F&&(g=a-G,e-=g,b-=g),b>G&&(g=b-G,e-=g,b-=g),q(o(a,b,c,e))}function q(a){return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]}}var a=0,b=0,c=0,e=0,f,g;return{flipCoords:o,setPressed:h,setCurrent:i,getOffset:j,moveOffset:k,getCorner:l,getFixed:m}}(),bb=function(){function f(a,b){e.left.css({height:h(b)}),e.right.css({height:h(b)})}function g(){return i(ba.getFixed())}function i(a){e.top.css({left:h(a.x),width:h(a.w),height:h(a.y)}),e.bottom.css({top:h(a.y2),left:h(a.x),width:h(a.w),height:h(G-a.y2)}),e.right.css({left:h(a.x2),width:h(F-a.x2)}),e.left.css({width:h(a.x)})}function j(){return a("<div />").css({position:"absolute",backgroundColor:d.shadeColor||d.bgColor}).appendTo(c)}function k(){b||(b=!0,c.insertBefore(E),g(),bc.setBgOpacity(1,0,1),I.hide(),l(d.shadeColor||d.bgColor,1),bc.isAwake()?n(d.bgOpacity,1):n(1,1))}function l(a,b){br(p(),a,b)}function m(){b&&(c.remove(),I.show(),b=!1,bc.isAwake()?bc.setBgOpacity(d.bgOpacity
-,1,1):(bc.setBgOpacity(1,1,1),bc.disableHandles()),br(H,0,1))}function n(a,e){b&&(d.bgFade&&!e?c.animate({opacity:1-a},{queue:!1,duration:d.fadeTime}):c.css({opacity:1-a}))}function o(){d.shade?k():m(),bc.isAwake()&&n(d.bgOpacity)}function p(){return c.children()}var b=!1,c=a("<div />").css({position:"absolute",zIndex:240,opacity:0}),e={top:j(),left:j().height(G),right:j().height(G),bottom:j()};return{update:g,updateRaw:i,getShades:p,setBgColor:l,enable:k,disable:m,resize:f,refresh:o,opacity:n}}(),bc=function(){function k(b){var c=a("<div />").css({position:"absolute",opacity:d.borderOpacity}).addClass(i(b));return J.append(c),c}function l(b,c){var d=a("<div />").mousedown(r(b)).css({cursor:b+"-resize",position:"absolute",zIndex:c}).addClass("ord-"+b);return _.support&&d.bind("touchstart.jcrop",_.createDragger(b)),K.append(d),d}function m(a){var b=d.handleSize;return l(a,c++).css({opacity:d.handleOpacity}).width(b).height(b).addClass(i("handle"))}function n(a){return l(a,c++).addClass("jcrop-dragbar")}function o
-(a){var b;for(b=0;b<a.length;b++)g[a[b]]=n(a[b])}function p(a){var b,c;for(c=0;c<a.length;c++){switch(a[c]){case"n":b="hline";break;case"s":b="hline bottom";break;case"e":b="vline right";break;case"w":b="vline"}e[a[c]]=k(b)}}function q(a){var b;for(b=0;b<a.length;b++)f[a[b]]=m(a[b])}function s(a,b){d.shade||I.css({top:h(-b),left:h(-a)}),L.css({top:h(b),left:h(a)})}function u(a,b){L.width(a).height(b)}function v(){var a=ba.getFixed();ba.setPressed([a.x,a.y]),ba.setCurrent([a.x2,a.y2]),w()}function w(a){if(b)return x(a)}function x(a){var c=ba.getFixed();u(c.w,c.h),s(c.x,c.y),d.shade&&bb.updateRaw(c),b||A(),a?d.onSelect.call(bt,t(c)):d.onChange.call(bt,t(c))}function y(a,c,e){if(!b&&!c)return;d.bgFade&&!e?E.animate({opacity:a},{queue:!1,duration:d.fadeTime}):E.css("opacity",a)}function A(){L.show(),d.shade?bb.opacity(P):y(P,!0),b=!0}function B(){F(),L.hide(),d.shade?bb.opacity(1):y(1),b=!1,d.onRelease.call(bt)}function C(){j&&K.show()}function D(){j=!0;if(d.allowResize)return K.show(),!0}function F(){j=!1,K.hide(
-)}function G(a){Y===a?F():D()}function H(){G(!1),v()}var b,c=370,e={},f={},g={},j=!1;d.dragEdges&&a.isArray(d.createDragbars)&&o(d.createDragbars),a.isArray(d.createHandles)&&q(d.createHandles),d.drawBorders&&a.isArray(d.createBorders)&&p(d.createBorders),a(document).bind("touchstart.jcrop-ios",function(b){a(b.currentTarget).hasClass("jcrop-tracker")&&b.stopPropagation()});var M=z().mousedown(r("move")).css({cursor:"move",position:"absolute",zIndex:360});return _.support&&M.bind("touchstart.jcrop",_.createDragger("move")),J.append(M),F(),{updateVisible:w,update:x,release:B,refresh:v,isAwake:function(){return b},setCursor:function(a){M.css("cursor",a)},enableHandles:D,enableOnly:function(){j=!0},showHandles:C,disableHandles:F,animMode:G,setBgOpacity:y,done:H}}(),bd=function(){function f(){N.css({zIndex:450}),_.support&&a(document).bind("touchmove.jcrop",k).bind("touchend.jcrop",m),e&&a(document).bind("mousemove.jcrop",h).bind("mouseup.jcrop",i)}function g(){N.css({zIndex:290}),a(document).unbind(".jcrop")}function h
-(a){return b(l(a)),!1}function i(a){return a.preventDefault(),a.stopPropagation(),X&&(X=!1,c(l(a)),bc.isAwake()&&d.onSelect.call(bt,t(ba.getFixed())),g(),b=function(){},c=function(){}),!1}function j(a,d){return X=!0,b=a,c=d,f(),!1}function k(a){return a.pageX=a.originalEvent.changedTouches[0].pageX,a.pageY=a.originalEvent.changedTouches[0].pageY,h(a)}function m(a){return a.pageX=a.originalEvent.changedTouches[0].pageX,a.pageY=a.originalEvent.changedTouches[0].pageY,i(a)}function n(a){N.css("cursor",a)}var b=function(){},c=function(){},e=d.trackDocument;return e||N.mousemove(h).mouseup(i).mouseout(i),E.before(N),{activateHandlers:j,setCursor:n}}(),be=function(){function e(){d.keySupport&&(b.show(),b.focus())}function f(a){b.hide()}function h(a,b,c){d.allowMove&&(ba.moveOffset([b,c]),bc.updateVisible(!0)),a.preventDefault(),a.stopPropagation()}function i(a){if(a.ctrlKey||a.metaKey)return!0;Z=a.shiftKey?!0:!1;var b=Z?10:1;switch(a.keyCode){case 37:h(a,-b,0);break;case 39:h(a,b,0);break;case 38:h(a,0,-b);break;case 40
-:h(a,0,b);break;case 27:d.allowSelect&&bc.release();break;case 9:return!0}return!1}var b=a('<input type="radio" />').css({position:"fixed",left:"-120px",width:"12px"}),c=a("<div />").css({position:"absolute",overflow:"hidden"}).append(b);return d.keySupport&&(b.keydown(i).blur(f),g||!d.fixedSupport?(b.css({position:"absolute",left:"-20px"}),c.append(b).insertBefore(E)):b.insertBefore(E)),{watchKeys:e}}();_.support&&N.bind("touchstart.jcrop",_.newSelection),K.hide(),bs(!0);var bt={setImage:bq,animateTo:bg,setSelect:bh,setOptions:bl,tellSelect:bj,tellScaled:bk,setClass:bf,disable:bm,enable:bn,cancel:bo,release:bc.release,destroy:bp,focus:be.watchKeys,getBounds:function(){return[F*U,G*V]},getWidgetSize:function(){return[F,G]},getScaleFactor:function(){return[U,V]},getOptions:function(){return d},ui:{holder:H,selection:L}};return a.browser.msie&&H.bind("selectstart",function(){return!1}),B.data("Jcrop",bt),bt},a.fn.Jcrop=function(b,c){var d;return this.each(function(){if(a(this).data("Jcrop")){if(b==="api")return a
-(this).data("Jcrop");a(this).data("Jcrop").setOptions(b)}else this.tagName=="IMG"?a.Jcrop.Loader(this,function(){a(this).css({display:"block",visibility:"hidden"}),d=a.Jcrop(this,b),a.isFunction(c)&&c.call(d)}):(a(this).css({display:"block",visibility:"hidden"}),d=a.Jcrop(this,b),a.isFunction(c)&&c.call(d))}),this},a.Jcrop.Loader=function(b,c,d){function g(){f.complete?(e.unbind(".jcloader"),a.isFunction(c)&&c.call(f)):window.setTimeout(g,50)}var e=a(b),f=e[0];e.bind("load.jcloader",g).bind("error.jcloader",function(b){e.unbind(".jcloader"),a.isFunction(d)&&d.call(f)}),f.complete&&a.isFunction(c)&&(e.unbind(".jcloader"),c.call(f))},a.Jcrop.defaults={allowSelect:!0,allowMove:!0,allowResize:!0,trackDocument:!0,baseClass:"jcrop",addClass:null,bgColor:"black",bgOpacity:.6,bgFade:!1,borderOpacity:.4,handleOpacity:.5,handleSize:7,aspectRatio:0,keySupport:!0,createHandles:["n","s","e","w","nw","ne","se","sw"],createDragbars:["n","s","e","w"],createBorders:["n","s","e","w"],drawBorders:!0,dragEdges:!0,fixedSupport:!0,
-touchSupport:null,shade:null,boxWidth:0,boxHeight:0,boundary:2,fadeTime:400,animationDelay:20,swingSpeed:3,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){},onDblClick:function(){},onRelease:function(){}}})(jQuery);
+(function(a){a.Jcrop=function(b,c){function i(a){return Math.round(a)+"px"}function j(a){return d.baseClass+"-"+a}function k(){return a.fx.step.hasOwnProperty("backgroundColor")}function l(b){var c=a(b).offset();return[c.left,c.top]}function m(a){return[a.pageX-e[0],a.pageY-e[1]]}function n(b){typeof b!="object"&&(b={}),d=a.extend(d,b),a.each(["onChange","onSelect","onRelease","onDblClick"],function(a,b){typeof d[b]!="function"&&(d[b]=function(){})})}function o(a,b,c){e=l(D),bc.setCursor(a==="move"?a:a+"-resize");if(a==="move")return bc.activateHandlers(q(b),v,c);var d=_.getFixed(),f=r(a),g=_.getCorner(r(f));_.setPressed(_.getCorner(f)),_.setCurrent(g),bc.activateHandlers(p(a,d),v,c)}function p(a,b){return function(c){if(!d.aspectRatio)switch(a){case"e":c[1]=b.y2;break;case"w":c[1]=b.y2;break;case"n":c[0]=b.x2;break;case"s":c[0]=b.x2}else switch(a){case"e":c[1]=b.y+1;break;case"w":c[1]=b.y+1;break;case"n":c[0]=b.x+1;break;case"s":c[0]=b.x+1}_.setCurrent(c),bb.update()}}function q(a){var b=a;return bd.watchKeys
+(),function(a){_.moveOffset([a[0]-b[0],a[1]-b[1]]),b=a,bb.update()}}function r(a){switch(a){case"n":return"sw";case"s":return"nw";case"e":return"nw";case"w":return"ne";case"ne":return"sw";case"nw":return"se";case"se":return"nw";case"sw":return"ne"}}function s(a){return function(b){return d.disabled?!1:a==="move"&&!d.allowMove?!1:(e=l(D),W=!0,o(a,m(b)),b.stopPropagation(),b.preventDefault(),!1)}}function t(a,b,c){var d=a.width(),e=a.height();d>b&&b>0&&(d=b,e=b/a.width()*a.height()),e>c&&c>0&&(e=c,d=c/a.height()*a.width()),T=a.width()/d,U=a.height()/e,a.width(d).height(e)}function u(a){return{x:a.x*T,y:a.y*U,x2:a.x2*T,y2:a.y2*U,w:a.w*T,h:a.h*U}}function v(a){var b=_.getFixed();b.w>d.minSelect[0]&&b.h>d.minSelect[1]?(bb.enableHandles(),bb.done()):bb.release(),bc.setCursor(d.allowSelect?"crosshair":"default")}function w(a){if(d.disabled)return!1;if(!d.allowSelect)return!1;W=!0,e=l(D),bb.disableHandles(),bc.setCursor("crosshair");var b=m(a);return _.setPressed(b),bb.update(),bc.activateHandlers(x,v,a.type.substring
+(0,5)==="touch"),bd.watchKeys(),a.stopPropagation(),a.preventDefault(),!1}function x(a){_.setCurrent(a),bb.update()}function y(){var b=a("<div></div>").addClass(j("tracker"));return g&&b.css({opacity:0,backgroundColor:"white"}),b}function be(a){G.removeClass().addClass(j("holder")).addClass(a)}function bf(a,b){function t(){window.setTimeout(u,l)}var c=a[0]/T,e=a[1]/U,f=a[2]/T,g=a[3]/U;if(X)return;var h=_.flipCoords(c,e,f,g),i=_.getFixed(),j=[i.x,i.y,i.x2,i.y2],k=j,l=d.animationDelay,m=h[0]-j[0],n=h[1]-j[1],o=h[2]-j[2],p=h[3]-j[3],q=0,r=d.swingSpeed;c=k[0],e=k[1],f=k[2],g=k[3],bb.animMode(!0);var s,u=function(){return function(){q+=(100-q)/r,k[0]=Math.round(c+q/100*m),k[1]=Math.round(e+q/100*n),k[2]=Math.round(f+q/100*o),k[3]=Math.round(g+q/100*p),q>=99.8&&(q=100),q<100?(bh(k),t()):(bb.done(),bb.animMode(!1),typeof b=="function"&&b.call(bs))}}();t()}function bg(a){bh([a[0]/T,a[1]/U,a[2]/T,a[3]/U]),d.onSelect.call(bs,u(_.getFixed())),bb.enableHandles()}function bh(a){_.setPressed([a[0],a[1]]),_.setCurrent([a[2],
+a[3]]),bb.update()}function bi(){return u(_.getFixed())}function bj(){return _.getFixed()}function bk(a){n(a),br()}function bl(){d.disabled=!0,bb.disableHandles(),bb.setCursor("default"),bc.setCursor("default")}function bm(){d.disabled=!1,br()}function bn(){bb.done(),bc.activateHandlers(null,null)}function bo(){G.remove(),A.show(),A.css("visibility","visible"),a(b).removeData("Jcrop")}function bp(a,b){bb.release(),bl();var c=new Image;c.onload=function(){var e=c.width,f=c.height,g=d.boxWidth,h=d.boxHeight;D.width(e).height(f),D.attr("src",a),H.attr("src",a),t(D,g,h),E=D.width(),F=D.height(),H.width(E).height(F),M.width(E+L*2).height(F+L*2),G.width(E).height(F),ba.resize(E,F),bm(),typeof b=="function"&&b.call(bs)},c.src=a}function bq(a,b,c){var e=b||d.bgColor;d.bgFade&&k()&&d.fadeTime&&!c?a.animate({backgroundColor:e},{queue:!1,duration:d.fadeTime}):a.css("backgroundColor",e)}function br(a){d.allowResize?a?bb.enableOnly():bb.enableHandles():bb.disableHandles(),bc.setCursor(d.allowSelect?"crosshair":"default"),bb
+.setCursor(d.allowMove?"move":"default"),d.hasOwnProperty("trueSize")&&(T=d.trueSize[0]/E,U=d.trueSize[1]/F),d.hasOwnProperty("setSelect")&&(bg(d.setSelect),bb.done(),delete d.setSelect),ba.refresh(),d.bgColor!=N&&(bq(d.shade?ba.getShades():G,d.shade?d.shadeColor||d.bgColor:d.bgColor),N=d.bgColor),O!=d.bgOpacity&&(O=d.bgOpacity,d.shade?ba.refresh():bb.setBgOpacity(O)),P=d.maxSize[0]||0,Q=d.maxSize[1]||0,R=d.minSize[0]||0,S=d.minSize[1]||0,d.hasOwnProperty("outerImage")&&(D.attr("src",d.outerImage),delete d.outerImage),bb.refresh()}var d=a.extend({},a.Jcrop.defaults),e,f=navigator.userAgent.toLowerCase(),g=/msie/.test(f),h=/msie [1-6]\./.test(f);typeof b!="object"&&(b=a(b)[0]),typeof c!="object"&&(c={}),n(c);var z={border:"none",visibility:"visible",margin:0,padding:0,position:"absolute",top:0,left:0},A=a(b),B=!0;if(b.tagName=="IMG"){if(A[0].width!=0&&A[0].height!=0)A.width(A[0].width),A.height(A[0].height);else{var C=new Image;C.src=A[0].src,A.width(C.width),A.height(C.height)}var D=A.clone().removeAttr("id").
+css(z).show();D.width(A.width()),D.height(A.height()),A.after(D).hide()}else D=A.css(z).show(),B=!1,d.shade===null&&(d.shade=!0);t(D,d.boxWidth,d.boxHeight);var E=D.width(),F=D.height(),G=a("<div />").width(E).height(F).addClass(j("holder")).css({position:"relative",backgroundColor:d.bgColor}).insertAfter(A).append(D);d.addClass&&G.addClass(d.addClass);var H=a("<div />"),I=a("<div />").width("100%").height("100%").css({zIndex:310,position:"absolute",overflow:"hidden"}),J=a("<div />").width("100%").height("100%").css("zIndex",320),K=a("<div />").css({position:"absolute",zIndex:600}).dblclick(function(){var a=_.getFixed();d.onDblClick.call(bs,a)}).insertBefore(D).append(I,J);B&&(H=a("<img />").attr("src",D.attr("src")).css(z).width(E).height(F),I.append(H)),h&&K.css({overflowY:"hidden"});var L=d.boundary,M=y().width(E+L*2).height(F+L*2).css({position:"absolute",top:i(-L),left:i(-L),zIndex:290}).mousedown(w),N=d.bgColor,O=d.bgOpacity,P,Q,R,S,T,U,V=!0,W,X,Y;e=l(D);var Z=function(){function a(){var a={},b=["touchstart"
+,"touchmove","touchend"],c=document.createElement("div"),d;try{for(d=0;d<b.length;d++){var e=b[d];e="on"+e;var f=e in c;f||(c.setAttribute(e,"return;"),f=typeof c[e]=="function"),a[b[d]]=f}return a.touchstart&&a.touchend&&a.touchmove}catch(g){return!1}}function b(){return d.touchSupport===!0||d.touchSupport===!1?d.touchSupport:a()}return{createDragger:function(a){return function(b){return d.disabled?!1:a==="move"&&!d.allowMove?!1:(e=l(D),W=!0,o(a,m(Z.cfilter(b)),!0),b.stopPropagation(),b.preventDefault(),!1)}},newSelection:function(a){return w(Z.cfilter(a))},cfilter:function(a){return a.pageX=a.originalEvent.changedTouches[0].pageX,a.pageY=a.originalEvent.changedTouches[0].pageY,a},isSupported:a,support:b()}}(),_=function(){function h(d){d=n(d),c=a=d[0],e=b=d[1]}function i(a){a=n(a),f=a[0]-c,g=a[1]-e,c=a[0],e=a[1]}function j(){return[f,g]}function k(d){var f=d[0],g=d[1];0>a+f&&(f-=f+a),0>b+g&&(g-=g+b),F<e+g&&(g+=F-(e+g)),E<c+f&&(f+=E-(c+f)),a+=f,c+=f,b+=g,e+=g}function l(a){var b=m();switch(a){case"ne":return[
+b.x2,b.y];case"nw":return[b.x,b.y];case"se":return[b.x2,b.y2];case"sw":return[b.x,b.y2]}}function m(){if(!d.aspectRatio)return p();var f=d.aspectRatio,g=d.minSize[0]/T,h=d.maxSize[0]/T,i=d.maxSize[1]/U,j=c-a,k=e-b,l=Math.abs(j),m=Math.abs(k),n=l/m,r,s,t,u;return h===0&&(h=E*10),i===0&&(i=F*10),n<f?(s=e,t=m*f,r=j<0?a-t:t+a,r<0?(r=0,u=Math.abs((r-a)/f),s=k<0?b-u:u+b):r>E&&(r=E,u=Math.abs((r-a)/f),s=k<0?b-u:u+b)):(r=c,u=l/f,s=k<0?b-u:b+u,s<0?(s=0,t=Math.abs((s-b)*f),r=j<0?a-t:t+a):s>F&&(s=F,t=Math.abs(s-b)*f,r=j<0?a-t:t+a)),r>a?(r-a<g?r=a+g:r-a>h&&(r=a+h),s>b?s=b+(r-a)/f:s=b-(r-a)/f):r<a&&(a-r<g?r=a-g:a-r>h&&(r=a-h),s>b?s=b+(a-r)/f:s=b-(a-r)/f),r<0?(a-=r,r=0):r>E&&(a-=r-E,r=E),s<0?(b-=s,s=0):s>F&&(b-=s-F,s=F),q(o(a,b,r,s))}function n(a){return a[0]<0&&(a[0]=0),a[1]<0&&(a[1]=0),a[0]>E&&(a[0]=E),a[1]>F&&(a[1]=F),[Math.round(a[0]),Math.round(a[1])]}function o(a,b,c,d){var e=a,f=c,g=b,h=d;return c<a&&(e=c,f=a),d<b&&(g=d,h=b),[e,g,f,h]}function p(){var d=c-a,f=e-b,g;return P&&Math.abs(d)>P&&(c=d>0?a+P:a-P),Q&&Math.abs
+(f)>Q&&(e=f>0?b+Q:b-Q),S/U&&Math.abs(f)<S/U&&(e=f>0?b+S/U:b-S/U),R/T&&Math.abs(d)<R/T&&(c=d>0?a+R/T:a-R/T),a<0&&(c-=a,a-=a),b<0&&(e-=b,b-=b),c<0&&(a-=c,c-=c),e<0&&(b-=e,e-=e),c>E&&(g=c-E,a-=g,c-=g),e>F&&(g=e-F,b-=g,e-=g),a>E&&(g=a-F,e-=g,b-=g),b>F&&(g=b-F,e-=g,b-=g),q(o(a,b,c,e))}function q(a){return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]}}var a=0,b=0,c=0,e=0,f,g;return{flipCoords:o,setPressed:h,setCurrent:i,getOffset:j,moveOffset:k,getCorner:l,getFixed:m}}(),ba=function(){function f(a,b){e.left.css({height:i(b)}),e.right.css({height:i(b)})}function g(){return h(_.getFixed())}function h(a){e.top.css({left:i(a.x),width:i(a.w),height:i(a.y)}),e.bottom.css({top:i(a.y2),left:i(a.x),width:i(a.w),height:i(F-a.y2)}),e.right.css({left:i(a.x2),width:i(E-a.x2)}),e.left.css({width:i(a.x)})}function j(){return a("<div />").css({position:"absolute",backgroundColor:d.shadeColor||d.bgColor}).appendTo(c)}function k(){b||(b=!0,c.insertBefore(D),g(),bb.setBgOpacity(1,0,1),H.hide(),l(d.shadeColor||d.bgColor,1),bb.
+isAwake()?n(d.bgOpacity,1):n(1,1))}function l(a,b){bq(p(),a,b)}function m(){b&&(c.remove(),H.show(),b=!1,bb.isAwake()?bb.setBgOpacity(d.bgOpacity,1,1):(bb.setBgOpacity(1,1,1),bb.disableHandles()),bq(G,0,1))}function n(a,e){b&&(d.bgFade&&!e?c.animate({opacity:1-a},{queue:!1,duration:d.fadeTime}):c.css({opacity:1-a}))}function o(){d.shade?k():m(),bb.isAwake()&&n(d.bgOpacity)}function p(){return c.children()}var b=!1,c=a("<div />").css({position:"absolute",zIndex:240,opacity:0}),e={top:j(),left:j().height(F),right:j().height(F),bottom:j()};return{update:g,updateRaw:h,getShades:p,setBgColor:l,enable:k,disable:m,resize:f,refresh:o,opacity:n}}(),bb=function(){function k(b){var c=a("<div />").css({position:"absolute",opacity:d.borderOpacity}).addClass(j(b));return I.append(c),c}function l(b,c){var d=a("<div />").mousedown(s(b)).css({cursor:b+"-resize",position:"absolute",zIndex:c}).addClass("ord-"+b);return Z.support&&d.bind("touchstart.jcrop",Z.createDragger(b)),J.append(d),d}function m(a){var b=d.handleSize,e=l(a,c++
+).css({opacity:d.handleOpacity}).addClass(j("handle"));return b&&e.width(b).height(b),e}function n(a){return l(a,c++).addClass("jcrop-dragbar")}function o(a){var b;for(b=0;b<a.length;b++)g[a[b]]=n(a[b])}function p(a){var b,c;for(c=0;c<a.length;c++){switch(a[c]){case"n":b="hline";break;case"s":b="hline bottom";break;case"e":b="vline right";break;case"w":b="vline"}e[a[c]]=k(b)}}function q(a){var b;for(b=0;b<a.length;b++)f[a[b]]=m(a[b])}function r(a,b){d.shade||H.css({top:i(-b),left:i(-a)}),K.css({top:i(b),left:i(a)})}function t(a,b){K.width(Math.round(a)).height(Math.round(b))}function v(){var a=_.getFixed();_.setPressed([a.x,a.y]),_.setCurrent([a.x2,a.y2]),w()}function w(a){if(b)return x(a)}function x(a){var c=_.getFixed();t(c.w,c.h),r(c.x,c.y),d.shade&&ba.updateRaw(c),b||A(),a?d.onSelect.call(bs,u(c)):d.onChange.call(bs,u(c))}function z(a,c,e){if(!b&&!c)return;d.bgFade&&!e?D.animate({opacity:a},{queue:!1,duration:d.fadeTime}):D.css("opacity",a)}function A(){K.show(),d.shade?ba.opacity(O):z(O,!0),b=!0}function B
+(){F(),K.hide(),d.shade?ba.opacity(1):z(1),b=!1,d.onRelease.call(bs)}function C(){h&&J.show()}function E(){h=!0;if(d.allowResize)return J.show(),!0}function F(){h=!1,J.hide()}function G(a){a?(X=!0,F()):(X=!1,E())}function L(){G(!1),v()}var b,c=370,e={},f={},g={},h=!1;d.dragEdges&&a.isArray(d.createDragbars)&&o(d.createDragbars),a.isArray(d.createHandles)&&q(d.createHandles),d.drawBorders&&a.isArray(d.createBorders)&&p(d.createBorders),a(document).bind("touchstart.jcrop-ios",function(b){a(b.currentTarget).hasClass("jcrop-tracker")&&b.stopPropagation()});var M=y().mousedown(s("move")).css({cursor:"move",position:"absolute",zIndex:360});return Z.support&&M.bind("touchstart.jcrop",Z.createDragger("move")),I.append(M),F(),{updateVisible:w,update:x,release:B,refresh:v,isAwake:function(){return b},setCursor:function(a){M.css("cursor",a)},enableHandles:E,enableOnly:function(){h=!0},showHandles:C,disableHandles:F,animMode:G,setBgOpacity:z,done:L}}(),bc=function(){function f(b){M.css({zIndex:450}),b?a(document).bind("touchmove.jcrop"
+,k).bind("touchend.jcrop",l):e&&a(document).bind("mousemove.jcrop",h).bind("mouseup.jcrop",i)}function g(){M.css({zIndex:290}),a(document).unbind(".jcrop")}function h(a){return b(m(a)),!1}function i(a){return a.preventDefault(),a.stopPropagation(),W&&(W=!1,c(m(a)),bb.isAwake()&&d.onSelect.call(bs,u(_.getFixed())),g(),b=function(){},c=function(){}),!1}function j(a,d,e){return W=!0,b=a,c=d,f(e),!1}function k(a){return b(m(Z.cfilter(a))),!1}function l(a){return i(Z.cfilter(a))}function n(a){M.css("cursor",a)}var b=function(){},c=function(){},e=d.trackDocument;return e||M.mousemove(h).mouseup(i).mouseout(i),D.before(M),{activateHandlers:j,setCursor:n}}(),bd=function(){function e(){d.keySupport&&(b.show(),b.focus())}function f(a){b.hide()}function g(a,b,c){d.allowMove&&(_.moveOffset([b,c]),bb.updateVisible(!0)),a.preventDefault(),a.stopPropagation()}function i(a){if(a.ctrlKey||a.metaKey)return!0;Y=a.shiftKey?!0:!1;var b=Y?10:1;switch(a.keyCode){case 37:g(a,-b,0);break;case 39:g(a,b,0);break;case 38:g(a,0,-b);break;
+case 40:g(a,0,b);break;case 27:d.allowSelect&&bb.release();break;case 9:return!0}return!1}var b=a('<input type="radio" />').css({position:"fixed",left:"-120px",width:"12px"}).addClass("jcrop-keymgr"),c=a("<div />").css({position:"absolute",overflow:"hidden"}).append(b);return d.keySupport&&(b.keydown(i).blur(f),h||!d.fixedSupport?(b.css({position:"absolute",left:"-20px"}),c.append(b).insertBefore(D)):b.insertBefore(D)),{watchKeys:e}}();Z.support&&M.bind("touchstart.jcrop",Z.newSelection),J.hide(),br(!0);var bs={setImage:bp,animateTo:bf,setSelect:bg,setOptions:bk,tellSelect:bi,tellScaled:bj,setClass:be,disable:bl,enable:bm,cancel:bn,release:bb.release,destroy:bo,focus:bd.watchKeys,getBounds:function(){return[E*T,F*U]},getWidgetSize:function(){return[E,F]},getScaleFactor:function(){return[T,U]},getOptions:function(){return d},ui:{holder:G,selection:K}};return g&&G.bind("selectstart",function(){return!1}),A.data("Jcrop",bs),bs},a.fn.Jcrop=function(b,c){var d;return this.each(function(){if(a(this).data("Jcrop")){if(
+b==="api")return a(this).data("Jcrop");a(this).data("Jcrop").setOptions(b)}else this.tagName=="IMG"?a.Jcrop.Loader(this,function(){a(this).css({display:"block",visibility:"hidden"}),d=a.Jcrop(this,b),a.isFunction(c)&&c.call(d)}):(a(this).css({display:"block",visibility:"hidden"}),d=a.Jcrop(this,b),a.isFunction(c)&&c.call(d))}),this},a.Jcrop.Loader=function(b,c,d){function g(){f.complete?(e.unbind(".jcloader"),a.isFunction(c)&&c.call(f)):window.setTimeout(g,50)}var e=a(b),f=e[0];e.bind("load.jcloader",g).bind("error.jcloader",function(b){e.unbind(".jcloader"),a.isFunction(d)&&d.call(f)}),f.complete&&a.isFunction(c)&&(e.unbind(".jcloader"),c.call(f))},a.Jcrop.defaults={allowSelect:!0,allowMove:!0,allowResize:!0,trackDocument:!0,baseClass:"jcrop",addClass:null,bgColor:"black",bgOpacity:.6,bgFade:!1,borderOpacity:.4,handleOpacity:.5,handleSize:null,aspectRatio:0,keySupport:!0,createHandles:["n","s","e","w","nw","ne","se","sw"],createDragbars:["n","s","e","w"],createBorders:["n","s","e","w"],drawBorders:!0,dragEdges
+:!0,fixedSupport:!0,touchSupport:null,shade:null,boxWidth:0,boxHeight:0,boundary:2,fadeTime:400,animationDelay:20,swingSpeed:3,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){},onDblClick:function(){},onRelease:function(){}}})(jQuery);

data/vendor/assets/javascripts/jquery_plugins/{jquery.dialogextend.1_0_1.js → jquery.dialogextend.js}

@@ -1,9 +1,7 @@
 /*!
- * jQuery DialogExtend 1.0.1
+ * jQuery DialogExtend 1.1.0
  *
- * tvd: fixes for jQuery UI 1.9 and adjusts sizes.
- *
- * Copyright (c) 2010 Shum Ting Hin
+ * Copyright (c) 2013 Shum Ting Hin, Thomas von Deyen
  *
  * Licensed under MIT
  *   http:// www.opensource.org/licenses/mit-license.php
@@ -12,8 +10,8 @@
  *   http:// code.google.com/p/jquery-dialogextend/
  *
  * Depends:
- *   jQuery 1.7.2
- *   jQuery UI Dialog 1.8.22
+ *   jQuery 1.9.1
+ *   jQuery UI Dialog 1.10.1
  *
  */
 (function($){
@@ -137,8 +135,7 @@
 				// fix dialog from scrolling
 				.dialog("widget")
 					.css({
-						// ie6 does not support {position:fixed} ===> simply use {absolute}
-						"position" : ( $.browser.msie && parseInt($.browser.version) <= 6 ) ? "absolute" : "fixed"
+						"position" : "fixed"
 					})
 				.find(".ui-dialog-content")
 				// show content
@@ -181,8 +178,7 @@
 				var fixedContainer = $('<div id="dialog-extend-fixed-container"></div>').appendTo("body");
 			}
 			$(fixedContainer).css({
-				// ie6 does not support {position:fixed} ===> simply use {absolute}
-				"position" : ( $.browser.mise && parseInt($.browser.version) <= 6 ) ? "absolute" : "fixed",
+				"position" : "fixed",
 				"bottom" : 1,
 				"left" : 1,
 				"z-index" : 9999
@@ -288,16 +284,28 @@
 				.end();
 			// append other buttons to button-pane
 			$(buttonPane)
-				.append('<a class="ui-dialog-titlebar-maximize ui-corner-all" href="#"><span class="ui-icon '+settings.icons.maximize+'">maximize</span></a>')
-				.append('<a class="ui-dialog-titlebar-restore ui-corner-all" href="#"><span class="ui-icon '+settings.icons.restore+'">restore</span></a>')
-				.append('<a class="ui-dialog-titlebar-minimize ui-corner-all" href="#"><span class="ui-icon '+settings.icons.minimize+'">minimize</span></a>')
+				.append('<button class="ui-dialog-titlebar-maximize ui-corner-all ui-state-default"><span class="ui-icon '+settings.icons.maximize+'">maximize</span></button>')
+				.append('<button class="ui-dialog-titlebar-restore ui-corner-all ui-state-default"><span class="ui-icon '+settings.icons.restore+'">restore</span></button>')
+				.append('<button class="ui-dialog-titlebar-minimize ui-corner-all ui-state-default"><span class="ui-icon '+settings.icons.minimize+'">minimize</span></button>')
 				// add effect to buttons
 				.find(".ui-dialog-titlebar-maximize,.ui-dialog-titlebar-minimize,.ui-dialog-titlebar-restore")
 					.attr("role", "button")
-					.mouseover(function(){ $(this).addClass("ui-state-hover"); })
-					.mouseout(function(){ $(this).removeClass("ui-state-hover"); })
-					.focus(function(){ $(this).addClass("ui-state-focus"); })
-					.blur(function(){ $(this).removeClass("ui-state-focus"); })
+					.mouseover(function(){
+						$(this).addClass("ui-state-hover");
+						$(this).removeClass("ui-state-default");
+					})
+					.mouseout(function(){
+						$(this).removeClass("ui-state-hover");
+						$(this).addClass("ui-state-default");
+					})
+					.focus(function(){
+						$(this).addClass("ui-state-focus");
+						$(this).removeClass("ui-state-default");
+					})
+					.blur(function(){
+						$(this).removeClass("ui-state-focus");
+						$(this).addClass("ui-state-default");
+					})
 				.end()
 				// default show buttons
 				// set button positions

data/vendor/assets/javascripts/jquery_plugins/jquery.scrollTo.min.js

@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) 2007-2013 Ariel Flesler - aflesler<a>gmail<d>com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * @author Ariel Flesler
+ * @version 1.4.5b
+ */
+;(function($){var h=$.scrollTo=function(a,b,c){$(window).scrollTo(a,b,c)};h.defaults={axis:'xy',duration:parseFloat($.fn.jquery)>=1.3?0:1,limit:true};h.window=function(a){return $(window)._scrollable()};$.fn._scrollable=function(){return this.map(function(){var a=this,isWin=!a.nodeName||$.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!isWin)return a;var b=(a.contentWindow||a).document||a.ownerDocument||a;return/webkit/i.test(navigator.userAgent)||b.compatMode=='BackCompat'?b.body:b.documentElement})};$.fn.scrollTo=function(e,f,g){if(typeof f=='object'){g=f;f=0}if(typeof g=='function')g={onAfter:g};if(e=='max')e=9e9;g=$.extend({},h.defaults,g);f=f||g.duration;g.queue=g.queue&&g.axis.length>1;if(g.queue)f/=2;g.offset=both(g.offset);g.over=both(g.over);return this._scrollable().each(function(){if(e==null)return;var d=this,$elem=$(d),targ=e,toff,attr={},win=$elem.is('html,body');switch(typeof targ){case'number':case'string':if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(targ)){targ=both(targ);break}targ=$(targ,this);if(!targ.length)return;case'object':if(targ.is||targ.style)toff=(targ=$(targ)).offset()}$.each(g.axis.split(''),function(i,a){var b=a=='x'?'Left':'Top',pos=b.toLowerCase(),key='scroll'+b,old=d[key],max=h.max(d,a);if(toff){attr[key]=toff[pos]+(win?0:old-$elem.offset()[pos]);if(g.margin){attr[key]-=parseInt(targ.css('margin'+b))||0;attr[key]-=parseInt(targ.css('border'+b+'Width'))||0}attr[key]+=g.offset[pos]||0;if(g.over[pos])attr[key]+=targ[a=='x'?'width':'height']()*g.over[pos]}else{var c=targ[pos];attr[key]=c.slice&&c.slice(-1)=='%'?parseFloat(c)/100*max:c}if(g.limit&&/^\d+$/.test(attr[key]))attr[key]=attr[key]<=0?0:Math.min(attr[key],max);if(!i&&g.queue){if(old!=attr[key])animate(g.onAfterFirst);delete attr[key]}});animate(g.onAfter);function animate(a){$elem.animate(attr,f,g.easing,a&&function(){a.call(this,e,g)})}}).end()};h.max=function(a,b){var c=b=='x'?'Width':'Height',scroll='scroll'+c;if(!$(a).is('html,body'))return a[scroll]-$(a)[c.toLowerCase()]();var d='client'+c,html=a.ownerDocument.documentElement,body=a.ownerDocument.body;return Math.max(html[scroll],body[scroll])-Math.min(html[d],body[d])};function both(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);

data/vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js

@@ -1,7 +1,7 @@
 /*
- * UI Tabs Paging extension - v1.2 (for jQuery 1.8.2 and jQuery UI 1.9.0)
+ * UI Tabs Paging extension - v1.2.2 (for jQuery 1.9.0 and jQuery UI 1.9.0)
  *
- * Copyright (c) 2012, http://seyfertdesign.com/jquery/ui-tabs-paging.html
+ * Copyright (c) 2013, http://seyfertdesign.com/jquery/ui-tabs-paging.html
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -97,7 +97,7 @@ $.extend($.ui.tabs.prototype, {
 
       // fix padding issues with buttons
       // TODO determine a better way to handle this
-      allTabsWidth += maxDiff + ($.browser.msie?4:0) + 9;
+      allTabsWidth += maxDiff + 9;
 
       // if the width of all tables is greater than the container's width, calculate the pages
       if (allTabsWidth > containerWidth) {
@@ -232,7 +232,7 @@ $.extend($.ui.tabs.prototype, {
 
     // ------------- OVERRIDDEN PUBLIC FUNCTIONS -------------
     self.option = function(optionName, value) {
-      uiTabsFuncs.option.apply(this, [optionName, value]);
+      var retVal = uiTabsFuncs.option.apply(this, [optionName, value]);
 
       // if "followOnActive" is true, then move page when selection changes
       if (optionName == "active")
@@ -240,7 +240,7 @@ $.extend($.ui.tabs.prototype, {
         // if paging is not initialized or it is not configured to
         // change pages when a new tab is active, then do nothing
         if (!initialized || !opts.followOnActive)
-          return this;
+          return retVal;
 
         // find the new page based on index of the active tab
         for (var i in pages) {
@@ -265,7 +265,7 @@ $.extend($.ui.tabs.prototype, {
         }
       }
 
-      return this;
+      return retVal;
     }
 
     self.refresh = function() {
@@ -344,4 +344,4 @@ $.extend($.ui.tabs.prototype, {
 });
 
 
-})(jQuery);
+})(jQuery);

data/vendor/assets/javascripts/keymage.min.js

@@ -0,0 +1,6 @@
+// keymage.js - Javascript keyboard event handling
+// http://github.com/piranha/keymage
+//
+// (c) 2012 Alexander Solovyov
+// under terms of ISC License
+(function(a,b){a(function(){function m(a){var b=a.split("-"),d=b[b.length-1],e={code:f[d]};if(!e.code)throw'Unknown key "'+d+'" in keystring "'+a+'"';var g;for(var h=0;h<b.length-1;h++){d=b[h],g=c[d];if(!g)throw'Unknown modifier "'+d+'" in keystring "'+a+'"';e[g]=!0}return e}function n(a){var b="";for(var c=0;c<d.length;c++)a[d[c]]&&(b+=d[c]+"-");return b+=h[a.code],b}function o(a){var b=[],c=a.split(" ");for(var d=0;d<c.length;d++){var e=m(c[d]);e=n(e),b.push(e)}return b.original=a,b}function p(b){var c={code:b.keyCode};for(var d=0;d<a.length;d++){var e=a[d];b[e]&&(c[e.slice(0,e.length-3)]=!0)}return n(c)}function q(a,b){for(var c=0;c<b.length;c++){var d=b[c];d&&(a=a[d]);if(!a)break}return a}function s(a){if(~e.indexOf(a.keyCode))return;var b=r.slice();b.push(p(a));var c=k.split("."),d,f,g;for(var h=c.length;h>=0;h--){f=q(l,c.slice(0,h));if(!f)continue;d=!0;for(var i=0;i<b.length;i++){g=b[i];if(!f[g]){d=!1;break}f=f[g]}if(d)break}var j=c.slice(0,h).join("."),m=f.preventDefault;if(d&&!f.handlers){r=b,m&&a.preventDefault();return}if(d)for(h=0;h<f.handlers.length;h++){var n=f.handlers[h],o=n._keymage,s=n.call(o.context,a,{shortcut:o.original,scope:k,definitionScope:j});(s===!1||m)&&a.preventDefault()}r=[]}function t(a,b,c){var d=a.split("."),e=l;d=d.concat(b);for(var f=0,g=d.length;f<g;f++){var h=d[f];if(!h)continue;e=e[h]||(e[h]={}),c._keymage.preventDefault&&(e.preventDefault=!0);if(f===g-1){var i=e.handlers||(e.handlers=[]);i.push(c)}}}function u(a,c,d,e){if(c===b&&d===b)return function(b,c){return u(a,b,c)};typeof c=="function"&&(e=d,d=c,c=a,a="");var f=o(c);d._keymage=e||{},d._keymage.original=c,t(a,f,d)}var a=["shiftKey","ctrlKey","altKey","metaKey"],c={shift:"shift",ctrl:"ctrl",control:"ctrl",alt:"alt",option:"alt",win:"meta",cmd:"meta","super":"meta",meta:"meta",defmod:~navigator.userAgent.indexOf("Mac OS X")?"meta":"ctrl"},d=["shift","ctrl","alt","meta"],e=[16,17,18,91],f={backspace:8,tab:9,enter:13,"return":13,pause:19,caps:20,capslock:20,escape:27,esc:27,space:32,pgup:33,pageup:33,pgdown:34,pagedown:34,end:35,home:36,ins:45,insert:45,del:46,"delete":46,left:37,up:38,right:39,down:40,"*":106,"+":107,plus:107,"-":109,minus:109,";":186,"=":187,",":188,".":190,"/":191,"`":192,"[":219,"\\":220,"]":221,"'":222},g;for(g=0;g<10;g++)f["num-"+g]=g+95;for(g=0;g<10;g++)f[g.toString()]=g+48;for(g=1;g<25;g++)f["f"+g]=g+111;for(g=65;g<91;g++)f[String.fromCharCode(g).toLowerCase()]=g;var h={};for(var i in f){var j=f[i];if(!h[j]||h[j].length<i.length)h[j]=i}var k="",l={},r=[];return u.parse=m,u.stringify=n,u.bindings=l,u.setScope=function(a){k=a?a:""},u.getScope=function(){return k},u.pushScope=function(a){return k=(k?k+".":"")+a,k},u.popScope=function(a){var b;return a?(k=k.replace(new RegExp("(^|\\.)"+a+"(\\.|$).*"),""),a):(b=k.lastIndexOf("."),a=k.slice(b+1),k=k.slice(0,b),a)},window.addEventListener("keydown",s,!1),u})})(typeof define!="undefined"?define:function(a){window.keymage=a()});

data/vendor/assets/javascripts/spin.min.js

@@ -0,0 +1 @@
+!function(t,e,i){var o=["webkit","Moz","ms","O"],r={},n;function a(t,i){var o=e.createElement(t||"div"),r;for(r in i)o[r]=i[r];return o}function s(t){for(var e=1,i=arguments.length;e<i;e++)t.appendChild(arguments[e]);return t}var f=function(){var t=a("style",{type:"text/css"});s(e.getElementsByTagName("head")[0],t);return t.sheet||t.styleSheet}();function l(t,e,i,o){var a=["opacity",e,~~(t*100),i,o].join("-"),s=.01+i/o*100,l=Math.max(1-(1-t)/e*(100-s),t),p=n.substring(0,n.indexOf("Animation")).toLowerCase(),u=p&&"-"+p+"-"||"";if(!r[a]){f.insertRule("@"+u+"keyframes "+a+"{"+"0%{opacity:"+l+"}"+s+"%{opacity:"+t+"}"+(s+.01)+"%{opacity:1}"+(s+e)%100+"%{opacity:"+t+"}"+"100%{opacity:"+l+"}"+"}",f.cssRules.length);r[a]=1}return a}function p(t,e){var r=t.style,n,a;if(r[e]!==i)return e;e=e.charAt(0).toUpperCase()+e.slice(1);for(a=0;a<o.length;a++){n=o[a]+e;if(r[n]!==i)return n}}function u(t,e){for(var i in e)t.style[p(t,i)||i]=e[i];return t}function c(t){for(var e=1;e<arguments.length;e++){var o=arguments[e];for(var r in o)if(t[r]===i)t[r]=o[r]}return t}function d(t){var e={x:t.offsetLeft,y:t.offsetTop};while(t=t.offsetParent)e.x+=t.offsetLeft,e.y+=t.offsetTop;return e}var h={lines:12,length:7,width:5,radius:10,rotate:0,corners:1,color:"#000",speed:1,trail:100,opacity:1/4,fps:20,zIndex:2e9,className:"spinner",top:"auto",left:"auto",position:"relative"};function m(t){if(!this.spin)return new m(t);this.opts=c(t||{},m.defaults,h)}m.defaults={};c(m.prototype,{spin:function(t){this.stop();var e=this,i=e.opts,o=e.el=u(a(0,{className:i.className}),{position:i.position,width:0,zIndex:i.zIndex}),r=i.radius+i.length+i.width,s,f;if(t){t.insertBefore(o,t.firstChild||null);f=d(t);s=d(o);u(o,{left:(i.left=="auto"?f.x-s.x+(t.offsetWidth>>1):parseInt(i.left,10)+r)+"px",top:(i.top=="auto"?f.y-s.y+(t.offsetHeight>>1):parseInt(i.top,10)+r)+"px"})}o.setAttribute("aria-role","progressbar");e.lines(o,e.opts);if(!n){var l=0,p=i.fps,c=p/i.speed,h=(1-i.opacity)/(c*i.trail/100),m=c/i.lines;(function y(){l++;for(var t=i.lines;t;t--){var r=Math.max(1-(l+t*m)%c*h,i.opacity);e.opacity(o,i.lines-t,r,i)}e.timeout=e.el&&setTimeout(y,~~(1e3/p))})()}return e},stop:function(){var t=this.el;if(t){clearTimeout(this.timeout);if(t.parentNode)t.parentNode.removeChild(t);this.el=i}return this},lines:function(t,e){var i=0,o;function r(t,o){return u(a(),{position:"absolute",width:e.length+e.width+"px",height:e.width+"px",background:t,boxShadow:o,transformOrigin:"left",transform:"rotate("+~~(360/e.lines*i+e.rotate)+"deg) translate("+e.radius+"px"+",0)",borderRadius:(e.corners*e.width>>1)+"px"})}for(;i<e.lines;i++){o=u(a(),{position:"absolute",top:1+~(e.width/2)+"px",transform:e.hwaccel?"translate3d(0,0,0)":"",opacity:e.opacity,animation:n&&l(e.opacity,e.trail,i,e.lines)+" "+1/e.speed+"s linear infinite"});if(e.shadow)s(o,u(r("#000","0 0 4px "+"#000"),{top:2+"px"}));s(t,s(o,r(e.color,"0 0 1px rgba(0,0,0,.1)")))}return t},opacity:function(t,e,i){if(e<t.childNodes.length)t.childNodes[e].style.opacity=i}});(function(){function t(t,e){return a("<"+t+' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">',e)}var e=u(a("group"),{behavior:"url(#default#VML)"});if(!p(e,"transform")&&e.adj){f.addRule(".spin-vml","behavior:url(#default#VML)");m.prototype.lines=function(e,i){var o=i.length+i.width,r=2*o;function n(){return u(t("group",{coordsize:r+" "+r,coordorigin:-o+" "+-o}),{width:r,height:r})}var a=-(i.width+i.length)*2+"px",f=u(n(),{position:"absolute",top:a,left:a}),l;function p(e,r,a){s(f,s(u(n(),{rotation:360/i.lines*e+"deg",left:~~r}),s(u(t("roundrect",{arcsize:i.corners}),{width:o,height:i.width,left:i.radius,top:-i.width>>1,filter:a}),t("fill",{color:i.color,opacity:i.opacity}),t("stroke",{opacity:0}))))}if(i.shadow)for(l=1;l<=i.lines;l++)p(l,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(l=1;l<=i.lines;l++)p(l);return s(e,f)};m.prototype.opacity=function(t,e,i,o){var r=t.firstChild;o=o.shadow&&o.lines||0;if(r&&e+o<r.childNodes.length){r=r.childNodes[e+o];r=r&&r.firstChild;r=r&&r.firstChild;if(r)r.opacity=i}}}else n=p(e,"animation")})();if(typeof define=="function"&&define.amd)define(function(){return m});else t.Spinner=m}(window,document);

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 2.5.3.1
-  prerelease: 
+  version: 2.6.0.rc5
+  prerelease: 6
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -22,7 +22,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.12
+        version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -100,17 +100,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.7
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: acts_as_ferret
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +166,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.9
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: magiclabs-userstamp
   requirement: !ruby/object:Gem::Requirement
@@ -214,7 +214,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.3
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -239,22 +239,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.1
-- !ruby/object:Gem::Dependency
-  name: attachment_magic
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -335,6 +319,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.10
+- !ruby/object:Gem::Dependency
+  name: tvdeyen-handles_sortable_columns
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: bumpy
   requirement: !ruby/object:Gem::Requirement
@@ -356,17 +356,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -383,22 +383,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.12.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.12.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -465,45 +449,48 @@ files:
 - README.md
 - Rakefile
 - alchemy_cms.gemspec
-- app/assets/images/alchemy/ajax_loader.gif
+- app/assets/fonts/alchemy-icons.eot
+- app/assets/fonts/alchemy-icons.svg
+- app/assets/fonts/alchemy-icons.ttf
+- app/assets/fonts/alchemy-icons.woff
 - app/assets/images/alchemy/alchemy-logo.png
-- app/assets/images/alchemy/gui/toggle.png
 - app/assets/images/alchemy/icons.png
-- app/assets/images/alchemy/image_loader.gif
 - app/assets/images/alchemy/lupe.cur
 - app/assets/images/alchemy/placeholder.png
-- app/assets/images/alchemy/shading.png
 - app/assets/images/alchemy/swfupload/browse_button.png
-- app/assets/images/alchemy/tabs.gif
 - app/assets/images/alchemy/ui-icons_666666_256x240.png
 - app/assets/images/sassy-ie-overlay.png
-- app/assets/javascripts/alchemy/alchemy.base.js
+- app/assets/javascripts/alchemy/alchemy.base.js.coffee
 - app/assets/javascripts/alchemy/alchemy.browser.js.coffee
 - app/assets/javascripts/alchemy/alchemy.buttons.js.coffee
 - app/assets/javascripts/alchemy/alchemy.custom.js
-- app/assets/javascripts/alchemy/alchemy.datepicker.js
+- app/assets/javascripts/alchemy/alchemy.datepicker.js.coffee
 - app/assets/javascripts/alchemy/alchemy.dirty.js
 - app/assets/javascripts/alchemy/alchemy.dragndrop.js
-- app/assets/javascripts/alchemy/alchemy.element_editor_selector.js
+- app/assets/javascripts/alchemy/alchemy.element_editors.js.coffee
 - app/assets/javascripts/alchemy/alchemy.elements_window.js.coffee
 - app/assets/javascripts/alchemy/alchemy.file_progress.js
-- app/assets/javascripts/alchemy/alchemy.growler.js
+- app/assets/javascripts/alchemy/alchemy.growler.js.coffee
 - app/assets/javascripts/alchemy/alchemy.gui.js.coffee
+- app/assets/javascripts/alchemy/alchemy.hotkeys.js.coffee
 - app/assets/javascripts/alchemy/alchemy.html5.js
-- app/assets/javascripts/alchemy/alchemy.image_cropper.js
+- app/assets/javascripts/alchemy/alchemy.image_cropper.js.coffee
 - app/assets/javascripts/alchemy/alchemy.jquery_loader.js
 - app/assets/javascripts/alchemy/alchemy.js
-- app/assets/javascripts/alchemy/alchemy.js_extensions.js
 - app/assets/javascripts/alchemy/alchemy.link_overlay.js.coffee
+- app/assets/javascripts/alchemy/alchemy.list_filter.js.coffee
 - app/assets/javascripts/alchemy/alchemy.menubar.js
 - app/assets/javascripts/alchemy/alchemy.onload.js.coffee
 - app/assets/javascripts/alchemy/alchemy.page_sorter.js
 - app/assets/javascripts/alchemy/alchemy.preview.js.coffee
-- app/assets/javascripts/alchemy/alchemy.preview_window.js
+- app/assets/javascripts/alchemy/alchemy.preview_window.js.coffee
 - app/assets/javascripts/alchemy/alchemy.routes.js.erb
+- app/assets/javascripts/alchemy/alchemy.sitemap.js.coffee
+- app/assets/javascripts/alchemy/alchemy.spinner.js.coffee
+- app/assets/javascripts/alchemy/alchemy.string_extension.js.coffee
 - app/assets/javascripts/alchemy/alchemy.swf_upload.js
 - app/assets/javascripts/alchemy/alchemy.uploader.js
-- app/assets/javascripts/alchemy/alchemy.windows.js
+- app/assets/javascripts/alchemy/alchemy.windows.js.coffee
 - app/assets/javascripts/alchemy/menubar.js
 - app/assets/javascripts/alchemy/preview.js
 - app/assets/javascripts/tiny_mce/plugins/alchemy_link/editor_plugin.js
@@ -517,14 +504,15 @@ files:
 - app/assets/stylesheets/alchemy/defaults.scss
 - app/assets/stylesheets/alchemy/elements.scss
 - app/assets/stylesheets/alchemy/errors.scss
+- app/assets/stylesheets/alchemy/extends.scss
 - app/assets/stylesheets/alchemy/flash.scss
+- app/assets/stylesheets/alchemy/fonts.scss
 - app/assets/stylesheets/alchemy/form_elements.scss
 - app/assets/stylesheets/alchemy/frame.scss
 - app/assets/stylesheets/alchemy/icons.scss
 - app/assets/stylesheets/alchemy/jquery-ui.scss
 - app/assets/stylesheets/alchemy/login.scss
 - app/assets/stylesheets/alchemy/menubar.css.scss
-- app/assets/stylesheets/alchemy/mixins.scss
 - app/assets/stylesheets/alchemy/modules.scss
 - app/assets/stylesheets/alchemy/notices.scss
 - app/assets/stylesheets/alchemy/pagination.scss
@@ -571,6 +559,7 @@ files:
 - app/helpers/alchemy/admin/essences_helper.rb
 - app/helpers/alchemy/admin/pages_helper.rb
 - app/helpers/alchemy/admin/pictures_helper.rb
+- app/helpers/alchemy/admin/tags_helper.rb
 - app/helpers/alchemy/base_helper.rb
 - app/helpers/alchemy/elements_block_helper.rb
 - app/helpers/alchemy/elements_helper.rb
@@ -583,7 +572,6 @@ files:
 - app/models/alchemy/attachment.rb
 - app/models/alchemy/cell.rb
 - app/models/alchemy/clipboard.rb
-- app/models/alchemy/clipboard_spec.rb
 - app/models/alchemy/content.rb
 - app/models/alchemy/element.rb
 - app/models/alchemy/essence_boolean.rb
@@ -601,6 +589,9 @@ files:
 - app/models/alchemy/legacy_page_url.rb
 - app/models/alchemy/message.rb
 - app/models/alchemy/page.rb
+- app/models/alchemy/page/cells.rb
+- app/models/alchemy/page/elements.rb
+- app/models/alchemy/page/naming.rb
 - app/models/alchemy/picture.rb
 - app/models/alchemy/site.rb
 - app/models/alchemy/tag.rb
@@ -612,11 +603,15 @@ files:
 - app/views/alchemy/admin/attachments/_attachment.html.erb
 - app/views/alchemy/admin/attachments/_file_to_assign.html.erb
 - app/views/alchemy/admin/attachments/_files_list.html.erb
+- app/views/alchemy/admin/attachments/_overlay_file_list.html.erb
+- app/views/alchemy/admin/attachments/_tag_list.html.erb
+- app/views/alchemy/admin/attachments/archive_overlay.js.erb
 - app/views/alchemy/admin/attachments/create.js.erb
 - app/views/alchemy/admin/attachments/destroy.js.erb
 - app/views/alchemy/admin/attachments/edit.html.erb
 - app/views/alchemy/admin/attachments/index.html.erb
 - app/views/alchemy/admin/attachments/new.html.erb
+- app/views/alchemy/admin/attachments/show.html.erb
 - app/views/alchemy/admin/clipboard/clear.js.erb
 - app/views/alchemy/admin/clipboard/index.html.erb
 - app/views/alchemy/admin/clipboard/insert.js.erb
@@ -714,7 +709,7 @@ files:
 - app/views/alchemy/admin/pictures/index.js.erb
 - app/views/alchemy/admin/pictures/info.html.erb
 - app/views/alchemy/admin/pictures/new.html.erb
-- app/views/alchemy/admin/pictures/show_in_window.html.erb
+- app/views/alchemy/admin/pictures/show.html.erb
 - app/views/alchemy/admin/resources/_boolean.html.erb
 - app/views/alchemy/admin/resources/_datetime.html.erb
 - app/views/alchemy/admin/resources/_form.html.erb
@@ -724,8 +719,10 @@ files:
 - app/views/alchemy/admin/resources/_text.html.erb
 - app/views/alchemy/admin/resources/destroy.js.erb
 - app/views/alchemy/admin/resources/edit.html.erb
+- app/views/alchemy/admin/resources/index.csv.erb
 - app/views/alchemy/admin/resources/index.html.erb
 - app/views/alchemy/admin/resources/new.html.erb
+- app/views/alchemy/admin/sites/index.html.erb
 - app/views/alchemy/admin/tags/_radio_tag.html.erb
 - app/views/alchemy/admin/tags/_tag.html.erb
 - app/views/alchemy/admin/tags/edit.html.erb
@@ -746,6 +743,8 @@ files:
 - app/views/alchemy/base/redirect.js.erb
 - app/views/alchemy/base/remote_errors.js.erb
 - app/views/alchemy/base/update.js.erb
+- app/views/alchemy/breadcrumb/_page.html.erb
+- app/views/alchemy/breadcrumb/_spacer.html.erb
 - app/views/alchemy/elements/_editor_not_found.html.erb
 - app/views/alchemy/elements/_view_not_found.html.erb
 - app/views/alchemy/elements/show.html.erb
@@ -777,7 +776,8 @@ files:
 - app/views/alchemy/navigation/_renderer.html.erb
 - app/views/alchemy/notifications/admin_user_created.de.text.erb
 - app/views/alchemy/notifications/admin_user_created.en.text.erb
-- app/views/alchemy/notifications/registered_user_created.text.erb
+- app/views/alchemy/notifications/registered_user_created.de.text.erb
+- app/views/alchemy/notifications/registered_user_created.en.text.erb
 - app/views/alchemy/notifications/reset_password_instructions.de.text.erb
 - app/views/alchemy/notifications/reset_password_instructions.en.text.erb
 - app/views/alchemy/pages/show.html.erb
@@ -791,7 +791,9 @@ files:
 - app/views/alchemy/user_sessions/leave.html.erb
 - app/views/alchemy/user_sessions/new.html.erb
 - app/views/alchemy/users/new.html.erb
+- app/views/kaminari/_first_page.html.erb
 - app/views/kaminari/_gap.html.erb
+- app/views/kaminari/_last_page.html.erb
 - app/views/kaminari/_next_page.html.erb
 - app/views/kaminari/_page.html.erb
 - app/views/kaminari/_paginator.html.erb
@@ -812,13 +814,9 @@ files:
 - config/locales/devise.de.yml
 - config/locales/devise.en.yml
 - config/routes.rb
-- db/migrate/20121118000000_alchemy_two_point_four.rb
-- db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
-- db/migrate/20121205155004_create_alchemy_sites.rb
-- db/migrate/20121211163003_add_public_to_alchemy_sites.rb
-- db/migrate/20121220102223_add_aliases_to_site.rb
-- db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb
-- db/migrate/20130121092645_migrate_to_devise.rb
+- db/migrate/20130214233001_alchemy_two_point_five.rb
+- db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb
+- db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb
 - lib/alchemy/auth_engine.rb
 - lib/alchemy/authentication_helpers.rb
 - lib/alchemy/capistrano.rb
@@ -827,10 +825,12 @@ files:
 - lib/alchemy/errors.rb
 - lib/alchemy/essence.rb
 - lib/alchemy/ferret_search.rb
+- lib/alchemy/filetypes.rb
 - lib/alchemy/i18n.rb
 - lib/alchemy/logger.rb
 - lib/alchemy/modules.rb
 - lib/alchemy/mount_point.rb
+- lib/alchemy/name_conversions.rb
 - lib/alchemy/page_layout.rb
 - lib/alchemy/picture_attributes.rb
 - lib/alchemy/resource.rb
@@ -869,13 +869,12 @@ files:
 - lib/rails/generators/alchemy/scaffold/scaffold_generator.rb
 - lib/rails/generators/alchemy/scaffold/templates/page_layouts.yml.tt
 - lib/rails/templates/alchemy.rb
+- lib/tasks/alchemy/convert.rake
 - lib/tasks/alchemy/db.rake
 - lib/tasks/alchemy/install.rake
 - lib/tasks/alchemy/upgrade.rake
 - lib/tasks/ferret.rake
 - script/rails
-- spec/alchemy_spec.rb
-- spec/config_spec.rb
 - spec/controllers/admin/clipboard_controller_spec.rb
 - spec/controllers/admin/contents_controller_spec.rb
 - spec/controllers/admin/elements_controller_spec.rb
@@ -901,6 +900,7 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/event.rb
+- spec/dummy/app/models/location.rb
 - spec/dummy/app/views/alchemy/elements/_article_editor.html.erb
 - spec/dummy/app/views/alchemy/elements/_article_view.html.erb
 - spec/dummy/app/views/alchemy/elements/_headline_view.html.erb
@@ -927,13 +927,10 @@ files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121026104128_create_events.rb
-- spec/dummy/db/migrate/20121118000000_alchemy_two_point_four.rb
-- spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
-- spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb
-- spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb
-- spec/dummy/db/migrate/20121220102223_add_aliases_to_site.rb
-- spec/dummy/db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb
-- spec/dummy/db/migrate/20130121092645_migrate_to_devise.rb
+- spec/dummy/db/migrate/20130214233001_alchemy_two_point_five.rb
+- spec/dummy/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb
+- spec/dummy/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb
+- spec/dummy/db/migrate/20130328101418_create_locations.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
@@ -943,26 +940,28 @@ files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb
+- spec/features/admin/link_overlay_spec.rb
+- spec/features/admin/modules_integration_spec.rb
+- spec/features/admin/pages_controller_spec.rb
+- spec/features/admin/picture_library_integration_spec.rb
+- spec/features/admin/resources_integration_spec.rb
+- spec/features/navigation_spec.rb
+- spec/features/pages_controller_spec.rb
+- spec/features/picture_security_spec.rb
+- spec/features/security_spec.rb
+- spec/features/translation_integration_spec.rb
 - spec/helpers/admin/base_helper_spec.rb
 - spec/helpers/admin/contents_helper_spec.rb
 - spec/helpers/admin/elements_helper_spec.rb
 - spec/helpers/admin/essences_helper_spec.rb
+- spec/helpers/admin/tags_helper_spec.rb
 - spec/helpers/base_helper_spec.rb
 - spec/helpers/elements_block_helper_spec.rb
 - spec/helpers/elements_helper_spec.rb
 - spec/helpers/essences_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
+- spec/helpers/picture_url_helpers_spec.rb
 - spec/helpers/url_helper_spec.rb
-- spec/integration/admin/link_overlay_spec.rb
-- spec/integration/admin/modules_integration_spec.rb
-- spec/integration/admin/pages_controller_spec.rb
-- spec/integration/admin/picture_library_integration_spec.rb
-- spec/integration/admin/resources_integration_spec.rb
-- spec/integration/navigation_spec.rb
-- spec/integration/pages_controller_spec.rb
-- spec/integration/picture_security_spec.rb
-- spec/integration/security_spec.rb
-- spec/integration/translation_integration_spec.rb
 - spec/javascripts/alchemy/link_overlay_spec.js.coffee
 - spec/javascripts/alchemy_integration_spec.coffee
 - spec/javascripts/fixtures/select.html
@@ -972,6 +971,7 @@ files:
 - spec/javascripts/helpers/test_responses/test_responses.js
 - spec/javascripts/spec.css
 - spec/javascripts/spec.js
+- spec/libraries/config_spec.rb
 - spec/libraries/essence_spec.rb
 - spec/libraries/resource_spec.rb
 - spec/libraries/resources_helper_spec.rb
@@ -992,27 +992,29 @@ files:
 - spec/models/resource_spec.rb
 - spec/models/site_spec.rb
 - spec/models/user_spec.rb
-- spec/routing_spec.rb
+- spec/routing/routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/80x60.png
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/specs_helpers.rb
 - spec/support/alchemy/test_tweaks.rb
 - spec/support/ci/install_phantomjs
+- spec/support/image with spaces.png
 - spec/support/image.png
 - spec/support/image2.PNG
 - spec/support/image3.jpeg
-- spec/url_helpers_spec.rb
 - spec/views/essences/essence_picture_view_spec.rb
 - vendor/assets/images/Jcrop.gif
 - vendor/assets/javascripts/jquery_plugins/jquery.Jcrop.min.js
-- vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.1_0_1.js
+- vendor/assets/javascripts/jquery_plugins/jquery.dialogextend.js
 - vendor/assets/javascripts/jquery_plugins/jquery.html5uploader.js
-- vendor/assets/javascripts/jquery_plugins/jquery.scrollTo-1.4.2-min.js
+- vendor/assets/javascripts/jquery_plugins/jquery.scrollTo.min.js
 - vendor/assets/javascripts/jquery_plugins/jquery.selectboxit.min.js
 - vendor/assets/javascripts/jquery_plugins/jquery.ui.nestedSortable.js
 - vendor/assets/javascripts/jquery_plugins/jquery.ui.tabspaging.js
 - vendor/assets/javascripts/jquery_plugins/preloadCssImages.jQuery_v5.js
+- vendor/assets/javascripts/keymage.min.js
+- vendor/assets/javascripts/spin.min.js
 - vendor/assets/javascripts/swfupload/SWFObject License.txt
 - vendor/assets/javascripts/swfupload/swfupload.cookies.js
 - vendor/assets/javascripts/swfupload/swfupload.js
@@ -1126,12 +1128,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -806389200489129591
+      version: 1.3.1
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubyforge_project: 
@@ -1140,8 +1139,6 @@ signing_key:
 specification_version: 3
 summary: A powerful, userfriendly and flexible CMS for Rails 3
 test_files:
-- spec/alchemy_spec.rb
-- spec/config_spec.rb
 - spec/controllers/admin/clipboard_controller_spec.rb
 - spec/controllers/admin/contents_controller_spec.rb
 - spec/controllers/admin/elements_controller_spec.rb
@@ -1167,6 +1164,7 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.gitkeep
 - spec/dummy/app/models/event.rb
+- spec/dummy/app/models/location.rb
 - spec/dummy/app/views/alchemy/elements/_article_editor.html.erb
 - spec/dummy/app/views/alchemy/elements/_article_view.html.erb
 - spec/dummy/app/views/alchemy/elements/_headline_view.html.erb
@@ -1193,13 +1191,10 @@ test_files:
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/20121026104128_create_events.rb
-- spec/dummy/db/migrate/20121118000000_alchemy_two_point_four.rb
-- spec/dummy/db/migrate/20121121162313_switch_from_fleximage_to_dragonfly.rb
-- spec/dummy/db/migrate/20121205155004_create_alchemy_sites.rb
-- spec/dummy/db/migrate/20121211163003_add_public_to_alchemy_sites.rb
-- spec/dummy/db/migrate/20121220102223_add_aliases_to_site.rb
-- spec/dummy/db/migrate/20130110212411_create_alchemy_legacy_page_urls.rb
-- spec/dummy/db/migrate/20130121092645_migrate_to_devise.rb
+- spec/dummy/db/migrate/20130214233001_alchemy_two_point_five.rb
+- spec/dummy/db/migrate/20130221200514_migrate_attachments_to_dragonfly.rb
+- spec/dummy/db/migrate/20130312205327_change_alchemy_users_role_to_roles.rb
+- spec/dummy/db/migrate/20130328101418_create_locations.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/lib/assets/.gitkeep
 - spec/dummy/public/404.html
@@ -1209,26 +1204,28 @@ test_files:
 - spec/dummy/public/stylesheets/.gitkeep
 - spec/dummy/script/rails
 - spec/factories.rb
+- spec/features/admin/link_overlay_spec.rb
+- spec/features/admin/modules_integration_spec.rb
+- spec/features/admin/pages_controller_spec.rb
+- spec/features/admin/picture_library_integration_spec.rb
+- spec/features/admin/resources_integration_spec.rb
+- spec/features/navigation_spec.rb
+- spec/features/pages_controller_spec.rb
+- spec/features/picture_security_spec.rb
+- spec/features/security_spec.rb
+- spec/features/translation_integration_spec.rb
 - spec/helpers/admin/base_helper_spec.rb
 - spec/helpers/admin/contents_helper_spec.rb
 - spec/helpers/admin/elements_helper_spec.rb
 - spec/helpers/admin/essences_helper_spec.rb
+- spec/helpers/admin/tags_helper_spec.rb
 - spec/helpers/base_helper_spec.rb
 - spec/helpers/elements_block_helper_spec.rb
 - spec/helpers/elements_helper_spec.rb
 - spec/helpers/essences_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
+- spec/helpers/picture_url_helpers_spec.rb
 - spec/helpers/url_helper_spec.rb
-- spec/integration/admin/link_overlay_spec.rb
-- spec/integration/admin/modules_integration_spec.rb
-- spec/integration/admin/pages_controller_spec.rb
-- spec/integration/admin/picture_library_integration_spec.rb
-- spec/integration/admin/resources_integration_spec.rb
-- spec/integration/navigation_spec.rb
-- spec/integration/pages_controller_spec.rb
-- spec/integration/picture_security_spec.rb
-- spec/integration/security_spec.rb
-- spec/integration/translation_integration_spec.rb
 - spec/javascripts/alchemy/link_overlay_spec.js.coffee
 - spec/javascripts/alchemy_integration_spec.coffee
 - spec/javascripts/fixtures/select.html
@@ -1238,6 +1235,7 @@ test_files:
 - spec/javascripts/helpers/test_responses/test_responses.js
 - spec/javascripts/spec.css
 - spec/javascripts/spec.js
+- spec/libraries/config_spec.rb
 - spec/libraries/essence_spec.rb
 - spec/libraries/resource_spec.rb
 - spec/libraries/resources_helper_spec.rb
@@ -1258,16 +1256,16 @@ test_files:
 - spec/models/resource_spec.rb
 - spec/models/site_spec.rb
 - spec/models/user_spec.rb
-- spec/routing_spec.rb
+- spec/routing/routing_spec.rb
 - spec/spec_helper.rb
 - spec/support/80x60.png
 - spec/support/alchemy/controller_hacks.rb
 - spec/support/alchemy/specs_helpers.rb
 - spec/support/alchemy/test_tweaks.rb
 - spec/support/ci/install_phantomjs
+- spec/support/image with spaces.png
 - spec/support/image.png
 - spec/support/image2.PNG
 - spec/support/image3.jpeg
-- spec/url_helpers_spec.rb
 - spec/views/essences/essence_picture_view_spec.rb
 has_rdoc: