[schoorbs commit] r701 - in trunk: . schoorbs-contrib/deactivated-pages schoorbs-includes schoorbs-misc/templates s...
codesite...@google.com
Date: Sat Oct 25 10:13:43 2008
New Revision: 701
Added:
trunk/schoorbs-misc/themes/contented6/jquery-ui-personalized-info.txt
trunk/schoorbs-misc/themes/contented6/search.js
trunk/schoorbs-misc/themes/contented6/search.tpl.php
Removed:
trunk/schoorbs-contrib/deactivated-pages/search.php
trunk/schoorbs-includes/area.functions.php
trunk/schoorbs-misc/templates/search.tpl
Modified:
trunk/schoorbs-includes/global.functions.php
trunk/schoorbs-includes/rest.functions.php
trunk/schoorbs-includes/time.functions.php
trunk/schoorbs-misc/themes/contented6/jquery-ui-personalized-1.5.2.packed.js
trunk/schoorbs-misc/themes/contented6/style.css
trunk/search.php
Log:
Made a lot in the search interface but it's not yet finished.
Modified: trunk/schoorbs-includes/global.functions.php
==============================================================================
--- trunk/schoorbs-includes/global.functions.php (original)
+++ trunk/schoorbs-includes/global.functions.php Sat Oct 25 10:13:43 2008
@@ -13,27 +13,10 @@
require_once dirname(__FILE__).'/../config.inc.php';
/** Funtions for time handling */
require_once 'time.functions.php';
-/** Functions for area handling */
-require_once 'area.functions.php';
/// Functions ///
/**
- * Compare two values and return the fitting sign as string.
- *
- * @author Uwe L. Korn <uw...@xhochy.org>
- * @param int $a
- * @param int %b
- * @return string One of ['< ', '= ', '> ']
- */
-function cmp3($a, $b)
-{
- if ($a < $b) return '< ';
- if ($a == $b) return '= ';
- return '> ';
-}
-
-/**
* Error handler - this is used to display serious errors such as database
* errors without sending incomplete HTML pages. This is only used for
* errors which "should never happen", not those caused by bad inputs.
@@ -52,16 +35,14 @@
// REMOVE IT IN FUTURE !!!
if(defined('SCHOORBS_NOGUI')) {
- if(version_compare('5.0.0',PHP_VERSION,'>') === true) {
- trigger_error('Schoorbs Fatal Error: '.$message, E_USER_ERROR);
- } else {
- throw new Exception($message);
- }
+ throw new Exception($message);
} else {
+ // @codeCoverageIgnoreStart
if ($need_header) print_header();
echo $message;
require_once 'trailer.php';
exit(1);
+ // @codeCoverageIgnoreEnd
}
}
@@ -93,23 +74,6 @@
}
/**
- * Return the format string for displaying the hour and minute depending
on if
- * we want to display the time in 24h-format or using PM/AM.
- *
- * @return string
- */
-function hour_min_format()
-{
- global $twentyfourhour_format;
-
- if ($twentyfourhour_format) {
- return '%H:%M';
- } else {
- return '%I:%M%p';
- }
-}
-
-/**
*
* @param int $mod_time
* @return array
@@ -127,17 +91,6 @@
return array($p_num, $periods[$p_num] . utf8_strftime(', %A %d %B %Y',
$t));
}
-function period_time_string($t, $mod_time=0)
-{
- global $periods;
-
- $time = getdate($t);
- $p_num = $time['minutes'] + $mod_time;
- if( $p_num < 0 ) $p_num = 0;
- if( $p_num >= count($periods) - 1 ) $p_num = count($periods ) - 1;
- return $periods[$p_num];
-}
-
function time_date_string($t)
{
global $twentyfourhour_format;
@@ -148,141 +101,6 @@
return utf8_strftime("%I:%M:%S%p - %A %d %B %Y",$t);
}
-
-/**
- * Display the entry-type color key. This has up to 2 rows, up to 5
columns.
- *
- * @author jberanek, Uwe L. Korn <uw...@xhochy.org>
- */
-function show_colour_key()
-{
- global $typel, $pview;
-
- // Do not display colour key when we are in the printing view
- if ($pview == 1) return;
-
- // Make a list of colour keys
- echo '<div id="schoorbs-colour-keys">';
- $nct = 0;
- for ($ct = "A"; $ct <= "Z"; $ct++) {
- if (!empty($typel[$ct])) {
- if (++$nct > 5) {
- $nct = 0;
- echo '<br />';
- }
- printf('<a href="#" rel="tag" class="%s">%s</a>', $ct, $typel[$ct]);
- }
- }
- echo "</div>\n";
-}
-
-/**
- * Round time down to the nearest resolution
- *
- * @param int $t
- * @param int $resolution
- * @param int $am7
- * @return int
- */
-function round_t_down($t, $resolution, $am7)
-{
- return (int)$t - (int)abs(((int)$t-(int)$am7) % $resolution);
-}
-
-/**
- * Round time up to the nearest resolution
- *
- * @param int $t
- * @param int $resolution
- * @param int $am7
- * @return int
- */
-function round_t_up($t, $resolution, $am7)
-{
- if (($t-$am7) % $resolution != 0) {
- return $t + $resolution - abs(((int)$t-(int)
- $am7) % $resolution);
- } else {
- return $t;
- }
-}
-
-/**
- * Generates some html that can be used to select which area should be
- * displayed.
- *
- * @param string $link
- * @param string $current
- * @param int $year
- * @param int $month
- * @param int $day
- * @return string
- */
-function make_area_select_html( $link, $current, $year, $month, $day )
-{
- global $tbl_area;
- $out_html = "
-<form name=\"areaChangeForm\" method=get action=\"$link\">
- <select name=\"area\" onChange=\"document.areaChangeForm.submit()\">";
-
- $sql = "select id, area_name from $tbl_area order by area_name";
- $res = sql_query($sql);
- if ($res) for ($i = 0; ($row = sql_row($res, $i)); $i++)
- {
- $selected = ($row[0] == $current) ? "selected" : "";
- $out_html .= "
- <option $selected value=\"".$row[0]."\">" . htmlspecialchars($row[1]);
- }
- $out_html .= "
- </select>
-
- <input type=\"hidden\" name=\"day\" value=\"$day\">
- <input type=\"hidden\" name=\"month\" value=\"$month\">
- <input type=\"hidden\" name=\"year\" value=\"$year\">
- <input type=\"submit\" value=\"".get_vocab("change")."\">
-</form>\n";
-
- return $out_html;
-}
-
-/**
- * Generates some html that can be used to select which room should be
- * displayed.
- *
- * @param string $link
- * @param int $area
- * @param int $current
- * @param int $year
- * @param int $month
- * @param int $day
- * @return string
- */
-function make_room_select_html( $link, $area, $current, $year, $month,
$day)
-{
- global $tbl_room;
- $out_html = "
-<form name=\"roomChangeForm\" method=get action=\"$link\">
- <select name=\"room\" onChange=\"document.roomChangeForm.submit()\">";
-
- $sql = "select id, room_name from $tbl_room where area_id=$area order by
room_name";
- $res = sql_query($sql);
- if ($res) for ($i = 0; ($row = sql_row($res, $i)); $i++)
- {
- $selected = ($row[0] == $current) ? "selected" : "";
- $out_html .= "
- <option $selected value=\"".$row[0]."\">" . htmlspecialchars($row[1]);
- }
- $out_html .= "
- </select>
- <input type=\"hidden\" name=\"day\" value=\"$day\" >
- <input type=\"hidden\" name=\"month\" value=\"$month\" >
- <input type=\"hidden\" name=\"year\" value=\"$year\" >
- <input type=\"hidden\" name=\"area\" value=\"$area\" >
- <input type=submit value=\"".get_vocab("change")."\">
-</form>\n";
-
- return $out_html;
-}
/**
* If crossing dst determine if you need to make a modification
Modified: trunk/schoorbs-includes/rest.functions.php
==============================================================================
--- trunk/schoorbs-includes/rest.functions.php (original)
+++ trunk/schoorbs-includes/rest.functions.php Sat Oct 25 10:13:43 2008
@@ -105,11 +105,15 @@
{
// Send no headers while we are in unit tests
if (defined('REST_TESTING')) return;
+ // @codeCoverageIgnoreStart
header('Content-type: text/xml; charset=utf-8');
// REST-Answers should never be chached!
- header('Cache-Control: no-cache, must-revalidate'); // HTTP/1.1
- header('Expires: Mon, 26 Jul 1997 05:00:00 GMT'); // Date in the past
+ // HTTP/1.1
+ header('Cache-Control: no-cache, must-revalidate');
+ // Date in the past
+ header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+ // @codeCoverageIgnoreEnd
}
/**
@@ -130,7 +134,9 @@
if (defined('REST_TESTING')) {
throw new Exception('REST Exception' + $sMessage);
} else {
+ // @codeCoverageIgnoreStart
exit($nCode);
+ // @codeCoverageIgnoreEnd
}
}
}
Modified: trunk/schoorbs-includes/time.functions.php
==============================================================================
--- trunk/schoorbs-includes/time.functions.php (original)
+++ trunk/schoorbs-includes/time.functions.php Sat Oct 25 10:13:43 2008
@@ -39,39 +39,6 @@
return -1;
}
-/**
- * Make up the time of morning
- *
- * @param int $month
- * @param int $day
- * @param int $year
- * @return int
- * @author Uwe L. Korn <uw...@xhochy.org>
- */
-function am7($day, $month, $year)
-{
- global $morningstarts, $morningstarts_minutes;
-
- return mktime($morningstarts,$morningstarts_minutes,0,$month,$day,$year,
- is_dst($month,$day,$year,$morningstarts));
-}
-
-/**
- * Make up the time of evening
- *
- * @param int $month
- * @param int $day
- * @param int $year
- * @return int
- * @author Uwe L. Korn <uw...@xhochy.org>
- */
-function pm7($day, $month, $year)
-{
- global $eveningends, $eveningends_minutes;
-
- return mktime($eveningends,$eveningends_minutes,0,$month,$day,$year,
- is_dst($month,$day,$year,$eveningends));
-}
/**
* Returns the Day+Month+Year of yesterday
Modified:
trunk/schoorbs-misc/themes/contented6/jquery-ui-personalized-1.5.2.packed.js
==============================================================================
---
trunk/schoorbs-misc/themes/contented6/jquery-ui-personalized-1.5.2.packed.js
(original)
+++
trunk/schoorbs-misc/themes/contented6/jquery-ui-personalized-1.5.2.packed.js
Sat Oct 25 10:13:43 2008
@@ -1 +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}('(b(C){C.m={56:{w:b(E,F,H){d
G=C.m[E].1O;1L(d D 3o H){G.23[D]=G.23[D]||
[];G.23[D].5m([F,H[D]])}},1B:b(D,F,E){d H=D.23[F];c(!H){8}1L(d
G=0;G<H.1i;G++){c(D.j[H[G][0]]){H[G][1].q(D.l,E)}}}},1R:{},h:b(D){c(C.m.1R[D]){8
C.m.1R[D]}d E=C(\'<2K
2Z="m-5U">\').U(D).h({15:"6j",1f:"-3T",1n:"-3T",3g:"68"}).3u("3a");C.m.1R[D]=!!((!(/24|
2R/).1b(E.h("6c"))||(/^[1-9]/).1b(E.h("r"))||(/^[1-9]/).1b(E.h("2N"))|
|!(/2H/).1b(E.h("6g"))||!(/1W|4f\\(0, 0, 0,
0\\)/).1b(E.h("39"))));6b{C("3a").41(0).6a(E.41(0))}65(F){}8
C.m.1R[D]},5O:b(D){C(D).R("1Y","3H").h("3r","2H")},5J:b(D){C(D).R("1Y","5I").h("3r","")},5Y:b(G,E){d
D=/1f/.1b(E||"1f")?"5X":"77",F=p;c(G[D]>0){8 T}G[D]=1;F=G[D]>0?T:p;G[D]=0;8
F}};d B=C.V.Q;C.V.Q=b(){C("*",6).w(6).3l("Q");8 B.q(6,g)};b A(E,F,G){d
D=C[E][F].79||[];D=(19
D=="2x"?D.31(/,?\\s+/):D);8(C.70(G,D)!=-1)}C.1E=b(E,D){d
F=E.31(".")[0];E=E.31(".")[1];C.V[E]=b(J){d H=(19
J=="2x"),I=4c.1O.7n.1B(g,1);c(H&&A(F,E,J)){d
G=C.W(6[0],E);8(G?G[J].q(G,I):1M)}8 6.13(b(){d
K=C.W(6,E);c(H&&K&&C.7k(K[J])){K[J].q(K,I)}o{c(!H){C.W(6,E,6H
C[F][E](6,J))}}})};C[F][E]=b(I,H){d
G=6;6.1k=E;6.40=F+"-"+E;6.j=C.18({},C.1E.20,C[F][E].20,H);6.l=C(I).1m("1Z."+E,b(L,J,K){8
G.1Z(J,K)}).1m("2S."+E,b(K,J){8 G.2S(J)}).1m("Q",b(){8
G.2Y()});6.2n()};C[F][E].1O=C.18({},C.1E.1O,D)};C.1E.1O={2n:b(){},2Y:b(){6.l.3i(6.1k)},2S:b(D){8
6.j[D]},1Z:b(D,E){6.j[D]=E;c(D=="1H"){6.l[E?"U":"1o"](6.40+"-1H")}},4z:b(){6.1Z("1H",p)},5n:b(){6.1Z("1H",T)}};C.1E.20={1H:p};C.m.4g={5j:b(){d
D=6;6.l.1m("5f."+6.1k,b(E){8
D.4b(E)});c(C.1y.1S){6.4d=6.l.R("1Y");6.l.R("1Y","3H")}6.4Z=p},5S:b(){6.l.2j("."+6.1k);(C.1y.1S&&6.l.R("1Y",6.4d))},4b:b(F){(6.12&&6.1U(F));6.2a=F;d
E=6,G=(F.54==1),D=(19
6.j.2F=="2x"?C(F.1G).3N().w(F.1G).1r(6.j.2F).1i:p);c(!G||D||!6.4k(F)){8
T}6.26=!6.j.2q;c(!6.26){6.52=57(b(){E.26=T},6.j.2q)}c(6.2u(F)&&6.2y(F)){6.12=(6.2s(F)!==p);c(!6.12){F.58();8
T}}6.2w=b(H){8 E.3Z(H)};6.2t=b(H){8
E.1U(H)};C(1w).1m("3U."+6.1k,6.2w).1m("46."+6.1k,6.2t);8
p},3Z:b(D){c(C.1y.1S&&!D.5c){8 6.1U(D)}c(6.12){6.2A(D);8
p}c(6.2u(D)&&6.2y(D)){6.12=(6.2s(6.2a,D)!==p);(6.12?6.2A(D):6.1U(D))}8!6.12},1U:b(D){C(1w).2j("3U."+6.1k,6.2w).2j("46."+6.1k,6.2t);c(6.12){6.12=p;6.4i(D)}8
p},2u:b(D){8(e.1C(e.1K(6.2a.44-D.44),e.1K(6.2a.3R-D.3R))>=6.j.4j)},2y:b(D){8
6.26},2s:b(D){},2A:b(D){},4i:b(D){},4k:b(D){8
T}};C.m.4g.20={2F:1c,4j:1,2q:0}})(k);(b(E){E.1E("m.n",{2n:b(){d
G=6.j;c(G.4W){d
J=6.l.2p("a").1r(G.3O);c(J.1i){c(J.1r(G.1t).1i){G.t=J}o{G.t=J.X().X().4V();J.U("5d")}}}G.v=6.l.2p(G.1t);G.t=C(G.v,G.t);c(E.1y.1S){6.l.2p("a").h("5u","1")}c(!6.l.3A("m-n")){6.l.U("m-n");E("<3n
2Z=\'m-n-1n\'/>").5t(G.v);E("<3n
2Z=\'m-n-36\'/>").3u(G.v);G.v.U("m-n-1t").R("5r","0")}d
I;c(G.3h){I=6.l.X().r();G.v.13(b(){I-=E(6).2M()});d
H=0;G.v.1e().13(b(){H=e.1C(H,E(6).5v()-E(6).r())}).r(I-H)}o{c(G.1h){I=0;G.v.1e().13(b(){I=e.1C(I,E(6).2M())}).r(I)}}G.v.2G(G.t|
|"").1e().1l();G.t.X().2c().U(G.1X);c(G.2d){6.l.1m((G.2d)+".n",F)}},2P:b(G){F.1B(6.l[0],{1G:C(6.j.v,G)[0]})},2Y:b(){6.j.v.1e().h("3g","");c(6.j.3h|
|6.j.1h){6.j.v.1e().h("r","")}E.3i(6.l[0],"n");6.l.1o("m-n").2j(".n")}});b
B(H,G){8 b(){8 H.q(G,g)}}b D(I){c(!E.W(6,"n")){8}d G=E.W(6,"n");d
H=G.j;H.1z=I?0:--H.1z;c(H.1z){8}c(H.5y){H.11.w(H.1s).h({r:"",3e:""})}E(6).3l("3I",[E.2d.4N({5q:"3I",1G:G.l[0]}),H.W],H.5p)}b
A(G,K,L,J,M){d I=E.W(6,"n").j;I.11=G;I.1s=K;I.W=L;d
H=B(D,6);I.1z=K.1T()===0?G.1T():K.1T();c(I.2e){c(!I.1V&&J){E.m.n.2W[I.2e]({11:k([]),1s:K,1Q:H,2f:M,1h:I.1h})}o{E.m.n.2W[I.2e]({11:G,1s:K,1Q:H,2f:M,1h:I.1h})}}o{c(!I.1V&&J){G.Y()}o{K.1l();G.1j()}H(T)}}b
F(L){d J=E.W(6,"n").j;c(J.1H){8 p}c(!L.1G&&!J.1V){J.t.X().2c().29(J.1X);d
I=J.t.1e(),M={j:J,3G:k([]),3F:J.t,3z:k([]),3y:I},G=(J.t=E([]));A.1B(6,G,I,M);8
p}d K=E(L.1G);K=E(K.3N(J.1t)[0]||K);d H=K[0]==J.t[0];c(J.1z||(J.1V&&H)){8
p}c(!K.3X(J.1t)){8}J.t.X().2c().29(J.1X);c(!H){K.X().2c().U(J.1X)}d
G=K.1e(),I=J.t.1e(),M={j:J,3G:K,3F:J.t,3z:G,3y:I},N=J.v.2L(J.t[0])>J.v.2L(K[0]);J.t=H?E([]):K;A.1B(6,G,I,M,H,N);8
p}b C(H,G){8 G!=1M?19
G=="5k"?H.1r(":3E("+G+")"):H.2G(H.2G(G)):G===p?E([]):H.1r(":3E(0)")}E.18(E.m.n,{20:{1X:"5B",1V:T,2e:"2g",2d:"4q",1t:"a",1h:T,1z:0,3O:b(){8
6.3P.2I()==4M.3P.2I()}},2W:{2g:b(G,I){G=E.18({S:"28",17:4L},G,I);c(!G.1s.1T()){G.11.30({r:"1j"},G);8}d
H=G.1s.r(),J=G.11.r(),K=J/H;G.11.h({r:0,3e:"2Q"}).1j();G.1s.1r(":2Q").13(G.1Q).1D().1r(":4u").30({r:"1l"},{3S:b(L){d
M=(H-L)*K;c(E.1y.1S||
E.1y.4B){M=e.4A(M)}G.11.r(M)},17:G.17,S:G.S,1Q:b(){c(!G.1h){G.11.h("r","24")}G.1Q()}})},4v:b(G){6.2g(G,{S:G.2f?"4w":"28",17:G.2f?4K:4t})},4E:b(G){6.2g(G,{S:"4G",17:4l})}}});E.V.2P=b(G){8
6.n("2P",G)}})(k);(b(C){C.1a=C.1a||{};C.18(C.1a,{4o:b(F,G){1L(d
E=0;E<G.1i;E++){c(G[E]!==1c){C.W(F[0],"49.3W."+G[E],F[0].1d[G[E]])}}},5x:b(F,G){1L(d
E=0;E<G.1i;E++){c(G[E]!==1c){F.h(G[E],C.W(F[0],"49.3W."+G[E]))}}},6P:b(E,F){c(F=="Y"){F=E.3X(":2Q")?"1j":"1l"}8
F},6O:b(F,G){d
H,E;48(F[0]){1A"1f":H=0;1p;1A"6N":H=0.5;1p;1A"3x":H=1;1p;2R:H=F[0]/G.r}48(F[1]){1A"1n":E=0;1p;1A"6L":E=0.5;1p;1A"36":E=1;1p;2R:E=F[1]/G.2N}8{x:E,y:H}},6V:b(F){c(F.X().R("2U")=="33"){8
F}d E={2N:F.6S({2J:T}),r:F.2M({2J:T}),"4a":F.h("4a")};F.6K(\'<2K 2U="33"
1d="6J-1T:3s%;6A:1W;6z:2H;2J:0;6C:0"></2K>\');d
I=F.X();c(F.h("15")=="34"){I.h({15:"2T"});F.h({15:"2T"})}o{d
H=F.h("1f");c(32(u(H))){H="24"}d
G=F.h("1n");c(32(u(G))){G="24"}I.h({15:F.h("15"),1f:H,1n:G,6I:F.h("z-2L")}).1j();F.h({15:"2T",1f:0,1n:0})}I.h(E);8
I},6F:b(E){c(E.X().R("2U")=="33"){8 E.X().6Y(E)}8 E},7i:b(F,G,E,H){H=H||
{};C.13(G,b(J,I){2b=F.3J(I);c(2b[0]>0){H[I]=2b[0]*E+2b[1]}});8
H},1N:b(G,H,J,I){d E=(19 J=="b"?J:(I?I:1c));d F=(19 J=="2V"?J:1c);8
6.13(b(){d O={};d M=C(6);d N=M.R("1d")||"";c(19
N=="2V"){N=N.2X}c(G.Y){M.3A(G.Y)?G.Q=G.Y:G.w=G.Y}d
K=C.18({},(1w.27?1w.27.3D(6,1c):6.3C));c(G.w){M.U(G.w)}c(G.Q){M.1o(G.Q)}d
L=C.18({},(1w.27?1w.27.3D(6,1c):6.3C));c(G.w){M.1o(G.w)}c(G.Q){M.U(G.Q)}1L(d
P 3o L){c(19
L[P]!="b"&&L[P]&&P.2B("7j")==-1&&P.2B("1i")==-1&&L[P]!=K[P]&&(P.35(/2C/i)||
(!P.35(/2C/i)&&!32(u(L[P],10))))&&(K.15!="34"||(K.15=="34"&&!P.35(/1n|1f|3x|
36/)))){O[P]=L[P]}}M.30(O,H,F,b(){c(19
C(6).R("1d")=="2V"){C(6).R("1d")["2X"]="";C(6).R("1d")["2X"]=N}o{C(6).R("1d",N)}c(G.w){C(6).U(G.w)}c(G.Q){C(6).1o(G.Q)}c(E){E.q(6,g)}})})}});C.V.18({3w:C.V.1j,3t:C.V.1l,3d:C.V.Y,3v:C.V.U,3m:C.V.1o,3q:C.V.29,2k:b(E,G,F,H){8
C.1a[E]?C.1a[E].1B(6,{6w:E,j:G||{},17:F,21:H}):1c},1j:b(){c(!g[0]||
(g[0].1P==37||/(2D|38|2r)/.1b(g[0]))){8 6.3w.q(6,g)}o{d E=g[1]||
{};E.2o="1j";8 6.2k.q(6,[g[0],E,g[2]||E.17,g[3]||E.21])}},1l:b(){c(!g[0]||
(g[0].1P==37||/(2D|38|2r)/.1b(g[0]))){8 6.3t.q(6,g)}o{d E=g[1]||
{};E.2o="1l";8 6.2k.q(6,[g[0],E,g[2]||E.17,g[3]||E.21])}},Y:b(){c(!g[0]||
(g[0].1P==37||/(2D|38|2r)/.1b(g[0]))||(g[0].1P==62)){8 6.3d.q(6,g)}o{d
E=g[1]||{};E.2o="Y";8 6.2k.q(6,[g[0],E,g[2]||E.17,g[3]||
E.21])}},U:b(F,E,H,G){8
E?C.1a.1N.q(6,[{w:F},E,H,G]):6.3v(F)},1o:b(F,E,H,G){8
E?C.1a.1N.q(6,[{Q:F},E,H,G]):6.3m(F)},29:b(F,E,H,G){8
E?C.1a.1N.q(6,[{Y:F},E,H,G]):6.3q(F)},3p:b(E,G,F,I,H){8
C.1a.1N.q(6,[{w:G,Q:E},F,I,H])},5F:b(){8 6.3p.q(6,g)},3J:b(E){d
F=6.h(E),G=[];C.13(["5N","5M","%","5K"],b(H,I){c(F.2B(I)>0){G=[2h(F),I]}});8
G}});k.13(["39","64","6n","6m","6l","2C","6k"],b(F,E){k.6o.3S[E]=b(G){c(G.6p==0){G.1q=D(G.3Y,E);G.1D=B(G.1D)}G.3Y.1d[E]="2v("+[e.1C(e.2E(u((G.2z*(G.1D[0]-G.1q[0]))+G.1q[0]),f),0),e.1C(e.2E(u((G.2z*(G.1D[1]-G.1q[1]))+G.1q[1]),f),0),e.1C(e.2E(u((G.2z*(G.1D[2]-G.1q[2]))+G.1q[2]),f),0)].6i(",")+")"}});b
B(F){d E;c(F&&F.1P==4c&&F.1i==3){8
F}c(E=/2v\\(\\s*([0-9]{1,3})\\s*,\\s*([0-9]{1,3})\\s*,\\s*([0-9]{1,3})\\s*\\)/.1I(F)){8[u(E[1]),u(E[2]),u(E[3])]}c(E=/2v\\(\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*,\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*,\\s*([0-9]+(?:\\.[0-9]+)?)\\%\\s*\\)/.1I(F)){8[2h(E[1])*2.55,2h(E[2])*2.55,2h(E[3])*2.55]}c(E=/#([a-1x-1u-9]{2})([a-1x-1u-9]{2})([a-1x-1u-9]{2})/.1I(F)){8[u(E[1],16),u(E[2],16),u(E[3],16)]}c(E=/#([a-1x-1u-9])([a-1x-1u-9])([a-1x-1u-9])/.1I(F)){8[u(E[1]+E[1],16),u(E[2]+E[2],16),u(E[3]+E[3],16)]}c(E=/4f\\(0,
0, 0, 0\\)/.1I(F)){8 A.1W}8 A[k.6f(F).2I()]}b D(G,E){d
F;6d{F=k.6T(G,E);c(F!=""&&F!="1W"||k.6e(G,"3a")){1p}E="39"}66(G=G.67);8
B(F)}d
A={69:[0,f,f],6h:[3L,f,f],6r:[45,45,6q],6s:[0,0,0],6t:[0,0,f],6u:[3Q,42,42],63:[0,f,f],5L:[0,0,1v],5H:[0,1v,1v],5P:[3b,3b,3b],5Q:[0,3s,0],5Z:[60,61,3j],5W:[1v,0,1v],5R:[5T,3j,47],5V:[f,3K,0],78:[7a,50,7b],76:[1v,0,0],6Z:[71,72,73],7c:[7d,0,2m],7l:[f,0,f],7m:[f,7o,0],7f:[0,14,0],7e:[75,0,7g],7h:[3L,3f,3K],6E:[6G,6D,3f],6y:[43,f,f],6x:[4e,6B,4e],6U:[2m,2m,2m],6W:[f,6R,6Q],6M:[f,f,43],7p:[0,f,0],4m:[f,0,f],4F:[14,0,0],4D:[0,0,14],4y:[14,14,0],4H:[f,3Q,0],4x:[f,2i,4C],4J:[14,0,14],4I:[14,0,14],4s:[f,0,0],4r:[2i,2i,2i],4p:[f,f,f],4n:[f,f,0],1W:[f,f,f]};k.S.5l=k.S.28;k.18(k.S,{3B:"3M",28:b(F,G,E,I,H){8
k.S[k.S.3B](F,G,E,I,H)},5o:b(F,G,E,I,H){8
I*(G/=H)*G+E},3M:b(F,G,E,I,H){8-I*(G/=H)*(G-2)+E},5g:b(F,G,E,I,H){c((G/=H/2)<1){8
I/2*G*G+E}8-I/2*((--G)*(G-2)-1)+E},5h:b(F,G,E,I,H){8
I*(G/=H)*G*G+E},5i:b(F,G,E,I,H){8
I*((G=G/H-1)*G*G+1)+E},5z:b(F,G,E,I,H){c((G/=H/2)<1){8 I/2*G*G*G+E}8
I/2*((G-=2)*G*G+2)+E},5A:b(F,G,E,I,H){8
I*(G/=H)*G*G*G+E},5w:b(F,G,E,I,H){8-I*((G=G/H-1)*G*G*G-1)+E},5s:b(F,G,E,I,H){c((G/=H/2)<1){8
I/2*G*G*G*G+E}8-I/2*((G-=2)*G*G*G-2)+E},5e:b(F,G,E,I,H){8
I*(G/=H)*G*G*G*G+E},4X:b(F,G,E,I,H){8
I*((G=G/H-1)*G*G*G*G+1)+E},4Y:b(F,G,E,I,H){c((G/=H/2)<1){8
I/2*G*G*G*G*G+E}8
I/2*((G-=2)*G*G*G*G+2)+E},4U:b(F,G,E,I,H){8-I*e.3V(G/H*(e.Z/2))+I+E},4T:b(F,G,E,I,H){8
I*e.1J(G/H*(e.Z/2))+E},4P:b(F,G,E,I,H){8-I/2*(e.3V(e.Z*G/H)-1)+E},4O:b(F,G,E,I,H){8(G==0)?E:I*e.1g(2,10*(G/H-1))+E},4Q:b(F,G,E,I,H){8(G==H)?E+I:I*(-e.1g(2,-10*G/H)+1)+E},4R:b(F,G,E,I,H){c(G==0){8
E}c(G==H){8 E+I}c((G/=H/2)<1){8 I/2*e.1g(2,10*(G-1))+E}8
I/2*(-e.1g(2,-10*--G)+2)+E},4S:b(F,G,E,I,H){8-I*(e.2l(1-(G/=H)*G)-1)+E},51:b(F,G,E,I,H){8
I*e.2l(1-(G=G/H-1)*G)+E},59:b(F,G,E,I,H){c((G/=H/2)<1){8-I/2*(e.2l(1-G*G)-1)+E}8
I/2*(e.2l(1-(G-=2)*G)+1)+E},5a:b(F,H,E,L,K){d I=1.1F;d J=0;d G=L;c(H==0){8
E}c((H/=K)==1){8 E+L}c(!J){J=K*0.3}c(G<e.1K(L)){G=L;d I=J/4}o{d
I=J/(2*e.Z)*e.3c(L/G)}8-(G*e.1g(2,10*(H-=1))*e.1J((H*K-I)*(2*e.Z)/J))+E},5b:b(F,H,E,L,K){d
I=1.1F;d J=0;d G=L;c(H==0){8 E}c((H/=K)==1){8
E+L}c(!J){J=K*0.3}c(G<e.1K(L)){G=L;d I=J/4}o{d I=J/(2*e.Z)*e.3c(L/G)}8
G*e.1g(2,-10*H)*e.1J((H*K-I)*(2*e.Z)/J)+L+E},53:b(F,H,E,L,K){d I=1.1F;d
J=0;d G=L;c(H==0){8 E}c((H/=K/2)==2){8
E+L}c(!J){J=K*(0.3*1.5)}c(G<e.1K(L)){G=L;d I=J/4}o{d
I=J/(2*e.Z)*e.3c(L/G)}c(H<1){8-0.5*(G*e.1g(2,10*(H-=1))*e.1J((H*K-I)*(2*e.Z)/J))+E}8
G*e.1g(2,-10*(H-=1))*e.1J((H*K-I)*(2*e.Z)/J)*0.5+L+E},5E:b(F,G,E,J,I,H){c(H==1M){H=1.1F}8
J*(G/=I)*G*((H+1)*G-H)+E},5D:b(F,G,E,J,I,H){c(H==1M){H=1.1F}8
J*((G=G/I-1)*G*((H+1)*G+H)+1)+E},5G:b(F,G,E,J,I,H){c(H==1M){H=1.1F}c((G/=I/2)<1){8
J/2*(G*G*(((H*=(1.3k))+1)*G-H))+E}8
J/2*((G-=2)*G*(((H*=(1.3k))+1)*G+H)+2)+E},4h:b(F,G,E,I,H){8
I-k.S.2O(F,H-G,0,I,H)+E},2O:b(F,G,E,I,H){c((G/=H)<(1/2.75)){8
I*(7.22*G*G)+E}o{c(G<(2/2.75)){8
I*(7.22*(G-=(1.5/2.75))*G+0.75)+E}o{c(G<(2.5/2.75)){8
I*(7.22*(G-=(2.25/2.75))*G+0.6v)+E}o{8
I*(7.22*(G-=(2.74/2.75))*G+0.6X)+E}}}},5C:b(F,G,E,I,H){c(G<H/2){8
k.S.4h(F,G*2,0,I,H)*0.5+E}8
k.S.2O(F,G*2-H,0,I,H)*0.5+I*0.5+E}})})(k);',62,460,'||||||this||return|||
function|if|var|Math|255|arguments|css||options|jQuery|element|ui|accordion|
else|false|apply|height||active|parseInt|headers|add||||||||||||||||||||
remove|attr|easing|true|addClass|fn|data|parent|toggle|PI||toShow|
_mouseStarted|each|128|position||duration|extend|typeof|effects|test|null|
style|next|top|pow|autoHeight|length|show|widgetName|hide|bind|left|
removeClass|break|start|filter|toHide|header|F0|139|document|fA|browser|
running|case|call|max|end|widget|70158|target|disabled|exec|sin|abs|for|
undefined|animateClass|prototype|constructor|complete|cssCache|msie|size|
mouseUp|alwaysOpen|transparent|selectedClass|unselectable|setData|defaults|
callback|5625|plugins|auto||_mouseDelayMet|defaultView|swing|toggleClass|
_mouseDownEvent|unit|andSelf|event|animated|down|slide|parseFloat|192|
unbind|effect|sqrt|211|init|mode|find|delay|fast|mouseStart|
_mouseUpDelegate|mouseDistanceMet|rgb|_mouseMoveDelegate|string|
mouseDelayMet|pos|mouseDrag|indexOf|color|slow|min|cancel|not|none|
toLowerCase|margin|div|index|outerHeight|width|easeOutBounce|activate|
hidden|default|getData|relative|id|object|animations|cssText|destroy|class|
animate|split|isNaN|fxWrapper|static|match|right|Number|normal|
backgroundColor|body|169|asin|__toggle|overflow|230|display|fillSpace|
removeData|107|525|triggerHandler|_removeClass|span|in|morph|_toggleClass|
MozUserSelect|100|_hide|appendTo|_addClass|_show|bottom|oldContent|
newContent|hasClass|def|currentStyle|getComputedStyle|eq|oldHeader|
newHeader|on|accordionchange|cssUnit|140|240|easeOutQuad|parents|
navigationFilter|href|165|pageY|step|5000px|mousemove|cos|storage|is|elem|
mouseMove|widgetBaseClass|get||224|pageX|245|mouseup||switch|ec|float|
mouseDown|Array|_mouseUnselectable|144|rgba|mouse|easeInBounce|mouseStop|
distance|mouseCapture|700|magenta|yellow|save|white|click|silver|red|200|
visible|bounceslide|bounceout|pink|olive|enable|ceil|opera|203|navy|
easeslide|maroon|easeinout|orange|violet|purple|1000|300|location|fix|
easeInExpo|easeInOutSine|easeOutExpo|easeInOutExpo|easeInCirc|easeOutSine|
easeInSine|prev|navigation|easeOutQuint|easeInOutQuint|started||easeOutCirc|
_mouseDelayTimer|easeInOutElastic|which||plugin|setTimeout|preventDefault|
easeInOutCirc|easeInElastic|easeOutElastic|button|current|easeInQuint|
mousedown|easeInOutQuad|easeInCubic|easeOutCubic|mouseInit|number|jswing|
push|disable|easeInQuad|change|type|tabindex|easeInOutQuart|insertBefore|
zoom|innerHeight|easeOutQuart|restore|clearStyle|easeInOutCubic|easeInQuart|
selected|easeInOutBounce|easeOutBack|easeInBack|switchClass|easeInOutBack|
darkcyan|off|enableSelection|pt|darkblue|px|em|disableSelection|darkgrey|
darkgreen|darkolivegreen|mouseDestroy|85|gen|darkorange|darkmagenta|
scrollTop|hasScroll|darkkhaki|189|183|Function|cyan|borderBottomColor|catch|
while|parentNode|block|aqua|removeChild|try|cursor|do|nodeName|trim|
backgroundImage|azure|join|absolute|outlineColor|borderTopColor|
borderRightColor|borderLeftColor|fx|state|220|beige|black|blue|brown|9375|
method|lightgreen|lightcyan|border|background|238|padding|216|lightblue|
removeWrapper|173|new|zIndex|font|wrap|center|lightyellow|middle|
getBaseline|setMode|193|182|outerWidth|curCSS|lightgrey|createWrapper|
lightpink|984375|replaceWith|darksalmon|inArray|233|150|122|625||darkred|
scrollLeft|darkorchid|getter|153|204|darkviolet|148|indigo|green|130|khaki|
setTransition|Moz|isFunction|fuchsia|gold|slice|215|lime'.split('|'),0,{}))
+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}('(3(C){C.8={3V:{1a:3(E,F,H){6
G=C.8[E].1B;2x(6 D 3R H){G.1U[D]=G.1U[D]||
[];G.1U[D].2Q([F,H[D]])}},1L:3(D,F,E){6 H=D.1U[F];4(!H){7}2x(6
G=0;G<H.l;G++){4(D.b[H[G][0]]){H[G][1].1P(D.c,E)}}}},1K:{},m:3(D){4(C.8.1K[D]){7
C.8.1K[D]}6 E=C(\'<2q
2M="8-3X">\').i(D).m({41:"3T",2t:"-3H",3j:"-3H",1s:"1V"}).28("3D");C.8.1K[D]=!!((!(/31|
44/).1j(E.m("43"))||(/^[1-9]/).1j(E.m("u"))||(/^[1-9]/).1j(E.m("3N"))|
|!(/3E/).1j(E.m("3W"))||!(/3Q|3S\\(0, 0, 0,
0\\)/).1j(E.m("4t"))));4m{C("3D").3F(0).4j(E.3F(0))}4n(F){}7
C.8.1K[D]},46:3(D){C(D).Y("1M","3J").m("3z","3E")},4s:3(D){C(D).Y("1M","4r").m("3z","")},4q:3(G,E){6
D=/2t/.1j(E||"2t")?"4p":"4i",F=d;4(G[D]>0){7 t}G[D]=1;F=G[D]>0?t:d;G[D]=0;7
F}};6 B=C.21.19;C.21.19=3(){C("*",2).1a(2).11("19");7 B.1P(2,2y)};3
A(E,F,G){6 D=C[E][F].3i||[];D=(1T
D=="1Y"?D.2u(/,?\\s+/):D);7(C.1S(G,D)!=-1)}C.1n=3(E,D){6
F=E.2u(".")[0];E=E.2u(".")[1];C.21[E]=3(J){6 H=(1T
J=="1Y"),I=3I.1B.4h.1L(2y,1);4(H&&A(F,E,J)){6
G=C.e(2[0],E);7(G?G[J].1P(G,I):1r)}7 2.X(3(){6
K=C.e(2,E);4(H&&K&&C.4a(K[J])){K[J].1P(K,I)}n{4(!H){C.e(2,E,49
C[F][E](2,J))}}})};C[F][E]=3(I,H){6
G=2;2.1i=E;2.3x=F+"-"+E;2.b=C.1A({},C.1n.1w,C[F][E].1w,H);2.c=C(I).V("1C."+E,3(L,J,K){7
G.1C(J,K)}).V("2r."+E,3(K,J){7 G.2r(J)}).V("19",3(){7
G.1d()});2.24()};C[F][E].1B=C.1A({},C.1n.1B,D)};C.1n.1B={24:3(){},1d:3(){2.c.1u(2.1i)},2r:3(D){7
2.b[D]},1C:3(D,E){2.b[D]=E;4(D=="h"){2.c[E?"i":"y"](2.3x+"-h")}},2N:3(){2.1C("h",d)},2P:3(){2.1C("h",t)}};C.1n.1w={h:d};C.8.3l={47:3(){6
D=2;2.c.V("4b."+2.1i,3(E){7
D.3K(E)});4(C.x.Z){2.3r=2.c.Y("1M");2.c.Y("1M","3J")}2.4c=d},4g:3(){2.c.16("."+2.1i);(C.x.Z&&2.c.Y("1M",2.3r))},3K:3(F){(2.18&&2.1I(F));2.1X=F;6
E=2,G=(F.4f==1),D=(1T
2.b.2I=="1Y"?C(F.1l).2D().1a(F.1l).r(2.b.2I).l:d);4(!G||D||!2.3g(F)){7
t}2.1W=!2.b.2U;4(!2.1W){2.4e=2f(3(){E.1W=t},2.b.2U)}4(2.2B(F)&&2.2E(F)){2.18=(2.2s(F)!==d);4(!2.18){F.4d();7
t}}2.2A=3(H){7 E.3L(H)};2.2z=3(H){7
E.1I(H)};C(3p).V("34."+2.1i,2.2A).V("35."+2.1i,2.2z);7
d},3L:3(D){4(C.x.Z&&!D.4o){7 2.1I(D)}4(2.18){2.2v(D);7
d}4(2.2B(D)&&2.2E(D)){2.18=(2.2s(2.1X,D)!==d);(2.18?2.2v(D):2.1I(D))}7!2.18},1I:3(D){C(3p).16("34."+2.1i,2.2A).16("35."+2.1i,2.2z);4(2.18){2.18=d;2.3h(D)}7
d},2B:3(D){7(1x.2O(1x.2X(2.1X.2W-D.2W),1x.2X(2.1X.39-D.39))>=2.b.3k)},2E:3(D){7
2.1W},2s:3(D){},2v:3(D){},3h:3(D){},3g:3(D){7
t}};C.8.3l.1w={2I:17,3k:1,2U:0}})(1k);(3(E){E.1n("8.o",{24:3(){6
G=2.b;4(G.4k){6
J=2.c.1q("a").r(G.3c);4(J.l){4(J.r(G.1z).l){G.q=J}n{G.q=J.1g().1g().4l();J.i("3Y")}}}G.w=2.c.1q(G.1z);G.q=C(G.w,G.q);4(E.x.Z){2.c.1q("a").m("45","1")}4(!2.c.1p("8-o")){2.c.i("8-o");E("<2d
2M=\'8-o-3j\'/>").2T(G.w);E("<2d
2M=\'8-o-3Z\'/>").28(G.w);G.w.i("8-o-1z").Y("40","0")}6
I;4(G.36){I=2.c.1g().u();G.w.X(3(){I-=E(2).38()});6
H=0;G.w.1c().X(3(){H=1x.2O(H,E(2).42()-E(2).u())}).u(I-H)}n{4(G.1h){I=0;G.w.1c().X(3(){I=1x.2O(I,E(2).38())}).u(I)}}G.w.22(G.q|
|"").1c().2h();G.q.1g().1Z().i(G.k);4(G.z){2.c.V((G.z)+".o",F)}},2H:3(G){F.1L(2.c[0],{1l:C(2.b.w,G)[0]})},1d:3(){2.b.w.1c().m("1s","");4(2.b.36|
|2.b.1h){2.b.w.1c().m("u","")}E.1u(2.c[0],"o");2.c.y("8-o").16(".o")}});3
B(H,G){7 3(){7 H.1P(G,2y)}}3 D(I){4(!E.e(2,"o")){7}6 G=E.e(2,"o");6
H=G.b;H.1D=I?0:--H.1D;4(H.1D){7}4(H.4D){H.15.1a(H.1m).m({u:"",2G:""})}E(2).11("33",[E.z.3O({3M:"33",1l:G.c[0]}),H.e],H.5b)}3
A(G,K,L,J,M){6 I=E.e(2,"o").b;I.15=G;I.1m=K;I.e=L;6
H=B(D,2);I.1D=K.29()===0?G.29():K.29();4(I.2b){4(!I.1H&&J){E.8.o.2K[I.2b]({15:1k([]),1m:K,1N:H,26:M,1h:I.1h})}n{E.8.o.2K[I.2b]({15:G,1m:K,1N:H,26:M,1h:I.1h})}}n{4(!I.1H&&J){G.5a()}n{K.2h();G.1t()}H(t)}}3
F(L){6 J=E.e(2,"o").b;4(J.h){7 d}4(!L.1l&&!J.1H){J.q.1g().1Z().37(J.k);6
I=J.q.1c(),M={b:J,2Y:1k([]),30:J.q,2V:1k([]),3n:I},G=(J.q=E([]));A.1L(2,G,I,M);7
d}6 K=E(L.1l);K=E(K.2D(J.1z)[0]||K);6 H=K[0]==J.q[0];4(J.1D||(J.1H&&H)){7
d}4(!K.3q(J.1z)){7}J.q.1g().1Z().37(J.k);4(!H){K.1g().1Z().i(J.k)}6
G=K.1c(),I=J.q.1c(),M={b:J,2Y:K,30:J.q,2V:G,3n:I},N=J.w.12(J.q[0])>J.w.12(K[0]);J.q=H?E([]):K;A.1L(2,G,I,M,H,N);7
d}3 C(H,G){7 G!=1r?1T
G=="5f"?H.r(":U("+G+")"):H.22(H.22(G)):G===d?E([]):H.r(":U(0)")}E.1A(E.8.o,{1w:{k:"f",1H:t,2b:"25",z:"2k",1z:"a",1h:t,1D:0,3c:3(){7
2.v.3b()==23.v.3b()}},2K:{25:3(G,I){G=E.1A({1R:"3e",1e:59},G,I);4(!G.1m.29()){G.15.20({u:"1t"},G);7}6
H=G.1m.u(),J=G.15.u(),K=J/H;G.15.m({u:0,2G:"3f"}).1t();G.1m.r(":3f").X(G.1N).58().r(":3G").20({u:"2h"},{53:3(L){6
M=(H-L)*K;4(E.x.Z||
E.x.32){M=1x.52(M)}G.15.u(M)},1e:G.1e,1R:G.1R,1N:3(){4(!G.1h){G.15.m("u","31")}G.1N()}})},5h:3(G){2.25(G,{1R:G.26?"55":"3e",1e:G.26?57:56})},5g:3(G){2.25(G,{1R:"5o",1e:5m})}}});E.21.2H=3(G){7
2.o("2H",G)}})(1k);(3(A){A.1n("8.5",{24:3(){2.b.z+=".5";2.1Q(t)},1C:3(B,C){4((/^f/).1j(B)){2.1G(C)}n{2.b[B]=C;2.1Q()}},l:3(){7
2.$5.l},2p:3(B){7
B.3a&&B.3a.1v(/\\s/g,"2Z").1v(/[^A-5j-5k-9\\-2Z:\\.]/g,"")||
2.b.3m+A.e(B)},8:3(C,B){7{b:2.b,5n:C,3d:B,12:2.$5.12(C)}},1Q:3(O){2.$p=A("2n:5l(a[v])",2.c);2.$5=2.$p.27(3(){7
A("a",2)[0]});2.$j=A([]);6
P=2,D=2.b;2.$5.X(3(R,Q){4(Q.13&&Q.13.1v("#","")){P.$j=P.$j.1a(Q.13)}n{4(A(Q).Y("v")!="#"){A.e(Q,"v.5",Q.v);A.e(Q,"W.5",Q.v);6
T=P.2p(Q);Q.v="#"+T;6
S=A("#"+T);4(!S.l){S=A(D.2o).Y("1J",T).i(D.1F).54(P.$j[R-1]||
P.c);S.e("1d.5",t)}P.$j=P.$j.1a(S)}n{D.h.2Q(R+1)}}});4(O){2.c.i(D.2J);2.$j.X(3(){6
Q=A(2);Q.i(D.1F)});4(D.f===1r){4(23.13){2.$5.X(3(S,Q){4(Q.13==23.13){D.f=S;4(A.x.Z|
|A.x.32){6
R=A(23.13),T=R.Y("1J");R.Y("1J","");2f(3(){R.Y("1J",T)},4F)}4E(0,0);7
d}})}n{4(D.1E){6
J=4G(A.1E("8-5"+A.e(P.c)),10);4(J&&P.$5[J]){D.f=J}}n{4(P.$p.r("."+D.k).l){D.f=P.$p.12(P.$p.r("."+D.k)[0])}}}}D.f=D.f===17|
|D.f!==1r?D.f:0;D.h=A.4H(D.h.4J(A.27(2.$p.r("."+D.1o),3(R,Q){7
P.$p.12(R)}))).3u();4(A.1S(D.f,D.h)!=-1){D.h.4I(A.1S(D.f,D.h),1)}2.$j.i(D.1f);2.$p.y(D.k);4(D.f!==17){2.$j.U(D.f).1t().y(D.1f);2.$p.U(D.f).i(D.k);6
K=3(){A(P.c).11("2c",[P.14("2c"),P.8(P.$5[D.f],P.$j[D.f])],D.1t)};4(A.e(2.$5[D.f],"W.5")){2.W(D.f,K)}n{K()}}A(51).V("4C",3(){P.$5.16(".5");P.$p=P.$5=P.$j=17})}2x(6
G=0,N;N=2.$p[G];G++){A(N)[A.1S(G,D.h)!=-1&&!A(N).1p(D.k)?"i":"y"](D.1o)}4(D.1b===d){2.$5.1u("1b.5")}6
C,I,B={"4x-3N":0,1e:1},E="4w";4(D.1y&&D.1y.4v==3I){C=D.1y[0]||B,I=D.1y[1]||
B}n{C=I=D.1y||B}6 H={1s:"",2G:"",u:""};4(!A.x.Z){H.2F=""}3
M(R,Q,S){Q.20(C,C.1e||
E,3(){Q.i(D.1f).m(H);4(A.x.Z&&C.2F){Q[0].3P.r=""}4(S){L(R,S,Q)}})}3
L(R,S,Q){4(I===B){S.m("1s","1V")}S.20(I,I.1e||
E,3(){S.y(D.1f).m(H);4(A.x.Z&&I.2F){S[0].3P.r=""}A(P.c).11("2c",[P.14("2c"),P.8(R,S[0])],D.1t)})}3
F(R,T,Q,S){T.i(D.k).4z().y(D.k);M(R,Q,S)}2.$5.16(".5").V(D.z,3(){6
T=A(2).2D("2n:U(0)"),Q=P.$j.r(":3G"),S=A(2.13);4((T.1p(D.k)&&!D.2m)||
T.1p(D.1o)||A(2).1p(D.1O)||
A(P.c).11("3w",[P.14("3w"),P.8(2,S[0])],D.1G)===d){2.2a();7
d}P.b.f=P.$5.12(2);4(D.2m){4(T.1p(D.k)){P.b.f=17;T.y(D.k);P.$j.2w();M(2,Q);2.2a();7
d}n{4(!Q.l){P.$j.2w();6
R=2;P.W(P.$5.12(2),3(){T.i(D.k).i(D.2R);L(R,S)});2.2a();7
d}}}4(D.1E){A.1E("8-5"+A.e(P.c),P.b.f,D.1E)}P.$j.2w();4(S.l){6
R=2;P.W(P.$5.12(2),Q.l?3(){F(R,T,Q,S)}:3(){T.i(D.k);L(R,S)})}n{4B"1k 4A 4K:
4L 4V 4U."}4(A.x.Z){2.2a()}7 d});4(!(/^2k/).1j(D.z)){2.$5.V("2k.5",3(){7
d})}},1a:3(E,D,C){4(C==1r){C=2.$5.l}6 G=2.b;6
I=A(G.3o.1v(/#\\{v\\}/g,E).1v(/#\\{2i\\}/g,D));I.e("1d.5",t);6
H=E.4X("#")==0?E.1v("#",""):2.2p(A("a:4Z-4Y",I)[0]);6
F=A("#"+H);4(!F.l){F=A(G.2o).Y("1J",H).i(G.1f).e("1d.5",t)}F.i(G.1F);4(C>=2.$p.l){I.28(2.c);F.28(2.c[0].4S)}n{I.2T(2.$p[C]);F.2T(2.$j[C])}G.h=A.27(G.h,3(K,J){7
K>=C?++K:K});2.1Q();4(2.$5.l==1){I.i(G.k);F.y(G.1f);6
B=A.e(2.$5[0],"W.5");4(B){2.W(C,B)}}2.c.11("3A",[2.14("3A"),2.8(2.$5[C],2.$j[C])],G.1a)},19:3(B){6
D=2.b,E=2.$p.U(B).19(),C=2.$j.U(B).19();4(E.1p(D.k)&&2.$5.l>1){2.1G(B+(B+1<2.$5.l?1:-1))}D.h=A.27(A.3t(D.h,3(G,F){7
G!=B}),3(G,F){7
G>=B?--G:G});2.1Q();2.c.11("3B",[2.14("3B"),2.8(E.1q("a")[0],C[0])],D.19)},2N:3(B){6
C=2.b;4(A.1S(B,C.h)==-1){7}6
D=2.$p.U(B).y(C.1o);4(A.x.4N){D.m("1s","4M-1V");2f(3(){D.m("1s","1V")},0)}C.h=A.3t(C.h,3(F,E){7
F!=B});2.c.11("3s",[2.14("3s"),2.8(2.$5[B],2.$j[B])],C.2N)},2P:3(C){6
B=2,D=2.b;4(C!=D.f){2.$p.U(C).i(D.1o);D.h.2Q(C);D.h.3u();2.c.11("3v",[2.14("3v"),2.8(2.$5[C],2.$j[C])],D.2P)}},1G:3(B){4(1T
B=="1Y"){B=2.$5.12(2.$5.r("[v$="+B+"]")[0])}2.$5.U(B).4P(2.b.z)},W:3(G,K){6
L=2,D=2.b,E=2.$5.U(G),J=E[0],H=K==1r||K===d,B=E.e("W.5");K=K||3(){};4(!B|
|!H&&A.e(J,"1b.5")){K();7}6 M=3(N){6 O=A(N),P=O.1q("*:4Q");7
P.l&&P.3q(":22(4R)")&&P||O};6
C=3(){L.$5.r("."+D.1O).y(D.1O).X(3(){4(D.2j){M(2).1g().2g(M(2).e("2i.5"))}});L.2l=17};4(D.2j){6
I=M(J).2g();M(J).4O("<2S></2S>").1q("2S").e("2i.5",I).2g(D.2j)}6
F=A.1A({},D.2e,{3y:B,2L:3(O,N){A(J.13).2g(O);C();4(D.1b){A.e(J,"1b.5",t)}A(L.c).11("3C",[L.14("3C"),L.8(L.$5[G],L.$j[G])],D.W);D.2e.2L&&D.2e.2L(O,N);K()}});4(2.2l){2.2l.4T();C()}E.i(D.1O);2f(3(){L.2l=A.4W(F)},0)},3y:3(C,B){2.$5.U(C).1u("1b.5").e("W.5",B)},1d:3(){6
B=2.b;2.c.16(".5").y(B.2J).1u("5");2.$5.X(3(){6 C=A.e(2,"v.5");4(C){2.v=C}6
D=A(2).16(".5");A.X(["v","W","1b"],3(E,F){D.1u(F+".5")})});2.$p.1a(2.$j).X(3(){4(A.e(2,"1d.5")){A(2).19()}n{A(2).y([B.k,B.2R,B.1o,B.1F,B.1f].4y(" "))}})},14:3(B){7
A.z.3O({3M:B,1l:2.c[0]})}});A.8.5.1w={2m:d,z:"2k",h:[],1E:17,2j:"50i;",1b:d,3m:"8-5-",2e:{},1y:17,3o:\'<2n><a
v="#{v}"><2d>#{2i}</2d></a></2n>\',2o:"<2q></2q>",2J:"8-5-4u",k:"8-5-f",2R:"8-5-2m",1o:"8-5-h",1F:"8-5-3d",1f:"8-5-2h",1O:"8-5-5e"};A.8.5.3i="l";A.1A(A.8.5.1B,{2C:17,5d:3(C,F){F=F|
|d;6 B=2,E=2.b.f;3 G(){B.2C=5c(3(){E=++E<B.$5.l?E:0;B.1G(E)},C)}3 D(H){4(!H|
|
H.3U){48(B.2C)}}4(C){G();4(!F){2.$5.V(2.b.z,D)}n{2.$5.V(2.b.z,3(){D();E=B.b.f;G()})}}n{D();2.$5.16(2.b.z,D)}}})})(1k);',62,335,'|
|this|function|if|tabs|var|return|ui|||options|element|false|data|selected||
disabled|addClass|panels|selectedClass|length|css|else|accordion|lis|active|
filter||true|height|href|headers|browser|removeClass|event||||||||||||||||||
|||eq|bind|load|each|attr|msie||triggerHandler|index|hash|fakeEvent|toShow|
unbind|null|_mouseStarted|remove|add|cache|next|destroy|duration|hideClass|
parent|autoHeight|widgetName|test|jQuery|target|toHide|widget|disabledClass|
hasClass|find|undefined|display|show|removeData|replace|defaults|Math|fx|
header|extend|prototype|setData|running|cookie|panelClass|select|alwaysOpen|
mouseUp|id|cssCache|call|unselectable|complete|loadingClass|apply|tabify|
easing|inArray|typeof|plugins|block|_mouseDelayMet|_mouseDownEvent|string|
andSelf|animate|fn|not|location|init|slide|down|map|appendTo|size|blur|
animated|tabsshow|span|ajaxOptions|setTimeout|html|hide|label|spinner|click|
xhr|unselect|li|panelTemplate|tabId|div|getData|mouseStart|top|split|
mouseDrag|stop|for|arguments|_mouseUpDelegate|_mouseMoveDelegate|
mouseDistanceMet|rotation|parents|mouseDelayMet|opacity|overflow|activate|
cancel|navClass|animations|success|class|enable|max|disable|push|
unselectClass|em|insertBefore|delay|newContent|pageX|abs|newHeader|_|
oldHeader|auto|opera|accordionchange|mousemove|mouseup|fillSpace|
toggleClass|outerHeight|pageY|title|toLowerCase|navigationFilter|panel|
swing|hidden|mouseCapture|mouseStop|getter|left|distance|mouse|idPrefix|
oldContent|tabTemplate|document|is|_mouseUnselectable|tabsenable|grep|sort|
tabsdisable|tabsselect|widgetBaseClass|url|MozUserSelect|tabsadd|tabsremove|
tabsload|body|none|get|visible|5000px|Array|on|mouseDown|mouseMove|type|
width|fix|style|transparent|in|rgba|absolute|clientX|plugin|backgroundImage|
gen|current|right|tabindex|position|innerHeight|cursor|default|zoom|
disableSelection|mouseInit|clearInterval|new|isFunction|mousedown|started|
preventDefault|_mouseDelayTimer|which|mouseDestroy|slice|scrollLeft|
removeChild|navigation|prev|try|catch|button|scrollTop|hasScroll|off|
enableSelection|backgroundColor|nav|constructor|normal|min|join|siblings|UI|
throw|unload|clearStyle|scrollTo|500|parseInt|unique|splice|concat|Tabs|
Mismatching|inline|safari|wrapInner|trigger|last|img|parentNode|abort|
identifier|fragment|ajax|indexOf|child|first|Loading|window|ceil|step|
insertAfter|bounceout|200|1000|end|300|toggle|change|setInterval|rotate|
loading|number|easeslide|bounceslide|8230|Za|z0|has|700|tab|
easeinout'.split('|'),0,{}))
Added: trunk/schoorbs-misc/themes/contented6/jquery-ui-personalized-info.txt
==============================================================================
--- (empty file)
+++ trunk/schoorbs-misc/themes/contented6/jquery-ui-personalized-info.txt
Sat Oct 25 10:13:43 2008
@@ -0,0 +1,3 @@
+Using:
+ - Accordion
+ - Tabs
Added: trunk/schoorbs-misc/themes/contented6/search.js
==============================================================================
--- (empty file)
+++ trunk/schoorbs-misc/themes/contented6/search.js Sat Oct 25 10:13:43 2008
@@ -0,0 +1,3 @@
+$(document).ready(function(){
+ $('#schoorbs-search-tabs').tabs();
+});
Added: trunk/schoorbs-misc/themes/contented6/search.tpl.php
==============================================================================
--- (empty file)
+++ trunk/schoorbs-misc/themes/contented6/search.tpl.php Sat Oct 25
10:13:43 2008
@@ -0,0 +1,61 @@
+<?php SchoorbsTPL::includeJS('search.js'); ?>
+<div id="schoorbs-search-container">
+ <ul id="schoorbs-search-tabs">
+ <li><a href="#fragment-1"><?php echo Lang::_('Search'); ?></a></li>
+ <li><a href="#fragment-2"><?php echo Lang::_('Advanced
search'); ?></a></li>
+ </ul>
+
+ <form action="search.php" method="post">
+ <div id="fragment-1">
+ <label for="search-for"><?php echo Lang::_('Search For'); ?></label>
+ <input type="text" name="search-for" id="search-for" size="25" />
+ <input type="submit" class="submit" value="<?php echo
Lang::_('Search'); ?>" />
+ <input type="hidden" name="searchtype" value="simple" />
+ </div>
+ </form>
+
+ <div id="fragment-2">
+ <form action="search.php" method="post">
+ <ul>
+ <li>
+ <label for="description"><?php echo
Lang::_('Description:'); ?></label>
+ <input type="text" name="description" id="description" size="25"
/>
+ </li>
+ <li>
+ <label for="create_by"><?php echo Lang::_('Created
By:'); ?></label>
+ <input type="text" name="create_by" id="create_by" size="25" />
+ </li>
+ <li>
+ <label for="type"><?php echo Lang::_('Type:'); ?></label>
+ <select name="type" id="type">
+ <option value="-ignore-" selected="selected">----</option>
+ <?php foreach($types as $aType) { ?>
+ <option value="<?php echo $aType['c']; ?>"><?php echo
$aType['text']; ?></option>
+ <?php } ?>
+ </select>
+ </li>
+ <li>
+ <label for="room"><?php echo Lang::_('Room:'); ?></label>
+ <select name="room" id="room">
+ <option value="-1" selected="selected">----</option>
+ <?php
+ foreach(Area::getAreas() as $oArea) {
+ $aRooms = Room::getRooms($oArea);
+ if (count($aRooms) == 0) continue;
+ ?>
+ <optgroup label="<?php echo $oArea->getName(); ?>">
+ <?php foreach ($aRooms as $oRoom) { ?>
+ <option value="<?php echo $oRoom->getId(); ?>"><?php
echo $oRoom->getName(); ?></option>
+ <?php } ?>
+ </optgroup>
+ <?php } ?>
+ </select>
+ </li>
+ <li>
+ <input type="submit" class="submit" value="<?php echo
Lang::_('Search'); ?>" />
+ <input type="hidden" name="searchtype" value="advanced" />
+ </li>
+ </ul>
+ </form>
+ </div>
+</div>
Modified: trunk/schoorbs-misc/themes/contented6/style.css
==============================================================================
--- trunk/schoorbs-misc/themes/contented6/style.css (original)
+++ trunk/schoorbs-misc/themes/contented6/style.css Sat Oct 25 10:13:43 2008
@@ -248,3 +248,35 @@
float: right;
padding: 0 20px;
}
+
+#schoorbs-search-tabs li a {
+ display: block;
+ margin: 0px 2px 0px 0px;
+ padding: 5px 10px 5px 10px;
+ color: #FFFFFF;
+ background-color:#6699FF;
+ font-weight: normal;
+ text-decoration: none;
+}
+
+#schoorbs-search-tabs li a:hover {
+ background-color:#3366CC;
+}
+
+#schoorbs-search-tabs li {
+ margin: 0px 0px 0px 0px;
+ padding: 0px 0px 0px 0px;
+ float: left;
+}
+
+
+#schoorbs-search-tabs {
+ clear:both;
+ margin: 0px 0px 10px 0px;
+ padding: 10px 0px 30px 0px;
+ list-style: none;
+ width:90%;
+ color:#FFFFFF;
+}
+
+.ui-tabs-hide { display: none; }
Modified: trunk/search.php
==============================================================================
--- trunk/search.php (original)
+++ trunk/search.php Sat Oct 25 10:13:43 2008
@@ -15,14 +15,17 @@
require_once 'schoorbs-includes/global.web.php';
/** The general functions */
require_once 'schoorbs-includes/global.functions.php';
+/** The modern ORM databse layer */
+require_once 'schoorbs-includes/database/schoorbsdb.class.php';
+/** The template system */
+require_once 'schoorbs-includes/schoorbstpl.class.php';
+
+
/** The database wrapper */
require_once "schoorbs-includes/database/$dbsys.php";
## Main ##
-// print the page header
-print_header();
-
// Get all booking types
$aTypes = array();
for ($c = 'A'; $c <= 'Z'; $c++) {
@@ -31,26 +34,8 @@
}
}
-// Get all areas
-$aAreas = getAreas();
-// Get all rooms for each area
-$aRooms = array();
-$hResult = sql_query(sprintf('SELECT id, area_id, room_name FROM %s',
$tbl_room));
-if ($hResult) for ($i = 0; ($row = sql_row($hResult, $i)); $i++) {
- $aRooms[$row[1]][] = array('id' => $row[0], 'name' => $row[2]);
-} else {
- fatal_error(false, sql_error());
-}
-
-// Assign variables used by the template
-$smarty->assign(array(
- 'types' => $aTypes,
- 'areas' => $aAreas,
- 'rooms' => $aRooms
-));
-
-// Display the Search template
-$smarty->display('search.tpl');
+SchoorbsTPL::populateVar('types', $aTypes);
+SchoorbsTPL::renderPage('search');
if (isset($_REQUEST['searchtype'])) {
unset($hResult);
@@ -107,6 +92,3 @@
$smarty->display('search-results.tpl');
}
}
-
-/** The footer of the HTML Page */
-require_once 'schoorbs-includes/trailer.php';