updated and new stuff pertaining to the customise panel, new jquery also

git-svn-id: https://code.elgg.org/elgg/trunk@923 36083f99-b078-4883-b0ff-0f9b5a30f544

9 files changed, 816 insertions, 703 deletions

diff --git a/_graphics/icon_customise_drag.gif b/_graphics/icon_customise_drag.gif
new file mode 100644
index 000000000..010270426
--- /dev/null
+++ b/_graphics/icon_customise_drag.gif
diff --git a/_graphics/icon_customise_info.gif b/_graphics/icon_customise_info.gif
new file mode 100644
index 000000000..ba57b42fe
--- /dev/null
+++ b/_graphics/icon_customise_info.gif
diff --git a/_graphics/icon_customise_remove.gif b/_graphics/icon_customise_remove.gif
new file mode 100644
index 000000000..98fccaa1c
--- /dev/null
+++ b/_graphics/icon_customise_remove.gif
diff --git a/javascript/initialise_elgg.js b/javascript/initialise_elgg.js
index d77aaa8ce..0927eab78 100644
--- a/javascript/initialise_elgg.js
+++ b/javascript/initialise_elgg.js
@@ -1,6 +1,16 @@
 
 
 $(document).ready(function () {
+
+	// close all drawer elements
+	$('li.drawer ul').hide();
+	
+	// register click handler for elggtoolbar and define onclick function
+	$('h2.drawer-handle').click(function () {	
+		$('li.drawer ul:visible').slideUp('medium').prev().removeClass('open');
+		$(this).addClass('open').next().slideDown('fast');
+	return false;
+	});
 	
 	// register click function for toggling box contents
 	$('a.toggle_box_contents').bind('click', toggleContent);
@@ -8,8 +18,41 @@ $(document).ready(function () {
 	// click function for box contents edit panel
 	$('a.toggle_box_edit_panel').click(function () {
 		$(this.parentNode.parentNode).children("[class=collapsable_box_editpanel]").slideToggle("fast");
+		return false;
+    });
+    
+	// click function for customise edit panel
+	$('a.toggle_customise_edit_panel').click(function () {
+		$('div#customise_editpanel').slideToggle("fast");
+		return false;
+    });
+ 
+ 	// temp. function to close panel on save
+	$('input.submit_button').click(function () {
+		$('div#customise_editpanel').slideToggle("fast");
+		return false;
+    });       
+    
+	// click function for customise panel - remove widget
+	$('img.remove_me').click(function () {
+		$(this.parentNode.parentNode.parentNode.parentNode.parentNode).fadeOut("medium");
+		return false;
     });
+    
+	var els = ['#widget_picker_gallery', '#main_widgets', '#rightsidebar_widgets'];
+	var $els = $(els.toString());
 	
+	$els.sortable({
+		items: '.draggable_widget',
+		handle: '.drag_handle',
+		cursor: 'move',
+		revert: true,
+		opacity: 0.8,
+		appendTo: 'body',
+		placeholder: 'placeholder',
+		connectWith: els
+	});
+    
 });
 
 // toggle box content
diff --git a/vendors/jquery/jquery-ui-personalized-1.5.packed.js b/vendors/jquery/jquery-ui-personalized-1.5.packed.js
new file mode 100755
index 000000000..b50a57340
--- /dev/null
+++ b/vendors/jquery/jquery-ui-personalized-1.5.packed.js
@@ -0,0 +1 @@
+eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('(a(C){C.d={17:{1o:a(E,F,H){b G=C.d[E].2U;1k(b D 4Y H){G.2d[D]=G.2d[D]||[];G.2d[D].1V([F,H[D]])}},X:a(D,F,E){b H=D.2d[F];5(!H){e}1k(b G=0;G<H.19;G++){5(D.6[H[G][0]]){H[G][1].2l(D.f,E)}}}},2Q:{},g:a(D){5(C.d.2Q[D]){e C.d.2Q[D]}b E=C(\'<2s 4n="d-4J-4X">\').1J(D).g({o:"1b",7:"-4w",8:"-4w",4Z:"51"}).1G("14");C.d.2Q[D]=!!((!(/1U|4c/).1g(E.g("1A"))||(/^[1-9]/).1g(E.g("k"))||(/^[1-9]/).1g(E.g("m"))||!(/4H/).1g(E.g("52"))||!(/4W|4V\\(0, 0, 0, 0\\)/).1g(E.g("4R"))));4Q{C("14").4y(0).4t(E.4y(0))}4S(F){}e C.d.2Q[D]},4T:a(D){D.2M="47";D.4G=a(){e n};5(D.1L){D.1L.4A="4H"}},4U:a(D){D.2M="53";D.4G=a(){e z};5(D.1L){D.1L.4A=""}},54:a(G,E){b D=/7/.1g(E||"7")?"T":"V",F=n;5(G[D]>0){e z}G[D]=1;F=G[D]>0?z:n;G[D]=0;e F}};b B=C.3M.1H;C.3M.1H=a(){C("*",4).1o(4).5d("1H");e B.2l(4,4x)};a A(E,F,G){b D=C[E][F].4h||[];D=(3n D=="3Y"?D.3P(/,?\\s+/):D);e(C.5c(G,D)!=-1)}C.2G=a(E,D){b F=E.3P(".")[0];E=E.3P(".")[1];C.3M[E]=a(J){b H=(3n J=="3Y"),I=5e.2U.5f.X(4x,1);5(H&&A(F,E,J)){b G=C.15(4[0],E);e(G?G[J].2l(G,I):1W)}e 4.1m(a(){b K=C.15(4,E);5(H&&K&&C.2o(K[J])){K[J].2l(K,I)}1q{5(!H){C.15(4,E,4P C[F][E](4,J))}}})};C[F][E]=a(I,H){b G=4;4.25=E;4.4i=F+"-"+E;4.6=C.1Q({1n:n},C[F][E].2S,H);4.f=C(I).2x("2N."+E,a(L,J,K){e G.2N(J,K)}).2x("3J."+E,a(K,J){e G.3J(J)}).2x("1H",a(){e G.31()});4.30()};C[F][E].2U=C.1Q({},C.2G.2U,D)};C.2G.2U={30:a(){},31:a(){4.f.36(4.25)},3J:a(D){e 4.6[D]},2N:a(D,E){4.6[D]=E;5(D=="1n"){4.f[E?"1J":"1Y"](4.4i+"-1n")}},5b:a(){4.2N("1n",n)},5a:a(){4.2N("1n",z)}};C.d.3m={3N:a(){b D=4;4.f.2x("56."+4.25,a(E){e D.4g(E)});5(C.2I.3W){4.43=4.f.33("2M");4.f.33("2M","47")}4.55=n},40:a(){4.f.2v("."+4.25);(C.2I.3W&&4.f.33("2M",4.43))},4g:a(F){(4.1S&&4.2Z(F));4.39=F;b E=4,G=(F.57==1),D=(3n 4.6.2W=="3Y"?C(F.2b).3b(4.6.2W):n);5(!G||D||!4.3k(F)){e z}4.3l=!4.6.2O;5(!4.3l){4.58=59(a(){E.3l=z},4.6.2O)}5(4.3F(F)&&4.3G(F)){4.1S=(4.2i(F)!==n);5(!4.1S){F.5h();e z}}4.3Q=a(H){e E.41(H)};4.3Z=a(H){e E.2Z(H)};C(i).2x("46."+4.25,4.3Q).2x("49."+4.25,4.3Z);e n},41:a(D){5(C.2I.3W&&!D.3H){e 4.2Z(D)}5(4.1S){4.22(D);e n}5(4.3F(D)&&4.3G(D)){4.1S=(4.2i(4.39,D)!==n);(4.1S?4.22(D):4.2Z(D))}e!4.1S},2Z:a(D){C(i).2v("46."+4.25,4.3Q).2v("49."+4.25,4.3Z);5(4.1S){4.1S=n;4.2J(D)}e n},3F:a(D){e(1c.2T(1c.1B(4.39.1r-D.1r),1c.1B(4.39.1v-D.1v))>=4.6.3r)},3G:a(D){e 4.3l},2i:a(D){},22:a(D){},2J:a(D){},3k:a(D){e z}};C.d.3m.2S={2W:1p,3r:1,2O:0}})(38);(a(A){A.2G("d.U",A.1Q(A.d.3m,{30:a(){b B=4.6;5(B.h=="3O"&&!(/(11|1b|1I)/).1g(4.f.g("o"))){4.f.g("o","11")}4.f.1J("d-U");(B.1n&&4.f.1J("d-U-1n"));4.3N()},2i:a(F){b H=4.6;5(4.h||H.1n||A(F.2b).3b(".d-4J-2t")){e n}b C=!4.6.2t||!A(4.6.2t,4.f).19?z:n;A(4.6.2t,4.f).3U("*").4v().1m(a(){5(4==F.2b){C=z}});5(!C){e n}5(A.d.W){A.d.W.29=4}4.h=A.2o(H.h)?A(H.h.2l(4.f[0],[F])):(H.h=="2L"?4.f.2L():4.f);5(!4.h.3c("14").19){4.h.1G((H.1G=="l"?4.f[0].1F:H.1G))}5(4.h[0]!=4.f[0]&&!(/(1I|1b)/).1g(4.h.g("o"))){4.h.g("o","1b")}4.12={8:(S(4.f.g("42"),10)||0),7:(S(4.f.g("4s"),10)||0)};4.1t=4.h.g("o");4.c=4.f.c();4.c={7:4.c.7-4.12.7,8:4.c.8-4.12.8};4.c.q={8:F.1r-4.c.8,7:F.1v-4.c.7};4.v=4.h.v();b B=4.v.c();5(4.v[0]==i.14&&A.2I.4N){B={7:0,8:0}}4.c.l={7:B.7+(S(4.v.g("2y"),10)||0),8:B.8+(S(4.v.g("2m"),10)||0)};b E=4.f.o();4.c.11=4.1t=="11"?{7:E.7-(S(4.h.g("7"),10)||0)+4.v[0].T,8:E.8-(S(4.h.g("8"),10)||0)+4.v[0].V}:{7:0,8:0};4.1x=4.2q(F);4.p={m:4.h.1N(),k:4.h.1M()};5(H.1j){5(H.1j.8!=1W){4.c.q.8=H.1j.8+4.12.8}5(H.1j.2R!=1W){4.c.q.8=4.p.m-H.1j.2R+4.12.8}5(H.1j.7!=1W){4.c.q.7=H.1j.7+4.12.7}5(H.1j.3w!=1W){4.c.q.7=4.p.k-H.1j.3w+4.12.7}}5(H.j){5(H.j=="l"){H.j=4.h[0].1F}5(H.j=="i"||H.j=="1C"){4.j=[0-4.c.11.8-4.c.l.8,0-4.c.11.7-4.c.l.7,A(H.j=="i"?i:1C).m()-4.c.11.8-4.c.l.8-4.p.m-4.12.8-(S(4.f.g("3x"),10)||0),(A(H.j=="i"?i:1C).k()||i.14.1F.3v)-4.c.11.7-4.c.l.7-4.p.k-4.12.7-(S(4.f.g("3p"),10)||0)]}5(!(/^(i|1C|l)$/).1g(H.j)){b D=A(H.j)[0];b G=A(H.j).c();4.j=[G.8+(S(A(D).g("2m"),10)||0)-4.c.11.8-4.c.l.8,G.7+(S(A(D).g("2y"),10)||0)-4.c.11.7-4.c.l.7,G.8+1c.2T(D.4u,D.2V)-(S(A(D).g("2m"),10)||0)-4.c.11.8-4.c.l.8-4.p.m-4.12.8-(S(4.f.g("3x"),10)||0),G.7+1c.2T(D.3v,D.34)-(S(A(D).g("2y"),10)||0)-4.c.11.7-4.c.l.7-4.p.k-4.12.7-(S(4.f.g("3p"),10)||0)]}}4.Y("1u",F);4.p={m:4.h.1N(),k:4.h.1M()};5(A.d.W&&!H.3s){A.d.W.3t(4,F)}4.h.1J("d-U-2P");4.22(F);e z},1D:a(C,D){5(!D){D=4.o}b B=C=="1b"?1:-1;e{7:(D.7+4.c.11.7*B+4.c.l.7*B-(4.1t=="1I"||(4.1t=="1b"&&4.v[0]==i.14)?0:4.v[0].T)*B+(4.1t=="1I"?4.v[0].T:0)*B+4.12.7*B),8:(D.8+4.c.11.8*B+4.c.l.8*B-(4.1t=="1I"||(4.1t=="1b"&&4.v[0]==i.14)?0:4.v[0].V)*B+(4.1t=="1I"?4.v[0].V:0)*B+4.12.8*B)}},2q:a(E){b F=4.6;b B={7:(E.1v-4.c.q.7-4.c.11.7-4.c.l.7+(4.1t=="1I"||(4.1t=="1b"&&4.v[0]==i.14)?0:4.v[0].T)-(4.1t=="1I"?4.v[0].T:0)),8:(E.1r-4.c.q.8-4.c.11.8-4.c.l.8+(4.1t=="1I"||(4.1t=="1b"&&4.v[0]==i.14)?0:4.v[0].V)-(4.1t=="1I"?4.v[0].V:0))};5(!4.1x){e B}5(4.j){5(B.8<4.j[0]){B.8=4.j[0]}5(B.7<4.j[1]){B.7=4.j[1]}5(B.8>4.j[2]){B.8=4.j[2]}5(B.7>4.j[3]){B.7=4.j[3]}}5(F.1h){b D=4.1x.7+1c.3q((B.7-4.1x.7)/F.1h[1])*F.1h[1];B.7=4.j?(!(D<4.j[1]||D>4.j[3])?D:(!(D<4.j[1])?D-F.1h[1]:D+F.1h[1])):D;b C=4.1x.8+1c.3q((B.8-4.1x.8)/F.1h[0])*F.1h[0];B.8=4.j?(!(C<4.j[0]||C>4.j[2])?C:(!(C<4.j[0])?C-F.1h[0]:C+F.1h[0])):C}e B},22:a(B){4.o=4.2q(B);4.1e=4.1D("1b");4.o=4.Y("1T",B)||4.o;5(!4.6.21||4.6.21!="y"){4.h[0].1L.8=4.o.8+"2H"}5(!4.6.21||4.6.21!="x"){4.h[0].1L.7=4.o.7+"2H"}5(A.d.W){A.d.W.1T(4,B)}e n},2J:a(C){5(A.d.W&&!4.6.3s){A.d.W.1O(4,C)}5(4.6.23){b B=4;A(4.h).3L(4.1x,S(4.6.23,10)||3I,a(){B.Y("1E",C);B.2g()})}1q{4.Y("1E",C);4.2g()}e n},2g:a(){4.h.1Y("d-U-2P");5(4.6.h!="3O"&&!4.2k){4.h.1H()}4.h=1p;4.2k=n},2d:{},3B:a(B){e{h:4.h,o:4.o,32:4.1e,6:4.6}},Y:a(C,B){A.d.17.X(4,C,[B,4.3B()]);e 4.f.28(C=="1T"?C:"1T"+C,[B,4.3B()],4.6[C])},31:a(){5(!4.f.15("U")){e}4.f.36("U").2v(".U").1Y("d-U");4.40()}}));A.1Q(A.d.U,{2S:{1G:"l",21:n,2W:":4e,3H",2O:0,3r:0,h:"3O"}});A.d.17.1o("U","1A",{1u:a(D,C){b B=A("14");5(B.g("1A")){C.6.2D=B.g("1A")}B.g("1A",C.6.1A)},1E:a(C,B){5(B.6.2D){A("14").g("1A",B.6.2D)}}});A.d.17.1o("U","1i",{1u:a(D,C){b B=A(C.h);5(B.g("1i")){C.6.2F=B.g("1i")}B.g("1i",C.6.1i)},1E:a(C,B){5(B.6.2F){A(B.h).g("1i",B.6.2F)}}});A.d.17.1o("U","1s",{1u:a(D,C){b B=A(C.h);5(B.g("1s")){C.6.2E=B.g("1s")}B.g("1s",C.6.1s)},1E:a(C,B){5(B.6.2E){A(B.h).g("1s",B.6.2E)}}});A.d.17.1o("U","3j",{1u:a(C,B){A(B.6.3j===z?"4L":B.6.3j).1m(a(){A(\'<2s 4n="d-U-3j" 1L="4O: #4M;"></2s>\').g({m:4.2V+"2H",k:4.34+"2H",o:"1b",1s:"0.5g",1i:4r}).g(A(4).c()).1G("14")})},1E:a(C,B){A("2s.5p").1m(a(){4.1F.4t(4)})}});A.d.17.1o("U","1R",{1u:a(D,C){b E=C.6;b B=A(4).15("U");E.1f=E.1f||20;E.1d=E.1d||20;B.1a=a(F){3z{5(/1U|1R/.1g(F.g("27"))||(/1U|1R/).1g(F.g("27-y"))){e F}F=F.l()}35(F[0].1F);e A(i)}(4);B.18=a(F){3z{5(/1U|1R/.1g(F.g("27"))||(/1U|1R/).1g(F.g("27-x"))){e F}F=F.l()}35(F[0].1F);e A(i)}(4);5(B.1a[0]!=i&&B.1a[0].2a!="24"){B.2u=B.1a.c()}5(B.18[0]!=i&&B.18[0].2a!="24"){B.2w=B.18.c()}},1T:a(D,C){b E=C.6;b B=A(4).15("U");5(B.1a[0]!=i&&B.1a[0].2a!="24"){5((B.2u.7+B.1a[0].34)-D.1v<E.1f){B.1a[0].T=B.1a[0].T+E.1d}5(D.1v-B.2u.7<E.1f){B.1a[0].T=B.1a[0].T-E.1d}}1q{5(D.1v-A(i).T()<E.1f){A(i).T(A(i).T()-E.1d)}5(A(1C).k()-(D.1v-A(i).T())<E.1f){A(i).T(A(i).T()+E.1d)}}5(B.18[0]!=i&&B.18[0].2a!="24"){5((B.2w.8+B.18[0].2V)-D.1r<E.1f){B.18[0].V=B.18[0].V+E.1d}5(D.1r-B.2w.8<E.1f){B.18[0].V=B.18[0].V-E.1d}}1q{5(D.1r-A(i).V()<E.1f){A(i).V(A(i).V()-E.1d)}5(A(1C).m()-(D.1r-A(i).V())<E.1f){A(i).V(A(i).V()+E.1d)}}}});A.d.17.1o("U","3V",{1u:a(D,C){b B=A(4).15("U");B.2h=[];A(C.6.3V===z?".d-U":C.6.3V).1m(a(){b F=A(4);b E=F.c();5(4!=B.f[0]){B.2h.1V({1l:4,m:F.1N(),k:F.1M(),7:E.7,8:E.8})}})},1T:a(J,N){b I=A(4).15("U");b L=N.6.5U||20;b D=N.32.8,C=D+I.p.m,P=N.32.7,O=P+I.p.k;1k(b H=I.2h.19-1;H>=0;H--){b E=I.2h[H].8,B=E+I.2h[H].m,R=I.2h[H].7,M=R+I.2h[H].k;5(!((E-L<D&&D<B+L&&R-L<P&&P<M+L)||(E-L<D&&D<B+L&&R-L<O&&O<M+L)||(E-L<C&&C<B+L&&R-L<P&&P<M+L)||(E-L<C&&C<B+L&&R-L<O&&O<M+L))){2n}5(N.6.4q!="5T"){b K=1c.1B(R-O)<=20;b Q=1c.1B(M-P)<=20;b G=1c.1B(E-C)<=20;b F=1c.1B(B-D)<=20;5(K){N.o.7=I.1D("11",{7:R-I.p.k,8:0}).7}5(Q){N.o.7=I.1D("11",{7:M,8:0}).7}5(G){N.o.8=I.1D("11",{7:0,8:E-I.p.m}).8}5(F){N.o.8=I.1D("11",{7:0,8:B}).8}}5(N.6.4q!="5R"){b K=1c.1B(R-P)<=20;b Q=1c.1B(M-O)<=20;b G=1c.1B(E-D)<=20;b F=1c.1B(B-C)<=20;5(K){N.o.7=I.1D("11",{7:R,8:0}).7}5(Q){N.o.7=I.1D("11",{7:M-I.p.k,8:0}).7}5(G){N.o.8=I.1D("11",{7:0,8:E}).8}5(F){N.o.8=I.1D("11",{7:0,8:B-I.p.m}).8}}}}});A.d.17.1o("U","4z",{1u:a(D,C){b B=A(4).15("U");B.3h=[];A(C.6.4z).1m(a(){5(A.15(4,"Z")){b E=A.15(4,"Z");B.3h.1V({t:E,4B:E.6.23});E.3e();E.Y("2e",D,B)}})},1E:a(D,C){b B=A(4).15("U");A.1m(B.3h,a(){5(4.t.2B){4.t.2B=0;B.2k=z;4.t.2k=n;5(4.4B){4.t.6.23=z}4.t.2J(D);4.t.f.28("5M",[D,A.1Q(4.t.d(),{4k:B.f})],4.t.6.4b);4.t.6.h=4.t.6.3D}1q{4.t.Y("2f",D,B)}})},1T:a(F,E){b D=A(4).15("U"),B=4;b C=a(K){b H=K.8,J=H+K.m,I=K.7,G=I+K.k;e(H<(4.1e.8+4.c.q.8)&&(4.1e.8+4.c.q.8)<J&&I<(4.1e.7+4.c.q.7)&&(4.1e.7+4.c.q.7)<G)};A.1m(D.3h,a(G){5(C.X(D,4.t.1z)){5(!4.t.2B){4.t.2B=1;4.t.r=A(B).2L().1G(4.t.f).15("Z-1l",z);4.t.6.3D=4.t.6.h;4.t.6.h=a(){e E.h[0]};F.2b=4.t.r[0];4.t.3k(F,z,z);4.t.2i(F,z,z);4.t.c.q.7=D.c.q.7;4.t.c.q.8=D.c.q.8;4.t.c.l.8-=D.c.l.8-4.t.c.l.8;4.t.c.l.7-=D.c.l.7-4.t.c.l.7;D.Y("5N",F)}5(4.t.r){4.t.22(F)}}1q{5(4.t.2B){4.t.2B=0;4.t.2k=z;4.t.6.23=n;4.t.2J(F,z);4.t.6.h=4.t.6.3D;4.t.r.1H();4.t.13.1H();D.Y("5Q",F)}}})}});A.d.17.1o("U","2C",{1u:a(D,B){b C=A.5i(A(B.6.2C.5P)).2Y(a(F,E){e(S(A(F).g("1i"),10)||B.6.2C.3f)-(S(A(E).g("1i"),10)||B.6.2C.3f)});A(C).1m(a(E){4.1L.1i=B.6.2C.3f+E});4[0].1L.1i=B.6.2C.3f+C.19}})})(38);(a(A){A.2G("d.1w",{30:a(){4.f.1J("d-1w");4.1K=0;4.26=1;b C=4.6,B=C.1P;C=A.1Q(C,{1P:C.1P&&C.1P.4o==5O?C.1P:a(D){e A(D).3b(B)}});4.3d={m:4.f.1N(),k:4.f.1M()};A.d.W.2A.1V(4)},2d:{},d:a(B){e{U:(B.r||B.f),h:B.h,o:B.o,32:B.1e,6:4.6,f:4.f}},31:a(){b B=A.d.W.2A;1k(b C=0;C<B.19;C++){5(B[C]==4){B.5L(C,1)}}4.f.1Y("d-1w d-1w-1n").36("1w").2v(".1w")},1y:a(C){b B=A.d.W.29;5(!B||(B.r||B.f)[0]==4.f[0]){e}5(4.6.1P.X(4.f,(B.r||B.f))){A.d.17.X(4,"1y",[C,4.d(B)]);4.f.28("5S",[C,4.d(B)],4.6.1y)}},2c:a(C){b B=A.d.W.29;5(!B||(B.r||B.f)[0]==4.f[0]){e}5(4.6.1P.X(4.f,(B.r||B.f))){A.d.17.X(4,"2c",[C,4.d(B)]);4.f.28("5X",[C,4.d(B)],4.6.2c)}},1O:a(D,C){b B=C||A.d.W.29;5(!B||(B.r||B.f)[0]==4.f[0]){e n}b E=n;4.f.3U(".d-1w").2X(".d-U-2P").1m(a(){b F=A.15(4,"1w");5(F.6.4f&&A.d.2K(B,A.1Q(F,{c:F.f.c()}),F.6.1Z)){E=z;e n}});5(E){e n}5(4.6.1P.X(4.f,(B.r||B.f))){A.d.17.X(4,"1O",[D,4.d(B)]);4.f.28("1O",[D,4.d(B)],4.6.1O);e z}e n},2e:a(C){b B=A.d.W.29;A.d.17.X(4,"2e",[C,4.d(B)]);5(B){4.f.28("5W",[C,4.d(B)],4.6.2e)}},2f:a(C){b B=A.d.W.29;A.d.17.X(4,"2f",[C,4.d(B)]);5(B){4.f.28("5V",[C,4.d(B)],4.6.2f)}}});A.1Q(A.d.1w,{2S:{1n:n,1Z:"2K"}});A.d.2K=a(L,F,J){5(!F.c){e n}b D=(L.1e||L.o.1b).8,C=D+L.p.m,I=(L.1e||L.o.1b).7,H=I+L.p.k;b E=F.c.8,B=E+F.3d.m,K=F.c.7,G=K+F.3d.k;5Y(J){3i"5J":e(E<D&&C<B&&K<I&&H<G);2p;3i"2K":e(E<D+(L.p.m/2)&&C-(L.p.m/2)<B&&K<I+(L.p.k/2)&&H-(L.p.k/2)<G);2p;3i"3E":e(E<((L.1e||L.o.1b).8+(L.37||L.c.q).8)&&((L.1e||L.o.1b).8+(L.37||L.c.q).8)<B&&K<((L.1e||L.o.1b).7+(L.37||L.c.q).7)&&((L.1e||L.o.1b).7+(L.37||L.c.q).7)<G);2p;3i"5r":e((I>=K&&I<=G)||(H>=K&&H<=G)||(I<K&&H>G))&&((D>=E&&D<=B)||(C>=E&&C<=B)||(D<E&&C>B));2p;4c:e n;2p}};A.d.W={29:1p,2A:[],3t:a(D,F){b B=A.d.W.2A;b E=F?F.3R:1p;1k(b C=0;C<B.19;C++){5(B[C].6.1n||(D&&!B[C].6.1P.X(B[C].f,(D.r||D.f)))){2n}B[C].2r=B[C].f.3b(":2r");5(!B[C].2r){2n}B[C].c=B[C].f.c();B[C].3d={m:B[C].f.1N(),k:B[C].f.1M()};5(E=="5t"||E=="5u"){B[C].2e.X(B[C],F)}}},1O:a(B,C){b D=n;A.1m(A.d.W.2A,a(){5(!4.6){e}5(!4.6.1n&&4.2r&&A.d.2K(B,4,4.6.1Z)){D=4.1O.X(4,C)}5(!4.6.1n&&4.2r&&4.6.1P.X(4.f,(B.r||B.f))){4.26=1;4.1K=0;4.2f.X(4,C)}});e D},1T:a(B,C){5(B.6.3u){A.d.W.3t(B,C)}A.1m(A.d.W.2A,a(){5(4.1n||4.4j||!4.2r){e}b E=A.d.2K(B,4,4.6.1Z);b G=!E&&4.1K==1?"26":(E&&4.1K==0?"1K":1p);5(!G){e}b F;5(4.6.4f){b D=4.f.3c(".d-1w:5o(0)");5(D.19){F=A.15(D[0],"1w");F.4j=(G=="1K"?1:0)}}5(F&&G=="1K"){F.1K=0;F.26=1;F.2c.X(F,C)}4[G]=1;4[G=="26"?"1K":"26"]=0;4[G=="1K"?"1y":"2c"].X(4,C);5(F&&G=="26"){F.26=0;F.1K=1;F.1y.X(F,C)}})}};A.d.17.1o("1w","3g",{2e:a(C,B){A(4).1J(B.6.3g)},2f:a(C,B){A(4).1Y(B.6.3g)},1O:a(C,B){A(4).1Y(B.6.3g)}});A.d.17.1o("1w","3a",{1y:a(C,B){A(4).1J(B.6.3a)},2c:a(C,B){A(4).1Y(B.6.3a)},1O:a(C,B){A(4).1Y(B.6.3a)}})})(38);(a(B){a A(E,D){b C=B.2I.5k&&B.2I.5j<5l;5(E.4D&&!C){e E.4D(D)}5(E.4E){e!!(E.4E(D)&16)}35(D=D.1F){5(D==E){e z}}e n}B.2G("d.Z",B.1Q(B.d.3m,{30:a(){b C=4.6;4.1z={};4.f.1J("d-Z");4.3e();4.1X=4.w.19?(/8|2R/).1g(4.w[0].1l.g("5m")):n;5(!(/(11|1b|1I)/).1g(4.f.g("o"))){4.f.g("o","11")}4.c=4.f.c();4.3N()},2d:{},d:a(C){e{h:(C||4)["h"],13:(C||4)["13"]||B([]),o:(C||4)["o"],32:(C||4)["1e"],6:4.6,f:4.f,1l:(C||4)["r"],4k:C?C.f:1p}},Y:a(F,E,C,D){B.d.17.X(4,F,[E,4.d(C)]);5(!D){4.f.28(F=="2Y"?F:"2Y"+F,[E,4.d(C)],4.6[F])}},48:a(E){b C=(B.2o(4.6.w)?4.6.w.X(4.f):B(4.6.w,4.f)).2X(".d-Z-h");b D=[];E=E||{};C.1m(a(){b F=(B(4).33(E.5v||"4I")||"").5w(E.5F||(/(.+)[-=5E](.+)/));5(F){D.1V((E.4K||F[1])+"[]="+(E.4K?F[1]:F[2]))}});e D.5G("&")},4a:a(C){b D=(B.2o(4.6.w)?4.6.w.X(4.f):B(4.6.w,4.f)).2X(".d-Z-h");b E=[];D.1m(a(){E.1V(B(4).33(C||"4I"))});e E},4m:a(J){b E=4.1e.8,D=E+4.p.m,I=4.1e.7,H=I+4.p.k;b F=J.8,C=F+J.m,K=J.7,G=K+J.k;5(4.6.1Z=="3E"||(4.6.1Z=="3T"&&4.p[4.1X?"m":"k"]>J[4.1X?"m":"k"])){e(I+4.c.q.7>K&&I+4.c.q.7<G&&E+4.c.q.8>F&&E+4.c.q.8<C)}1q{e(F<E+(4.p.m/2)&&D-(4.p.m/2)<C&&K<I+(4.p.k/2)&&H-(4.p.k/2)<G)}},4p:a(J){b E=4.1e.8,D=E+4.p.m,I=4.1e.7,H=I+4.p.k;b F=J.8,C=F+J.m,K=J.7,G=K+J.k;5(4.6.1Z=="3E"||(4.6.1Z=="3T"&&4.p[4.1X?"m":"k"]>J[4.1X?"m":"k"])){5(!(I+4.c.q.7>K&&I+4.c.q.7<G&&E+4.c.q.8>F&&E+4.c.q.8<C)){e n}5(4.1X){5(E+4.c.q.8>F&&E+4.c.q.8<F+J.m/2){e 2}5(E+4.c.q.8>F+J.m/2&&E+4.c.q.8<C){e 1}}1q{5(I+4.c.q.7>K&&I+4.c.q.7<K+J.k/2){e 2}5(I+4.c.q.7>K+J.k/2&&I+4.c.q.7<G){e 1}}}1q{5(!(F<E+(4.p.m/2)&&D-(4.p.m/2)<C&&K<I+(4.p.k/2)&&H-(4.p.k/2)<G)){e n}5(4.1X){5(D>F&&E<F){e 2}5(E<C&&D>C){e 1}}1q{5(H>K&&I<K){e 1}5(I<G&&H>G){e 2}}}e n},3e:a(){4.4F();4.3u()},4F:a(){4.w=[];4.u=[4];b C=4.w;b E=[B.2o(4.6.w)?4.6.w.X(4.f):B(4.6.w,4.f)];5(4.6.3A){1k(b F=4.6.3A.19-1;F>=0;F--){b H=B(4.6.3A[F]);1k(b D=H.19-1;D>=0;D--){b G=B.15(H[D],"Z");5(G&&!G.6.1n){E.1V(B.2o(G.6.w)?G.6.w.X(G.f):B(G.6.w,G.f));4.u.1V(G)}}}}1k(b F=E.19-1;F>=0;F--){E[F].1m(a(){B.15(4,"Z-1l",z);C.1V({1l:B(4),m:0,k:0,8:0,7:0})})}},3u:a(C){1k(b E=4.w.19-1;E>=0;E--){b D=4.w[E].1l;5(!C){4.w[E].m=(4.6.2j?B(4.6.2j,D):D).1N()}5(!C){4.w[E].k=(4.6.2j?B(4.6.2j,D):D).1M()}b F=(4.6.2j?B(4.6.2j,D):D).c();4.w[E].8=F.8;4.w[E].7=F.7}1k(b E=4.u.19-1;E>=0;E--){b F=4.u[E].f.c();4.u[E].1z.8=F.8;4.u[E].1z.7=F.7;4.u[E].1z.m=4.u[E].f.1N();4.u[E].1z.k=4.u[E].f.1M()}},31:a(){4.f.1Y("d-Z d-Z-1n").36("Z").2v(".Z");4.40();1k(b C=4.w.19-1;C>=0;C--){4.w[C].1l.36("Z-1l")}},3S:a(E){b C=E||4,F=C.6;5(F.13.4o==5y){b D=F.13;F.13={f:a(){e B("<2s></2s>").1J(D)[0]},2z:a(G,H){H.g(G.c()).g({m:G.1N(),k:G.1M()})}}}C.13=B(F.13.f.X(C.f,C.r)).1G("14").g({o:"1b"});F.13.2z.X(C.f,C.r,C.13)},4C:a(F){1k(b D=4.u.19-1;D>=0;D--){5(4.4m(4.u[D].1z)){5(!4.u[D].1z.1y){5(4.3X!=4.u[D]){b I=5x;b H=1p;b E=4.1e[4.u[D].1X?"8":"7"];1k(b C=4.w.19-1;C>=0;C--){5(!A(4.u[D].f[0],4.w[C].1l[0])){2n}b G=4.w[C][4.u[D].1X?"8":"7"];5(1c.1B(G-E)<I){I=1c.1B(G-E);H=4.w[C]}}5(!H&&!4.6.4l){2n}5(4.13){4.13.1H()}5(4.u[D].6.13){4.u[D].3S(4)}1q{4.13=1p}H?4.3o(F,H):4.3o(F,1p,4.u[D].f);4.Y("3C",F);4.u[D].Y("3C",F,4);4.3X=4.u[D]}4.u[D].Y("1y",F,4);4.u[D].1z.1y=1}}1q{5(4.u[D].1z.1y){4.u[D].Y("2c",F,4);4.u[D].1z.1y=0}}}},3k:a(F,E){5(4.6.1n||4.6.3R=="5A"){e n}b D=1p,C=B(F.2b).3c().1m(a(){5(B.15(4,"Z-1l")){D=B(4);e n}});5(B.15(F.2b,"Z-1l")){D=B(F.2b)}5(!D){e n}5(4.6.2t&&!E){b G=n;B(4.6.2t,D).3U("*").4v().1m(a(){5(4==F.2b){G=z}});5(!G){e n}}4.r=D;e z},2i:a(H,F,C){b J=4.6;4.3X=4;4.3e();4.h=3n J.h=="a"?B(J.h.2l(4.f[0],[H,4.r])):4.r.2L();5(!4.h.3c("14").19){4.h.1G((J.1G!="l"?J.1G:4.r[0].1F))}4.h.g({o:"1b",2g:"5B"}).1J("d-Z-h");4.12={8:(S(4.r.g("42"),10)||0),7:(S(4.r.g("4s"),10)||0)};4.c=4.r.c();4.c={7:4.c.7-4.12.7,8:4.c.8-4.12.8};4.c.q={8:H.1r-4.c.8,7:H.1v-4.c.7};4.v=4.h.v();b D=4.v.c();4.c.l={7:D.7+(S(4.v.g("2y"),10)||0),8:D.8+(S(4.v.g("2m"),10)||0)};4.1x=4.2q(H);4.p={m:4.h.1N(),k:4.h.1M()};5(J.1j){5(J.1j.8!=1W){4.c.q.8=J.1j.8}5(J.1j.2R!=1W){4.c.q.8=4.p.m-J.1j.2R}5(J.1j.7!=1W){4.c.q.7=J.1j.7}5(J.1j.3w!=1W){4.c.q.7=4.p.k-J.1j.3w}}4.3K=4.r.3y()[0];5(J.j){5(J.j=="l"){J.j=4.h[0].1F}5(J.j=="i"||J.j=="1C"){4.j=[0-4.c.l.8,0-4.c.l.7,B(J.j=="i"?i:1C).m()-4.c.l.8-4.p.m-4.12.8-(S(4.f.g("3x"),10)||0),(B(J.j=="i"?i:1C).k()||i.14.1F.3v)-4.c.l.7-4.p.k-4.12.7-(S(4.f.g("3p"),10)||0)]}5(!(/^(i|1C|l)$/).1g(J.j)){b G=B(J.j)[0];b I=B(J.j).c();4.j=[I.8+(S(B(G).g("2m"),10)||0)-4.c.l.8,I.7+(S(B(G).g("2y"),10)||0)-4.c.l.7,I.8+1c.2T(G.4u,G.2V)-(S(B(G).g("2m"),10)||0)-4.c.l.8-4.p.m-4.12.8-(S(4.r.g("3x"),10)||0),I.7+1c.2T(G.3v,G.34)-(S(B(G).g("2y"),10)||0)-4.c.l.7-4.p.k-4.12.7-(S(4.r.g("3p"),10)||0)]}}5(J.13){4.3S()}4.Y("1u",H);4.p={m:4.h.1N(),k:4.h.1M()};5(4.6.13!="2L"){4.r.g("4d","5z")}5(!C){1k(b E=4.u.19-1;E>=0;E--){4.u[E].Y("2e",H,4)}}5(B.d.W){B.d.W.29=4}5(B.d.W&&!J.3s){B.d.W.3t(4,H)}4.2P=z;4.22(H);e z},1D:a(D,E){5(!E){E=4.o}b C=D=="1b"?1:-1;e{7:(E.7+4.c.l.7*C-(4.v[0]==i.14?0:4.v[0].T)*C+4.12.7*C),8:(E.8+4.c.l.8*C-(4.v[0]==i.14?0:4.v[0].V)*C+4.12.8*C)}},2q:a(F){b G=4.6;b C={7:(F.1v-4.c.q.7-4.c.l.7+(4.v[0]==i.14?0:4.v[0].T)),8:(F.1r-4.c.q.8-4.c.l.8+(4.v[0]==i.14?0:4.v[0].V))};5(!4.1x){e C}5(4.j){5(C.8<4.j[0]){C.8=4.j[0]}5(C.7<4.j[1]){C.7=4.j[1]}5(C.8>4.j[2]){C.8=4.j[2]}5(C.7>4.j[3]){C.7=4.j[3]}}5(G.1h){b E=4.1x.7+1c.3q((C.7-4.1x.7)/G.1h[1])*G.1h[1];C.7=4.j?(!(E<4.j[1]||E>4.j[3])?E:(!(E<4.j[1])?E-G.1h[1]:E+G.1h[1])):E;b D=4.1x.8+1c.3q((C.8-4.1x.8)/G.1h[0])*G.1h[0];C.8=4.j?(!(D<4.j[0]||D>4.j[2])?D:(!(D<4.j[0])?D-G.1h[0]:D+G.1h[0])):D}e C},22:a(D){4.o=4.2q(D);4.1e=4.1D("1b");1k(b C=4.w.19-1;C>=0;C--){b E=4.4p(4.w[C]);5(!E){2n}5(4.w[C].1l[0]!=4.r[0]&&4.r[E==1?"5C":"3y"]()[0]!=4.w[C].1l[0]&&!A(4.r[0],4.w[C].1l[0])&&(4.6.3R=="5D-5I"?!A(4.f[0],4.w[C].1l[0]):z)){4.44=E==1?"45":"5H";4.3o(D,4.w[C]);4.Y("3C",D);2p}}4.4C(D);4.Y("2Y",D);5(!4.6.21||4.6.21=="x"){4.h[0].1L.8=4.o.8+"2H"}5(!4.6.21||4.6.21=="y"){4.h[0].1L.7=4.o.7+"2H"}5(B.d.W){B.d.W.1T(4,D)}e n},2J:a(E,D){5(B.d.W&&!4.6.3s){B.d.W.1O(4,E)}5(4.6.23){b C=4;b F=C.r.c();5(C.13){C.13.3L({1s:"5n"},(S(4.6.23,10)||3I)-50)}B(4.h).3L({8:F.8-4.c.l.8-C.12.8+(4.v[0]==i.14?0:4.v[0].V),7:F.7-4.c.l.7-C.12.7+(4.v[0]==i.14?0:4.v[0].T)},S(4.6.23,10)||3I,a(){C.Y("1E",E,1p,D);C.2g(E)})}1q{4.Y("1E",E,1p,D);4.2g(E,D)}e n},2g:a(E,D){5(4.3K!=4.r.3y().2X(".d-Z-h")[0]){4.Y("2z",E,1p,D)}5(!A(4.f[0],4.r[0])){5(4.3K==4.r.3y().2X(".d-Z-h")[0]){4.Y("2z",E,1p,D)}4.Y("1H",E,1p,D);1k(b C=4.u.19-1;C>=0;C--){5(A(4.u[C].f[0],4.r[0])){4.u[C].Y("2z",E,4,D);4.u[C].Y("4b",E,4,D)}}}1k(b C=4.u.19-1;C>=0;C--){4.u[C].Y("2f",E,4,D);5(4.u[C].1z.1y){4.u[C].Y("2c",E,4);4.u[C].1z.1y=0}}4.2P=n;5(4.2k){e n}B(4.r).g("4d","");5(4.13){4.13.1H()}4.h.1H();e z},3o:a(E,D,C){C?C.5K(4.r):D.1l[4.44=="45"?"5s":"5q"](4.r);4.3u(z);5(4.6.13){4.6.13.2z.X(4.f,4.r,4.13)}}}));B.1Q(B.d.Z,{4h:"48 4a",2S:{1Z:"3T",3r:0,2O:0,2W:":4e,3H",w:"> *",1i:4r,4l:z,1G:"l"}});B.d.17.1o("Z","1A",{1u:a(E,D){b C=B("14");5(C.g("1A")){D.6.2D=C.g("1A")}C.g("1A",D.6.1A)},1E:a(D,C){5(C.6.2D){B("14").g("1A",C.6.2D)}}});B.d.17.1o("Z","1i",{1u:a(E,D){b C=D.h;5(C.g("1i")){D.6.2F=C.g("1i")}C.g("1i",D.6.1i)},1E:a(D,C){5(C.6.2F){B(C.h).g("1i",C.6.2F)}}});B.d.17.1o("Z","1s",{1u:a(E,D){b C=D.h;5(C.g("1s")){D.6.2E=C.g("1s")}C.g("1s",D.6.1s)},1E:a(D,C){5(C.6.2E){B(C.h).g("1s",C.6.2E)}}});B.d.17.1o("Z","1R",{1u:a(E,D){b F=D.6;b C=B(4).15("Z");F.1f=F.1f||20;F.1d=F.1d||20;C.1a=a(G){3z{5(/1U|1R/.1g(G.g("27"))||(/1U|1R/).1g(G.g("27-y"))){e G}G=G.l()}35(G[0].1F);e B(i)}(C.r);C.18=a(G){3z{5(/1U|1R/.1g(G.g("27"))||(/1U|1R/).1g(G.g("27-x"))){e G}G=G.l()}35(G[0].1F);e B(i)}(C.r);5(C.1a[0]!=i&&C.1a[0].2a!="24"){C.2u=C.1a.c()}5(C.18[0]!=i&&C.18[0].2a!="24"){C.2w=C.18.c()}},2Y:a(E,D){b F=D.6;b C=B(4).15("Z");5(C.1a[0]!=i&&C.1a[0].2a!="24"){5((C.2u.7+C.1a[0].34)-E.1v<F.1f){C.1a[0].T=C.1a[0].T+F.1d}5(E.1v-C.2u.7<F.1f){C.1a[0].T=C.1a[0].T-F.1d}}1q{5(E.1v-B(i).T()<F.1f){B(i).T(B(i).T()-F.1d)}5(B(1C).k()-(E.1v-B(i).T())<F.1f){B(i).T(B(i).T()+F.1d)}}5(C.18[0]!=i&&C.18[0].2a!="24"){5((C.2w.8+C.18[0].2V)-E.1r<F.1f){C.18[0].V=C.18[0].V+F.1d}5(E.1r-C.2w.8<F.1f){C.18[0].V=C.18[0].V-F.1d}}1q{5(E.1r-B(i).V()<F.1f){B(i).V(B(i).V()-F.1d)}5(B(1C).m()-(E.1r-B(i).V())<F.1f){B(i).V(B(i).V()+F.1d)}}}})})(38);',62,371,'||||this|if|options|top|left||function|var|offset|ui|return|element|css|helper|document|containment|height|parent|width|false|position|helperProportions|click|currentItem||instance|containers|offsetParent|items|||true|||||||||||||||||||parseInt|scrollTop|draggable|scrollLeft|ddmanager|call|propagate|sortable||relative|margins|placeholder|body|data||plugin|overflowX|length|overflowY|absolute|Math|scrollSpeed|positionAbs|scrollSensitivity|test|grid|zIndex|cursorAt|for|item|each|disabled|add|null|else|pageX|opacity|cssPosition|start|pageY|droppable|originalPosition|over|containerCache|cursor|abs|window|convertPositionTo|stop|parentNode|appendTo|remove|fixed|addClass|isover|style|outerHeight|outerWidth|drop|accept|extend|scroll|_mouseStarted|drag|auto|push|undefined|floating|removeClass|tolerance||axis|mouseDrag|revert|HTML|widgetName|isout|overflow|triggerHandler|current|tagName|target|out|plugins|activate|deactivate|clear|snapElements|mouseStart|toleranceElement|cancelHelperRemoval|apply|borderLeftWidth|continue|isFunction|break|generatePosition|visible|div|handle|overflowYOffset|unbind|overflowXOffset|bind|borderTopWidth|update|droppables|isOver|stack|_cursor|_opacity|_zIndex|widget|px|browser|mouseStop|intersect|clone|unselectable|setData|delay|dragging|cssCache|right|defaults|max|prototype|offsetWidth|cancel|not|sort|mouseUp|init|destroy|absolutePosition|attr|offsetHeight|while|removeData|clickOffset|jQuery|_mouseDownEvent|hoverClass|is|parents|proportions|refresh|min|activeClass|sortables|case|iframeFix|mouseCapture|_mouseDelayMet|mouse|typeof|rearrange|marginBottom|round|distance|dropBehaviour|prepareOffsets|refreshPositions|scrollHeight|bottom|marginRight|prev|do|connectWith|uiHash|change|_helper|pointer|mouseDistanceMet|mouseDelayMet|button|500|getData|domPosition|animate|fn|mouseInit|original|split|_mouseMoveDelegate|type|createPlaceholder|guess|find|snap|msie|currentContainer|string|_mouseUpDelegate|mouseDestroy|mouseMove|marginLeft|_mouseUnselectable|direction|down|mousemove|on|serialize|mouseup|toArray|receive|default|visibility|input|greedy|mouseDown|getter|widgetBaseClass|greedyChild|sender|dropOnEmpty|intersectsWith|class|constructor|intersectsWithEdge|snapMode|1000|marginTop|removeChild|scrollWidth|andSelf|5000px|arguments|get|connectToSortable|MozUserSelect|shouldRevert|contactContainers|contains|compareDocumentPosition|refreshItems|onselectstart|none|id|resizable|key|iframe|fff|mozilla|background|new|try|backgroundColor|catch|disableSelection|enableSelection|rgba|transparent|gen|in|display||block|backgroundImage|off|hasScroll|started|mousedown|which|_mouseDelayTimer|setTimeout|disable|enable|inArray|trigger|Array|slice|001|preventDefault|makeArray|version|safari|522|float|hide|eq|DragDropIframeFix|after|touch|before|dragstart|sortactivate|attribute|match|10000|String|hidden|static|both|next|semi|_|expression|join|up|dynamic|fit|append|splice|sortreceive|toSortable|Function|group|fromSortable|outer|dropover|inner|snapTolerance|dropdeactivate|dropactivate|dropout|switch'.split('|'),0,{}))
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php
index 820c41f19..b9227c64a 100644
--- a/views/default/canvas/layouts/widgets.php
+++ b/views/default/canvas/layouts/widgets.php
@@ -13,42 +13,15 @@
 
 		$widgettypes = get_widget_types();
 
-		if (is_array($widgettypes) && sizeof($widgettypes) > 0) {
+		$owner = page_owner_entity();
+		
+		if (is_array($widgettypes) && sizeof($widgettypes) > 0 && $owner->canEdit()) {
 			
 ?>
 
 <div id="customise_editpanel">
-<!-- temporarily include customise panel js here -->
-
-<!-- jQuery UI Base -->
-<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/ui.base.js"></script>	
-<!-- jQuery UI Plugins -->
-<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/ui.draggable.js"></script>
-<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/ui.droppable.js"></script>
-<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/ui.sortable.js"></script>
-
-<script type="text/javascript">
-$(document).ready(function () {
-
-	var els = ['#widget_picker_gallery', '#main_widgets', '#rightsidebar_widgets'];
-	var $els = $(els.toString());
-	
-	$els.sortable({
-		items: '> table',
-		handle: 'img.drag_handle',
-		cursor: 'move',
-		revert: true,
-		opacity: 0.8,
-		ghosting: true,
-		appendTo: 'body',
-		placeholder: 'placeholder',
-		connectWith: els,
-	});	
-	
-});
-</script>
 
-<div id="widget_picker_gallery" style="float:right;border:1px solid black;width:210px;height:198px;padding:10px;overflow:auto;overflow-x:hidden;">
+<div id="widget_picker_gallery">
 <h2>Widget gallery</h2>
 
 <?php
@@ -59,7 +32,7 @@ $(document).ready(function () {
 
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3><?php echo $widget->name; ?></h3></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
 </tr></table>
 
@@ -82,27 +55,27 @@ $(document).ready(function () {
 
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 1 Title</h3></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
 </tr></table>
-<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 2 Title</h3></td>
+<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 2 Title megacalculatorextrodinaire</h3></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
 </tr></table>
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 3 Title</h3></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
 </tr></table>
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 4 Title</h3></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
 </tr></table>
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 5 Title</h3></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
 </tr></table>
 </div>
@@ -113,17 +86,17 @@ $(document).ready(function () {
 <h2>Right sidebar widgets</h2>
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 6 Title</h3></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
 </tr></table>
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 7 Title</h3></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
 </tr></table>
 <table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 8 Title</h3></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td>
 </tr></table>
 </div>
diff --git a/views/default/css.php b/views/default/css.php
index d1d09599b..8bb14c1e6 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -1,526 +1,634 @@
-<?php

-

-	/**

-	 * Elgg CSS

-	 * The standard CSS file

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author (s) Pete Harris / David Tosh

-	 * @copyright Curverider Ltd 2008

-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['wwwroot'] The site URL

-	 */

-

-?>

-

-/* ***************************************

-	RESET BASE STYLES

-*************************************** */

-html, body, div, span, applet, object, iframe,

-h1, h2, h3, h4, h5, h6, p, blockquote, pre,

-a, abbr, acronym, address, big, cite, code,

-del, dfn, em, font, img, ins, kbd, q, s, samp,

-small, strike, strong, sub, sup, tt, var,

-dl, dt, dd, ol, ul, li,

-fieldset, form, label, legend,

-table, caption, tbody, tfoot, thead, tr, th, td {

-	margin: 0;

-	padding: 0;

-	border: 0;

-	outline: 0;

-	font-weight: inherit;

-	font-style: inherit;

-	font-size: 100%;

-	font-family: inherit;

-	vertical-align: baseline;

-}

-/* remember to define focus styles! */

-:focus {

-	outline: 0;

-}

-ol, ul {

-	list-style: none;

-}

-/* tables still need 'cellspacing="0"' in the markup */

-table {

-	border-collapse: separate;

-	border-spacing: 0;

-}

-caption, th, td {

-	text-align: left;

-	font-weight: normal;

-}

-blockquote:before, blockquote:after,

-q:before, q:after {

-	content: "";

-}

-blockquote, q {

-	quotes: "" "";

-}

-.clearfloat { 

-	clear:both;

-    height:0;

-    font-size: 1px;

-    line-height: 0px;

-}

-

-/* ***************************************

-	DEFAULTS

-*************************************** */

-body {

-	text-align:left;

-	margin:0 auto;

-	padding:0;

-	background: #4690d6;

-	font: 75%/1.5  "Lucida Grande", "Lucida Sans", Verdana, sans-serif;

-	color: #333333;

-}

-a {

-	color: #4690d6;

-	text-decoration: none;

-}

-a:visited {

-	color: #336699;

-}

-a:hover {

-	color: #003366;

-	text-decoration: underline;

-}

-p {

-	margin: 0px 0px 15px;

-}

-img {

-	border: none;

-}

-ul {

-	margin: 5px 0px 15px;

-	padding-left: 20px;

-}

-ul li {

-	margin: 0px;

-}

-ol {

-	margin: 5px 0px 15px;

-	padding-left: 20px;

-}

-ul li {

-	margin: 0px;

-}

-form {

-	margin: 0px;

-	padding: 0px;

-}

-small {

-	font-size: 90%;

-}

-h1, h2, h3, h4, h5, h6 {

-	font-weight: bold;

-	line-height: normal;

-}

-h1 { font-size: 1.8em; }

-h2 { font-size: 1.5em; }

-h3 { font-size: 1.2em; }

-h4 { font-size: 1.0em; }

-h5 { font-size: 0.9em; }

-h6 { font-size: 0.8em; }

-

-/* ***************************************

-    PAGE LAYOUT - MAIN STRUCTURE

-*************************************** */

-#page_container {

-	margin:0;

-	padding:0;

-}

-#page_wrapper {

-	width:998px;

-	margin:4px auto;

-	min-height: 300px;

-	background: white;

-	border-right: 1px solid #666666;

-	border-bottom: 1px solid #000000;

-}

-

-#layout_header {

-	text-align:left;

-	position:relative;

-	width:100%;

-	height:67px;

-	border-bottom:1px solid #4690d6;

-}

-#wrapper_header {

-	margin:0;

-	padding:10px 20px 20px 20px;

-}

-#layout_sidebar_left {

-	width: 160px;

-	float: left;

-}

-#wrapper_sidebar_left {

-	margin:0;

-	padding:20px 0 0 20px;

-}

-

-#wrapper_sidebar_left p {

-	margin:0;

-}

-

-#layout_canvas {

-	margin:20px 20px 20px 160px;

-	min-height: 360px;

-}

-

-#layout_sidebar_right {

-	width:250px; /* 260-10*/

-	min-height: 260px;

-	float:right;

-	padding:0px 0px 20px 10px;

-}

