typus 3.0.10 → 3.0.11.rc1

data/app/assets/vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js

@@ -0,0 +1,46 @@
+/*
+ * FancyBox - jQuery Plugin
+ * Simple and fancy lightbox alternative
+ *
+ * Examples and documentation at: http://fancybox.net
+ * 
+ * Copyright (c) 2008 - 2010 Janis Skarnelis
+ * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated.
+ * 
+ * Version: 1.3.4 (11/11/2010)
+ * Requires: jQuery v1.3+
+ *
+ * Dual licensed under the MIT and GPL licenses:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *   http://www.gnu.org/licenses/gpl.html
+ */
+
+;(function(b){var m,t,u,f,D,j,E,n,z,A,q=0,e={},o=[],p=0,d={},l=[],G=null,v=new Image,J=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,W=/[^\.]\.(swf)\s*$/i,K,L=1,y=0,s="",r,i,h=false,B=b.extend(b("<div/>")[0],{prop:0}),M=b.browser.msie&&b.browser.version<7&&!window.XMLHttpRequest,N=function(){t.hide();v.onerror=v.onload=null;G&&G.abort();m.empty()},O=function(){if(false===e.onError(o,q,e)){t.hide();h=false}else{e.titleShow=false;e.width="auto";e.height="auto";m.html('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');
+F()}},I=function(){var a=o[q],c,g,k,C,P,w;N();e=b.extend({},b.fn.fancybox.defaults,typeof b(a).data("fancybox")=="undefined"?e:b(a).data("fancybox"));w=e.onStart(o,q,e);if(w===false)h=false;else{if(typeof w=="object")e=b.extend(e,w);k=e.title||(a.nodeName?b(a).attr("title"):a.title)||"";if(a.nodeName&&!e.orig)e.orig=b(a).children("img:first").length?b(a).children("img:first"):b(a);if(k===""&&e.orig&&e.titleFromAlt)k=e.orig.attr("alt");c=e.href||(a.nodeName?b(a).attr("href"):a.href)||null;if(/^(?:javascript)/i.test(c)||
+c=="#")c=null;if(e.type){g=e.type;if(!c)c=e.content}else if(e.content)g="html";else if(c)g=c.match(J)?"image":c.match(W)?"swf":b(a).hasClass("iframe")?"iframe":c.indexOf("#")===0?"inline":"ajax";if(g){if(g=="inline"){a=c.substr(c.indexOf("#"));g=b(a).length>0?"inline":"ajax"}e.type=g;e.href=c;e.title=k;if(e.autoDimensions)if(e.type=="html"||e.type=="inline"||e.type=="ajax"){e.width="auto";e.height="auto"}else e.autoDimensions=false;if(e.modal){e.overlayShow=true;e.hideOnOverlayClick=false;e.hideOnContentClick=
+false;e.enableEscapeButton=false;e.showCloseButton=false}e.padding=parseInt(e.padding,10);e.margin=parseInt(e.margin,10);m.css("padding",e.padding+e.margin);b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){b(this).replaceWith(j.children())});switch(g){case "html":m.html(e.content);F();break;case "inline":if(b(a).parent().is("#fancybox-content")===true){h=false;break}b('<div class="fancybox-inline-tmp" />').hide().insertBefore(b(a)).bind("fancybox-cleanup",function(){b(this).replaceWith(j.children())}).bind("fancybox-cancel",
+function(){b(this).replaceWith(m.children())});b(a).appendTo(m);F();break;case "image":h=false;b.fancybox.showActivity();v=new Image;v.onerror=function(){O()};v.onload=function(){h=true;v.onerror=v.onload=null;e.width=v.width;e.height=v.height;b("<img />").attr({id:"fancybox-img",src:v.src,alt:e.title}).appendTo(m);Q()};v.src=c;break;case "swf":e.scrolling="no";C='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+e.width+'" height="'+e.height+'"><param name="movie" value="'+c+
+'"></param>';P="";b.each(e.swf,function(x,H){C+='<param name="'+x+'" value="'+H+'"></param>';P+=" "+x+'="'+H+'"'});C+='<embed src="'+c+'" type="application/x-shockwave-flash" width="'+e.width+'" height="'+e.height+'"'+P+"></embed></object>";m.html(C);F();break;case "ajax":h=false;b.fancybox.showActivity();e.ajax.win=e.ajax.success;G=b.ajax(b.extend({},e.ajax,{url:c,data:e.ajax.data||{},error:function(x){x.status>0&&O()},success:function(x,H,R){if((typeof R=="object"?R:G).status==200){if(typeof e.ajax.win==
+"function"){w=e.ajax.win(c,x,H,R);if(w===false){t.hide();return}else if(typeof w=="string"||typeof w=="object")x=w}m.html(x);F()}}}));break;case "iframe":Q()}}else O()}},F=function(){var a=e.width,c=e.height;a=a.toString().indexOf("%")>-1?parseInt((b(window).width()-e.margin*2)*parseFloat(a)/100,10)+"px":a=="auto"?"auto":a+"px";c=c.toString().indexOf("%")>-1?parseInt((b(window).height()-e.margin*2)*parseFloat(c)/100,10)+"px":c=="auto"?"auto":c+"px";m.wrapInner('<div style="width:'+a+";height:"+c+
+";overflow: "+(e.scrolling=="auto"?"auto":e.scrolling=="yes"?"scroll":"hidden")+';position:relative;"></div>');e.width=m.width();e.height=m.height();Q()},Q=function(){var a,c;t.hide();if(f.is(":visible")&&false===d.onCleanup(l,p,d)){b.event.trigger("fancybox-cancel");h=false}else{h=true;b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");f.is(":visible")&&d.titlePosition!=="outside"&&f.css("height",f.height());l=o;p=q;d=e;if(d.overlayShow){u.css({"background-color":d.overlayColor,
+opacity:d.overlayOpacity,cursor:d.hideOnOverlayClick?"pointer":"auto",height:b(document).height()});if(!u.is(":visible")){M&&b("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"});u.show()}}else u.hide();i=X();s=d.title||"";y=0;n.empty().removeAttr("style").removeClass();if(d.titleShow!==false){if(b.isFunction(d.titleFormat))a=d.titleFormat(s,l,p,d);else a=s&&s.length?
+d.titlePosition=="float"?'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+s+'</td><td id="fancybox-title-float-right"></td></tr></table>':'<div id="fancybox-title-'+d.titlePosition+'">'+s+"</div>":false;s=a;if(!(!s||s==="")){n.addClass("fancybox-title-"+d.titlePosition).html(s).appendTo("body").show();switch(d.titlePosition){case "inside":n.css({width:i.width-d.padding*2,marginLeft:d.padding,marginRight:d.padding});
+y=n.outerHeight(true);n.appendTo(D);i.height+=y;break;case "over":n.css({marginLeft:d.padding,width:i.width-d.padding*2,bottom:d.padding}).appendTo(D);break;case "float":n.css("left",parseInt((n.width()-i.width-40)/2,10)*-1).appendTo(f);break;default:n.css({width:i.width-d.padding*2,paddingLeft:d.padding,paddingRight:d.padding}).appendTo(f)}}}n.hide();if(f.is(":visible")){b(E.add(z).add(A)).hide();a=f.position();r={top:a.top,left:a.left,width:f.width(),height:f.height()};c=r.width==i.width&&r.height==
+i.height;j.fadeTo(d.changeFade,0.3,function(){var g=function(){j.html(m.contents()).fadeTo(d.changeFade,1,S)};b.event.trigger("fancybox-change");j.empty().removeAttr("filter").css({"border-width":d.padding,width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2});if(c)g();else{B.prop=0;b(B).animate({prop:1},{duration:d.changeSpeed,easing:d.easingChange,step:T,complete:g})}})}else{f.removeAttr("style");j.css("border-width",d.padding);if(d.transitionIn=="elastic"){r=V();j.html(m.contents());
+f.show();if(d.opacity)i.opacity=0;B.prop=0;b(B).animate({prop:1},{duration:d.speedIn,easing:d.easingIn,step:T,complete:S})}else{d.titlePosition=="inside"&&y>0&&n.show();j.css({width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2}).html(m.contents());f.css(i).fadeIn(d.transitionIn=="none"?0:d.speedIn,S)}}}},Y=function(){if(d.enableEscapeButton||d.enableKeyboardNav)b(document).bind("keydown.fb",function(a){if(a.keyCode==27&&d.enableEscapeButton){a.preventDefault();b.fancybox.close()}else if((a.keyCode==
+37||a.keyCode==39)&&d.enableKeyboardNav&&a.target.tagName!=="INPUT"&&a.target.tagName!=="TEXTAREA"&&a.target.tagName!=="SELECT"){a.preventDefault();b.fancybox[a.keyCode==37?"prev":"next"]()}});if(d.showNavArrows){if(d.cyclic&&l.length>1||p!==0)z.show();if(d.cyclic&&l.length>1||p!=l.length-1)A.show()}else{z.hide();A.hide()}},S=function(){if(!b.support.opacity){j.get(0).style.removeAttribute("filter");f.get(0).style.removeAttribute("filter")}e.autoDimensions&&j.css("height","auto");f.css("height","auto");
+s&&s.length&&n.show();d.showCloseButton&&E.show();Y();d.hideOnContentClick&&j.bind("click",b.fancybox.close);d.hideOnOverlayClick&&u.bind("click",b.fancybox.close);b(window).bind("resize.fb",b.fancybox.resize);d.centerOnScroll&&b(window).bind("scroll.fb",b.fancybox.center);if(d.type=="iframe")b('<iframe id="fancybox-frame" name="fancybox-frame'+(new Date).getTime()+'" frameborder="0" hspace="0" '+(b.browser.msie?'allowtransparency="true""':"")+' scrolling="'+e.scrolling+'" src="'+d.href+'"></iframe>').appendTo(j);
+f.show();h=false;b.fancybox.center();d.onComplete(l,p,d);var a,c;if(l.length-1>p){a=l[p+1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}if(p>0){a=l[p-1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}},T=function(a){var c={width:parseInt(r.width+(i.width-r.width)*a,10),height:parseInt(r.height+(i.height-r.height)*a,10),top:parseInt(r.top+(i.top-r.top)*a,10),left:parseInt(r.left+(i.left-r.left)*a,10)};if(typeof i.opacity!=="undefined")c.opacity=a<0.5?0.5:a;f.css(c);
+j.css({width:c.width-d.padding*2,height:c.height-y*a-d.padding*2})},U=function(){return[b(window).width()-d.margin*2,b(window).height()-d.margin*2,b(document).scrollLeft()+d.margin,b(document).scrollTop()+d.margin]},X=function(){var a=U(),c={},g=d.autoScale,k=d.padding*2;c.width=d.width.toString().indexOf("%")>-1?parseInt(a[0]*parseFloat(d.width)/100,10):d.width+k;c.height=d.height.toString().indexOf("%")>-1?parseInt(a[1]*parseFloat(d.height)/100,10):d.height+k;if(g&&(c.width>a[0]||c.height>a[1]))if(e.type==
+"image"||e.type=="swf"){g=d.width/d.height;if(c.width>a[0]){c.width=a[0];c.height=parseInt((c.width-k)/g+k,10)}if(c.height>a[1]){c.height=a[1];c.width=parseInt((c.height-k)*g+k,10)}}else{c.width=Math.min(c.width,a[0]);c.height=Math.min(c.height,a[1])}c.top=parseInt(Math.max(a[3]-20,a[3]+(a[1]-c.height-40)*0.5),10);c.left=parseInt(Math.max(a[2]-20,a[2]+(a[0]-c.width-40)*0.5),10);return c},V=function(){var a=e.orig?b(e.orig):false,c={};if(a&&a.length){c=a.offset();c.top+=parseInt(a.css("paddingTop"),
+10)||0;c.left+=parseInt(a.css("paddingLeft"),10)||0;c.top+=parseInt(a.css("border-top-width"),10)||0;c.left+=parseInt(a.css("border-left-width"),10)||0;c.width=a.width();c.height=a.height();c={width:c.width+d.padding*2,height:c.height+d.padding*2,top:c.top-d.padding-20,left:c.left-d.padding-20}}else{a=U();c={width:d.padding*2,height:d.padding*2,top:parseInt(a[3]+a[1]*0.5,10),left:parseInt(a[2]+a[0]*0.5,10)}}return c},Z=function(){if(t.is(":visible")){b("div",t).css("top",L*-40+"px");L=(L+1)%12}else clearInterval(K)};
+b.fn.fancybox=function(a){if(!b(this).length)return this;b(this).data("fancybox",b.extend({},a,b.metadata?b(this).metadata():{})).unbind("click.fb").bind("click.fb",function(c){c.preventDefault();if(!h){h=true;b(this).blur();o=[];q=0;c=b(this).attr("rel")||"";if(!c||c==""||c==="nofollow")o.push(this);else{o=b("a[rel="+c+"], area[rel="+c+"]");q=o.index(this)}I()}});return this};b.fancybox=function(a,c){var g;if(!h){h=true;g=typeof c!=="undefined"?c:{};o=[];q=parseInt(g.index,10)||0;if(b.isArray(a)){for(var k=
+0,C=a.length;k<C;k++)if(typeof a[k]=="object")b(a[k]).data("fancybox",b.extend({},g,a[k]));else a[k]=b({}).data("fancybox",b.extend({content:a[k]},g));o=jQuery.merge(o,a)}else{if(typeof a=="object")b(a).data("fancybox",b.extend({},g,a));else a=b({}).data("fancybox",b.extend({content:a},g));o.push(a)}if(q>o.length||q<0)q=0;I()}};b.fancybox.showActivity=function(){clearInterval(K);t.show();K=setInterval(Z,66)};b.fancybox.hideActivity=function(){t.hide()};b.fancybox.next=function(){return b.fancybox.pos(p+
+1)};b.fancybox.prev=function(){return b.fancybox.pos(p-1)};b.fancybox.pos=function(a){if(!h){a=parseInt(a);o=l;if(a>-1&&a<l.length){q=a;I()}else if(d.cyclic&&l.length>1){q=a>=l.length?0:l.length-1;I()}}};b.fancybox.cancel=function(){if(!h){h=true;b.event.trigger("fancybox-cancel");N();e.onCancel(o,q,e);h=false}};b.fancybox.close=function(){function a(){u.fadeOut("fast");n.empty().hide();f.hide();b.event.trigger("fancybox-cleanup");j.empty();d.onClosed(l,p,d);l=e=[];p=q=0;d=e={};h=false}if(!(h||f.is(":hidden"))){h=
+true;if(d&&false===d.onCleanup(l,p,d))h=false;else{N();b(E.add(z).add(A)).hide();b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");j.find("iframe").attr("src",M&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");d.titlePosition!=="inside"&&n.empty();f.stop();if(d.transitionOut=="elastic"){r=V();var c=f.position();i={top:c.top,left:c.left,width:f.width(),height:f.height()};if(d.opacity)i.opacity=1;n.empty().hide();B.prop=1;
+b(B).animate({prop:0},{duration:d.speedOut,easing:d.easingOut,step:T,complete:a})}else f.fadeOut(d.transitionOut=="none"?0:d.speedOut,a)}}};b.fancybox.resize=function(){u.is(":visible")&&u.css("height",b(document).height());b.fancybox.center(true)};b.fancybox.center=function(a){var c,g;if(!h){g=a===true?1:0;c=U();!g&&(f.width()>c[0]||f.height()>c[1])||f.stop().animate({top:parseInt(Math.max(c[3]-20,c[3]+(c[1]-j.height()-40)*0.5-d.padding)),left:parseInt(Math.max(c[2]-20,c[2]+(c[0]-j.width()-40)*0.5-
+d.padding))},typeof a=="number"?a:200)}};b.fancybox.init=function(){if(!b("#fancybox-wrap").length){b("body").append(m=b('<div id="fancybox-tmp"></div>'),t=b('<div id="fancybox-loading"><div></div></div>'),u=b('<div id="fancybox-overlay"></div>'),f=b('<div id="fancybox-wrap"></div>'));D=b('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(f);
+D.append(j=b('<div id="fancybox-content"></div>'),E=b('<a id="fancybox-close"></a>'),n=b('<div id="fancybox-title"></div>'),z=b('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),A=b('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));E.click(b.fancybox.close);t.click(b.fancybox.cancel);z.click(function(a){a.preventDefault();b.fancybox.prev()});A.click(function(a){a.preventDefault();b.fancybox.next()});
+b.fn.mousewheel&&f.bind("mousewheel.fb",function(a,c){if(h)a.preventDefault();else if(b(a.target).get(0).clientHeight==0||b(a.target).get(0).scrollHeight===b(a.target).get(0).clientHeight){a.preventDefault();b.fancybox[c>0?"prev":"next"]()}});b.support.opacity||f.addClass("fancybox-ie");if(M){t.addClass("fancybox-ie6");f.addClass("fancybox-ie6");b('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').prependTo(D)}}};
+b.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",
+easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};b(document).ready(function(){b.fancybox.init()})})(jQuery);

