diff options
| -rw-r--r-- | assets/img/apple-touch-icon/57x57.png | bin | 0 -> 833 bytes | |||
| -rw-r--r-- | assets/img/apple-touch-icon/60x60.png | bin | 0 -> 858 bytes | |||
| -rw-r--r-- | assets/img/apple-touch-icon/72x72.png | bin | 0 -> 998 bytes | |||
| -rw-r--r-- | assets/img/apple-touch-icon/76x76.png | bin | 0 -> 1035 bytes | |||
| -rw-r--r-- | assets/img/apple-touch-icon/precomposed.png | bin | 0 -> 1591 bytes | |||
| -rw-r--r-- | assets/img/favicon/16x16.png | bin | 0 -> 343 bytes | |||
| -rw-r--r-- | assets/img/favicon/196x196.png | bin | 0 -> 2513 bytes | |||
| -rw-r--r-- | assets/img/favicon/32x32.png | bin | 0 -> 614 bytes | |||
| -rw-r--r-- | assets/img/favicon/96x96.png | bin | 0 -> 1732 bytes | |||
| -rw-r--r-- | configs/conferences/32c3/config.php | 4 | ||||
| -rwxr-xr-x | configs/conferences/32c3/download.sh | 2 | ||||
| -rw-r--r-- | template/assemblies/header.phtml | 8 |
12 files changed, 7 insertions, 7 deletions
diff --git a/assets/img/apple-touch-icon/57x57.png b/assets/img/apple-touch-icon/57x57.png Binary files differnew file mode 100644 index 0000000..d8d7151 --- /dev/null +++ b/assets/img/apple-touch-icon/57x57.png diff --git a/assets/img/apple-touch-icon/60x60.png b/assets/img/apple-touch-icon/60x60.png Binary files differnew file mode 100644 index 0000000..235b879 --- /dev/null +++ b/assets/img/apple-touch-icon/60x60.png diff --git a/assets/img/apple-touch-icon/72x72.png b/assets/img/apple-touch-icon/72x72.png Binary files differnew file mode 100644 index 0000000..2aa2969 --- /dev/null +++ b/assets/img/apple-touch-icon/72x72.png diff --git a/assets/img/apple-touch-icon/76x76.png b/assets/img/apple-touch-icon/76x76.png Binary files differnew file mode 100644 index 0000000..95cee73 --- /dev/null +++ b/assets/img/apple-touch-icon/76x76.png diff --git a/assets/img/apple-touch-icon/precomposed.png b/assets/img/apple-touch-icon/precomposed.png Binary files differnew file mode 100644 index 0000000..605a37d --- /dev/null +++ b/assets/img/apple-touch-icon/precomposed.png diff --git a/assets/img/favicon/16x16.png b/assets/img/favicon/16x16.png Binary files differnew file mode 100644 index 0000000..2280e78 --- /dev/null +++ b/assets/img/favicon/16x16.png diff --git a/assets/img/favicon/196x196.png b/assets/img/favicon/196x196.png Binary files differnew file mode 100644 index 0000000..8eed3d7 --- /dev/null +++ b/assets/img/favicon/196x196.png diff --git a/assets/img/favicon/32x32.png b/assets/img/favicon/32x32.png Binary files differnew file mode 100644 index 0000000..108e846 --- /dev/null +++ b/assets/img/favicon/32x32.png diff --git a/assets/img/favicon/96x96.png b/assets/img/favicon/96x96.png Binary files differnew file mode 100644 index 0000000..70ba31b --- /dev/null +++ b/assets/img/favicon/96x96.png diff --git a/configs/conferences/32c3/config.php b/configs/conferences/32c3/config.php index 70da521..b07f25f 100644 --- a/configs/conferences/32c3/config.php +++ b/configs/conferences/32c3/config.php @@ -594,12 +594,12 @@ $GLOBALS['CONFIG']['SUBTITLES'] = array( /** * URL des L2S2 Primus-Servers */ - 'PRIMUS_URL' => 'http://fusrohda.marudor.de:63404/', + 'PRIMUS_URL' => 'https://subtitles.media.ccc.de/', /** * URL des L2S2 Frontend-Servers */ - 'FRONTEND_URL' => 'http://l2s2.marudor.de/', + 'FRONTEND_URL' => 'https://subtitles.media.ccc.de/', ); /** diff --git a/configs/conferences/32c3/download.sh b/configs/conferences/32c3/download.sh index 8ce5e47..5d59347 100755 --- a/configs/conferences/32c3/download.sh +++ b/configs/conferences/32c3/download.sh @@ -11,5 +11,5 @@ wget --no-check-certificate -q "http://data.testi.ber.c3voc.de/32C3/everything.s rm -f /tmp/everything.schedule.xml /tmp/everything.schedule.json # vod json -wget -q "http://cdn.c3voc.de/relive/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json +wget -q "http://live.cch.c3voc.de/relive/32c3/index.json" -O /tmp/vod.json && mv /tmp/vod.json vod.json rm -f /tmp/vod.json diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml index f29a221..b2d4215 100644 --- a/template/assemblies/header.phtml +++ b/template/assemblies/header.phtml @@ -9,23 +9,23 @@ <div class="nav navbar-form navbar-right button-wrapper"> <? if(startswith('//', @$GLOBALS['CONFIG']['BASEURL'])): ?> - <a class="form-control btn btn-ssl btn-<?= ssl() ? 'success' : 'warning' ?>" href="<?=h(ssl() ? $httpurl : $httpsurl)?>"> + <a class="form-control btn btn-ssl btn-<?= ssl() ? 'success' : 'warning' ?>" title="<?=h(ssl() ? 'Disable TLS' : 'Enable TLS')?>" href="<?=h(ssl() ? $httpurl : $httpsurl)?>"> <span class="fa fa-<?= ssl() ? 'lock' : 'unlock-alt' ?>"></span> TLS </a> <? endif ?> <? if(!$conference->hasEnded() && isset($feedback) && $feedback->isEnabled()): ?> - <a class="form-control btn btn-default feedback" href="<?=h($feedback->getUrl())?>"> + <a class="form-control btn btn-default feedback" title="Feedback" href="<?=h($feedback->getUrl())?>"> <span class="fa fa-bullhorn"></span> </a> <? endif ?> <? if($conference->hasReleases()): ?> - <a class="form-control btn btn-default releases" href="<?=h($conference->getReleasesUrl())?>"> + <a class="form-control btn btn-default releases" title="Releases" href="<?=h($conference->getReleasesUrl())?>"> <span class="fa fa-video-camera"></span> </a> <? endif ?> - <a class="form-control btn btn-default about" href="about/"> + <a class="form-control btn btn-default about" title="About" href="about/"> <span class="fa fa-info"></span> </a> </div> |