-#wrapper_sidebar_right {

-	margin:0;

-}

-

-#layout_maincontent {

-    padding:0px 10px 20px 20px;

-}

-#wrapper_maincontent {

-	margin:0;

-}

-/* subclass for layout_maincontent when showing rhs sidebar */

-.has_sidebar_right {

-    margin:0 260px 0 0 !important;

-}

-/* IE6 fix */

-* html #layout_maincontent { 

-	height:360px;

-}

-

-#wrapper_sidebar_right .collapsable_box_content {

-	border-left: 1px solid #cccccc;

-	border-right: 1px solid #cccccc;

-	border-bottom: 1px solid #cccccc;

-}

-#wrapper_sidebar_right .collapsable_box_header {

-	border: 1px solid #cccccc;

-}

-

-#wrapper_maincontent .collapsable_box_content  {

-	margin:0;

-	padding:0;

-}

-

-#layout_spotlight {

-	padding:0;

-}

-#wrapper_spotlight {

-	margin:0;

-	padding:0;

-	height:auto;

-}

-#wrapper_spotlight .collapsable_box_content  {

-	margin:0;

-	padding:0 0 10px 0;

-	background: #dfdfdf;

-	height:184px;

-	border:none;

-}

-#layout_spotlight .collapsable_box_content p {

