From 7dc128752fb16ead06d935582211969c20159dc1 Mon Sep 17 00:00:00 2001 From: Milan Date: Sat, 25 Feb 2023 23:05:53 +0100 Subject: [PATCH] templates/coloradio: back to original filenames for template coloradio --- website/agenda/.htaccess | 12 +- .../agenda/templates/coloradio/calendar.html | 105 ++++++++++-------- .../templates/coloradio/calendar_colo.html | 68 ------------ .../templates/coloradio/event_list.html | 42 +------ .../templates/coloradio/event_list_2.html | 34 ------ 5 files changed, 65 insertions(+), 196 deletions(-) delete mode 100644 website/agenda/templates/coloradio/calendar_colo.html delete mode 100644 website/agenda/templates/coloradio/event_list_2.html diff --git a/website/agenda/.htaccess b/website/agenda/.htaccess index 833f9ae..3c3b739 100644 --- a/website/agenda/.htaccess +++ b/website/agenda/.htaccess @@ -17,9 +17,9 @@ RewriteRule ^kommentar_neu/(.*)$ add_comment.cgi?$1 [L] RewriteRule ^sendung/(\d+)/[^&]*(&.*)?$ events.cgi?template=event_details.html&event_id=$1&$2 [L] RewriteRule ^sendung/(.*)$ events.cgi?$1 [L] -RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(\d)/(.*)$ events.cgi?template=event_list_2.html&from_date=$1&till_date=$2&weekday=$3&$4 [L] -RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=event_list_2.html&from_date=$1&till_date=$2&$3 [L] -RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=event_list_2.html&date=$1&$2 [L] +RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(\d)/(.*)$ events.cgi?template=event_list.html&from_date=$1&till_date=$2&weekday=$3&$4 [L] +RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=event_list.html&from_date=$1&till_date=$2&$3 [L] +RewriteRule ^sendungen/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=event_list.html&date=$1&$2 [L] RewriteRule ^sendungen/heute/(.*)$ events.cgi?template=event_list_2.html&date=today&$1 [L] RewriteRule ^sendungen/(.*)$ events.cgi?$1 [L] @@ -29,9 +29,9 @@ RewriteRule ^menu/(\d{4}-\d{2}-\d{2})/(.*)$ events.cgi?template=even RewriteRule ^menu/heute/(.*)$ events.cgi?template=event_menu.html&date=today&$1 [L] RewriteRule ^menu/(.*)$ events.cgi?$1 [L] -RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})/$ cal.cgi?date=$1&template=calendar_colo.html&open_end=1 [L] -RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/$ cal.cgi?from_date=$1&till_date=$2&template=calendar_colo.html&open_end=1 [L] -RewriteRule ^kalender/(.*)$ cal.cgi?$1&template=calendar_colo.html&open_end=1 [L] +RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})/$ cal.cgi?date=$1&template=calendar.html&open_end=1 [L] +RewriteRule ^kalender/(\d{4}-\d{2}-\d{2})/(\d{4}-\d{2}-\d{2})/$ cal.cgi?from_date=$1&till_date=$2&template=calendar.html&open_end=1 [L] +RewriteRule ^kalender/(.*)$ cal.cgi?$1&template=calendar.html&open_end=1 [L] RewriteRule ^sendereihen/(.*)$ series_names.cgi?$1 [L] diff --git a/website/agenda/templates/coloradio/calendar.html b/website/agenda/templates/coloradio/calendar.html index fe73a73..3b96a37 100644 --- a/website/agenda/templates/coloradio/calendar.html +++ b/website/agenda/templates/coloradio/calendar.html @@ -2,56 +2,67 @@ Content-type:text/html; charset=UTF-8; - - - - - Calendar <TMPL_VAR project_title> - - + + + + + Calendar <TMPL_VAR project_title> + + -
- -
- + + - - - - - - - +
+ +
+ -
- - - +
- « - - - - » -
+ + + + + + - - + + + + - - - - - - - - -
+ « + + + + + » +
-
- + + + + + + + + + + + + + + + + + + + + diff --git a/website/agenda/templates/coloradio/calendar_colo.html b/website/agenda/templates/coloradio/calendar_colo.html deleted file mode 100644 index b8c0cc3..0000000 --- a/website/agenda/templates/coloradio/calendar_colo.html +++ /dev/null @@ -1,68 +0,0 @@ -Content-type:text/html; charset=UTF-8; - - - - - - - - Calendar <TMPL_VAR project_title> - - - - - - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- « - - - - - » -
-
- - - - - - diff --git a/website/agenda/templates/coloradio/event_list.html b/website/agenda/templates/coloradio/event_list.html index 9398755..8aa188a 100644 --- a/website/agenda/templates/coloradio/event_list.html +++ b/website/agenda/templates/coloradio/event_list.html @@ -1,22 +1,8 @@ Content-type:text/html; charset=utf-8; - - - - - - - - Agenda <TMPL_VAR project_title> - - - - -
- @@ -26,8 +12,6 @@ Content-type:text/html; charset=utf-8;
- - - - diff --git a/website/agenda/templates/coloradio/event_list_2.html b/website/agenda/templates/coloradio/event_list_2.html deleted file mode 100644 index 3835086..0000000 --- a/website/agenda/templates/coloradio/event_list_2.html +++ /dev/null @@ -1,34 +0,0 @@ -Content-type:text/html; charset=utf-8; - - - - -
- - - - -
- , -
- -
- - - - - | -
- - - -
- - 💬 - - (läuft gerade) -
- - -