From ea4b6c7699a7fbb7be3d9e5ce86c84a36b63f569 Mon Sep 17 00:00:00 2001
From: MaZderMind
Date: Sun, 15 Mar 2015 19:13:25 +0100
Subject: Move get/set-Calls into ModelBase and abstract all access into a
 Model

Conflicts:
	model/Overview.php
	model/Room.php
	model/StreamList.php
	tests/ModelTestbase.php
---
 template/assemblies/header.phtml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'template/assemblies/header.phtml')

diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml
index 50eb9cb..cb6b991 100644
--- a/template/assemblies/header.phtml
+++ b/template/assemblies/header.phtml
@@ -3,22 +3,22 @@
 		<div class="navbar-header">
 			<a class="navbar-brand" href="">
 				<i class="icon"></i>
-				<?=h(get('CONFERENCE.TITLE', 'C3Voc Streaming'))?>
+				<?=h($conference->getTitle())?>
 			</a>
 		</div>
 
 		<div class="nav navbar-form navbar-right button-wrapper">
-			<? if(has('FEEDBACK')): ?>
-				<a class="form-control btn btn-default" href="feedback/">
+			<? if($feedback->isEnabled()): ?>
+				<a class="form-control btn btn-default" href="<?=h($feedback->getUrl())?>">
 					<span class="fa fa-bullhorn"></span>
 				</a>
 			<? endif ?>
-			<? if(has('OVERVIEW.RELEASES')): ?>
-				<a class="form-control btn btn-default" href="<?=h(get('OVERVIEW.RELEASES'))?>">
+			<? if($conference->hasReleases()): ?>
+				<a class="form-control btn btn-default" href="<?=h($conference->getReleasesUrl())?>">
 					<span class="fa fa-video-camera"></span>
 				</a>
 			<? endif ?>
-			<a class="form-control btn btn-default" href="about/">
+			<a class="form-control btn btn-default" href="<?=h($conference->getAboutUrl())?>">
 				<span class="fa fa-info"></span>
 			</a>
 		</div>
-- 
cgit v1.2.3