-	padding:0;

-	background: url(<?php echo $vars['url']; ?>_graphics/temp_spotlight.gif) repeat-x left top;

-}

-#layout_footer {

-	background: url(<?php echo $vars['url']; ?>_graphics/footer_back.gif) repeat-x left top;

-	height:80px;

-}

-#layout_footer p {

-   padding:20px;

-}

-#layout_footer a {

-   color:white;

-}

-

-/* ***************************************

-  TOPMENU (IN HEADER)

-*************************************** */

-#topmenu {

-    position:absolute;

-    top:10px;

-    right:20px;

-    width: 700px;

-    height:47px;

-    text-align: right;

-}

-#topmenu li {

-    display:inline;

-    list-style:none;

-}

-#topmenu li a {

-    color:#3399cc;

-    margin:0 10px 0 10px;

-}

-#topmenu li a:hover {

-    color:#000000;

-}

-#topmenu .usericon {

-	float:right;

-}

-/* temp fix - force user avatar to mini size */

-#topmenu .usericon img {

-	width:40px;

-	height:40px;

-}

-

-/* ***************************************

-  COLLAPSABLE BOXES

-*************************************** */

-.collapsable_box {

-	margin: 0 0 20px 0;

-	background: white;

-	height:auto;

-}

-/* IE6 fix */

