aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--404.html4
-rw-r--r--50x.html2
-rw-r--r--README.md4
-rw-r--r--configs/conferences/31c3/config.php2
-rw-r--r--configs/conferences/32c3/config.php2
-rw-r--r--configs/conferences/cccamp15/config.php2
-rw-r--r--configs/conferences/chaosradio/config.php2
-rw-r--r--configs/conferences/datengarten/config.php2
-rw-r--r--configs/conferences/gpn15/config.php2
-rw-r--r--configs/conferences/ppw15b/config.php2
-rw-r--r--template/500.phtml2
-rw-r--r--template/assemblies/footer.phtml2
-rw-r--r--view/about-global.php2
13 files changed, 15 insertions, 15 deletions
diff --git a/404.html b/404.html
index e28cdb2..1be5583 100644
--- a/404.html
+++ b/404.html
@@ -45,7 +45,7 @@
<title>404 Not Found – Video Live Streaming</title>
<meta name="robots" content="index,follow" />
- <meta name="author" content="c3voc" />
+ <meta name="author" content="C3VOC" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<style type="text/css">
@@ -140,7 +140,7 @@
</span>
</div>
<footer>
- by <a class='inverted' href='http://c3voc.de'>c3voc</a>
+ by <a class='inverted' href='http://c3voc.de'>C3VOC</a>
</footer>
</body>
</html>
diff --git a/50x.html b/50x.html
index 2fa2077..5883bf4 100644
--- a/50x.html
+++ b/50x.html
@@ -140,7 +140,7 @@
</span>
</div>
<footer>
- by <a class='inverted' href='http://c3voc.de'>c3voc</a>
+ by <a class='inverted' href='http://c3voc.de'>C3VOC</a>
</footer>
</body>
</html>
diff --git a/README.md b/README.md
index c1569dd..97b16aa 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
-# c3voc Streaming-Webseite
+# C3VOC Streaming-Webseite
Dies ist der Code für die Streaming-Webseite unter
[streaming.media.ccc.de](http://streaming.media.ccc.de/), welche vom
-[c3voc](https://c3voc.de/) benutzt wird, um Live-Video- und -Audio-Streams von
+[C3VOC](https://c3voc.de/) benutzt wird, um Live-Video- und -Audio-Streams von
[diversen Konferenzen](https://c3voc.de/eventkalender/) im Internet zu
präsentieren. Die Idee hinter diesem Projekt ist es, eine generische Codebasis
zu haben, die mit wenigen Konfigurationsoptionen und ein paar CSS-Rules an die
diff --git a/configs/conferences/31c3/config.php b/configs/conferences/31c3/config.php
index 5a68f18..ecdfdff 100644
--- a/configs/conferences/31c3/config.php
+++ b/configs/conferences/31c3/config.php
@@ -65,7 +65,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
by <a href="https://ccc.de">Chaos Computer Club e.V</a>,
<a href="http://fem.tu-ilmenau.de/">FeM</a>,
<a href="http://www.ags.tu-bs.de/">ags</a> &amp;
- <a href="https://c3voc.de">c3voc</a>
+ <a href="https://c3voc.de">C3VOC</a>
',
/**
diff --git a/configs/conferences/32c3/config.php b/configs/conferences/32c3/config.php
index fcd50d1..70da521 100644
--- a/configs/conferences/32c3/config.php
+++ b/configs/conferences/32c3/config.php
@@ -65,7 +65,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
by <a href="https://ccc.de">Chaos Computer Club e.V</a>,
<a href="http://fem.tu-ilmenau.de/">FeM</a>,
<a href="http://www.ags.tu-bs.de/">ags</a> &amp;
- <a href="https://c3voc.de">c3voc</a>
+ <a href="https://c3voc.de">C3VOC</a>
',
/**
diff --git a/configs/conferences/cccamp15/config.php b/configs/conferences/cccamp15/config.php
index 88ab1db..4ec7d00 100644
--- a/configs/conferences/cccamp15/config.php
+++ b/configs/conferences/cccamp15/config.php
@@ -65,7 +65,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
by <a href="https://ccc.de">Chaos Computer Club e.V</a>,
<a href="http://www.ags.tu-bs.de/">ags</a>,
<a href="https://www.isystems.at">isystems.at</a> &amp;
- <a href="https://c3voc.de">c3voc</a>
+ <a href="https://c3voc.de">C3VOC</a>
',
/**
diff --git a/configs/conferences/chaosradio/config.php b/configs/conferences/chaosradio/config.php
index ece49ef..e9f330a 100644
--- a/configs/conferences/chaosradio/config.php
+++ b/configs/conferences/chaosradio/config.php
@@ -68,7 +68,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
*/
'FOOTER_HTML' => '
by <a href="https://ccc.de">Chaos Computer Club e.V</a> &amp;
- <a href="https://c3voc.de">c3voc</a>
+ <a href="https://c3voc.de">C3VOC</a>
',
/**
diff --git a/configs/conferences/datengarten/config.php b/configs/conferences/datengarten/config.php
index 882c96f..fc65d71 100644
--- a/configs/conferences/datengarten/config.php
+++ b/configs/conferences/datengarten/config.php
@@ -68,7 +68,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
*/
'FOOTER_HTML' => '
by <a href="https://ccc.de">Chaos Computer Club e.V</a> &amp;
- <a href="https://c3voc.de">c3voc</a>
+ <a href="https://c3voc.de">C3VOC</a>
',
/**
diff --git a/configs/conferences/gpn15/config.php b/configs/conferences/gpn15/config.php
index 5d13c4e..2a633e0 100644
--- a/configs/conferences/gpn15/config.php
+++ b/configs/conferences/gpn15/config.php
@@ -63,7 +63,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
*/
'FOOTER_HTML' => '
by <a href="https://entropia.de">Entropia e.V</a> &amp;
- <a href="https://c3voc.de">c3voc</a>
+ <a href="https://c3voc.de">C3VOC</a>
',
/**
diff --git a/configs/conferences/ppw15b/config.php b/configs/conferences/ppw15b/config.php
index 94859c0..2cabfe5 100644
--- a/configs/conferences/ppw15b/config.php
+++ b/configs/conferences/ppw15b/config.php
@@ -63,7 +63,7 @@ $GLOBALS['CONFIG']['CONFERENCE'] = array(
*/
'FOOTER_HTML' => '
by <a href="http://metaebene.me">metaebene</a> &amp;
- <a href="https://c3voc.de">c3voc</a>
+ <a href="https://c3voc.de">C3VOC</a>
',
/**
diff --git a/template/500.phtml b/template/500.phtml
index fd67a27..d7c7e4a 100644
--- a/template/500.phtml
+++ b/template/500.phtml
@@ -1,6 +1,6 @@
<div class="container">
<h1>Keep Calm and use your Towel</h1>
- <h2>And maybe report to <a href="https://twitter.com/c3voc">@c3voc</a> that you've seen this error:</h2>
+ <h2>And maybe report to <a href="https://twitter.com/c3voc">@C3VOC</a> that you've seen this error:</h2>
<div class="well">
<pre><?=h($e)?></pre>
</div>
diff --git a/template/assemblies/footer.phtml b/template/assemblies/footer.phtml
index 619eff8..6f48cee 100644
--- a/template/assemblies/footer.phtml
+++ b/template/assemblies/footer.phtml
@@ -2,6 +2,6 @@
<? if($conference->hasFooterHtml()): ?>
<?= $conference->getFooterHtml() ?>
<? else: ?>
- by <a href="https://c3voc.de">c3voc</a>
+ by <a href="https://c3voc.de">C3VOC</a>
<? endif ?>
</footer>
diff --git a/view/about-global.php b/view/about-global.php
index 5807e8b..2707631 100644
--- a/view/about-global.php
+++ b/view/about-global.php
@@ -2,5 +2,5 @@
echo $tpl->render(array(
'page' => 'about-global',
- 'title' => 'About the c3voc',
+ 'title' => 'About the C3VOC',
));