From 2e8b5f233ea6f1536b041b8b0433dd78b7465c76 Mon Sep 17 00:00:00 2001 From: OptimusCrime Date: Thu, 16 Oct 2014 19:32:28 +0200 Subject: [PATCH] Fixed stuff --- index.php | 62 ++++++------------------------ static/css/{ => gfx}/settings.png | Bin static/css/{ => gfx}/skip.png | Bin templates/chan.tpl | 60 +++++++++-------------------- templates/footer.tpl | 10 +++++ templates/index.tpl | 4 ++ 6 files changed, 45 insertions(+), 91 deletions(-) rename static/css/{ => gfx}/settings.png (100%) rename static/css/{ => gfx}/skip.png (100%) create mode 100755 templates/footer.tpl diff --git a/index.php b/index.php index 6d5ebad3..e351bfa4 100755 --- a/index.php +++ b/index.php @@ -1,51 +1,3 @@ -<<<<<<< HEAD - - - - - -
-
- - Zöff -
- -
-
-
- -
-
- - Settings - Skip -
-
-
-
- -
-
-
-
-
-
© 2014 Nixo & KasperRT & David
- - - - - - - - - - -======= assign('CHANNEL_NAME', htmlspecialchars(urldecode($_GET['q']))); + } + else { + // This is not a channel + header("Location: index.php"); + exit; + } + + // Display the template $template->display('chan.tpl'); -} ->>>>>>> Fixed template for the frontpage +} \ No newline at end of file diff --git a/static/css/settings.png b/static/css/gfx/settings.png similarity index 100% rename from static/css/settings.png rename to static/css/gfx/settings.png diff --git a/static/css/skip.png b/static/css/gfx/skip.png similarity index 100% rename from static/css/skip.png rename to static/css/gfx/skip.png diff --git a/templates/chan.tpl b/templates/chan.tpl index 023e3350..07ccd90c 100755 --- a/templates/chan.tpl +++ b/templates/chan.tpl @@ -5,50 +5,28 @@
-
Zöff
-
- - - ";} ?> - -
- -
-
-
Active Channels
- ".htmlspecialchars(urldecode($channel))."";} ?> + Zöff +
+ [[+$CHANNEL_NAME]]
-
-
-Zöff -
- -
- -
-
-
-
-
- - Settings - Skip -
-
-
-
+ +
+
+
+
+
+ + Settings + Skip +
+
+
+
+
+
-
- © 2014 Nixo & KasperRT & David -
- - - - - - - +[[+include file="footer.tpl"]] diff --git a/templates/footer.tpl b/templates/footer.tpl new file mode 100755 index 00000000..f31356e8 --- /dev/null +++ b/templates/footer.tpl @@ -0,0 +1,10 @@ +
+ © 2014 Nixo & KasperRT & David +
+ + + + + + + \ No newline at end of file diff --git a/templates/index.tpl b/templates/index.tpl index a6db354b..c0fac65c 100755 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -61,6 +61,7 @@
+<<<<<<< HEAD
© 2014 Nixo & KasperRT & David
@@ -72,5 +73,8 @@ >>>>>>> Fixed template for the frontpage +======= +[[+include file="footer.tpl"]] +>>>>>>> Fixed stuff