-* html .collapsable_box  { 

-	height:10px;

-}

-.collapsable_box_header {

-	color: #4690d6;

-	background: #f5f5f5;

-	border-top:2px solid #4690d6;

-	padding: 5px 10px 5px 10px;

-	margin:0;

-}

-.collapsable_box_content {

-	padding: 10px;

-	margin:0;

-	height:auto;

-	border-left:2px solid white;

-	border-right:2px solid white;

-	border-bottom:2px solid white;

-}

-.collapsable_box_editpanel {

-	display: none;

-	background: #dedede;

-	padding:5px 10px 5px 10px;

-	font-size: 9px;

-}

-.collapsable_box_header a.toggle_box_contents {

-	color: #4690d6;

-	cursor:pointer;

-	font-size:16px;

-	font-weight: bold;

-	text-decoration:none;

-	float:right;

-	margin: 0;

-	margin-top: -4px;

-}

-.collapsable_box_header a.toggle_box_edit_panel {

-	color: #4690d6;

-	cursor:pointer;

-	font-size:9px;

-	text-transform: uppercase;

-	text-decoration:none;

-	font-weight: normal;

-	float:right;

-	margin: 3px 10px 0 0;

-}

-/* used for collapsing a content box */

-.display_none {

-	display:none;

-}

-/* used on spotlight box - to cancel default box margin */

