(keys %{$IkiWiki::typedlinks{$event}{tag}}));
@tags
= map {
- my $besttag = bestlink($params{page}, $_);
- my $tag = (length $besttag > 0 ? $besttag : $_);
+ my $tag_best = bestlink($params{page}, $_);
+ $tag_best = (length $tag_best > 0 ? $tag_best : bestlink($event, $_));
+ my $tag = (length $tag_best > 0 ? $tag_best : $_);
my $title
= exists $pagestate{$tag}{meta}{title}
? $pagestate{$tag}{meta}{title}
= htmllink
( $params{page}
, $params{destpage}
- , (length $besttag == 0 and defined $config{tag_new} ? $config{tag_new} : '').'/'.$tag
+ , $tag
, linktext => $title
, noimageinline => 1
, title => $title );
- add_depends($params{page}, $event, deptype('content'));
+ #add_depends($params{page}, $event, deptype('content'));
+ # NOTE: useless now that deptype('content') is default.
#add_depends($params{page}, $tag, deptype('content'));
# XXX: much too heavy :\ and midnight refresh may fix it anyway.
my $class = qq{$tag};
, $date->year()
);
add_depends($params{page}, $year_page, deptype("presence"));
- if ($pagesources{$year_page}) {
+ if (exists $pagesources{$year_page}) {
$year_html
= htmllink
( $params{page}
, $date->month()
);
add_depends($params{page}, $month_page, deptype("presence"));
- if ($pagesources{$month_page}) {
+ if (exists $pagesources{$month_page}) {
$month_html
= htmllink
( $params{page}
, $date->day()
);
add_depends($params{page}, $day_page, deptype("presence"));
- if ($pagesources{$day_page}) {
+ if (exists $pagesources{$day_page}) {
$day_html
= htmllink
( $params{page}
= pagespec_match_list
( $params{page}
, $params{pages}
- , deptype => deptype("presence")
- # NOTE: add presence dependencies to update calendar when pages are added/removed
+ , deptype => deptype("content")
+ # NOTE: add content dependency to update calendar when pages are tagged
);
my $event_html
= event_html
= pagespec_match_list
( $params{page}
, $params{pages}
- , deptype => deptype("presence")
- # NOTE: add presence dependencies to update calendar when pages are added/removed
+ , deptype => deptype("content")
+ # NOTE: add presence dependency to update calendar when pages are tagged
);
my %events_by_day = map {($_=>[])} (1 .. $last_day);
foreach my $event (events_of_pages(\@pages, %params)) {
- push @{$events_by_day{$event->{date}->{day}}}, $event;
+ my $day = $event->{date}->{day};
+ push @{$events_by_day{$day}}, $event
+ if defined $day;
}
my $t='<tr>';
: gettext('Agenda');
}
- my %focus_set;
- if (defined $params{day} and $params{day} =~ m/^(\d+)$/) {
- my ($day) = ($1);
- $focus_set{day} = $day;
+ my %focus_set =
+ ( day => $params{focus}->day()
+ , month => $params{focus}->month()
+ , year => $params{focus}->year()
+ );
+ if (defined $params{year} and $params{year} =~ m/^(\d+)$/) {
+ my ($year) = ($1);
+ $focus_set{year} = $year;
}
- if (defined $params{month} and $params{month} =~ m/^(\d+)$/) {
+ if (defined $params{month} and $params{month} =~ m/^(\d+)$/ and ($params{type} eq 'month' or $params{type} eq 'day')) {
my ($month) = ($1);
$focus_set{month} = $month;
}
- if (defined $params{year} and $params{year} =~ m/^(\d+)$/) {
- my ($year) = ($1);
- $focus_set{year} = $year;
+ if (defined $params{day} and $params{day} =~ m/^(\d+)$/ and $params{type} eq 'day') {
+ my ($day) = ($1);
+ $focus_set{day} = $day;
+ }
+ if (not defined $focus_set{day}) {
+ $focus_set{day} = 1;
+ }
+ else {
+ my $month = DateTime->new(year => $focus_set{year}, month => $focus_set{month}, day => 1);
+ my $last_day_of_month = $month->add(months => 1)->subtract(days => 1)->day();
+ $focus_set{day} = $last_day_of_month
+ if $focus_set{day} > $last_day_of_month;
}
$params{focus}->set(%focus_set);
- if (defined $params{day} and $params{day} =~ m/^([+-])(\d+)$/) {
+ if (defined $params{day} and $params{day} =~ m/^([+-])(\d+)$/ and $params{type} eq 'day') {
my ($sign, $days) = ($1, $2);
my $duration = DateTime::Duration->new(days => $days, end_of_month => 'limit');
$params{focus}
? $params{focus}->add_duration($duration)
: $params{focus}->subtract_duration($duration);
}
- if (defined $params{month} and $params{month} =~ m/^([+-])(\d+)$/) {
+ if (defined $params{month} and $params{month} =~ m/^([+-])(\d+)$/ and ($params{type} eq 'month' or $params{type} eq 'day')) {
my ($sign, $months) = ($1, $2);
my $duration = DateTime::Duration->new(months => $months, end_of_month => 'limit');
$params{focus}