diff --git a/website/agenda/planung/assign-series.cgi b/website/agenda/planung/assign-series.cgi index 67e0701..e2c0148 100755 --- a/website/agenda/planung/assign-series.cgi +++ b/website/agenda/planung/assign-series.cgi @@ -62,16 +62,9 @@ $params = $request->{params}->{checked}; #process header my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); -template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); +template::process( $config, 'print', template::check( $config, 'assign-series-header.html' ), $headerParams ); return unless uac::check( $config, $params, $user_presets ) == 1; -print q{ - - - - -}; - my $permissions = $request->{permissions}; unless ( $permissions->{scan_series_events} == 1 ) { uac::permissions_denied('scan_series_events'); diff --git a/website/agenda/planung/assignments.cgi b/website/agenda/planung/assignments.cgi index 1bf0f10..87cc686 100755 --- a/website/agenda/planung/assignments.cgi +++ b/website/agenda/planung/assignments.cgi @@ -63,16 +63,9 @@ $params = $request->{params}->{checked}; #process header my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); -template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); +template::process( $config, 'print', template::check( $config, 'assignments-header.html' ), $headerParams ); return unless uac::check( $config, $params, $user_presets ) == 1; -print q{ - - - - -}; - my $permissions = $request->{permissions}; unless ( $permissions->{scan_series_events} == 1 ) { uac::permissions_denied('scan_series_events'); diff --git a/website/agenda/planung/audio-recordings.cgi b/website/agenda/planung/audio-recordings.cgi index 850f1c9..9523a38 100755 --- a/website/agenda/planung/audio-recordings.cgi +++ b/website/agenda/planung/audio-recordings.cgi @@ -87,11 +87,8 @@ $headerParams->{loc} = localization::get( $config, { user => $user, file => 'men template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); exit unless uac::check( $config, $params, $user_presets ) == 1; - -print q{ - - -} unless (params::isJson); +template::process( $config, 'print', template::check( $config, 'audio-recordings-header.html' ), $headerParams ) + unless params::isJson; my $permissions = $request->{permissions}; $params->{action} = '' unless defined $params->{action}; diff --git a/website/agenda/planung/calendar.cgi b/website/agenda/planung/calendar.cgi index 4e4059f..ca6513a 100755 --- a/website/agenda/planung/calendar.cgi +++ b/website/agenda/planung/calendar.cgi @@ -100,15 +100,8 @@ if ( #process header my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); - template::process( $config, 'print', template::check( $config, 'default.html' ), + template::process( $config, 'print', template::check( $config, 'calendar-header.html' ), $headerParams ); - print q{ - - - - - - }; if ( $params->{list} eq '1' ) { print q{ diff --git a/website/agenda/planung/comment.cgi b/website/agenda/planung/comment.cgi index fe6105c..cfb680e 100755 --- a/website/agenda/planung/comment.cgi +++ b/website/agenda/planung/comment.cgi @@ -68,9 +68,8 @@ if ( ( params::isJson() ) || ( defined $params->{action} ) ) { my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); - print q{ - - } unless (params::isJson); + template::process( $config, 'print', template::check( $config, 'comment-header.html' ), $headerParams ) + unless (params::isJson); } return unless uac::check( $config, $params, $user_presets ) == 1; diff --git a/website/agenda/planung/create-events.cgi b/website/agenda/planung/create-events.cgi index 580614a..a95c22d 100755 --- a/website/agenda/planung/create-events.cgi +++ b/website/agenda/planung/create-events.cgi @@ -57,16 +57,9 @@ $params = $request->{params}->{checked}; #process header my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); -template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); +template::process( $config, 'print', template::check( $config, 'create-events-header.html' ), $headerParams ); return unless uac::check( $config, $params, $user_presets ) == 1; -print q{ - - - - -}; - my $permissions = $request->{permissions}; unless ( $permissions->{create_event_from_schedule} == 1 ) { uac::permissions_denied('create_event_from_schedule'); diff --git a/website/agenda/planung/event.cgi b/website/agenda/planung/event.cgi index 8fd4231..1d43e21 100755 --- a/website/agenda/planung/event.cgi +++ b/website/agenda/planung/event.cgi @@ -43,6 +43,7 @@ my $config = config::get('../config/config.cgi'); my $debug = $config->{system}->{debug}; my ( $user, $expires ) = auth::get_user( $config, $params, $cgi ); return if ( ( !defined $user ) || ( $user eq '' ) ); + my $user_presets = uac::get_user_presets( $config, { @@ -73,17 +74,10 @@ my $show_header = ! (params::isJson() or $params->{action} eq 'download_audio'); if ( $show_header ) { my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); - template::process( $config, 'print', template::check( $config, 'default.html' ), - $headerParams ); + template::process( $config, 'print', template::check( $config, 'event-header.html' ), $headerParams ); } return unless uac::check( $config, $params, $user_presets ) == 1; -print q{ - - - -} if $show_header; - if ( defined $params->{action} ) { if ( ( $params->{action} eq 'show_new_event' ) || ( $params->{action} eq 'show_new_event_from_schedule' ) ) diff --git a/website/agenda/planung/projects.cgi b/website/agenda/planung/projects.cgi index 1a0684d..2d13e9a 100755 --- a/website/agenda/planung/projects.cgi +++ b/website/agenda/planung/projects.cgi @@ -54,15 +54,9 @@ $params = $request->{params}->{checked}; #process header my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); -template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); +template::process( $config, 'print', template::check( $config, 'projects-header.html' ), $headerParams ); return unless uac::check( $config, $params, $user_presets ) == 1; -print q{ - - - -}; - if ( defined $params->{action} ) { save_project( $config, $request ) if ( $params->{action} eq 'save' ); delete_project( $config, $request ) if ( $params->{action} eq 'delete' ); diff --git a/website/agenda/planung/series.cgi b/website/agenda/planung/series.cgi index 59d8325..6dae612 100755 --- a/website/agenda/planung/series.cgi +++ b/website/agenda/planung/series.cgi @@ -65,19 +65,11 @@ $params = $request->{params}->{checked}; unless ( params::isJson() ) { my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); - template::process( $config, 'print', template::check( $config, 'default.html' ), + template::process( $config, 'print', template::check( $config, 'series-header.html' ), $headerParams ); } return unless uac::check( $config, $params, $user_presets ) == 1; -print q{ - - - -} unless params::isJson(); - -# - if ( defined $params->{action} ) { save_schedule( $config, $request ) if ( $params->{action} eq 'save_schedule' ); delete_schedule( $config, $request ) if ( $params->{action} eq 'delete_schedule' ); @@ -109,14 +101,12 @@ if ( defined $params->{action} ) { $config->{access}->{write} = 0; if ( defined $params->{series_id} ) { - print q{} - unless params::isJson(); + template::process( $config, 'print', template::check( $config, 'show-series-header.html' ),{}) + unless params::isJson(); show_series( $config, $request ); } else { - print q{ - - - } unless params::isJson(); + template::process( $config, 'print', template::check( $config, 'list-series-header.html' ),{}) + unless params::isJson(); list_series( $config, $request ); } diff --git a/website/agenda/planung/show-playout.cgi b/website/agenda/planung/show-playout.cgi index f5b90ec..91c474e 100755 --- a/website/agenda/planung/show-playout.cgi +++ b/website/agenda/planung/show-playout.cgi @@ -60,10 +60,8 @@ unless ( params::isJson() ) { } return unless uac::check( $config, $params, $user_presets ) == 1; -print q{ - - -} unless (params::isJson); +template::process( $config, 'print', template::check( $config, 'show-playout-header.html' ), $headerParams ) + unless (params::isJson); my $permissions = $request->{permissions}; $params->{action} = '' unless defined $params->{action}; diff --git a/website/agenda/planung/studio-timeslots.cgi b/website/agenda/planung/studio-timeslots.cgi index 4e6b351..4398e1f 100755 --- a/website/agenda/planung/studio-timeslots.cgi +++ b/website/agenda/planung/studio-timeslots.cgi @@ -60,7 +60,6 @@ $headerParams->{loc} = localization::get( $config, { user => $user, file => 'all my $action = $params->{action} || ''; if ( $action eq 'show_dates' ) { - #print "Content-type:text/html\n\n"; } else { template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); @@ -70,13 +69,7 @@ return unless uac::check( $config, $params, $user_presets ) == 1; if ( $action eq 'show_dates' ) { print "Content-Type:text/html\n\n"; } else { - print q{ - - - - - - }; + template::process( $config, 'print', template::check( $config, 'studio-timeslots-header.html' ), $headerParams ); } if ( defined $params->{action} ) { diff --git a/website/agenda/planung/studios.cgi b/website/agenda/planung/studios.cgi index cb3f431..cee39c8 100755 --- a/website/agenda/planung/studios.cgi +++ b/website/agenda/planung/studios.cgi @@ -53,14 +53,9 @@ $params = $request->{params}->{checked}; #process header my $headerParams = uac::set_template_permissions( $request->{permissions}, $params ); $headerParams->{loc} = localization::get( $config, { user => $user, file => 'menu' } ); -template::process( $config, 'print', template::check( $config, 'default.html' ), $headerParams ); +template::process( $config, 'print', template::check( $config, 'studio-headers.html' ), $headerParams ); return unless uac::check( $config, $params, $user_presets ) == 1; -print q{ - - -}; - if ( defined $params->{action} ) { save_studio( $config, $request ) if ( $params->{action} eq 'save' ); delete_studio( $config, $request ) if ( $params->{action} eq 'delete' ); diff --git a/website/agenda/planung/templates/assign-series-header.html b/website/agenda/planung/templates/assign-series-header.html new file mode 100644 index 0000000..a54bada --- /dev/null +++ b/website/agenda/planung/templates/assign-series-header.html @@ -0,0 +1,5 @@ + + + + + diff --git a/website/agenda/planung/templates/assignments-header.html b/website/agenda/planung/templates/assignments-header.html new file mode 100644 index 0000000..a54bada --- /dev/null +++ b/website/agenda/planung/templates/assignments-header.html @@ -0,0 +1,5 @@ + + + + + diff --git a/website/agenda/planung/templates/audio-recordings-header.html b/website/agenda/planung/templates/audio-recordings-header.html new file mode 100644 index 0000000..fb92751 --- /dev/null +++ b/website/agenda/planung/templates/audio-recordings-header.html @@ -0,0 +1,3 @@ + + + diff --git a/website/agenda/planung/templates/calendar-header.html b/website/agenda/planung/templates/calendar-header.html new file mode 100644 index 0000000..1eb1675 --- /dev/null +++ b/website/agenda/planung/templates/calendar-header.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/website/agenda/planung/templates/comment-header.html b/website/agenda/planung/templates/comment-header.html new file mode 100644 index 0000000..d40ecd7 --- /dev/null +++ b/website/agenda/planung/templates/comment-header.html @@ -0,0 +1,2 @@ + + diff --git a/website/agenda/planung/templates/create-events-header.html b/website/agenda/planung/templates/create-events-header.html new file mode 100644 index 0000000..a54bada --- /dev/null +++ b/website/agenda/planung/templates/create-events-header.html @@ -0,0 +1,5 @@ + + + + + diff --git a/website/agenda/planung/templates/event-header.html b/website/agenda/planung/templates/event-header.html new file mode 100644 index 0000000..cc3c4c7 --- /dev/null +++ b/website/agenda/planung/templates/event-header.html @@ -0,0 +1,4 @@ + + + + diff --git a/website/agenda/planung/templates/list-series-header.html b/website/agenda/planung/templates/list-series-header.html new file mode 100644 index 0000000..af4a28c --- /dev/null +++ b/website/agenda/planung/templates/list-series-header.html @@ -0,0 +1,2 @@ + + diff --git a/website/agenda/planung/templates/projects-header.html b/website/agenda/planung/templates/projects-header.html new file mode 100644 index 0000000..6c6caeb --- /dev/null +++ b/website/agenda/planung/templates/projects-header.html @@ -0,0 +1,5 @@ + + + + + diff --git a/website/agenda/planung/templates/series-header.html b/website/agenda/planung/templates/series-header.html new file mode 100644 index 0000000..5af011e --- /dev/null +++ b/website/agenda/planung/templates/series-header.html @@ -0,0 +1,4 @@ + + + + diff --git a/website/agenda/planung/templates/show-playout-header.html b/website/agenda/planung/templates/show-playout-header.html new file mode 100644 index 0000000..eff6b09 --- /dev/null +++ b/website/agenda/planung/templates/show-playout-header.html @@ -0,0 +1,3 @@ + + + diff --git a/website/agenda/planung/templates/show-series-header.html b/website/agenda/planung/templates/show-series-header.html new file mode 100644 index 0000000..1fd2be3 --- /dev/null +++ b/website/agenda/planung/templates/show-series-header.html @@ -0,0 +1 @@ + diff --git a/website/agenda/planung/templates/studio-timeslots-header.html b/website/agenda/planung/templates/studio-timeslots-header.html new file mode 100644 index 0000000..8062738 --- /dev/null +++ b/website/agenda/planung/templates/studio-timeslots-header.html @@ -0,0 +1,5 @@ + + + + + diff --git a/website/agenda/planung/templates/studios-header.html b/website/agenda/planung/templates/studios-header.html new file mode 100644 index 0000000..504a57c --- /dev/null +++ b/website/agenda/planung/templates/studios-header.html @@ -0,0 +1,4 @@ + + + + diff --git a/website/agenda/planung/templates/worktime-header.html b/website/agenda/planung/templates/worktime-header.html new file mode 100644 index 0000000..f40050c --- /dev/null +++ b/website/agenda/planung/templates/worktime-header.html @@ -0,0 +1,2 @@ + + diff --git a/website/agenda/planung/work-time.cgi b/website/agenda/planung/work-time.cgi index 820a8ab..f28eca8 100755 --- a/website/agenda/planung/work-time.cgi +++ b/website/agenda/planung/work-time.cgi @@ -64,7 +64,8 @@ if ( defined $params->{action} ) { } $config->{access}->{write} = 0; -print q{}; +template::process( $config, 'print', template::check( $config, 'worktime-header.html' ), $headerParams ); + show_work_schedule( $config, $request ); return;