-.no_space_after {

-	margin: 0 0 0 0;

-}

-

-/* ***************************************

-  System messages

-*************************************** */

-.messages {

-    border:1px solid #D3322A;

-    background:#F7DAD8;

-    color:#000;

-    padding:3px 10px 3px 10px;

-    margin:20px 20px 0px 20px;

-}

-

-

-/* ***************************************

-	ELGG TOOLBAR

-*************************************** */

-.elggtoolbar .elggtoolbar_header {

-	color: #4690d6;

-	background: #f5f5f5;

-	border-top:2px solid #333333;

-	border-bottom:1px solid #999999;

-	padding: 5px 10px 5px 10px;

-	margin:0;

-}

-

-.elggtoolbar {

-	border-left:2px solid #333333;

-	border-right:2px solid #333333;

-	border-bottom:2px solid #333333;

-	margin: 0 0 20px 0;

-}

-

-.elggtoolbar ul.drawers {

-	width: 136px;

-	margin: 0;

-	padding: 0;

-	

-}

-.elggtoolbar li.drawer ul li {

-	line-height: 1.2em;

-	margin: 0;

-	padding: 3px 0 3px 0;

-}

-.elggtoolbar ul {

-	list-style: none;

-	margin: 0;

-	padding: 3px 3px 3px 10px;

-}

