shuffle things around on the way to a bootstrap-based configurable website

3 files changed, 18 insertions, 25 deletions

diff --git a/template/assemblies/banner.phtml b/template/assemblies/banner.phtml
index 2779131..d1ca8c0 100644
--- a/template/assemblies/banner.phtml
+++ b/template/assemblies/banner.phtml
@@ -1,3 +1,6 @@
-<div class="banner">
-	<div class="logo"><img src="assets/img/logo.png" height="190" width="161" /></div>
+<? if(has('CONFERENCE.BANNER_HTML')) ?>
+<div class="row banner">
+	<div class="col-xs-12">
+		<?=get('CONFERENCE.BANNER_HTML')?>
+	</div>
 </div>
diff --git a/template/assemblies/footer.phtml b/template/assemblies/footer.phtml
index d93a512..2c5ab5d 100644
--- a/template/assemblies/footer.phtml
+++ b/template/assemblies/footer.phtml
@@ -1,6 +1,7 @@
 <footer>
-	by <a class='inverted' href='https://ccc.de'>Chaos Computer Club e.V</a>,
-	<a class='inverted' href='http://fem.tu-ilmenau.de/'>FeM</a>,
-	<a class='inverted' href='http://www.ags.tu-bs.de/'>ags</a> &amp;
-	<a class='inverted' href='https://c3voc.de'>c3voc</a>
+	<? if(has('CONFERENCE.FOOTER_HTML')): ?>
+		<?= get('CONFERENCE.FOOTER_HTML') ?>
+	<? else: ?>
+		by <a href="https://c3voc.de">c3voc</a>
+	<? endif ?>
 </footer>
diff --git a/template/assemblies/header.phtml b/template/assemblies/header.phtml
index 2889927..17afb6c 100644
--- a/template/assemblies/header.phtml
+++ b/template/assemblies/header.phtml
@@ -1,33 +1,22 @@
-<div class="navbar navbar-default navbar-fixed-top" role="navigation">
-	<div class="container-fluid">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation">
+	<div class="container">
 		<div class="navbar-header">
 			<a class="navbar-brand" href="">
-				<img alt="ccc-tv logo, a tv displaying a play icon" src="assets/img/tv.png">
-				31C3 Streaming
+				<img alt="ccc-tv logo, a tv displaying a play icon" src="assets/img/tv.png" />
+				<span><?=h(get('CONFERENCE.TITLE', 'C3Voc'))?> Streaming</span>
 			</a>
 		</div>
 
 		<div class="nav navbar-form navbar-right button-wrapper">
-			<a class="form-control btn btn-default" href="feedback/" title="Feedback">
+			<a class="form-control btn btn-default" href="feedback/">
 				<span class="fa fa-bullhorn"></span>
 			</a>
-			<a class="form-control btn btn-default" href="//media.ccc.de/browse/congress/2014/index.html" title="Recordings">
+			<a class="form-control btn btn-default" href="//media.ccc.de/browse/congress/2014/index.html">
 				<span class="fa fa-video-camera"></span>
 			</a>
-			<a class="form-control btn btn-default" href="about/" title="About">
+			<a class="form-control btn btn-default" href="about/">
 				<span class="fa fa-info"></span>
 			</a>
 		</div>
-
-		<!-- form action="/search/" class="navbar-form navbar-right" id="media-search" method="get" role="search">
-			<div class="form-group input-group">
-				<input class="form-control" name="q" placeholder="Search…" size="17" type="search">
-				<span class="input-group-btn">
-					<button class="btn btn-default" type="submit">
-					<span class="fa fa-search"></span>
-				</button>
-				</span>
-			</div>
-		</form -->
 	</div>
-</div>
+</nav>