KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/nixolas1/Zoff into dev

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-04-16 11:09:41 +02:00
parent 2b7cb42e8c 46bbfbda25
commit 595319fdf5
3 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
View File

@@ -17,7 +17,7 @@
<div class="navbar-fixed">
<nav id="nav">
<div class="nav-wrapper">
<a href="//zoff.no" class="brand-logo hide-on-small-only">
<a href="/" class="brand-logo hide-on-small-only">
<img id="zicon" src="static/images/squareicon_small.png" alt="zöff" title="Zöff">
</a>
<div class="brand-logo">

16
php/nochan.php
View File

@@ -28,11 +28,13 @@ if(isset($_GET['chan'])){
<div id="legal" class="modal">
<div class="modal-content">
<h4>Legal</h4>
<p>Copyright © 2015 Nicolas Tonne and Kasper Rynning-Tønnesen<br><br>
Creative Commons License<br>
Zöff by <a href="http://nixo.no">Nixo</a> & <a href="http://kasperrt.no">KasperRT</a> is licensed under a <a href="http://creativecommons.org/licenses/by-nc-nd/3.0/no/">Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Norway License.</a>
<br><br>
<p>Copyright © 2015 <br>Nicolas Almagro Tonne and Kasper Rynning-Tønnesen
<br><br>
Creative Commons License<br>
Zöff is licensed under a <br><a href="http://creativecommons.org/licenses/by-nc-nd/3.0/no/">Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Norway License.</a>
<br>
Do not redistribute without permission from the developers.
<br>
</div>
<div class="modal-footer">
<a href="#!" class=" modal-action modal-close waves-effect waves-green btn-flat">Close</a>
@@ -42,8 +44,8 @@ Zöff by <a href="http://nixo.no">Nixo</a> & <a href="http://kasperrt.no">Kasper
<div class="modal-content">
<h4>About</h4>
<p>Zöff is a shared (free) YouTube based radio service, built upon the YouTube API. <br><br>
Zöff is mainly a webbased service, but an Android app is made by Lasse Drevland, which has been a huge asset for the dev. team.<br><br>
The website builds mainly on PHP, and NodeJS with Socket.IO and MongoDB on the backend. More about the project itself can be found on GitHub<br><br>
Zöff is mainly a webbased service, but an <a href="https://play.google.com/store/apps/details?id=no.lqasse.zoff&hl=en">Android app</a> is made by Lasse Drevland, which has been a huge asset for the dev. team.<br><br>
The website uses <a href="https://nodejs.org/">NodeJS</a> with <a href="http://socket.io/">Socket.IO</a>, <a href="https://www.mongodb.org/">MongoDB</a> and PHP on the backend, with JavaScript, jQuery and <a href="http://materializecss.com/">Materialize</a> on the frontend. More about the project itself can be found on <a href="https://github.com/nixolas1/Zoff">GitHub</a><br><br>
The team consists of Kasper Rynning-Tønnesen and Nicolas Almagro Tonne, and the project has been worked on since late 2014.<br><br>
The team can be reached on either <a href="mailto:kasper@kasperrt.no?Subject=Contact%20Zoff">kasper@kasperrt.no</a> or <a href="mailto:me@nixo.no?Subject=Contact%20Zoff">me@nixo.no</a>
</p>

2
php/panel.php
View File

@@ -1,7 +1,7 @@
<li class="no-padding">
<ul class="collapsible collapsible-accordion">
<li><a class="nav-btn close-settings" title="Close" href="#" onclick="hide_settings()" style="float:right;">
<i class="mdi-navigation-close right-align"></i>
<i class="mdi-navigation-close center-align"></i>
</a>
<a class="col s9 collapsible-header bold waves-effect active">
Channel Settings