data/app/assets/vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox/jquery.mousewheel-3.0.4.pack.js

@@ -0,0 +1,14 @@
+/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
+* Licensed under the MIT License (LICENSE.txt).
+*
+* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
+* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
+* Thanks to: Seamus Leahy for adding deltaX and deltaY
+*
+* Version: 3.0.4
+*
+* Requires: 1.2.2+
+*/
+
+(function(d){function g(a){var b=a||window.event,i=[].slice.call(arguments,1),c=0,h=0,e=0;a=d.event.fix(b);a.type="mousewheel";if(a.wheelDelta)c=a.wheelDelta/120;if(a.detail)c=-a.detail/3;e=c;if(b.axis!==undefined&&b.axis===b.HORIZONTAL_AXIS){e=0;h=-1*c}if(b.wheelDeltaY!==undefined)e=b.wheelDeltaY/120;if(b.wheelDeltaX!==undefined)h=-1*b.wheelDeltaX/120;i.unshift(a,c,h,e);return d.event.handle.apply(this,i)}var f=["DOMMouseScroll","mousewheel"];d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=
+f.length;a;)this.addEventListener(f[--a],g,false);else this.onmousewheel=g},teardown:function(){if(this.removeEventListener)for(var a=f.length;a;)this.removeEventListener(f[--a],g,false);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);

