Merge remote-tracking branch 'calcms/master'

website/agenda/aggregate.cgi

@@ -31,8 +31,6 @@ if ( $0 =~ /aggregate.*?\.cgi$/ ) {
     }
 
     my $config = config::getFromScriptLocation();
-
-    my $debug    = $config->{system}->{debug};
     my $base_dir = $config->{locations}->{base_dir};
 
     my $output_header = '';

website/agenda/cal.cgi

@@ -19,8 +19,6 @@ if ( $0 =~ /cal.*?\.cgi$/ ) {
     ( my $cgi, my $params, my $error ) = params::get($r);
 
     my $config = config::getFromScriptLocation();
-    my $debug  = $config->{system}->{debug};
-
     my $request = {
         url    => $ENV{QUERY_STRING},
         params => {

website/agenda/comments.cgi

@@ -20,8 +20,6 @@ binmode STDOUT, ":encoding(UTF-8)";
 
 if ( $0 =~ /comments.*?\.cgi$/ ) {
     my $config = config::get('config/config.cgi');
-    my $debug  = $config->{system}->{debug};
-
     my $request = {
         url    => $ENV{QUERY_STRING},
         params => {

website/agenda/config/config.cgi.off

@@ -31,21 +31,6 @@ domain                      ${DOMAIN}
     rss                     rss
 </controllers>
 
-<system>
-    config_file             ${BASE_DIR}/agenda/config/config.cgi
-
-    log_file                /var/www/vhosts/${DOMAIN}/logs/error_log
-    log_debug_file          ${LOG_DIR}/${DOMAIN}/calcms.log
-    log_debug_memory_file   ${LOG_DIR}/${DOMAIN}/calcms-mem.log
-
-    debug_memory            0
-    debug                   0
-</system>
-
-<cache>
-    base_url                /programm
-</cache>
-
 <locations>
     temp_dir                ${BASE_DIR}/temp/
 
@@ -57,6 +42,7 @@ domain                      ${DOMAIN}
     source_base_url         https://${DOMAIN}/
     local_base_url          /agenda/
     editor_base_url         /agenda/planung/
+    widget_render_url       /programm
 
     # ajax
     base_domain             https://${DOMAIN}/

website/agenda/js/calcms.js

@@ -93,7 +93,6 @@ var calcms = (function($) {
         if (field != null && value != null && field != '') set(field, value);
 
         // read fields
-        var debug = my.get('debug');
         var from_date = my.get('from_date');
         var till_date = my.get('till_date');
         var date = my.get('date');
@@ -203,10 +202,6 @@ var calcms = (function($) {
             url += "&print=1";
         }
 
-        if (debug != '') {
-            url += '&debug=' + debug;
-        }
-
         return url;
     }
 
@@ -401,9 +396,7 @@ var calcms = (function($) {
 
     // load calendar content
     my.showCalendar = function showCalendar(target, field) {
-        var calendar_debug = my.get('calendar_debug');
         var calendar_url = my.get('calendar_url');
-        var debug = my.get('debug');
         var date = my.get('month');
 
         var url = calendar_url;
@@ -411,9 +404,6 @@ var calcms = (function($) {
         if (field == 'month') {
             url += '/' + date + '/';
         }
-        if (debug != '') {
-            url += '&debug=' + debug;
-        }
 
         if (target == 'window') {
             window.location.href = events_url + url;
@@ -421,9 +411,6 @@ var calcms = (function($) {
             my.updateContainer('calcms_calendar', url);
         }
 
-        if (calendar_debug != null) {
-            calendar_debug.innerHTML = url;
-        }
         return false;
     }
 
@@ -545,7 +532,6 @@ var calcms = (function($) {
         if (my.get('preloaded') == '') {
             var program_url = my.get('program_url');
             var series_name_url = my.get('series_name_url');
-            var debug = my.get('debug');
 
             if (program_url != null && program_url != '')
                 my.updateContainer('calcms_programs', program_url);

website/agenda/planung/assign-series.cgi

@@ -32,7 +32,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' );
 

website/agenda/planung/assignments.cgi

@@ -31,7 +31,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/audio-recordings.cgi

@@ -29,7 +29,6 @@ use time();
 binmode STDOUT, ":utf8";
 
 our $config = config::get('../config/config.cgi');
-our $debug  = $config->{system}->{debug};
 my $base_dir = $config->{locations}->{base_dir};
 
 my $tempDir     = '/var/tmp';

website/agenda/planung/calendar.cgi

@@ -42,7 +42,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' );
 $config->{user} = $user;

website/agenda/planung/comment.cgi

@@ -32,7 +32,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' );
 
@@ -139,7 +138,7 @@ sub showComments {
         for my $event (@$events) {
             $event->{start} = time::date_time_format( $config, $event->{start}, $language );
             $comment_count += $event->{comment_count} if defined $event->{comment_count};
-            $event->{cache_base_url} = $config->{cache}->{base_url};
+            $event->{widget_render_url} = $config->{locations}->{widget_render_url};
         }
     }
     for my $param (%$comment) {
@@ -148,7 +147,6 @@ sub showComments {
 
     $template_parameters->{search}        = markup::fix_utf8( $request->{params}->{original}->{search} );
     $template_parameters->{events}        = $events;
-    $template_parameters->{debug}         = $config->{system}->{debug};
     $template_parameters->{event_count}   = scalar(@$events);
     $template_parameters->{comment_count} = $comment_count;
     $template_parameters->{is_empty}      = 1 if scalar @$events == 0;

website/agenda/planung/create-events.cgi

@@ -26,7 +26,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/event-history.cgi

@@ -30,7 +30,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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(

website/agenda/planung/event.cgi

@@ -40,7 +40,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/help.cgi

@@ -25,7 +25,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/image-upload.cgi

@@ -33,7 +33,6 @@ my $r   = shift;
 my $cgi = undef;
 
 my $config = config::get('../config/config.cgi');
-our $debug = $config->{system}->{debug};
 my $base_dir     = $config->{locations}->{base_dir};
 my $tmp_dir      = '/var/tmp';
 my $upload_limit = 2048 * 1000;

website/agenda/planung/image.cgi

@@ -33,7 +33,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/localization.cgi

@@ -20,7 +20,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 my $config = config::get('../config/config.cgi');
-my $debug  = $config->{system}->{debug};
 my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( $user eq '' );
 

website/agenda/planung/notify-events.cgi

@@ -28,7 +28,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 
@@ -216,7 +215,7 @@ sub getMail {
     $mail->{Data} .= "nur zur Erinnerung...\n\n";
     $mail->{Data} .= "am $event->{weekday_name} ist die naechste '$event->{series_name}'-Sendung.\n\n";
     $mail->{Data} .=
-      "$event->{source_base_url}$event->{cache_base_url}/$config->{controllers}->{event}/$event->{event_id}.html\n\n";
+      "$event->{source_base_url}$event->{widget_render_url}/$config->{controllers}->{event}/$event->{event_id}.html\n\n";
     $mail->{Data} .= "Gruss, $request->{user}\n";
     return $mail;
 }
@@ -243,12 +242,6 @@ sub check_params {
     my $template = '';
     $checked->{template} = template::check( $config, $params->{template}, 'notify-events' );
 
-    my $debug = $params->{debug} || '';
-    if ( $debug =~ /([a-z\_\,]+)/ ) {
-        $debug = $1;
-    }
-    $checked->{debug} = $debug;
-
     entry::set_numbers( $checked, $params, [
         'event_id', 'project_id', 'studio_id', 'default_studio_id', 'user_id', 'series_id', 'duration'
     ]);

website/agenda/planung/playout.cgi

@@ -32,7 +32,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/projects.cgi

@@ -22,7 +22,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 my $config = config::get('../config/config.cgi');
-my $debug  = $config->{system}->{debug};
 
 my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( $user eq '' );

website/agenda/planung/request-password.cgi

@@ -19,7 +19,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 my $config = config::get('../config/config.cgi');
-my $debug  = $config->{system}->{debug};
 
 $params = check_params( $config, $params );
 

website/agenda/planung/roles.cgi

@@ -23,7 +23,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );

website/agenda/planung/select-series.cgi

@@ -22,7 +22,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/series.cgi

@@ -34,7 +34,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' );
 

website/agenda/planung/set-user-day-start.cgi

@@ -24,7 +24,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/show-image.cgi

@@ -22,7 +22,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/show-playout.cgi

@@ -25,7 +25,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' );
 

website/agenda/planung/studio-timeslots.cgi

@@ -28,7 +28,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/studios.cgi

@@ -22,7 +22,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 my $config = config::get('../config/config.cgi');
-my $debug  = $config->{system}->{debug};
 
 my ( $user, $expires ) = auth::get_user( $config, $params, $cgi );
 return if ( $user eq '' );

website/agenda/planung/templates/comments.html

@@ -58,7 +58,7 @@
                         </a>
                     </td>
                     <td class="event_title">
-                        <a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR id>.html#comments" title="zeige Sendung">
+                        <a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR id>.html#comments" title="zeige Sendung">
                             <TMPL_VAR series_name> - <TMPL_VAR title>
                         </a>
                     </td>

website/agenda/planung/templates/edit-event.html

@@ -138,7 +138,7 @@
     <!--
     <TMPL_IF .allow.update_event>
         <a class="button"
-            href="mailto:<TMPL_VAR .series_users_email_list>?cc=programm@radiopiloten.de&reply-to=programm@radiopiloten.de&subject=<TMPL_VAR start> - <TMPL_VAR series_name><TMPL_IF title> - <TMPL_VAR title></TMPL_IF><TMPL_IF episode> #<TMPL_VAR episode></TMPL_IF>&body=Hallo <TMPL_VAR .series_user_names>,%0A%0Anur zur Erinnerung...%0A%0Aam <TMPL_VAR weekday_name> ist die naechste '<TMPL_VAR series_name>'-Sendung.%0A%0Ahttp:<TMPL_VAR source_base_url><TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html%0A%0AGruss, <TMPL_VAR user>"
+            href="mailto:<TMPL_VAR .series_users_email_list>?cc=programm@radiopiloten.de&reply-to=programm@radiopiloten.de&subject=<TMPL_VAR start> - <TMPL_VAR series_name><TMPL_IF title> - <TMPL_VAR title></TMPL_IF><TMPL_IF episode> #<TMPL_VAR episode></TMPL_IF>&body=Hallo <TMPL_VAR .series_user_names>,%0A%0Anur zur Erinnerung...%0A%0Aam <TMPL_VAR weekday_name> ist die naechste '<TMPL_VAR series_name>'-Sendung.%0A%0Ahttp:<TMPL_VAR source_base_url><TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html%0A%0AGruss, <TMPL_VAR user>"
         ><button><TMPL_VAR .loc.button_reminder></button></a>
     </TMPL_IF>
     -->

website/agenda/planung/upload-audio-recordings.cgi

@@ -32,7 +32,6 @@ binmode STDOUT, ":utf8";
 my $useCgi = 0;
 
 our $config = config::get('../config/config.cgi');
-our $debug  = $config->{system}->{debug};
 my $base_dir = $config->{locations}->{base_dir};
 
 my $tempDir     = '/var/tmp';

website/agenda/planung/user-selected-event.cgi

@@ -24,7 +24,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/user-settings.cgi

@@ -24,7 +24,6 @@ use localization();
 my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 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 '' ) );
 

website/agenda/planung/user-stats.cgi

@@ -24,7 +24,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/planung/users.cgi

@@ -23,7 +23,6 @@ binmode STDOUT, ":utf8";
 my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 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(

website/agenda/planung/work-time.cgi

@@ -25,7 +25,6 @@ my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 
 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 '' ) );
 

website/agenda/series_names.cgi

@@ -19,7 +19,6 @@ binmode STDOUT, ":utf8";
 my $r = shift;
 ( my $cgi, my $params, my $error ) = params::get($r);
 my $config = config::getFromScriptLocation();
-my $debug  = $config->{system}->{debug};
 
 #get request
 my $request = {
@@ -38,8 +37,6 @@ my $dbh = db::connect($config);
 #fill template
 my $template_parameters = {};
 $template_parameters->{projects}         = getProjects( $dbh, $config, $params );
-$template_parameters->{debug}            = $config->{system}->{debug};
-$template_parameters->{server_cache}     = $config->{cache}->{server_cache} if $config->{cache}->{server_cache};
 
 #output template
 my $template = $params->{template};
@@ -96,7 +93,6 @@ sub getSeriesNames {
     my $project = shift;
     my $params  = shift;
 
-    my $debug       = $config->{system}->{debug};
     my $bind_values = [];
 
     my @conds = ();

website/agenda/templates/coloradio/calendar.html

@@ -3,7 +3,6 @@ Content-type:text/html; charset=UTF-8;
 <!DOCTYPE html>
 <html>
     <head>
-        <meta http-equiv="expires" content="">
         <meta http-equiv="Content-Script-Type" content="javascript" />
         <meta http-equiv="Content-Style-Type" content="text/css" />
         <title>Calendar <TMPL_VAR project_title></title>
@@ -22,16 +21,16 @@ Content-type:text/html; charset=UTF-8;
                 <thead>
                     <tr>
                         <th class="first">
-                            <a  href="<TMPL_VAR .cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" onclick="calcms.selectMonthEventListener('<TMPL_VAR previous_month>');return false;" 
+                            <a  href="<TMPL_VAR .widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" onclick="calcms.selectMonthEventListener('<TMPL_VAR previous_month>');return false;" 
                             >&laquo;</a>
                         </th>
                         <th colspan="5" align="center">
-                            <a class="calmonthclick" href="<TMPL_VAR .cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html"  
+                            <a class="calmonthclick" href="<TMPL_VAR .widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html"  
                             ><TMPL_VAR start_month_name> <TMPL_VAR start_year></a>
                             <!-- onclick="calcms.selectMonthEventListener('<TMPL_VAR start_date>');return false;" -->
                         </th>
                         <th class="last">
-                            <a  href="<TMPL_VAR .cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" onclick="calcms.selectMonthEventListener('<TMPL_VAR next_month>');return false;" 
+                            <a  href="<TMPL_VAR .widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" onclick="calcms.selectMonthEventListener('<TMPL_VAR next_month>');return false;" 
                             >&raquo;</a>
                         </th>
                     </tr>
@@ -50,7 +49,7 @@ Content-type:text/html; charset=UTF-8;
                             <!--
                             <TMPL_LOOP week><th class="<TMPL_VAR class>"><a href="<TMPL_VAR .local_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR from_date>/<TMPL_VAR till_date>/" title="Woche anzeigen" onclick="calcms.selectDateRangeEventListener('<TMPL_VAR from_date>','<TMPL_VAR till_date>');return false;" ><TMPL_VAR week_of_year></a></th></TMPL_LOOP>
                             -->
-                            <TMPL_LOOP days><td class="<TMPL_VAR class>"><a class="caldayclick" href="<TMPL_VAR .cache_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html" title="<TMPL_VAR day>.<TMPL_VAR month>. zeigen"
+                            <TMPL_LOOP days><td class="<TMPL_VAR class>"><a class="caldayclick" href="<TMPL_VAR .widget_render_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html" title="<TMPL_VAR day>.<TMPL_VAR month>. zeigen"
                             ><TMPL_VAR day></a></td>
                             </TMPL_LOOP>
 

website/agenda/templates/coloradio/calendar_js.html

@@ -3,7 +3,6 @@ Content-type:text/html; charset=UTF-8;
 <!DOCTYPE html>
 <html>
 <head>
-	<meta http-equiv="expires" content="36000">
 	<meta http-equiv="Content-Script-Type" content="javascript" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 
@@ -19,19 +18,19 @@ Content-type:text/html; charset=UTF-8;
 <table cellpadding="0" cellspacing="0" border="0" width="190">
 <tr>
 	<th class="first">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" 
+		<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" 
 		>&lt;</a>
 		<!--onclick="calcms.selectMonthEventListener('<TMPL_VAR previous_month>');return false;"-->
 	</th>
 	<th colspan="6" width="180" align="center">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html" 
+		<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html" 
 		>		
 			<TMPL_VAR start_month_name> <TMPL_VAR start_year>
 		</a>
 		<!--onclick="calcms.selectMonthEventListener('<TMPL_VAR start_date>');return false;"-->
 	</th>
 	<th class="last">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" 
+		<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" 
 		>&gt;</a>
 	</th>
 	<!--onclick="calcms.selectMonthEventListener('<TMPL_VAR next_month>');return false;"-->
@@ -65,7 +64,7 @@ Content-type:text/html; charset=UTF-8;
 	<TMPL_LOOP NAME=days>
 	<td class="<TMPL_VAR class>">
 		<TMPL_IF is_day>
-			<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html"
+			<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html"
 				title="<TMPL_VAR description>"
 			>
 				<TMPL_VAR day>

website/agenda/templates/coloradio/calendar_mobile.html

@@ -3,7 +3,6 @@ Content-type:text/html; charset=UTF-8;
 <!DOCTYPE html>
 <html>
 <head>
-	<meta http-equiv="expires" content="36000">
 	<meta http-equiv="Content-Script-Type" content="javascript" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 
@@ -19,15 +18,15 @@ Content-type:text/html; charset=UTF-8;
 <table cellpadding="0" cellspacing="0" border="0">
 <tr>
 	<th class="first">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" 
+		<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" 
 		>&laquo;</a>
 	</th>
 	<th colspan="6" align="center">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html" 
+		<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html" 
 		><TMPL_VAR start_month_name> <TMPL_VAR start_year></a>
 	</th>
 	<th class="last">
-		<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" 
+		<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" 
 		>&raquo;</a>
 	</th>
 </tr>
@@ -56,7 +55,7 @@ Content-type:text/html; charset=UTF-8;
 	<TMPL_LOOP NAME=days>
 	<td class="<TMPL_VAR class>">
 		<TMPL_IF is_day>
-			<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html"
+			<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html"
 				title="<TMPL_VAR description>"
 			><TMPL_VAR day></a>
 		</TMPL_IF>

website/agenda/templates/coloradio/comments.xml

@@ -3,7 +3,7 @@ Access-Control-Allow-Origin: *
 
 <?xml version='1.0' encoding='UTF-8'?>
 <feed xmlns='http://www.w3.org/2005/Atom' xmlns:gCal='http://schemas.google.com/gCal/2005'>
-<id><TMPL_VAR cache_base_url>comments</id>
+<id><TMPL_VAR widget_render_url>comments</id>
 
 <title type='text'><TMPL_VAR project_title> - Kommentare</title>
 <updated><TMPL_VAR created_at></updated>
@@ -14,7 +14,7 @@ Access-Control-Allow-Origin: *
 	<name><TMPL_VAR project_title></name>
 	<email>info@radiopiloten.de</email>
 </author>
-<link rel='alternate' type='text/html' href='<TMPL_VAR cache_base_url>feed_kommentare/'/>
+<link rel='alternate' type='text/html' href='<TMPL_VAR widget_render_url>feed_kommentare/'/>
 <generator version='0.1' uri='http://radiopiloten.org'>calcms</generator>
 <gCal:timezone value='Europe/Berlin'/>
 <gCal:timesCleaned value='0'/>
@@ -29,8 +29,8 @@ Access-Control-Allow-Origin: *
 <TMPL_IF content><summary type='text'><TMPL_VAR content></summary></TMPL_IF>
 <TMPL_IF content><content type='html'><![CDATA[<TMPL_VAR content>]]></content></TMPL_IF>
 
-<link rel='alternate'	type='text/html'		href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR event_id escape=url>.html#comment_<TMPL_VAR id escape=url>' title='alternate'/>
-<link rel='self' 	type='application/atom+xml'	href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR event_id escape=url>.html#comment_<TMPL_VAR id escape=url>'/>
+<link rel='alternate'	type='text/html'		href='<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR event_id escape=url>.html#comment_<TMPL_VAR id escape=url>' title='alternate'/>
+<link rel='self' 	type='application/atom+xml'	href='<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR event_id escape=url>.html#comment_<TMPL_VAR id escape=url>'/>
 <author><name><TMPL_VAR author></name></author>
 </entry>
 </TMPL_LOOP>

website/agenda/templates/coloradio/comments_newest.html

@@ -12,7 +12,7 @@ Access-Control-Allow-Origin: *
 <div id="sendungen">
 </div>
 <TMPL_LOOP comments>
-	<a id="event_list_id_<TMPL_VAR event_id>" class="click_for_detail" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
+	<a id="event_list_id_<TMPL_VAR event_id>" class="click_for_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
 	<div class="comments level<TMPL_VAR level>">
 		<span class="author"><TMPL_VAR author escape=none></span>:
 		<span class="content"><TMPL_VAR short_content escape=none></span>

website/agenda/templates/coloradio/event.atom.xml

@@ -3,7 +3,7 @@ Access-Control-Allow-Origin: *
 
 <?xml version='1.0' encoding='UTF-8'?>
 <feed xmlns='http://www.w3.org/2005/Atom' xmlns:gCal='http://schemas.google.com/gCal/2005'>
-<id><TMPL_VAR cache_base_url></id>
+<id><TMPL_VAR widget_render_url></id>
 
 <title type='text'><TMPL_VAR project_title></title>
 <updated><TMPL_VAR modified_at></updated>
@@ -15,14 +15,14 @@ Access-Control-Allow-Origin: *
 	<email><TMPL_VAR project_email></email>
 </author>
 <link rel='alternate' type='text/html' href='<TMPL_VAR source_base_url>'/>
-<link rel='self' type='application/atom+xml' href='<TMPL_VAR cache_base_url>/feed/'/>
+<link rel='self' type='application/atom+xml' href='<TMPL_VAR widget_render_url>/feed/'/>
 
 <generator version='0.1' uri='http://radiopiloten.de'>calcms</generator>
 <gCal:timezone value='<TMPL_VAR time_zone>'/>
 <gCal:timesCleaned value='0'/>
 <TMPL_LOOP events>
 <entry>
-<id><TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html</id>
+<id><TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html</id>
 <published><TMPL_VAR created_at></published>
 <updated><TMPL_VAR modified_at></updated>
 
@@ -31,8 +31,8 @@ Access-Control-Allow-Origin: *
 <summary type='text'><TMPL_VAR excerpt></summary>
 <content type='html'><![CDATA[<TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name> - <TMPL_VAR start_time_name> - <TMPL_VAR end_time_name> | <TMPL_VAR full_title><p><TMPL_VAR content_html>]]></content>
 
-<link rel='alternate' type='text/html' href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>' title='alternate'/>
-<link rel='self' type='application/atom+xml' href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>'/>
+<link rel='alternate' type='text/html' href='<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>' title='alternate'/>
+<link rel='self' type='application/atom+xml' href='<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>'/>
 <TMPL_IF media_url><link rel="enclosure" type="audio/mpeg" href="<TMPL_VAR media_url>"/>
 </TMPL_IF>
 <TMPL_IF project_title><author>

website/agenda/templates/coloradio/event.json-p

@@ -35,7 +35,7 @@ Feed = {
   "openSearch$totalResults" : { "$t" : "<TMPL_VAR event_count>" },
 <TMPL_LOOP events>
   "entry" : [ {
-    "id" : { "$t" : "<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html/" },
+    "id" : { "$t" : "<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html/" },
     "published" : { "$t": "<TMPL_VAR created_at>" },
     "updated" : { "$t": "<TMPL_VAR modified_at>" },
     "category" : [ {
@@ -49,11 +49,11 @@ Feed = {
     "link" : [ {
       "rel" : "alternate",
       "type" : "text/html",
-      "href" : "<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>"
+      "href" : "<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>"
       },{
       "rel" : "self",
       "type" : "application/atom+xml",
-      "href" : "<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>"
+      "href" : "<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>"
     } ],
     "author" : [ {
       "name" : { "$t" : "<TMPL_VAR project_email>" },

website/agenda/templates/coloradio/event.rss.xml

@@ -4,8 +4,8 @@ Content-type:application/rss+xml; charset=UTF-8
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
 
 <channel>
-    <atom:link href="http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/rss" rel="self" type="application/rss+xml" />
-	<link>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/event.rss.xml</link>
+    <atom:link href="http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/rss" rel="self" type="application/rss+xml" />
+	<link>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/event.rss.xml</link>
 	<title><TMPL_VAR project_title></title>
 	<description><TMPL_VAR project_subtitle></description>
 	<language>de-de</language>
@@ -14,7 +14,7 @@ Content-type:application/rss+xml; charset=UTF-8
     <ttl>3600</ttl>
 	<image>
 		<url>http:<TMPL_VAR base_domain>sites/default/files/images/piradio-logo-kreis.preview.gif</url>
-	    <link>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/event.rss.xml</link>
+	    <link>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/event.rss.xml</link>
 	    <title><TMPL_VAR project_title></title>
 	</image>
     
@@ -23,8 +23,8 @@ Content-type:application/rss+xml; charset=UTF-8
 	<item>
 		<title><TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name> - <TMPL_VAR start_time_name> - <TMPL_VAR end_time_name> | <TMPL_VAR full_title></title>
 		<description><TMPL_VAR excerpt></description>
-		<link>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></link>
-		<guid>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html</guid>
+		<link>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></link>
+		<guid>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html</guid>
 		<pubDate><TMPL_VAR modified_at></pubDate>
 		<comments>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_domain>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments</comments>
 		<media:content url="http:<TMPL_VAR base_domain><TMPL_VAR image>" medium="image">

website/agenda/templates/coloradio/event_details.html

@@ -18,7 +18,7 @@ Content-type:text/html; charset=utf-8;
 
                     <!-- Titel der Sendung -->
 
-                    <!--<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" >-->
+                    <!--<a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" >-->
 
                     <h1><TMPL_VAR full_title></h1>
 
@@ -133,7 +133,7 @@ Content-type:text/html; charset=utf-8;
 
                     <!-- Permalink --> 
 
-                    <a class="permalink" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">Permalink</a>
+                    <a class="permalink" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">Permalink</a>
 
                     <div style="clear:both"></div>
 

website/agenda/templates/coloradio/event_file_export.txt

@@ -5,7 +5,7 @@ $events=[
 {
 	'__last__'		=> q|<TMPL_VAR __last__>|,
 	'base_url'		=> q|<TMPL_VAR base_url>|,
-	'cache_base_url'	=> q|<TMPL_VAR cache_base_url>|,
+	'widget_render_url'	=> q|<TMPL_VAR widget_render_url>|,
 	'comment_count'		=> q|<TMPL_VAR comment_count>|,
 	'.controllers.event'	=> q|<TMPL_VAR .controllers.event>|,
 	'.controllers.events'	=> q|<TMPL_VAR .controllers.events>|,

website/agenda/templates/coloradio/event_freefm.xml

@@ -69,7 +69,7 @@ Content-type:text/xml; charset=UTF-8
     </categories>
     <feed>
         <title>Sendebeschreibung</title>
-        <url>https://piradio.de<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></url>
+        <url>https://piradio.de<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></url>
     </feed>
     <transmit-times>
         <transmit-time date-from="<TMPL_VAR start_datetime_utc>" date-to="<TMPL_VAR end_datetime_utc>" recurrence="false" rerun="<TMPL_IF rerun>true<TMPL_ELSE>false</TMPL_IF>" />

website/agenda/templates/coloradio/event_list.html

@@ -14,7 +14,7 @@ Content-type:text/html; charset=utf-8;
     >
         <span class="summary title" title="Mehr Infos zur Sendung">
             <TMPL_VAR start_time_name><TMPL_IF name="__last__"> - <TMPL_VAR end_time_name></TMPL_IF> | 
-            <a id="event_list_id_<TMPL_VAR event_id>" class="click_for_detail" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>"
+            <a id="event_list_id_<TMPL_VAR event_id>" class="click_for_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>"
             ><TMPL_VAR full_title></a> <br>
             <span class="excerpt">
                     <TMPL_VAR excerpt> <TMPL_VAR user_excerpt>

website/agenda/templates/coloradio/event_list_image.html

@@ -3,7 +3,6 @@ Content-type:text/html; charset=utf-8;
 <!DOCTYPE html>
 <html>
 <head>
-	<meta http-equiv="expires" content="3600">
 	<meta http-equiv="Content-Script-Type" content="javascript" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
 	<title>Agenda <TMPL_VAR project_title></title>
@@ -19,7 +18,7 @@ Content-type:text/html; charset=utf-8;
 	</div>
 </TMPL_IF>
 
-<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" >
+<a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" >
 <div  class="event">
 	<TMPL_IF event_id>
 		<div class="header"><TMPL_VAR series_name><br><TMPL_VAR full_title_no_series></div>
@@ -27,7 +26,7 @@ Content-type:text/html; charset=utf-8;
 
 		<div class="label">
 			<TMPL_VAR start_time><br/>
-			<a class="comment" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments"
+			<a class="comment" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments"
 				<span class="submitted"><TMPL_VAR comment_count> Kommentar<TMPL_UNLESS one_comment>e</TMPL_UNLESS></span>
 			</a>
 		</div>

website/agenda/templates/coloradio/event_menu.html

@@ -4,7 +4,6 @@ Content-type:text/html; charset=UTF-8;
 <html>
 <head>
     <meta http-equiv="Cache-control" content="public">
-    <meta http-equiv="expires" content="600">
 </head>
 <body>
 
@@ -20,7 +19,7 @@ Content-type:text/html; charset=UTF-8;
     <div class="date">
         <TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name> 
         <!--
-        <a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR start_date>.html">
+        <a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR start_date>.html">
             <TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name> 
         </a>
         -->
@@ -53,7 +52,7 @@ Content-type:text/html; charset=UTF-8;
 
     <noscript>
         <a     
-            href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>"
+            href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>"
         >
             <div id="event_menu_<TMPL_VAR event_id>" class="vevent event<TMPL_IF is_running> running</TMPL_IF>"
                 title="<TMPL_IF program><TMPL_VAR program> - </TMPL_IF><TMPL_IF series_name><TMPL_VAR series_name> - </TMPL_IF><TMPL_VAR title>"

website/agenda/templates/coloradio/event_playlist.html

@@ -4,7 +4,6 @@ Content-type:text/html; charset=UTF-8;
 <html>
 <head>
     <meta http-equiv="Cache-control" content="public">
-    <meta http-equiv="expires" content="600">
 </head>
 
 <body>
@@ -20,7 +19,7 @@ div.event div.title div{
 </style>
 
 <TMPL_LOOP NAME=events>
-<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" 
+<a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" 
 > 
     <div id="event_playlist_<TMPL_VAR event_id>" class="event"  title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt escape=url></TMPL_IF>">
 		<TMPL_COMMENT>

website/agenda/templates/coloradio/event_playlist.txt

@@ -1,5 +1,5 @@
 Content-type:text/plain; charset=UTF-8;
 Access-Control-Allow-Origin: *
 
-<TMPL_IF no_result>Andere Veranstalter</TMPL_IF><TMPL_LOOP NAME=events><a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>" ><TMPL_VAR full_title></a></TMPL_LOOP>
+<TMPL_IF no_result>Andere Veranstalter</TMPL_IF><TMPL_LOOP NAME=events><a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>" ><TMPL_VAR full_title></a></TMPL_LOOP>
 

website/agenda/templates/coloradio/event_playlist_long.html

@@ -4,7 +4,6 @@ Access-Control-Allow-Origin: *
 <!DOCTYPE html>
 <html>
 <head>
-    <meta http-equiv="expires" content="3600">
     <meta http-equiv="Cache-control" content="public">
     <meta http-equiv="Content-Script-Type" content="javascript" />
     <meta http-equiv="Content-Style-Type" content="text/css" />
@@ -112,7 +111,7 @@ Playlist Long <br><br>
 
 <TMPL_LOOP NAME=events>
 
-        <a class="playlist_long_event_detail" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
+        <a class="playlist_long_event_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
             <div id="event_playlist_<TMPL_VAR event_id>" class="eventContainer event">
                 <div class="top" title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt></TMPL_IF>">
                         <TMPL_VAR weekday_short_name> <TMPL_VAR start_time_name>
@@ -137,7 +136,7 @@ Playlist Long <br><br>
     </div>
 
     <noscript>
-        <a class="playlist_long_event_detail" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
+        <a class="playlist_long_event_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
             <div id="event_playlist_<TMPL_VAR event_id>" class="eventContainer event">
                 <div class="top" title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt></TMPL_IF>">
                         <TMPL_VAR weekday_short_name> <TMPL_VAR start_time_name>

website/agenda/templates/coloradio/event_playlist_show.html

@@ -4,7 +4,6 @@ Access-Control-Allow-Origin: *
 <!DOCTYPE html>
 <html>
 <head>
-	<meta http-equiv="expires" content="3600">
 	<meta http-equiv="Cache-control" content="public">
 	<meta http-equiv="Content-Script-Type" content="javascript" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />

website/agenda/templates/coloradio/event_pure1.html

@@ -18,7 +18,7 @@ Content-type:text/html; charset=utf-8;
 
                     <!-- Titel der Sendung -->
 
-                    <!--<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" >-->
+                    <!--<a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" >-->
 
                     <h1><TMPL_VAR full_title></h1>
 
@@ -133,7 +133,7 @@ Content-type:text/html; charset=utf-8;
 
                     <!-- Permalink --> 
 
-                    <!--<a class="permalink" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">Permalink</a>-->
+                    <!--<a class="permalink" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">Permalink</a>-->
 
                     <!--<div style="clear:both"></div>-->
 

website/agenda/templates/coloradio/event_running.html

@@ -56,7 +56,7 @@ Access-Control-Allow-Origin: *
 			<div class="date<TMPL_IF is_running> running</TMPL_IF>">
 				<p>
 				<h1 class="summary title">
-					Aktuelle Sendung: <a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
+					Aktuelle Sendung: <a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
 						<TMPL_VAR full_title>
 					</a>
 				</h1>
@@ -66,14 +66,14 @@ Access-Control-Allow-Origin: *
 			<div class="content" > 
 				<TMPL_COMMENT>
 				<div class="image-attach-teaser" style="width: 150px;">
-					<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
+					<a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
 						<img class="image image-thumbnail" src="<TMPL_VAR image>" width="150" height="150" />
 					</a>
 				</div>
 				</TMPL_COMMENT>
 				<TMPL_VAR excerpt >
 			</div>
-				<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
+				<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
 					<span><TMPL_VAR comment_count> Kommentar<TMPL_UNLESS one_comment>e</TMPL_UNLESS></span>
 				</a>	
 			</div>

website/agenda/templates/default/calendar.html

@@ -12,23 +12,19 @@ Access-Control-Allow-Origin: *
 <body>
 
 <div >
-<TMPL_IF debug>
-	<div id="calendar_debug"></div>
-</TMPL_IF>
-
 <table>
 <thead>
 <tr>
 	<th class="first">
-		<a 	href="<TMPL_VAR .cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" 
+		<a 	href="<TMPL_VAR .widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR previous_month>.html" 
 		>&laquo;</a>
 	</th>
 	<th colspan="5" align="center">
-		<a 	href="<TMPL_VAR .cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html" 
+		<a 	href="<TMPL_VAR .widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR start_date>_<TMPL_VAR end_date>.html" 
 		><TMPL_VAR start_month_name> <TMPL_VAR start_year></a>
 	</th>
 	<th class="last">
-		<a 	href="<TMPL_VAR .cache_base_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" 
+		<a 	href="<TMPL_VAR .widget_render_url>/<TMPL_VAR .controllers.calendar>/<TMPL_VAR next_month>.html" 
 		>&raquo;</a>
 	</th>
 </tr>
@@ -47,7 +43,7 @@ Access-Control-Allow-Origin: *
 <TMPL_COMMENT>
 <TMPL_LOOP week><th class="<TMPL_VAR class>"><a href="<TMPL_VAR .local_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR from_date>/<TMPL_VAR till_date>/" title="Woche anzeigen" onclick="calcms.selectDateRangeEventListener('<TMPL_VAR from_date escape=js>','<TMPL_VAR till_date escape=js>');return false;" ><TMPL_VAR week_of_year></a></th></TMPL_LOOP>
 </TMPL_COMMENT>
-<TMPL_LOOP days><td class="<TMPL_VAR class>"><a href="<TMPL_VAR .cache_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html" title="<TMPL_VAR day>.<TMPL_VAR month>. zeigen"><TMPL_VAR day></a></td>
+<TMPL_LOOP days><td class="<TMPL_VAR class>"><a href="<TMPL_VAR .widget_render_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR date>.html" title="<TMPL_VAR day>.<TMPL_VAR month>. zeigen"><TMPL_VAR day></a></td>
 </TMPL_LOOP></tr></TMPL_LOOP>
 </tbody>
 </table>

website/agenda/templates/default/comments.xml

@@ -1,10 +1,9 @@
-<TMPL_IF use_client_cache>Cache-Control: max-age=600, must-revalidate
-</TMPL_IF>Content-type:application/atom+xml; charset=UTF-8
+Content-type:application/atom+xml; charset=UTF-8
 Access-Control-Allow-Origin: *
 
 <?xml version='1.0' encoding='UTF-8'?>
 <feed xmlns='http://www.w3.org/2005/Atom' xmlns:gCal='http://schemas.google.com/gCal/2005'>
-<id><TMPL_VAR cache_base_url>comments</id>
+<id><TMPL_VAR widget_render_url>comments</id>
 
 <title type='text'><TMPL_VAR project_title> - Kommentare</title>
 <updated><TMPL_VAR created_at></updated>
@@ -15,7 +14,7 @@ Access-Control-Allow-Origin: *
 	<name><TMPL_VAR project_title></name>
 	<email>info@radiopiloten.de</email>
 </author>
-<link rel='alternate' type='text/html' href='<TMPL_VAR cache_base_url>feed_kommentare/'/>
+<link rel='alternate' type='text/html' href='<TMPL_VAR widget_render_url>feed_kommentare/'/>
 <generator version='0.1' uri='http://radiopiloten.org'>calcms</generator>
 <gCal:timezone value='Europe/Berlin'/>
 <gCal:timesCleaned value='0'/>
@@ -30,8 +29,8 @@ Access-Control-Allow-Origin: *
 <TMPL_IF content><summary type='text'><TMPL_VAR content></summary></TMPL_IF>
 <TMPL_IF content><content type='html'><![CDATA[<TMPL_VAR content>]]></content></TMPL_IF>
 
-<link rel='alternate'	type='text/html'		href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR event_id escape=url>.html#comment_<TMPL_VAR id escape=url>' title='alternate'/>
-<link rel='self' 	type='application/atom+xml'	href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR event_id escape=url>.html#comment_<TMPL_VAR id escape=url>'/>
+<link rel='alternate'	type='text/html'		href='<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR event_id escape=url>.html#comment_<TMPL_VAR id escape=url>' title='alternate'/>
+<link rel='self' 	type='application/atom+xml'	href='<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event escape=url>/<TMPL_VAR event_id escape=url>.html#comment_<TMPL_VAR id escape=url>'/>
 <author><name><TMPL_VAR author></name></author>
 </entry>
 </TMPL_LOOP>

website/agenda/templates/default/comments_newest.html

@@ -12,7 +12,7 @@ Access-Control-Allow-Origin: *
 <div id="sendungen">
 </div>
 <TMPL_LOOP comments>
-	<a id="event_list_id_<TMPL_VAR event_id>" class="click_for_detail" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
+	<a id="event_list_id_<TMPL_VAR event_id>" class="click_for_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
 	<div class="comments level<TMPL_VAR level>">
 		<span class="author"><TMPL_VAR author escape=none></span>:
 		<span class="content"><TMPL_VAR short_content escape=none></span>

website/agenda/templates/default/event.atom.xml

@@ -3,7 +3,7 @@ Access-Control-Allow-Origin: *
 
 <?xml version='1.0' encoding='UTF-8'?>
 <feed xmlns='http://www.w3.org/2005/Atom' xmlns:gCal='http://schemas.google.com/gCal/2005'>
-<id><TMPL_VAR cache_base_url></id>
+<id><TMPL_VAR widget_render_url></id>
 
 <title type='text'><TMPL_VAR project_title></title>
 <updated><TMPL_VAR modified_at></updated>
@@ -15,14 +15,14 @@ Access-Control-Allow-Origin: *
 	<email><TMPL_VAR project_email></email>
 </author>
 <link rel='alternate' type='text/html' href='<TMPL_VAR source_base_url>'/>
-<link rel='self' type='application/atom+xml' href='<TMPL_VAR cache_base_url>/feed/'/>
+<link rel='self' type='application/atom+xml' href='<TMPL_VAR widget_render_url>/feed/'/>
 
 <generator version='0.1' uri='http://radiopiloten.de'>calcms</generator>
 <gCal:timezone value='<TMPL_VAR time_zone>'/>
 <gCal:timesCleaned value='0'/>
 <TMPL_LOOP events>
 <entry>
-<id><TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html</id>
+<id><TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html</id>
 <published><TMPL_VAR created_at></published>
 <updated><TMPL_VAR modified_at></updated>
 
@@ -31,8 +31,8 @@ Access-Control-Allow-Origin: *
 <summary type='text'><TMPL_VAR excerpt></summary>
 <content type='html'><![CDATA[<TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name> - <TMPL_VAR start_time_name> - <TMPL_VAR end_time_name> | <TMPL_VAR full_title><p><TMPL_VAR content_html>]]></content>
 
-<link rel='alternate' type='text/html' href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>' title='alternate'/>
-<link rel='self' type='application/atom+xml' href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>'/>
+<link rel='alternate' type='text/html' href='<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>' title='alternate'/>
+<link rel='self' type='application/atom+xml' href='<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>'/>
 <TMPL_IF media_url><link rel="enclosure" type="audio/mpeg" href="<TMPL_VAR media_url>"/>
 </TMPL_IF>
 <TMPL_IF project_title><author>

website/agenda/templates/default/event.ics

@@ -41,7 +41,7 @@ LOCATION:<TMPL_VAR location_mapped>
 SEQUENCE:0
 STATUS:CONFIRMED
 SUMMARY:<TMPL_VAR full_title> - coloRadio
-URL:<TMPL_VAR base_url><TMPL_VAR .controllers.domain><TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>
+URL:<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>
 TRANSP:OPAQUE
 CATEGORIES:<TMPL_VAR project_title>
 END:VEVENT

website/agenda/templates/default/event.json-p

@@ -35,7 +35,7 @@ Feed = {
   "openSearch$totalResults" : { "$t" : "<TMPL_VAR event_count>" },
 <TMPL_LOOP events>
   "entry" : [ {
-    "id" : { "$t" : "<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html/" },
+    "id" : { "$t" : "<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html/" },
     "published" : { "$t": "<TMPL_VAR created_at>" },
     "updated" : { "$t": "<TMPL_VAR modified_at>" },
     "category" : [ {
@@ -49,11 +49,11 @@ Feed = {
     "link" : [ {
       "rel" : "alternate",
       "type" : "text/html",
-      "href" : "<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>"
+      "href" : "<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>"
       },{
       "rel" : "self",
       "type" : "application/atom+xml",
-      "href" : "<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>"
+      "href" : "<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>"
     } ],
     "author" : [ {
       "name" : { "$t" : "<TMPL_VAR project_email>" },

website/agenda/templates/default/event.rss.xml

@@ -4,8 +4,8 @@ Content-type:application/rss+xml; charset=UTF-8
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
 
 <channel>
-    <atom:link href="http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/rss" rel="self" type="application/rss+xml" />
-	<link>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/event.rss.xml</link>
+    <atom:link href="http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/rss" rel="self" type="application/rss+xml" />
+	<link>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/event.rss.xml</link>
 	<title><TMPL_VAR project_title></title>
 	<description><TMPL_VAR project_subtitle></description>
 	<language>de-de</language>
@@ -14,7 +14,7 @@ Content-type:application/rss+xml; charset=UTF-8
     <ttl>3600</ttl>
 	<image>
 		<url>http:<TMPL_VAR base_domain>sites/default/files/images/piradio-logo-kreis.preview.gif</url>
-	    <link>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/event.rss.xml</link>
+	    <link>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/event.rss.xml</link>
 	    <title><TMPL_VAR project_title></title>
 	</image>
     
@@ -23,8 +23,8 @@ Content-type:application/rss+xml; charset=UTF-8
 	<item>
 		<title><TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name> - <TMPL_VAR start_time_name> - <TMPL_VAR end_time_name> | <TMPL_VAR full_title></title>
 		<description><TMPL_VAR excerpt></description>
-		<link>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></link>
-		<guid>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html</guid>
+		<link>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></link>
+		<guid>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html</guid>
 		<pubDate><TMPL_VAR modified_at></pubDate>
 		<comments>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_domain>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments</comments>
 		<media:content url="http:<TMPL_VAR base_domain><TMPL_VAR image>" medium="image">

website/agenda/templates/default/event_file_export.txt

@@ -5,7 +5,7 @@ $events=[
 {
 	'__last__'		=> q|<TMPL_VAR __last__>|,
 	'base_url'		=> q|<TMPL_VAR base_url>|,
-	'cache_base_url'	=> q|<TMPL_VAR cache_base_url>|,
+	'widget_render_url'	=> q|<TMPL_VAR widget_render_url>|,
 	'comment_count'		=> q|<TMPL_VAR comment_count>|,
 	'.controllers.event'	=> q|<TMPL_VAR .controllers.event>|,
 	'.controllers.events'	=> q|<TMPL_VAR .controllers.events>|,

website/agenda/templates/default/event_freefm.xml

@@ -69,7 +69,7 @@ Content-type:text/xml; charset=UTF-8
     </categories>
     <feed>
         <title>Sendebeschreibung</title>
-        <url>https://piradio.de<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></url>
+        <url>https://piradio.de<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></url>
     </feed>
     <transmit-times>
         <transmit-time date-from="<TMPL_VAR start_datetime_utc>" date-to="<TMPL_VAR end_datetime_utc>" recurrence="false" rerun="<TMPL_IF rerun>true<TMPL_ELSE>false</TMPL_IF>" />

website/agenda/templates/default/event_list.html

@@ -22,18 +22,18 @@ Content-type:text/html; charset=utf-8;
         </div>
     </TMPL_IF>
     <div id="event_<TMPL_VAR event_id>" class="event<TMPL_IF location_css> <TMPL_VAR location_css></TMPL_IF><TMPL_IF is_running> running</TMPL_IF>"
-    onclick="window.location.href='<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>'"
+    onclick="window.location.href='<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>'"
     >
         <span class="time"><TMPL_VAR start_time_name><TMPL_IF name="__last__"> - <TMPL_VAR end_time_name></TMPL_IF></span>
         <span class="summary" title="Mehr Infos zur Sendung">
-            <a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
+            <a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
                 <span class="title"><TMPL_VAR skey></span>
                 <span class="subtitle"><TMPL_VAR stkey><TMPL_VAR tkey></span>
                 <span class="episode"><TMPL_VAR ekey></span>
             </a>
             <div class="excerpt"><TMPL_VAR excerpt> <TMPL_VAR user_excerpt> </div>
             <TMPL_UNLESS no_comment>
-            <a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>#comments"
+            <a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>#comments"
             >
                 <span class="submitted<TMPL_IF comment_count> comments</TMPL_IF>"><TMPL_VAR comment_count> Kommentar<TMPL_UNLESS one_comment>e</TMPL_UNLESS></span>
             </a>

website/agenda/templates/default/event_media.rss.xml

@@ -9,7 +9,7 @@ Content-type:application/rss+xml; charset=UTF-8
 
 <channel>
     <atom:link href="http:<TMPL_VAR base_domain>agenda/rss-media/rss" rel="self" type="application/rss+xml" />
-	<link>http:<TMPL_VAR base_domain><TMPL_VAR cache_base_url>/event.rss.xml</link>
+	<link>http:<TMPL_VAR base_domain><TMPL_VAR widget_render_url>/event.rss.xml</link>
 	<title><TMPL_VAR project_title></title>
 	<description><TMPL_VAR project_subtitle></description>
     <itunes:owner>

website/agenda/templates/default/event_menu.html

@@ -18,14 +18,14 @@ Content-type:text/html; charset=UTF-8;
 <TMPL_IF event_id>
     <TMPL_IF name="__first__">
     <div class="date">
-        <a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR start_date>.html">
+        <a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.events>/<TMPL_VAR start_date>.html">
             <TMPL_VAR weekday_short_name>, <TMPL_VAR start_date_name> 
         </a>
     </div>
     </TMPL_IF>
 
     <a     
-        href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>"
+        href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>"
     >
         <div id="event_menu_<TMPL_VAR event_id>" class="vevent event<TMPL_IF is_running> running</TMPL_IF>"
             title="<TMPL_IF program><TMPL_VAR program> - </TMPL_IF><TMPL_IF series_name><TMPL_VAR series_name> - </TMPL_IF><TMPL_VAR title>"

website/agenda/templates/default/event_playlist.html

@@ -20,7 +20,7 @@ div.event div.title div{
 </style>
 
 <TMPL_LOOP NAME=events>
-<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" 
+<a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" 
 > 
     <div id="event_playlist_<TMPL_VAR event_id>" class="event"  title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt escape=url></TMPL_IF>">
 		<TMPL_COMMENT>

website/agenda/templates/default/event_playlist.txt

@@ -1,5 +1,5 @@
 Content-type:text/plain; charset=UTF-8;
 Access-Control-Allow-Origin: *
 
-<TMPL_IF no_result>Andere Veranstalter</TMPL_IF><TMPL_LOOP NAME=events><a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>" ><TMPL_VAR full_title></a></TMPL_LOOP>
+<TMPL_IF no_result>Andere Veranstalter</TMPL_IF><TMPL_LOOP NAME=events><a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri>" ><TMPL_VAR full_title></a></TMPL_LOOP>
 

website/agenda/templates/default/event_playlist_long.html

@@ -112,14 +112,13 @@ Playlist Long <br><br>
 
 <TMPL_LOOP NAME=events>
 
-        <a class="playlist_long_event_detail" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
-            <div id="event_playlist_<TMPL_VAR event_id>" class="eventContainer event">
-                <div class="top" title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt></TMPL_IF>">
-                        <TMPL_VAR weekday_short_name> <TMPL_VAR start_time_name>
-                </div>
-                <div class="bottom">
-                    <TMPL_IF series_name><TMPL_VAR series_name><TMPL_ELSE><TMPL_VAR title></TMPL_IF>
-                </div>
+    <a class="playlist_long_event_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
+        <div id="event_playlist_<TMPL_VAR event_id>" class="eventContainer event">
+            <div class="top" title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt></TMPL_IF>">
+                    <TMPL_VAR weekday_short_name> <TMPL_VAR start_time_name>
+            </div>
+            <div class="bottom">
+                <TMPL_IF series_name><TMPL_VAR series_name><TMPL_ELSE><TMPL_VAR title></TMPL_IF>
             </div>
         </a>
 
@@ -137,7 +136,7 @@ Playlist Long <br><br>
     </div>
 
     <noscript>
-        <a class="playlist_long_event_detail" href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
+        <a class="playlist_long_event_detail" href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>" > 
             <div id="event_playlist_<TMPL_VAR event_id>" class="eventContainer event">
                 <div class="top" title="<TMPL_VAR full_title><TMPL_IF excerpt>. <TMPL_VAR excerpt></TMPL_IF>">
                         <TMPL_VAR weekday_short_name> <TMPL_VAR start_time_name>

website/agenda/templates/default/event_redirect.html

@@ -3,7 +3,7 @@ Content-type:text/html; charset=UTF-8;
 <!DOCTYPE html>
 <html>
 <head>
-<meta http-equiv="refresh" content="0; url=<TMPL_LOOP NAME=events><TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></TMPL_LOOP>" />
+<meta http-equiv="refresh" content="0; url=<TMPL_LOOP NAME=events><TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url></TMPL_LOOP>" />
 </head>
 
 <body></body>

website/agenda/templates/default/event_running.html

@@ -56,7 +56,7 @@ Access-Control-Allow-Origin: *
 			<div class="date<TMPL_IF is_running> running</TMPL_IF>">
 				<p>
 				<h1 class="summary title">
-					Aktuelle Sendung: <a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
+					Aktuelle Sendung: <a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
 						<TMPL_VAR full_title>
 					</a>
 				</h1>
@@ -66,14 +66,14 @@ Access-Control-Allow-Origin: *
 			<div class="content" > 
 				<TMPL_COMMENT>
 				<div class="image-attach-teaser" style="width: 150px;">
-					<a href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
+					<a href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#<TMPL_VAR event_uri escape=url>">
 						<img class="image image-thumbnail" src="<TMPL_VAR image>" width="150" height="150" />
 					</a>
 				</div>
 				</TMPL_COMMENT>
 				<TMPL_VAR excerpt >
 			</div>
-				<a 	href="<TMPL_VAR cache_base_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
+				<a 	href="<TMPL_VAR widget_render_url>/<TMPL_VAR .controllers.event>/<TMPL_VAR event_id>.html#comments">
 					<span><TMPL_VAR comment_count> Kommentar<TMPL_UNLESS one_comment>e</TMPL_UNLESS></span>
 				</a>	
 			</div>

website/agenda/upload_playout.cgi

@@ -30,7 +30,6 @@ if ( $0 =~ /upload_playout.*?\.cgi$/ ) {
     ( my $cgi, my $params, my $error ) = params::get($r);
 
     my $config = config::getFromScriptLocation();
-    my $debug  = $config->{system}->{debug};
     print "Content-type:text/plain\n\n";
 
     my $json = JSON::decode_json($content);