kalipso/racalmas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

calendar.js: move RMS plots to /media

Browse Source 
/media/playout should be used instead of /agenda_files/playout.
/media/ should include uploaded images as well (thumbs,images,icons).
This commit is contained in:
Milan
2021-03-21 23:13:24 +01:00
parent 63804d7db5
commit ca6098f07a
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/agenda/planung/calendar.cgi
View File

@@ -1514,8 +1514,6 @@ sub print_event {
my $attr = ''; my $attr = '';
if ( $class =~ /play/ ) { if ( $class =~ /play/ ) {
#$event->{rms_image}=~s/\.png/.svg/;
$attr .= ' rms="' . $event->{rms_image} . '"' if defined $event->{rms_image}; $attr .= ' rms="' . $event->{rms_image} . '"' if defined $event->{rms_image};
$attr .= ' start="' . $event->{start} . '"' if defined $event->{start}; $attr .= ' start="' . $event->{start} . '"' if defined $event->{start};
} }

2
website/agenda/planung/js/calendar.js
View File

@@ -511,7 +511,7 @@ function initRmsPlot(){
var content = $(this).html(); var content = $(this).html();
var id = createId("rms_img"); var id = createId("rms_img");
var url = '/agenda_files/playout/'+plot; var url = '/media/playout/'+plot;
var img = '<img src="'+url+'" ></img>'; var img = '<img src="'+url+'" ></img>';
var deleteHandler = 'onclick="deleteFromPlayout(' + quoteAttr(id) + ", " + quoteAttr(project_id) + ", " + quoteAttr(studio_id) + ", "+ quoteAttr(start) + ')"'; var deleteHandler = 'onclick="deleteFromPlayout(' + quoteAttr(id) + ", " + quoteAttr(project_id) + ", " + quoteAttr(studio_id) + ", "+ quoteAttr(start) + ')"';

2
website/agenda/planung/templates/show-playout.html
View File

@@ -29,7 +29,7 @@
<TMPL_VAR sampling_rate escape="text"> <TMPL_VAR sampling_rate escape="text">
<TMPL_VAR channels escape="text"> <TMPL_VAR channels escape="text">
</td> </td>
<td><TMPL_IF rms_image><a href="/agenda_files/playout/<TMPL_VAR rms_image>"><img src="/agenda_files/playout/<TMPL_VAR rms_image>"></a></TMPL_IF></td> <td><TMPL_IF rms_image><a href="/media/playout/<TMPL_VAR rms_image>"><img src="/media/playout/<TMPL_VAR rms_image>"></a></TMPL_IF></td>
<td><TMPL_VAR stream_size></td> <td><TMPL_VAR stream_size></td>
</tr> </tr>
</TMPL_LOOP> </TMPL_LOOP>