From ca6098f07a70e566f38015710d91ba60ed62df80 Mon Sep 17 00:00:00 2001 From: Milan Date: Sun, 21 Mar 2021 23:13:24 +0100 Subject: [PATCH] calendar.js: move RMS plots to /media /media/playout should be used instead of /agenda_files/playout. /media/ should include uploaded images as well (thumbs,images,icons). --- website/agenda/planung/calendar.cgi | 2 -- website/agenda/planung/js/calendar.js | 2 +- website/agenda/planung/templates/show-playout.html | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/website/agenda/planung/calendar.cgi b/website/agenda/planung/calendar.cgi index 471d4b8..3a4191f 100755 --- a/website/agenda/planung/calendar.cgi +++ b/website/agenda/planung/calendar.cgi @@ -1514,8 +1514,6 @@ sub print_event { my $attr = ''; if ( $class =~ /play/ ) { - - #$event->{rms_image}=~s/\.png/.svg/; $attr .= ' rms="' . $event->{rms_image} . '"' if defined $event->{rms_image}; $attr .= ' start="' . $event->{start} . '"' if defined $event->{start}; } diff --git a/website/agenda/planung/js/calendar.js b/website/agenda/planung/js/calendar.js index 8b48b1f..1e216c0 100644 --- a/website/agenda/planung/js/calendar.js +++ b/website/agenda/planung/js/calendar.js @@ -511,7 +511,7 @@ function initRmsPlot(){ var content = $(this).html(); var id = createId("rms_img"); - var url = '/agenda_files/playout/'+plot; + var url = '/media/playout/'+plot; var img = ''; var deleteHandler = 'onclick="deleteFromPlayout(' + quoteAttr(id) + ", " + quoteAttr(project_id) + ", " + quoteAttr(studio_id) + ", "+ quoteAttr(start) + ')"'; diff --git a/website/agenda/planung/templates/show-playout.html b/website/agenda/planung/templates/show-playout.html index 046107f..391c530 100644 --- a/website/agenda/planung/templates/show-playout.html +++ b/website/agenda/planung/templates/show-playout.html @@ -29,7 +29,7 @@ - +