KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed stuff

Browse Source
This commit is contained in:
OptimusCrime
2014-10-16 19:32:28 +02:00
parent a54d6a0f20
commit 2e8b5f233e
6 changed files with 45 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
index.php
View File

@@ -1,51 +1,3 @@
<<<<<<< HEAD
<html>
<head>
<?php include("php/header.php"); ?>
</head>
<body>
<div class="top vcent centered">
<div id="change" class="small">
<?php
if(isset($_GET['chan'])) header('Location: '.$_GET['chan']);
$list = explode("/", htmlspecialchars(strtolower($_SERVER["REQUEST_URI"])));
if($list[1]==""||!isset($list[1])||count($list)<=1){$list="";include('php/nochan.php');die();}
else $list=$list[1];
?>
<a id="toptitle" href="/">Zöff</a>
<div id="chan" class="chan" title="Show big URL" onclick="show()"><?php echo(ucfirst($list));?></div>
<input id="search" name="v" type="text" class="search_input innbox" spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off"/>
<div id="results"></div>
<div class="main">
<div id="player" class="ytplayer"></div>
<div class="playlist" >
<div id="buttons" class="result">
<!--<a href="/php/admin.php?list=<?php echo $list; ?>" title="Channel settings" ><img src="/static/settings2.png" class="skip middle" alt="Settings"/></a>-->
<img src="/static/settings2.png" class="skip middle" alt="Settings" title="Settings" onclick="admin();"/>
<img src="/static/skip.png" class="skip" alt="Skip" title="Skip" onclick="skip();">
</div>
<div id="adminPanel"></div>
<div id="playlist">
<div id="wrapper">
</div>
</div>
</div>
</div>
</div>
<div class="footer small centered top anim">&copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT </a>&amp; David </div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script type="text/javascript" src="/js/iscroll.js"></script>
<script type="text/javascript" src="/js/list.js"></script>
<script type="text/javascript" src="/js/youtube.js"></script>
<script type="text/javascript" src="/js/search.js"></script>
<script type="text/javascript" src="/js/admin.js"></script>
<script type="text/javascript" src="/js/visualize.js"></script>
</body>
</html>
=======
<?php <?php
/* /*
* *
@@ -103,6 +55,16 @@ if (!isset($_GET['q'])) {
} }
else { else {
// In a room, check if it is a valid room or not // In a room, check if it is a valid room or not
if (file_exists(ZOFF_BASE_PATH . '/lists/' . strtolower($_GET['q']) . '.json')) {
// Assign channel name
$template->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'); $template->display('chan.tpl');
} }
>>>>>>> Fixed template for the frontpage

0
static/css/settings.png → static/css/gfx/settings.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.3 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

0
static/css/skip.png → static/css/gfx/skip.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

44
templates/chan.tpl
View File

@@ -5,50 +5,28 @@
<body> <body>
<div class="top vcent centered"> <div class="top vcent centered">
<div id="change" class="small"> <div id="change" class="small">
<div class="bigchan nomargin">Zöff</div> <a id="toptitle" href="../">Zöff</a>
<form name="ufo" action="" class="daform nomargin" id="base" method="get" onsubmit="null;" > <div id="chan" class="chan" title="Show big URL" onclick="show()">
<input list="searches" id="search" name="chan" type="text" class="search_input innbox" spellcheck="false" maxlength="15" placeholder="Type Channel Name" autofocus/> [[+$CHANNEL_NAME]]
<datalist id="searches">
<?php foreach($channels as $channel){echo "<option value='".htmlspecialchars(urldecode($channel))."'> ";} ?>
</datalist>
</form>
</div> </div>
<center> <input id="search" name="v" type="text" class="search_input innbox" spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off" />
<div class="channels" id="channels">Active Channels<br> <div id="results"></div>
<?php foreach($channels as $channel){echo "<a class='channel' href='/".htmlspecialchars($channel)."'>".htmlspecialchars(urldecode($channel))."</a>";} ?> <div class="main">
</div>
</center>
</div>
<a id="toptitle" href="/">Zöff</a>
<div id="chan" class="chan" title="Show big URL" onclick="show()">
<?php echo(ucfirst($list));?>
</div>
<input id="search" name="v" type="text" class="search_input innbox" spellcheck="false" placeholder="Search" onsubmit="null;" autocomplete="off"/>
<div id="results"></div>
<div class="main">
<div id="player" class="ytplayer"></div> <div id="player" class="ytplayer"></div>
<div class="playlist" > <div class="playlist" >
<div id="buttons" class="result"> <div id="buttons" class="result">
<!--<a href="/php/admin.php?list=<?php echo $list; ?>" title="Channel settings" ><img src="static/settings2.png" class="skip middle" alt="Settings"/></a>--> <!--<a href="/php/admin.php?list=<?php echo $list; ?>" title="Channel settings" ><img src="static/settings2.png" class="skip middle" alt="Settings"/></a>-->
<img src="static/settings2.png" class="skip middle" alt="Settings" title="Settings" onclick="admin();"/> <img src="static/css/gfx/settings.png" class="skip middle" alt="Settings" title="Settings" onclick="admin();"/>
<img src="static/skip.png" class="skip" alt="Skip" title="Skip" onclick="skip();"> <img src="static/css/gfx/skip.png" class="skip" alt="Skip" title="Skip" onclick="skip();">
</div> </div>
<div id="adminPanel"></div> <div id="adminPanel"></div>
<div id="playlist"> <div id="playlist">
<div id="wrapper"></div> <div id="wrapper"></div>
</div> </div>
</div> </div>
</div>
</div>
</div> </div>
<div class="footer small centered top anim"> [[+include file="footer.tpl"]]
&copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT </a>&amp; David
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script type="text/javascript" src="static/js/iscroll.js"></script>
<script type="text/javascript" src="static/js/list.js"></script>
<script type="text/javascript" src="static/js/youtube.js"></script>
<script type="text/javascript" src="static/js/search.js"></script>
<script type="text/javascript" src="static/js/admin.js"></script>
<script type="text/javascript" src="static/js/visualize.js"></script>
</body> </body>
</html> </html>

10
templates/footer.tpl Executable file
View File

@@ -0,0 +1,10 @@
<div class="footer small centered top anim bottom">
&copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT </a>&amp; David
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
<script type="text/javascript" src="static/js/iscroll.js"></script>
<script type="text/javascript" src="static/js/list.js"></script>
<script type="text/javascript" src="static/js/youtube.js"></script>
<script type="text/javascript" src="static/js/search.js"></script>
<script type="text/javascript" src="static/js/admin.js"></script>
<script type="text/javascript" src="static/js/visualize.js"></script>

4
templates/index.tpl
View File

@@ -61,6 +61,7 @@
</div> </div>
</center> </center>
</div> </div>
<<<<<<< HEAD
<div class="footer small centered top anim bottom"> <div class="footer small centered top anim bottom">
&copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT </a>&amp; David &copy; 2014 <a class="anim" href="//nixo.no">Nixo</a> &amp; <a class="anim" href="//kasperrt.no">KasperRT </a>&amp; David
</div> </div>
@@ -72,5 +73,8 @@
<script type="text/javascript" src="static/js/admin.js"></script> <script type="text/javascript" src="static/js/admin.js"></script>
<script type="text/javascript" src="static/js/visualize.js"></script> <script type="text/javascript" src="static/js/visualize.js"></script>
>>>>>>> Fixed template for the frontpage >>>>>>> Fixed template for the frontpage
=======
[[+include file="footer.tpl"]]
>>>>>>> Fixed stuff
</body> </body>
</html> </html>