data/app/controllers/admin/account_controller.rb

@@ -42,11 +42,11 @@ class Admin::AccountController < Admin::BaseController
   private
 
   def sign_in?
-    redirect_to new_admin_session_path unless Typus.user_class.count.zero?
+    redirect_to new_admin_session_path unless zero_users
   end
 
   def new?
-    redirect_to new_admin_account_path if Typus.user_class.count.zero?
+    redirect_to new_admin_account_path if zero_users
   end
 
 end

data/app/controllers/admin/base_controller.rb

@@ -28,4 +28,8 @@ class Admin::BaseController < ActionController::Base
     I18n.locale = admin_user.locale if admin_user.respond_to?(:locale)
   end
 
+  def zero_users
+    Typus.user_class.count.zero?
+  end
+
 end

data/app/controllers/admin/resources_controller.rb

@@ -1,6 +1,7 @@
 class Admin::ResourcesController < Admin::BaseController
 
   include Typus::Controller::Actions
+  include Typus::Controller::ActsAs
   include Typus::Controller::Associations
   include Typus::Controller::Autocomplete
   include Typus::Controller::Filters
@@ -9,7 +10,7 @@ class Admin::ResourcesController < Admin::BaseController
   Whitelist = [:edit, :update, :destroy, :toggle, :position, :relate, :unrelate]
 
   before_filter :get_model