-.elggtoolbar li {

-	background: white;

-}

-.elggtoolbar li a {

-	text-decoration: none;

-	color: #3399cc;

-	line-height:0.5em;

-	padding-left:5px;

-}

-.elggtoolbar li a:hover {

-	text-decoration: underline;

-	color: #003366;

-}

-.elggtoolbar h2.drawer-handle {

-	margin: 0;

-	padding: 1px 1px 1px 10px;

-	background-color: #f4f4f4;

-	border-top: 1px solid #999999;

-	cursor: pointer;

-	font-size: 100%;

-	font-weight: normal;

-	line-height: 2em;

-}

-.elggtoolbar h2.drawer-handle:hover {

-	background-color: #cccccc;

-}

-.elggtoolbar h2.drawer-handle.open {

-	color:#000000;

-	font-weight: bold;

-	background: #cccccc;

-	border-bottom: none;

-}

-

-/* ***************************************

-	GENERAL FORM ELEMENTS

-*************************************** */

-label {

-	font-weight: bold;

-	color:#666;

-	font-size: 100%;

-}

-input {

-	font: 110% Arial, Helvetica, sans-serif;

-	width: 220px;

-	padding: 5px 3px 3px 7px;

-	border: 1px solid #cccccc;

-}

-textarea {

-	font: 110% Arial, Helvetica, sans-serif;

-	width: 480px;

-	height: 140px;

-	border: solid 1px #cccccc;

-	padding: 5px 3px 3px 7px;

-}

-.submit_button {

-	font: 12px/100% Arial, Helvetica, sans-serif;

-	color: #000000;

-	border: none;

-	width: auto;

-	height: 25px;

-	padding: 2px 6px 2px 6px;

-	margin:10px 0 10px 0;

-	cursor: pointer;

-}

-.submit_button:hover {

-	background: #e4ecf5;

-}

-textarea:focus, input[type="text"]:focus {

-	border: solid 1px #3b9acc;

-	background: #e4ecf5;

-}

-

-.input-text,

-.input-tags,

-.input-url,

-.input-textarea {

-	width:95%;

-}

-

-.input-textarea {

-	height: 200px;

-}

-

-/* ***************************************

-	LOGIN / HOMEPAGE

-*************************************** */

-#login-box {

-    text-align:left;

-    border:1px solid #ddd;

-    width:300px;

-    padding:10px;

-    background: #ffffff;

-}

-

-/* ***************************************

-	MAIN CONTENT ELEMENTS

-*************************************** */

-.elggtoolbar .elggtoolbar_header h1,

-.collapsable_box_header h1 {

-	color: #4690d6;

-	font-size:1.25em;

-	line-height: 1.2em;

-}

-

-.logo {

-	margin-left:21px;

-	margin-top:7px;

-}

-#header_search {

-	margin-right:50px;

-}

-#searchform input.search_input {

-	background-color:#FFFFFF;

-	border:1px solid #BBBBBB;

-	color:#999999;

-	font-size:13px;

-	font-weight:bold;

-	margin:0pt;

-	padding:2px;

-	width:180px;

-}

-#searchform input.search_submit_button {

-	color:#ffffff;

-	background: #cccccc;

-	border:none;

-	font-size:12px;

-	font-weight:bold;

-	margin:0px;

-	padding:0px;

-	width:auto;

-	height:20px;

-	cursor:pointer;

-}

-#searchform input.search_submit_button:hover {

-	color:#000000;

-}

-

-/* ***************************************

-	END

-*************************************** */

-

-

-

