diff options
| author | MaZderMind | 2014-12-27 16:19:13 +0100 |
|---|---|---|
| committer | MaZderMind | 2014-12-27 16:19:13 +0100 |
| commit | ab0a2cfbf2b4be1d87376052a02ef2e67557bf0b (patch) | |
| tree | 2e0d0ac51cfc44aac6483669d009c29ca29c96ff /template | |
| parent | 696066a2df58fa12bfbdac427a767efdb4fe00a4 (diff) | |
| parent | 03d3f65e9cdc7100628fb8dde20f97f503e09c57 (diff) | |
Merge branch 'master' into relivew
Conflicts:
31c3/assets/css/lustige-styles.css.map
Diffstat (limited to 'template')
| -rw-r--r-- | template/assemblies/desktop-player.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/player/video.phtml | 2 | ||||
| -rw-r--r-- | template/assemblies/program.phtml | 2 | ||||
| -rw-r--r-- | template/rooms.phtml | 20 |
4 files changed, 21 insertions, 5 deletions
diff --git a/template/assemblies/desktop-player.phtml b/template/assemblies/desktop-player.phtml index f08e8da..5836f90 100644 --- a/template/assemblies/desktop-player.phtml +++ b/template/assemblies/desktop-player.phtml @@ -1,2 +1,2 @@ <h3>Use a Desktop-Player!</h3> -<p>Browsers and Video doesn't go together well, even in 2014 and especially when it's live. So for your best viewing-experience <strong>please</strong> use a Desktop-Player like <a href="http://www.videolan.org/vlc/">VLC</a>.</p> +<p>Browsers and Video doesn't go together well, even in 2014 and especially when it's live. So for your best viewing-experience please use a Desktop-Player like VLC or mplayer.</p> diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml index b6036a5..0955492 100644 --- a/template/assemblies/player/video.phtml +++ b/template/assemblies/player/video.phtml @@ -7,12 +7,14 @@ style="width: 100%; height: 100%;" class="<?=h($miniroom ? 'nosubs' : 'subs')?>" > + <? if(!$translated): ?> <source data-plugin-type="native" src="<?=h(link_stream('webm', $room, $format, $translated))?>" title="WebM (Icecast)" type="video/webm" /> + <? endif ?> <source data-plugin-type="flash" src="<?=h(link_stream('rtmp', $room, $format, $translated))?>" diff --git a/template/assemblies/program.phtml b/template/assemblies/program.phtml index 32fc4c8..496fa83 100644 --- a/template/assemblies/program.phtml +++ b/template/assemblies/program.phtml @@ -43,7 +43,7 @@ foreach(reset($program) as $event) title="Switch to <?=h($GLOBALS['CONFIG']['ROOMS'][$name])?>" ><?=h($event['title'])?></a> </h3> - + <h5>by <?=h($event['speaker'])?></h5> <? endif ?> </div> diff --git a/template/rooms.phtml b/template/rooms.phtml index 3b6a1bb..7a348ec 100644 --- a/template/rooms.phtml +++ b/template/rooms.phtml @@ -10,7 +10,7 @@ <? foreach(array('saal1', 'saal2', 'saalg', 'saal6') as $room): ?> <li class="<?=h($room)?> col-md-6 col-sm-12"> <a href="<?=h(link_room($room))?>"> - <img class="teaser" src="assets/img/rooms/<?=h($room)?>.png" alt="" width="213" height="120" /> + <img class="teaser" src="thumbs/rooms/<?=h($room)?>.png" alt="" width="213" height="120" /> <div class="title"><?=h($rooms[$room])?></div> <div class="program-teaser"> @@ -53,7 +53,10 @@ <ul class="row"> <? foreach(array('sendezentrum') as $room): ?> <li class="<?=h($room)?> col-sm-12"> - <a href="<?=h(link_room($room))?>" class="title"><?=h($rooms[$room])?></a> + <a href="<?=h(link_room($room))?>"> + <img class="teaser" src="thumbs/rooms/<?=h($room)?>.png" alt="" width="213" height="120" /> + <div class="title"><?=h($rooms[$room])?></div> + </a> </li> <? endforeach ?> </ul> @@ -62,7 +65,18 @@ <div class="room-group recordings"> - <a href="//media.ccc.de/browse/congress/2014/index.html"><span class="fa fa-video-camera"></span> Recordings</a> + <h2>Recordings</h2> + + <ul class="row"> + <li class="col-sm-6"> + <div class="title"> + <a href="http://media.ccc.de/browse/congress/2014/index.html"><span class="fa fa-video-camera"></span> Releases</a> + </div> + </li> + <li class="col-sm-6"> + <a href="http://vod.c3voc.de/relive/"><span class="fa fa-play-circle"></span> ReLive</a> + </li> + </ul> </div> </div> |