diff --git a/website/agenda/planung/calendar.cgi b/website/agenda/planung/calendar.cgi index eebe7b8..4e4059f 100755 --- a/website/agenda/planung/calendar.cgi +++ b/website/agenda/planung/calendar.cgi @@ -211,9 +211,9 @@ sub showCalendar { #build event filter $options = { project_id => $project_id, - template => 'no', + template => 'html', limit => 600, - get => 'no_content', + #get => 'no_content', from_date => $from, till_date => $till, date_range_include => 1, @@ -257,6 +257,7 @@ sub showCalendar { unless ( $params->{list} == 1 ) { for my $event (@$events) { $event->{origStart} = $event->{start}; + $event->{origContent} = $event->{origContent}; } $events = break_dates( $events, $start_of_day ); } @@ -735,6 +736,7 @@ sub showEventList { my $playoutIcon = qq{}; my $processingIcon = qq{}; my $preparedIcon = qq{}; my $out = ''; $out = qq{ @@ -757,6 +759,7 @@ sub showEventList { $archiveIcon project studio + creole @@ -864,6 +867,8 @@ sub showEventList { my $playout_info = $file // $event->{upload_status} // ''; my $studio_name = $event->{studio_name} // '-'; + + my $format = {"markdown" => "-", "creole" => "Lang Belta" }->{$event->{content_format}} // 'Lang Belta'; $out .= qq!! . qq!! @@ -883,6 +888,7 @@ sub showEventList { . qq!$archived! . qq!$event->{project_name} $other_studio! . qq!$studio_name $other_studio! + . qq!$format! . qq!! . "\n"; } $i++; @@ -927,6 +933,7 @@ sub showEventList { var label_schedule='} . $params->{loc}->{label_schedule} . q{'; var label_worktime='} . $params->{loc}->{label_worktime} . q{'; var label_playout='} . $params->{loc}->{label_playout} . q{'; + var label_descriptions='} . $params->{loc}->{label_descriptions} . q{'; var label_pin='} . $params->{loc}->{label_pin} . q{'; @@ -1207,9 +1214,9 @@ sub printTableBody { ) . ' ' if defined $event->{duration}; - $event->{content} .= audio::formatLoudness( $event->{rms_left}, 'L: ' ) . ' ' + $event->{content} .= audio::formatLoudness( $event->{rms_left}, 'L: ' ,'round') . ' ' if defined $event->{rms_left}; - $event->{content} .= audio::formatLoudness( $event->{rms_right}, 'R: ' ) + $event->{content} .= audio::formatLoudness( $event->{rms_right}, 'R: ','round' ) if defined $event->{rms_right}; #$event->{content} .= formatBitrate( $event->{bitrate} ) if defined $event->{bitrate}; $event->{content} .= ''; @@ -1296,6 +1303,7 @@ sub printJavascript { var label_events='} . $params->{loc}->{label_events} . q{'; var label_schedule='} . $params->{loc}->{label_schedule} . q{'; var label_worktime='} . $params->{loc}->{label_worktime} . q{'; + var label_descriptions='} . $params->{loc}->{label_descriptions} . q{'; var label_playout='} . $params->{loc}->{label_playout} . q{'; var label_pin='} . $params->{loc}->{label_pin} . q{'; @@ -1519,8 +1527,10 @@ sub print_event { $height = ''; } - # my $date = $event->{origStart} || $event->{start} || ''; - my $content = $event->{content} || ''; + my $content = '
'; + $content .= qq!! if $class=~/event/; + $content .= $event->{content} || ''; + $content .= '
'; if ( $class =~ /schedule/ ) { my $frequency = getFrequency($event); @@ -1537,6 +1547,11 @@ sub print_event { $content .= '
uploading '; } + $content .= q{
}; + $content .= q{
}.$event->{excerpt}.q{
} if defined $event->{excerpt}; + $content .= q{
}.$event->{html_topic}.q{
} if defined $event->{topic}; + $content .= q{
}; + if ($showIcons) { my $attr = { map { $_ => undef } split( /\s+/, $class) }; @@ -1547,8 +1562,8 @@ sub print_event { my $playoutClass = qq{}; my $processingClass = qq{}; my $preparedClass = qq{}; - - my $icons=''; + my $icons = ''; + if ( exists $attr->{event} ){ my $playout = ''; if (exists $attr->{upload_status}){ @@ -1568,14 +1583,14 @@ sub print_event { if exists $attr->{archived}; } - $content = qq{
$content
$icons
}; + $content = qq{
$content
$icons
}; } my $time = ''; $time = qq{ time="$event->{time}"} if $class =~ m/time/; my $date = ''; - $date = qq{ date="$event->{date}"} if $class =~ m/date/; + $date = qq{ date="$event->{date}"} if $class =~ m/date/; my $line = q{