-  before_filter :set_scope
+  before_filter :set_context # MultiSite ...
   before_filter :get_object, :only => Whitelist + [:show]
   before_filter :check_resource_ownership, :only => Whitelist
   before_filter :check_if_user_can_perform_action_on_resources
@@ -25,7 +26,6 @@ class Admin::ResourcesController < Admin::BaseController
 
     respond_to do |format|
       format.html do
-        prepend_predefined_filter("All", "index", "unscoped")
         add_resource_action(default_action.titleize, {:action => default_action}, {})
         add_resource_action("Trash", {:action => "destroy"}, {:confirm => "#{Typus::I18n.t("Trash")}?", :method => 'delete'})
         generate_html
@@ -124,84 +124,6 @@ class Admin::ResourcesController < Admin::BaseController
     end
   end
 
-  ##
-  # Change item position:
-  #
-  #   params[:go] = 'move_to_top'
-  #
-  # Available positions are move_to_top, move_higher, move_lower, move_to_bottom.
-  #
-  # NOTE: Only works if `acts_as_list` is installed.
-  #
-  def position
-    @item.send(params[:go])
-    notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
-    redirect_to :back, :notice => notice
-  end
-
-  ##
-  # Action to relate models which respond to:
-  #
-  #   - has_and_belongs_to_many
-  #   - has_many
-  #
-  # For example:
-  #
-  #   class Item < ActiveRecord::Base
-  #     has_many :line_items
-  #   end
-  #
-  #   class LineItem < ActiveRecord::Base
-  #     belongs_to :item
-  #   end
-  #
-  #   >> related_item = LineItem.find(params[:related][:id])
-  #   => ...
-  #   >> item = Item.find(params[:id])
-  #   => ...
-  #   >> item.line_items << related_item
-  #   => ...
-  #
-  def relate
-    resource_class = params[:related][:model].typus_constantize
-    association_name = params[:related][:association_name].tableize
-
-    if @item.send(association_name) << resource_class.find(params[:related][:id])
-      notice = Typus::I18n.t("%{model} successfully updated.", :model => @resource.model_name.human)
-    end
-
-    redirect_to :back, :notice => notice
-  end
-
-  ##
-  # Action to unrelate models which respond to:
-  #
-  #   - has_and_belongs_to_many
-  #   - has_many
-  #   - has_one
-  #
-  def unrelate
-    item_class = params[:resource].typus_constantize
-    item = item_class.find(params[:resource_id])
-
-    case item_class.relationship_with(@resource)
-    when :has_one
-      association_name = @resource.model_name.underscore.to_sym
-      worked = item.send(association_name).delete
-    else
-      association_name = params[:association_name] ? params[:association_name].to_sym : @resource.model_name.tableize.to_sym
-      worked = item.send(association_name).delete(@item)
-    end
-
-    if worked
-      notice = Typus::I18n.t("%{model} successfully updated.", :model => item_class.model_name.human)
-    else
-      alert = item.error.full_messages
-    end
-
-    redirect_to :back, :notice => notice, :alert => alert
-  end
-
   private
 
   def get_model
