Added many of the fixes in pull request #21 from OptimusCrime/more-structure

This commit is contained in:
Nicolas A. Tonne
2014-10-20 13:31:09 +02:00
parent 0b8a25551b
commit 99cf229c5e
8 changed files with 23 additions and 15 deletions

View File

@@ -9,4 +9,6 @@ RewriteRule (.*) %{REQUEST_URI}/ [R=301,L]
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule /(.*)$ /$1 [L]
RewriteRule /(.*)$ /$1 [L]
Options -Indexes

View File

@@ -23,8 +23,8 @@
<div class="playlist" >
<div id="buttons" class="">
<!--<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();">
<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">
@@ -35,14 +35,6 @@
</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></div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.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>
<?php include("php/footer.php"); ?>
</body>
</html>

5
lists/.gitignore vendored Normal file
View File

@@ -0,0 +1,5 @@
# Ignore all
*
# Not this file
!.gitignore

View File

9
php/footer.php Normal file
View File

@@ -0,0 +1,9 @@
<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>
</div>
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.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>

View File

@@ -1,6 +1,6 @@
<title>Zöff</title>
<meta name="author" content="Nicolas 'Nixo' Almagro Tonne &amp; Kasper 'KasperRT' Rynning-Tønnesen">
<link rel="stylesheet" type="text/css" href="/static/style.css" title="Default" />
<link rel="stylesheet" type="text/css" href="static/style.css" title="Default" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<link rel="icon" type="image/png" href="/static/favicon.png"/>
<link rel="icon" type="image/png" href="static/favicon.png"/>
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300' rel='stylesheet' type='text/css'>

View File

View File

@@ -39,7 +39,7 @@ foreach($dir as $files){
</div>
<center>
<div class="channels" id="channels">Active Channels<br>
<?php foreach($channels as $channel){echo "<a class='channel' href='/".htmlspecialchars($channel)."'>".htmlspecialchars(urldecode($channel))."</a>";} ?>
<?php foreach($channels as $channel){echo "<a class='channel' href='./".htmlspecialchars($channel)."'>".htmlspecialchars(urldecode($channel))."</a>";} ?>
</div>
</center>
</div>