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/page.phtml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'template/page.phtml')

diff --git a/template/page.phtml b/template/page.phtml
index 9af5d7b..58f502c 100644
--- a/template/page.phtml
+++ b/template/page.phtml
@@ -8,20 +8,20 @@
 
 <? include("$assemblies/motd.phtml") ?>
 
-		<title><?=h($title)?> – <?=h(get('CONFERENCE.TITLE', 'C3Voc'))?> Streaming</title>
+		<title><?=h($title)?> – <?=h($conference->getTitle())?> Streaming</title>
 
 		<meta name="robots" content="index,follow" />
 
-		<? if(has('CONFERENCE.AUTHOR')): ?>
-			<meta name="author" content="<?=h(get('CONFERENCE.AUTHOR'))?>" />
+		<? if($conference->hasAuthor()): ?>
+			<meta name="author" content="<?=h($conference->getAuthor())?>" />
 		<? endif ?>
 
-		<? if(has('CONFERENCE.DESCRIPTION')): ?>
-			<meta name="description" content="<?=h(get('CONFERENCE.DESCRIPTION'))?>" />
+		<? if($conference->hasDescription()): ?>
+			<meta name="description" content="<?=h($conference->getDescription())?>" />
 		<? endif ?>
 
-		<? if(has('CONFERENCE.KEYWORDS')): ?>
-			<meta name="keywords" content="<?=h(get('CONFERENCE.KEYWORDS'))?>" />
+		<? if($conference->hasKeywords()): ?>
+			<meta name="keywords" content="<?=h($conference->getKeywords())?>" />
 		<? endif ?>
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
@@ -57,7 +57,7 @@
 		<? include("$assemblies/footer.phtml") ?>
 
 		<span class="js-settings"
-			data-scheduleoffset="<?=h(get('SCHEDULE.SIMULATE_OFFSET', 0))?>"
+			data-scheduleoffset="<?=h($schedule->getSimulationOffset())?>"
 		></span>
 	</body>
 </html>
-- 
cgit v1.2.3