@@ -209,9 +131,10 @@ class Admin::ResourcesController < Admin::BaseController
     @object_name = ActiveModel::Naming.singular(@resource)
   end
 
-  def set_scope
-    @resource = @resource.unscoped
+  def set_context
+    @resource
   end
+  helper_method :set_context
 
   def get_object
     @item = @resource.find(params[:id])
@@ -270,7 +193,9 @@ class Admin::ResourcesController < Admin::BaseController
   #
   def create_with_back_to
     item_class = params[:resource].typus_constantize
-    options = { :controller => item_class.to_resource }
+    # For some reason we are forced to set the /admin prefix to the controller
+    # when working with namespaced stuff.
+    options = { :controller => "/admin/#{item_class.to_resource}" }
     assoc = item_class.relationship_with(@resource).to_s
     send("set_#{assoc}_association", item_class, options)
   end

data/app/controllers/admin/session_controller.rb

@@ -9,7 +9,7 @@ class Admin::SessionController < Admin::BaseController
   end
 
   def create
-    user = Typus.user_class.authenticate(params[:typus_user][:email], params[:typus_user][:password])
+    user = user_scope.authenticate(params[:typus_user][:email], params[:typus_user][:password])
 
     path = if user
              session[:typus_user_id] = user.id
@@ -28,11 +28,19 @@ class Admin::SessionController < Admin::BaseController
   private
 
   def create_an_account?
