aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaZderMind2015-12-25 21:42:12 +0100
committerMaZderMind2015-12-25 21:42:12 +0100
commitbc3473d7bc7425aa0e89adb3ba1cfa9162f0b549 (patch)
treeba53570da74e09ac43f71f557c22c9d1e6921a08
parent2349062a3cc6bfa7d480334a592d6031e8ea50bf (diff)
fix duplicate 'Streaming' on generic views
-rw-r--r--model/Conference.php2
-rw-r--r--model/GenericConference.php4
-rw-r--r--template/assemblies/header.phtml2
3 files changed, 2 insertions, 6 deletions
diff --git a/model/Conference.php b/model/Conference.php
index d255c8d..4d08791 100644
--- a/model/Conference.php
+++ b/model/Conference.php
@@ -3,7 +3,7 @@
class Conference extends ModelBase
{
public function getTitle() {
- return $this->get('CONFERENCE.TITLE', 'C3VOC Streaming');
+ return $this->get('CONFERENCE.TITLE', 'C3VOC');
}
public function isPreviewEnabled() {
diff --git a/model/GenericConference.php b/model/GenericConference.php
index 93716b0..5f134fc 100644
--- a/model/GenericConference.php
+++ b/model/GenericConference.php
@@ -2,10 +2,6 @@
class GenericConference extends Conference
{
- public function getTitle() {
- return 'C3VOC Streaming';
- }
-
public function hasBegun() {
return true;
}
diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml
index 57beb5f..e41e9dd 100644
--- a/template/assemblies/header.phtml
+++ b/template/assemblies/header.phtml
@@ -3,7 +3,7 @@
<div class="navbar-header">
<a class="navbar-brand" href="">
<i class="icon"></i>
- <?=h($conference->getTitle())?>
+ <?=h($conference->getTitle())?> Streaming
</a>
</div>