+<?php
+
+	/**
+	 * Elgg CSS
+	 * The standard CSS file
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author (s) Pete Harris / David Tosh
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['wwwroot'] The site URL
+	 */
+
+?>
+
+/* ***************************************
+	RESET BASE STYLES
+*************************************** */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	margin: 0;
+	padding: 0;
+	border: 0;
+	outline: 0;
+	font-weight: inherit;
+	font-style: inherit;
+	font-size: 100%;
+	font-family: inherit;
+	vertical-align: baseline;
+}
+/* remember to define focus styles! */
+:focus {
+	outline: 0;
+}
+ol, ul {
+	list-style: none;
+}
+/* tables still need 'cellspacing="0"' in the markup */
+table {
+	border-collapse: separate;
+	border-spacing: 0;
+}
+caption, th, td {
+	text-align: left;
+	font-weight: normal;
+	vertical-align: top;
+}
+blockquote:before, blockquote:after,
+q:before, q:after {
+	content: "";
+}
+blockquote, q {
+	quotes: "" "";
+}
+.clearfloat { 
+	clear:both;
+    height:0;
+    font-size: 1px;
+    line-height: 0px;
+}
+
+/* ***************************************
+	DEFAULTS
+*************************************** */
+body {
+	text-align:left;
+	margin:0 auto;
+	padding:0;
+	background: #4690d6;
+	font: 75%/1.5  "Lucida Grande", "Lucida Sans", Verdana, sans-serif;
+	color: #333333;
+}
+a {
+	color: #4690d6;
+	text-decoration: none;
+}
+a:visited {
+	color: #336699;
+}
+a:hover {
+	color: #003366;
+	text-decoration: underline;
+}
+p {
+	margin: 0px 0px 15px;
+}
+img {
+	border: none;
+}
+ul {
+	margin: 5px 0px 15px;
+	padding-left: 20px;
+}
+ul li {
+	margin: 0px;
+}
+ol {
+	margin: 5px 0px 15px;
+	padding-left: 20px;
+}
+ul li {
+	margin: 0px;
+}
+form {
+	margin: 0px;
+	padding: 0px;
+}
+small {
+	font-size: 90%;
+}
+h1, h2, h3, h4, h5, h6 {
+	font-weight: bold;
+	line-height: normal;
+}
+h1 { font-size: 1.8em; }
+h2 { font-size: 1.5em; }
+h3 { font-size: 1.2em; }
+h4 { font-size: 1.0em; }
+h5 { font-size: 0.9em; }
+h6 { font-size: 0.8em; }
+
+/* ***************************************
+    PAGE LAYOUT - MAIN STRUCTURE
+*************************************** */
+#page_container {
+	margin:0;
+	padding:0;
+}
+#page_wrapper {
+	width:998px;
+	margin:4px auto;
+	min-height: 300px;
+	background: white;
+	border-right: 1px solid #666666;
+	border-bottom: 1px solid #000000;
+}
+
+#layout_header {
+	text-align:left;
+	position:relative;
+	width:100%;
+	height:67px;
+	border-bottom:1px solid #4690d6;
+}
+#wrapper_header {
+	margin:0;
+	padding:10px 20px 20px 20px;
+}
+#layout_sidebar_left {
+	width: 160px;
+	float: left;
+}
+#wrapper_sidebar_left {
+	margin:0;
+	padding:20px 0 0 20px;
+}
+
+#wrapper_sidebar_left p {
+	margin:0;
+}
+
+#layout_canvas {
+	margin:20px 20px 20px 160px;
+	min-height: 360px;
+}
+
+#layout_sidebar_right {
+	width:250px; /* 260-10*/
+	min-height: 260px;
+	float:right;
+	padding:0px 0px 20px 10px;
+}
+#wrapper_sidebar_right {
+	margin:0;
+}
+
+#layout_maincontent {
+    padding:0px 10px 20px 20px;
+}
+#wrapper_maincontent {
+	margin:0;
+}
+/* subclass for layout_maincontent when showing rhs sidebar */
+.has_sidebar_right {
+    margin:0 260px 0 0 !important;
+}
+/* IE6 fix */
+* html #layout_maincontent { 
+	height:360px;
+}
+
+#wrapper_sidebar_right .collapsable_box_content {
+	border-left: 1px solid #cccccc;
+	border-right: 1px solid #cccccc;
+	border-bottom: 1px solid #cccccc;
+}
+#wrapper_sidebar_right .collapsable_box_header {
+	border: 1px solid #cccccc;
+}
+
+#wrapper_maincontent .collapsable_box_content  {
+	margin:0;
+	padding:0;
+}
+
+#layout_spotlight {
+	padding:0;
+}
+#wrapper_spotlight {
+	margin:0;
+	padding:0;
+	height:auto;
+}
+#wrapper_spotlight .collapsable_box_content  {
+	margin:0;
+	padding:0 0 10px 0;
+	background: #dfdfdf;
+	height:184px;
+	border:none;
+}
+#layout_spotlight .collapsable_box_content p {
+	padding:0;
+	background: url(<?php echo $vars['url']; ?>_graphics/temp_spotlight.gif) repeat-x left top;
+}
+#layout_footer {
+	background: url(<?php echo $vars['url']; ?>_graphics/footer_back.gif) repeat-x left top;
+	height:80px;
+}
+#layout_footer p {
+   padding:20px;
+}
+#layout_footer a {
+   color:white;
+}
+/* ***************************************
+  CUSTOMISE PANEL (PROFILE & DASHBOARD)
+*************************************** */
+#customise_editpanel {
+	/* display:none;*/
+	margin: -20px 0 20px 20px;
+	padding:20px;
+	background: #dedede;
+}
+#customise_page_view {
+	width:490px;
+	padding:10px;
+	background:#666666;
+}
+#main_widgets {
+	padding-bottom:40px;
+	min-height: 200px;
+}
+#rightsidebar_widgets {
+	padding-bottom:40px;
+	min-height: 200px;
+}
+#customise_editpanel h2 {
+	color:white;
+	font-size: 1.2em;
+}
+#customise_editpanel #widget_picker_gallery h2 {
+	color:#333333;
+	font-size: 1.2em;
+}
+
+#customise_editpanel table.draggable_widget {
+	width:200px;
+	background: #cccccc;
+	margin: 10px 0 0 0;
+	vertical-align:text-top;
+}
+
+#widget_picker_gallery {
+	float:right;
+	border:1px solid black;
+	width:210px;
+	height:198px;
+	padding:10px;
+	overflow:auto;
+	overflow-x:hidden;
+}
+#widget_picker_gallery table.draggable_widget {
+	width:200px;
+	background: #cccccc;
+	margin: 10px 0 0 0;
+}
+
+/* take care of long widget names */
+#customise_editpanel table.draggable_widget h3 {
+	word-wrap:break-word;/* safari, webkit, ie */
+	width:140px;
+	line-height: 1.1em;
+	overflow: hidden;/* ff */
+	padding:4px;
+}
+#widget_picker_gallery table.draggable_widget h3 {
+	word-wrap:break-word;
+	width:140px;
+	line-height: 1.1em;
+	overflow: hidden;
+	padding:4px;
+}
+#customise_editpanel img.drag_handle {
+	cursor:move;
+	padding-top: 4px;
+}
+#customise_editpanel img.remove_me {
+	padding-top: 4px;
+}
+#customise_editpanel img.more_info {
+	padding-top: 4px;
+}
+.ui-sortable-helper {
+	background: lime;
+	padding: 4px;
+	margin: 10px 0 0 0;
+}
+/* IE6 fix */
+* html .ui-sortable-helper h3 { 
+	padding: 4px;
+}
+* html .ui-sortable-helper img.drag_handle, * html .ui-sortable-helper img.remove_me, * html .ui-sortable-helper img.more_info {
+	padding-top: 4px;
+}
+/* IE7 */
+*:first-child+html .ui-sortable-helper h3 {
+	padding: 4px;
+}
+*:first-child+html .ui-sortable-helper img.drag_handle, *:first-child+html .ui-sortable-helper img.remove_me, *:first-child+html .ui-sortable-helper img.more_info {
+	padding-top: 4px;
+}
+
+.placeholder {
+	border:2px dashed #AAA;
+	margin: 10px 0 10px 0;
+}
+
+/* ***************************************
+  TOPMENU (IN HEADER)
+*************************************** */
+#topmenu {
+    position:absolute;
+    top:10px;
+    right:20px;
+    width: 700px;
+    height:47px;
+    text-align: right;
+}
+#topmenu li {
+    display:inline;
+    list-style:none;
+}
+#topmenu li a {
+    color:#3399cc;
+    margin:0 10px 0 10px;
+}
+#topmenu li a:hover {
+    color:#000000;
+}
+#topmenu .usericon {
+	float:right;
+}
+/* temp fix - force user avatar to mini size */
+#topmenu .usericon img {
+	width:40px;
+	height:40px;
+}
+
+/* ***************************************
+  COLLAPSABLE BOXES
+*************************************** */
+/* temp. customise button */
+a.toggle_customise_edit_panel {
+	float:right;
+}
+
+.collapsable_box {
+	margin: 0 0 20px 0;
+	background: white;
+	height:auto;
+}
+/* IE6 fix */
+* html .collapsable_box  { 
+	height:10px;
+}
+.collapsable_box_header {
+	color: #4690d6;
+	background: #f5f5f5;
+	border-top:2px solid #4690d6;
+	padding: 5px 10px 5px 10px;
+	margin:0;
+}
+.collapsable_box_content {
+	padding: 10px;
+	margin:0;
+	height:auto;
+	border-left:2px solid white;
+	border-right:2px solid white;
+	border-bottom:2px solid white;
+}
+.collapsable_box_editpanel {
+	display: none;
+	background: #dedede;
+	padding:5px 10px 5px 10px;
+	font-size: 9px;
+}
+.collapsable_box_header a.toggle_box_contents {
+	color: #4690d6;
+	cursor:pointer;
+	font-size:16px;
+	font-weight: bold;
+	text-decoration:none;
+	float:right;
+	margin: 0;
+	margin-top: -4px;
+}
+.collapsable_box_header a.toggle_box_edit_panel {
+	color: #4690d6;
+	cursor:pointer;
+	font-size:9px;
+	text-transform: uppercase;
+	text-decoration:none;
+	font-weight: normal;
+	float:right;
+	margin: 3px 10px 0 0;
+}
+/* used for collapsing a content box */
+.display_none {
+	display:none;
+}
+/* used on spotlight box - to cancel default box margin */
+.no_space_after {
+	margin: 0 0 0 0;
+}
+
+/* ***************************************
+  System messages
+*************************************** */
+.messages {
+    border:1px solid #D3322A;
+    background:#F7DAD8;
+    color:#000;
+    padding:3px 10px 3px 10px;
+    margin:20px 20px 0px 20px;
+}
+
+
+/* ***************************************
+	ELGG TOOLBAR
+*************************************** */
+.elggtoolbar .elggtoolbar_header {
+	color: #4690d6;
+	background: #f5f5f5;
+	border-top:2px solid #333333;
+	border-bottom:1px solid #999999;
+	padding: 5px 10px 5px 10px;
+	margin:0;
+}
+
+.elggtoolbar {
+	border-left:2px solid #333333;
+	border-right:2px solid #333333;
+	border-bottom:2px solid #333333;
+	margin: 0 0 20px 0;
+}
+
+.elggtoolbar ul.drawers {
+	width: 136px;
+	margin: 0;
+	padding: 0;
+	
+}
+.elggtoolbar li.drawer ul li {
+	line-height: 1.2em;
+	margin: 0;
+	padding: 3px 0 3px 0;
+}
+.elggtoolbar ul {
+	list-style: none;
+	margin: 0;
+	padding: 3px 3px 3px 10px;
+}
+.elggtoolbar li {
+	background: white;
+}
+.elggtoolbar li a {
+	text-decoration: none;
+	color: #3399cc;
+	line-height:0.5em;
+	padding-left:5px;
+}
+.elggtoolbar li a:hover {
+	text-decoration: underline;
+	color: #003366;
+}
+.elggtoolbar h2.drawer-handle {
+	margin: 0;
+	padding: 1px 1px 1px 10px;
+	background-color: #f4f4f4;
+	border-top: 1px solid #999999;
+	cursor: pointer;
+	font-size: 100%;
+	font-weight: normal;
+	line-height: 2em;
+}
+.elggtoolbar h2.drawer-handle:hover {
+	background-color: #cccccc;
+}
+.elggtoolbar h2.drawer-handle.open {
+	color:#000000;
+	font-weight: bold;
+	background: #cccccc;
+	border-bottom: none;
+}
+
+/* ***************************************
+	GENERAL FORM ELEMENTS
+*************************************** */
+label {
+	font-weight: bold;
+	color:#666;
+	font-size: 100%;
+}
+input {
+	font: 110% Arial, Helvetica, sans-serif;
+	width: 220px;
+	padding: 5px 3px 3px 7px;
+	border: 1px solid #cccccc;
+}
+textarea {
+	font: 110% Arial, Helvetica, sans-serif;
+	width: 480px;
+	height: 140px;
+	border: solid 1px #cccccc;
+	padding: 5px 3px 3px 7px;
+}
+.submit_button {
+	font: 12px/100% Arial, Helvetica, sans-serif;
+	color: #000000;
+	border: none;
+	width: auto;
+	height: 25px;
+	padding: 2px 6px 2px 6px;
+	margin:10px 0 10px 0;
+	cursor: pointer;
+}
+.submit_button:hover {
+	background: #e4ecf5;
+}
+textarea:focus, input[type="text"]:focus {
+	border: solid 1px #3b9acc;
+	background: #e4ecf5;
+}
+
+.input-text,
+.input-tags,
+.input-url,
+.input-textarea {
+	width:95%;
+}
+
+.input-textarea {
+	height: 200px;
+}
+
+/* ***************************************
+	LOGIN / HOMEPAGE
+*************************************** */
+#login-box {
+    text-align:left;
+    border:1px solid #ddd;
+    width:300px;
+    padding:10px;
+    background: #ffffff;
+}
+
+/* ***************************************
+	MAIN CONTENT ELEMENTS
+*************************************** */
+.elggtoolbar .elggtoolbar_header h1,
+.collapsable_box_header h1 {
+	color: #4690d6;
+	font-size:1.25em;
+	line-height: 1.2em;
+}
+
+.logo {
+	margin-left:21px;
+	margin-top:7px;
+}
+#header_search {
+	margin-right:50px;
+}
+#searchform input.search_input {
+	background-color:#FFFFFF;
+	border:1px solid #BBBBBB;
+	color:#999999;
+	font-size:13px;
+	font-weight:bold;
+	margin:0pt;
+	padding:2px;
+	width:180px;
+}
+#searchform input.search_submit_button {
+	color:#ffffff;
+	background: #cccccc;
+	border:none;
+	font-size:12px;
+	font-weight:bold;
+	margin:0px;
+	padding:0px;
+	width:auto;
+	height:20px;
+	cursor:pointer;
+}
+#searchform input.search_submit_button:hover {
+	color:#000000;
+}
+
+/* ***************************************
+	END
+*************************************** */
+
+
+
diff --git a/views/default/navigation/toolbox.php b/views/default/navigation/toolbox.php
index e98ccd934..7da992d7d 100644
--- a/views/default/navigation/toolbox.php
+++ b/views/default/navigation/toolbox.php
@@ -1,80 +1,67 @@
-<?php