-    redirect_to new_admin_account_path if Typus.user_class.count.zero?
+    redirect_to new_admin_account_path if zero_users
   end
 
   def set_locale
     I18n.locale = I18n.default_locale
   end
 
+  def user_scope
+    if Typus.user_class.scopes.include?(:in_domain)
+      Typus.user_class.in_domain(request.host)
+    else
+      Typus.user_class
+    end
+  end
+
 end

data/app/helpers/admin/file_preview_helper.rb

@@ -14,12 +14,26 @@ module Admin
 
       attachment = @item.send(attribute)
 
+      # We are here and we already know we are handling attachments, but
+      # `dragonfly` and `paperclip` have different behaviors.
+
+      if defined?(Paperclip)
+        present = case attachment
+                  when Paperclip::Attachment
+                    attachment.exists?
+                  else
+                    attachment.present?
+                  end
+      else
+        present = attachment.present?
+      end
+
       field = case get_type_of_attachment(attachment)
               when :dragonfly then attribute
               when :paperclip then "#{attribute}_file_name"
               end
 
-      if !validators.include?(field) && attachment
+      if present && !validators.include?(field) && attachment
         attribute_i18n = @item.class.human_attribute_name(attribute)
         message = Typus::I18n.t("Remove")
         label_text = <<-HTML

data/app/helpers/admin/filters_helper.rb

@@ -10,7 +10,7 @@ module Admin
                   items = case value
                           when :boolean then boolean_filter(key)
                           when :string then string_filter(key)
-                          when :date, :datetime then date_filter(key)
+                          when :date, :datetime, :timestamp then date_filter(key)
                           when :belongs_to then belongs_to_filter(key)
                           when :has_many, :has_and_belongs_to_many then
                             has_many_filter(key)
