mirror of
https://github.com/voc/streaming-website
synced 2024-09-21 06:51:55 +00:00
Merge branch 'master' of git.c3voc.de:streaming-website
This commit is contained in:
commit
41df99afe4
3 changed files with 47 additions and 27 deletions
|
@ -149,6 +149,10 @@ $CONFIG['OVERVIEW'] = array(
|
|||
),
|
||||
);
|
||||
|
||||
if ( date('H') < 10 ) {
|
||||
krsort($CONFIG['OVERVIEW']['GROUPS']);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Globale Konfiguration der IRC-Links.
|
||||
|
@ -235,9 +239,9 @@ $CONFIG['ROOMS'] = array(
|
|||
* in $CONFIG['OVERVIEW'] oder im Feedback verwendet wird.
|
||||
*/
|
||||
'c3lounge' => array(
|
||||
'DISPLAY' => 'Lounge',
|
||||
'DISPLAY' => 'rC3 Lounge',
|
||||
'DISPLAY_SHORT' => 'Lounge',
|
||||
'WIDE' => true,
|
||||
#'WIDE' => true,
|
||||
|
||||
'STREAM' => 'c3lounge',
|
||||
'PREVIEW' => true,
|
||||
|
@ -273,7 +277,7 @@ $CONFIG['ROOMS'] = array(
|
|||
'abchillgleis' => array(
|
||||
'DISPLAY' => 'Abchillgleis',
|
||||
'DISPLAY_SHORT' => 'Abchillgleis',
|
||||
'WIDE' => false,
|
||||
#'WIDE' => false,
|
||||
|
||||
'STREAM' => 'abchillgleis',
|
||||
'PREVIEW' => true,
|
||||
|
@ -672,8 +676,8 @@ $CONFIG['ROOMS'] = array(
|
|||
),
|
||||
|
||||
'gehacktesfromhell' => array(
|
||||
'DISPLAY' => 'Gehacktes from Hell',
|
||||
'DISPLAY_SHORT' => 'gehacktesfromhell',
|
||||
'DISPLAY' => 'Gehacktes from Hell / Bierscheune',
|
||||
'DISPLAY_SHORT' => 'Hell',
|
||||
'STREAM' => 'gehacktes',
|
||||
'PREVIEW' => true,
|
||||
'TRANSLATION' => [
|
||||
|
@ -708,7 +712,7 @@ $CONFIG['ROOMS'] = array(
|
|||
),
|
||||
|
||||
'xhain' => array(
|
||||
'DISPLAY' => 'xHain',
|
||||
'DISPLAY' => 'xHain Lichtung',
|
||||
'DISPLAY_SHORT' => 'xHain',
|
||||
'STREAM' => 'xhain',
|
||||
'PREVIEW' => true,
|
||||
|
@ -836,8 +840,8 @@ $CONFIG['SCHEDULE'] = array(
|
|||
* Diese folgende Beispiel-Zeile Simuliert, dass das
|
||||
* Konferenz-Datum 2014-12-29 auf den heutigen Tag 2015-02-24 verschoben ist.
|
||||
*/
|
||||
//'SIMULATE_OFFSET' => strtotime(/* Conference-Date */ '2021-12-27') - strtotime(/* Today */ date("Y-m-d")),
|
||||
'SIMULATE_OFFSET' => 0,
|
||||
// 'SIMULATE_OFFSET' => strtotime(/* Conference-Date */ '2021-12-27') - strtotime(/* Today */ date("Y-m-d")),
|
||||
//'SIMULATE_OFFSET' => 0,
|
||||
);
|
||||
|
||||
/*
|
||||
|
|
|
@ -99,14 +99,16 @@ class Stream
|
|||
$display .= 'Radio';
|
||||
break;
|
||||
|
||||
case 'dash':
|
||||
if($room->h264Only()) {
|
||||
$display .= 'HLS';
|
||||
} else {
|
||||
$display .= 'DASH';
|
||||
case 'hls':
|
||||
// do not add suffix when we only provide HLS
|
||||
if($this->getRoom()->h264Only()) {
|
||||
break;
|
||||
}
|
||||
case 'dash':
|
||||
if($this->getRoom()->h264Only()) {
|
||||
$display .= 'DASH';
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
$display .= ucfirst($this->getSelection());
|
||||
break;
|
||||
|
|
|
@ -11,9 +11,19 @@
|
|||
<? endif ?>
|
||||
<div class="row room-group room-group-n<?=h($i++)?> room-group-<?=h(slugify($group))?>">
|
||||
|
||||
<? $count = count($rooms); $idx = 0 ?>
|
||||
<? foreach($rooms as $room): ?>
|
||||
<?
|
||||
<?
|
||||
$count = count($rooms);
|
||||
$idx = 0;
|
||||
usort($rooms, function ($a, $b) {
|
||||
global $upcomingTalksPerRoom;
|
||||
return (
|
||||
$upcomingTalksPerRoom[ $a->getSlug() ]['next']['start']
|
||||
<=>
|
||||
$upcomingTalksPerRoom[ $b->getSlug() ]['next']['start']
|
||||
);
|
||||
});
|
||||
|
||||
foreach($rooms as $room):
|
||||
$is_wide = 0;
|
||||
/* when the count is odd and this is the last item - make it full width */
|
||||
if (($count % 2 == 1) && ($idx == $count - 1)) {
|
||||
|
@ -77,18 +87,22 @@
|
|||
|
||||
<? endif ?>
|
||||
|
||||
<? if($room->hasSchedule()): ?>
|
||||
<? $upcoming = @$upcomingTalksPerRoom[ $room->getSlug() ] ?: [] ?>
|
||||
<? if($room->hasSchedule()):
|
||||
$upcoming = @$upcomingTalksPerRoom[ $room->getSlug() ] ?: [];
|
||||
$current = @$upcoming['current'];
|
||||
$next = @$upcoming['next']; ?>
|
||||
<div class="program-schedule">
|
||||
<div class="talk current-talk" title="<?=h(@$upcoming['current']['title'] ?: 'none') ?>">
|
||||
<strong>Now (since <?=date('G:i', @$upcoming['current']['start']) ?>):</strong><br/>
|
||||
<span class="t"><?=h(@$upcoming['current']['title'] ?: 'none') ?></span>
|
||||
<? if($current['title']): ?>
|
||||
<div class="talk current-talk" title="<?=h(@$current['title'] ?: 'none') ?>">
|
||||
<strong>Now (since <?=date('G:i', @$upcoming['start']) ?>):</strong><br/>
|
||||
<span class="t"><?=h(@$upcoming['title'] ?: 'none') ?></span>
|
||||
</div>
|
||||
|
||||
<div class="talk next-talk" title="<?=h(@$upcoming['next']['title'] ?: 'none') ?>">
|
||||
<strong>Next Talk (<?=date('G:i', @$upcoming['next']['start']) ?>):</strong><br/>
|
||||
<span class="t"><?=h(@$upcoming['next']['title'] ?: 'none') ?></span>
|
||||
<? endif; if($next['title']): ?>
|
||||
<div class="talk next-talk" title="<?=h(@$next['title'] ?: 'none') ?>">
|
||||
<strong>Next Talk (<?=date('G:i', @$next['start']) ?>):</strong><br/>
|
||||
<span class="t"><?=h(@$next['title'] ?: 'none') ?></span>
|
||||
</div>
|
||||
<? endif ?>
|
||||
</div>
|
||||
<? endif ?>
|
||||
</div>
|
||||
|
|
Loading…
Reference in a new issue