--- trunk/templates/master.html 2004/05/07 23:35:39 20 +++ trunk/templates/master.html 2004/05/08 00:54:16 21 @@ -59,6 +59,10 @@ [% END %] [% END %] +[% MACRO url_search BLOCK %] +[% IF param.search ; "?search=" ; param.search ; END %] +[% END %] + @@ -107,13 +111,15 @@ my $mm = shift || return "BUG3"; my $day = shift || return " "; + my $url = shift || ""; + return $day if (! $cal); # no calendar entries my $yyyymm = sprintf("%04d-%02d",$yyyy,$mm); my $dd = sprintf("%02d",$day); if ($cal->{$yyyymm}->{$dd}) { - return "{$yyyymm}->{$dd}."\">$day"; + return "{$yyyymm}->{$dd}."\">$day"; } else { return $day; } @@ -121,11 +127,13 @@ [% END %]
- + [% FOREACH row = cal.rows %] [% FOREACH col = row %] - + [% END %] [% END %] @@ -146,8 +154,9 @@
Links -
+
[% yyyy ; "-" ; mm %]
+ [% yyyy %]-[% mm %] +
[% get_cal(calendar,yyyy,mm,col) %][% get_cal(calendar,yyyy,mm,col,url_search) %]