@@ -79,10 +79,10 @@ module Admin
     end
 
     def string_filter(filter)
-      values = if @resource.const_defined?(filter.to_s.upcase)
-                 @resource::const_get(filter.to_s.upcase).to_a
+      values = if set_context.const_defined?(filter.to_s.upcase)
+                 set_context::const_get(filter.to_s.upcase).to_a
                else
-                 @resource.send(filter.to_s).to_a
+                 set_context.send(filter.to_s).to_a
                end
 
       items = [[Typus::I18n.t("Show by %{attribute}", :attribute => @resource.human_attribute_name(filter).downcase), ""]]

data/app/helpers/admin/relationships_helper.rb

@@ -6,7 +6,7 @@ module Admin
       @model_to_relate = @resource.reflect_on_association(field.to_sym).class_name.typus_constantize
       @model_to_relate_as_resource = @model_to_relate.to_resource
       @reflection = @resource.reflect_on_association(field.to_sym)
-      @association_name = @reflection.through_reflection ? @reflection.name.to_s : @model_to_relate.model_name
+      @association_name = @reflection.name.to_s
     end
 
     def typus_form_has_many(field)
@@ -17,7 +17,7 @@ module Admin
       count_items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by).count - @item.send(field).count
 
       if set_condition && !count_items_to_relate.zero?
-        form = if count_items_to_relate > Typus.autocomplete
+        form = if Typus.autocomplete && (count_items_to_relate > Typus.autocomplete)
                  build_relate_form('admin/templates/relate_form_with_autocomplete')
                else
                  @items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by) - @item.send(field)
@@ -49,7 +49,7 @@ module Admin
       count_items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by).count - @item.send(field).count
 
       if set_condition && !count_items_to_relate.zero?
-        form = if count_items_to_relate > Typus.autocomplete
+        form = if Typus.autocomplete && (count_items_to_relate > Typus.autocomplete)
                  build_relate_form('admin/templates/relate_form_with_autocomplete')
                else
                  @items_to_relate = @model_to_relate.order(@model_to_relate.typus_order_by) - @item.send(field)
@@ -140,7 +140,11 @@ module Admin
 
     def typus_belongs_to_field(attribute, form)
       association = @resource.reflect_on_association(attribute.to_sym)
-      related = association.class_name.typus_constantize
+      related = if defined?(set_belongs_to_context)
+                  set_belongs_to_context.send(attribute.pluralize.to_sym)
+                else
+                  association.class_name.typus_constantize
+                end
       related_fk = association.primary_key_name
 
       # TODO: Use the build_add_new method.
@@ -155,7 +159,7 @@ module Admin
       end
 
       # Set the template.
-      template = if related.respond_to?(:roots) || !(related.count > Typus.autocomplete)
+      template = if Typus.autocomplete && (related.respond_to?(:roots) || !(related.count > Typus.autocomplete))
                    "admin/templates/belongs_to"
                  else
                    "admin/templates/belongs_to_with_autocomplete"
@@ -164,11 +168,12 @@ module Admin
       # Set the values.
       values = if related.respond_to?(:roots)
                  expand_tree_into_select_field(related.roots, related_fk)
-               elsif !(related.count > Typus.autocomplete)
+               elsif Typus.autocomplete && !(related.count > Typus.autocomplete)
                  related.order(related.typus_order_by).map { |p| [p.to_label, p.id] }
                end
 
       render template,
+             :association => association,
              :resource => @resource,
              :attribute => attribute,
              :form => form,

data/app/helpers/admin/resources_helper.rb

@@ -15,7 +15,10 @@ module Admin
       if params[:resource]
 
         item_class = params[:resource].typus_constantize
-        url = { :controller => item_class.to_resource }
+
+        # For some reason we are forced to set the /admin prefix to the controller
+        # when working with namespaced stuff.
+        url = { :controller => "/admin/#{item_class.to_resource}" }
 
         if params[:resource_id]
           item = item_class.find(params[:resource_id])

data/app/helpers/admin/table_helper.rb

@@ -51,13 +51,15 @@ module Admin
     end
 
     def table_actions(model, item, association_name = nil)
-      resource_actions.map do |body, url, options|
+      resource_actions.map do |body, url, options, proc|
         if admin_user.can?(url[:action], model.name)
+          next if proc && proc.respond_to?(:call) && proc.call(item) == false
+
           link_to Typus::I18n.t(body),