-

-	/**

-	 * Elgg standard toolbox

-	 * The standard user toolbox that displays a users menu options

-	 * This will be populated depending on the plugins active - only plugin navigation will appear here

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Curverider Ltd

-	 * @copyright Curverider Ltd 2008

-	 * @link http://elgg.org/

-	 * 

-	 */

-	 

-		$menu = get_register('menu');

-

-		if (is_array($menu) && sizeof($menu) > 0) {

-		

-?>

-<div class="elggtoolbar">

-<div class="elggtoolbar_header"><h1>Your tools</h1></div>

-<ul class="drawers">

-

-<?php

-

-			foreach($menu as $item) {

-				

-?>

-

-	<li class="drawer">

-		<h2 class="drawer-handle"><?php echo $item->name ?></h2>

-<?php

-

-				if (sizeof($item->children) > 0 ) {

-					echo "<ul>";

-					foreach($item->children as $subitem) {

-?>

-		<li>

-			<a href="<?php echo $subitem->value ?>"><?php echo $subitem->name; ?></a>

-		</li>

-<?php

-					}

-					echo "</ul>";

-					

-				}

-

-?>

-	</li>

-

-<?php

-				

-			}

-

-?>

-

-</ul>    

-</div><!-- /.elggtoolbar -->

-

-<?php

-

-		}

-

-?>

-

-<script type="text/javascript">

-$(document).ready(function () {

-	//$('li.drawer ul:not(:first)').hide();

-	$('li.drawer ul').hide();

-	

-	$('h2.drawer-handle').click(function () {	

-		$('li.drawer ul:visible').slideUp('medium').prev().removeClass('open');

-		$(this).addClass('open').next().slideDown('fast');

-	return false;

-	});

-});

-</script>

-

-

+<?php
+
+	/**
+	 * Elgg standard toolbox
+	 * The standard user toolbox that displays a users menu options
+	 * This will be populated depending on the plugins active - only plugin navigation will appear here
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 * 
+	 */
+	 
+		$menu = get_register('menu');
+
+		if (is_array($menu) && sizeof($menu) > 0) {
+		
+?>
+<div class="elggtoolbar">
+<div class="elggtoolbar_header"><h1>Your tools</h1></div>
+<ul class="drawers">
+
+<?php
+
+			foreach($menu as $item) {
+				
+?>
+
+	<li class="drawer">
+		<h2 class="drawer-handle"><?php echo $item->name ?></h2>
+<?php
+
+				if (sizeof($item->children) > 0 ) {
+					echo "<ul>";
+					foreach($item->children as $subitem) {
+?>
+		<li>
+			<a href="<?php echo $subitem->value ?>"><?php echo $subitem->name; ?></a>
+		</li>
+<?php
+					}
+					echo "</ul>";
+					
+				}
+
+?>
+	</li>
+
+<?php
+				
+			}
+
+?>
+
+</ul>    
+</div><!-- /.elggtoolbar -->
+
+<?php
+
+		}
+
+?>
+
+
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index 75daa5b0d..fdcfe71df 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -1,56 +1,57 @@
-<?php

-

-	/**

-	 * Elgg pageshell when logged out

-	 * The standard HTML header that displays across the site

-	 * 

-	 * @package Elgg

-	 * @subpackage Core

-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2

-	 * @author Curverider Ltd

-	 * @copyright Curverider Ltd 2008

-	 * @link http://elgg.org/

-	 * 

-	 * @uses $vars['config'] The site configuration settings, imported

-	 * @uses $vars['title'] The page title

-	 * @uses $vars['body'] The main content of the page

-	 * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()

-	 */

-	 

-	 // Set title

-		if (empty($vars['title'])) {

-			$title = $vars['config']->sitename;

-		} else if (empty($vars['config']->sitename)) {

-			$title = $vars['title'];

-		} else {

-			$title = $vars['config']->sitename . ": " . $vars['title'];

-		}

-		

-?>

-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

-<head>

-	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

-	<title><?php echo $title; ?></title>

-	<!-- include links to jQuery here? -->

-	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.2.6.pack.js"></script>

-	<script type="text/javascript" src="<?php echo $vars['url']; ?>javascript/initialise_elgg.js"></script>

-	<!-- include the default css file -->

-	<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css" type="text/css" />

-	<?php echo elgg_view('metatags',$vars); ?>

-</head>

-

-<body>

-	

-<div id="page_container">

-<div id="page_wrapper">

-

-<div id="layout_header">

-<div id="wrapper_header">

-	<!-- display the page title -->

-	<h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>

-	<h2><?php echo $vars['title']; ?></h2>

-	<!-- display top level navigation -->

-	<?php echo elgg_view('navigation/topmenu'); ?>

-</div><!-- /#wrapper_header -->

-</div><!-- /#layout_header -->

+<?php
+
+	/**
+	 * Elgg pageshell when logged out
+	 * The standard HTML header that displays across the site
+	 * 
+	 * @package Elgg
+	 * @subpackage Core
+	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+	 * @author Curverider Ltd
+	 * @copyright Curverider Ltd 2008
+	 * @link http://elgg.org/
+	 * 
+	 * @uses $vars['config'] The site configuration settings, imported
+	 * @uses $vars['title'] The page title
+	 * @uses $vars['body'] The main content of the page
+	 * @uses $vars['messages'] A 2d array of various message registers, passed from system_messages()
+	 */
+	 
+	 // Set title
+		if (empty($vars['title'])) {
+			$title = $vars['config']->sitename;
+		} else if (empty($vars['config']->sitename)) {
+			$title = $vars['title'];
+		} else {
+			$title = $vars['config']->sitename . ": " . $vars['title'];
+		}
+		
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+	<title><?php echo $title; ?></title>
+	<!-- include links to jQuery here? -->
+	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.2.6.pack.js"></script>
+	<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-personalized-1.5.packed.js"></script>
+	<script type="text/javascript" src="<?php echo $vars['url']; ?>javascript/initialise_elgg.js"></script>
+	<!-- include the default css file -->
+	<link rel="stylesheet" href="<?php echo $vars['url']; ?>_css/css.css" type="text/css" />
+	<?php echo elgg_view('metatags',$vars); ?>
+</head>
+
+<body>
+	
+<div id="page_container">
+<div id="page_wrapper">
+
+<div id="layout_header">
+<div id="wrapper_header">
+	<!-- display the page title -->
+	<h1><a href="<?php echo $vars['url']; ?>"><?php echo $vars['config']->sitename; ?></a></h1>
+	<h2><?php echo $vars['title']; ?></h2>
+	<!-- display top level navigation -->
+	<?php echo elgg_view('navigation/topmenu'); ?>
+</div><!-- /#wrapper_header -->
+</div><!-- /#layout_header -->