-                  params.dup.cleanup.merge(url).merge(:controller => model.to_resource, :id => item.id),
+                  params.dup.cleanup.merge(url).merge(:controller => "/admin/#{model.to_resource}", :id => item.id),
                   options
         end
-      end.join(" / ").html_safe
+      end.compact.join(" / ").html_safe
     end
 
     def table_belongs_to_field(attribute, item)
@@ -132,6 +134,7 @@ module Admin
 
     alias :table_date_field :table_datetime_field
     alias :table_time_field :table_datetime_field
+    alias :table_timestamp_field :table_datetime_field
 
     def table_boolean_field(attribute, item)
       status = item.send(attribute)

data/app/views/admin/dashboard/_sidebar.html.erb

@@ -1,7 +1,5 @@
 <h2>Welcome!</h2>
 
-<p>If you need help don't hesitate in joining the <%= link_to 'mailing list', 'http://groups.google.com/group/typus' %> or use the <%= link_to "help", "/admin/help" %>.</p>
+<p>If you need help don't hesitate in joining the <%= link_to 'mailing list', 'http://groups.google.com/group/typus' %> or use the provided <%= link_to "user guide", admin_user_guide_path %>.</p>
 
 <p>Replace this sidebar dropping a file named <code>_sidebar.html.erb</code> on the <code>app/views/admin/dashboard</code> folder.</p>
-
-<p>If you need help you can use the provided <%= link_to "user guide", admin_user_guide_path %>.</p>

data/app/views/admin/helpers/table/_table.html.erb

@@ -23,12 +23,4 @@
     </tr>
   <% end %>
 
-  <thead>
-    <tr>
-      <% headers.each do |header| %>
-        <th><%= header %></th>
-      <% end %>
-    </tr>
-  </thead>
-
 </table>

data/app/views/admin/resources/index.html.erb

@@ -15,8 +15,10 @@
 <%= render 'index' %>
 
 <ul class="predefined_filters">
+  <li><%= link_to Typus::I18n.t("All"), :action => 'index' %> (<%= set_context.count %>)</li>
   <% predefined_filters.each do |filter, action, scope| %>
-    <li><%= link_to Typus::I18n.t(filter), params.dup.cleanup.merge(:action => action) %> (<%= @resource.send(scope).count %>)</li>
+    <% url = action.is_a?(String) ? params.dup.cleanup.merge(:action => action) : action %>
+    <li><%= link_to Typus::I18n.t(filter), url %> <%= "(#{@resource.send(scope).count})" if scope && @resource.respond_to?(scope) %></li>
   <% end %>
 </ul>
 

data/app/views/admin/shared/_head.html.erb

@@ -0,0 +1,30 @@
+<meta charset="utf-8" />
+<meta name="apple-mobile-web-app-capable" content="yes" />
+<meta name="generator" content="Typus <%= Typus::VERSION %>" />
+
+<%= favicon_link_tag %>
+
+<title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
+
+<%= stylesheet_link_tag "/vendor/typus/stylesheets/reset",
+                        "/vendor/typus/vendor/jquery-ui-1.8.12.custom/css/ui-lightness/jquery-ui-1.8.12.custom.css",
+                        "/vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.css",
+                        "/vendor/typus/vendor/jquery-tokeninput/css/token-input.css",
+                        "/vendor/typus/stylesheets/screen",
+                        "/vendor/typus/stylesheets/application" %>
+
+<%= yield :stylesheets -%>
+
+<%= javascript_include_tag "/vendor/typus/vendor/jquery-ui-1.8.12.custom/js/jquery-1.5.1.min.js",
+                           "/vendor/typus/vendor/jquery-ui-1.8.12.custom/js/jquery-ui-1.8.12.custom.min.js",
+                           "/vendor/typus/vendor/jquery.fancybox-1.3.4/fancybox/jquery.fancybox-1.3.4.pack.js",
+                           "/vendor/typus/vendor/jquery-tokeninput/js/jquery.tokeninput.js",
+                           "/vendor/typus/javascripts/jquery.searchField.js",
+                           "/vendor/typus/javascripts/jquery.rails.js",
+                           "/vendor/typus/javascripts/jquery.rails.autocomplete.js",
+                           "/vendor/typus/javascripts/jquery.application.js",
+                           "/vendor/typus/javascripts/application" %>
+
+<%= yield :javascripts -%>
+
+<%= csrf_meta_tag %>