This commit is contained in:
Nicolas A. Tonne
2015-04-12 20:05:45 +02:00
parent b776925122
commit 1105fb3bcb
6 changed files with 18 additions and 15 deletions

View File

@@ -85,11 +85,5 @@
<?php include("php/footer.php"); ?> <?php include("php/footer.php"); ?>
<script>
var socket = io.connect('http://'+window.location.hostname+':3000');
var guid = "<?php echo $guid; ?>";
socket.emit('list', '<?php echo $list; ?>,'+guid);
</script>
</body> </body>
</html> </html>

View File

@@ -37,6 +37,12 @@
<script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jquery/2.1.1/jquery.min.js"></script>
<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script> <script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.2/jquery-ui.min.js"></script>
<script src="//cdn.socket.io/socket.io-1.2.0.js"></script> <script src="//cdn.socket.io/socket.io-1.2.0.js"></script>
<script>
var socket = io.connect('http://'+window.location.hostname+':3000');
var guid = "<?php echo $guid; ?>";
socket.emit('list', '<?php echo $list; ?>,'+guid);
</script>
<script type="text/javascript" src="static/js/lib/iscroll-min.js"></script> <script type="text/javascript" src="static/js/lib/iscroll-min.js"></script>
<script type="text/javascript" src="static/js/list.js"></script> <script type="text/javascript" src="static/js/list.js"></script>
<script type="text/javascript" src="static/js/searchlist.js"></script> <script type="text/javascript" src="static/js/searchlist.js"></script>

View File

@@ -53,7 +53,7 @@ if(isset($_GET['chan'])){
<div class="section"> <div class="section">
<ul class="row" id="channels"> <ul class="row" id="channels">
<li id="chan-html"> <div id="chan-html">
<li id="chan-card" class="col s12 m4 l3"> <li id="chan-card" class="col s12 m4 l3">
<div class="card"> <div class="card">
<a class="chan-link"> <a class="chan-link">
@@ -75,7 +75,7 @@ if(isset($_GET['chan'])){
</div> </div>
</div> </div>
</li> </li>
</li> </div>
</ul> </ul>
</div> </div>
</main> </main>

View File

@@ -110,7 +110,7 @@ hide mdi-action-visibility mdi-action-visibility-off
transition: padding 1s ease; transition: padding 1s ease;
} }
#channels li{opacity: 0;} /*#channels li{opacity: 0;}*/
/*------------------- Channel page ---------------------------------------------------------------------------- */ /*------------------- Channel page ---------------------------------------------------------------------------- */

View File

@@ -59,15 +59,17 @@ $(document).ready(function (){
list_html = $("#chan-html").html(); list_html = $("#chan-html").html();
$("#channels").empty(); $("#channels").empty();
var socket = io.connect('http://localhost:3000'); var socket = io.connect('http://'+window.location.hostname+':3000');
var playlists = []; var playlists = [];
socket.emit('frontpage_lists'); socket.emit('frontpage_lists');
socket.on('playlists', function(msg){ socket.on('playlists', function(msg){
console.log(msg);
populate_channels(msg); populate_channels(msg);
}) })
/*
Materialize.showStaggeredList('#channels'); Materialize.showStaggeredList('#channels');
*/
var pad = 0; var pad = 0;
document.getElementById("zicon").addEventListener("click", function(){ document.getElementById("zicon").addEventListener("click", function(){
pad+=10; pad+=10;
@@ -91,4 +93,5 @@ $(document).ready(function (){
} }
} }
} }
}); });

View File

@@ -172,11 +172,11 @@ function getTitle(titt, v)
var title= titt.replace(/\\\'/g, "'").replace(/&quot;/g,"'").replace(/&amp;/g,"&"); var title= titt.replace(/\\\'/g, "'").replace(/&quot;/g,"'").replace(/&amp;/g,"&");
document.title = title + " • Zöff"; document.title = title + " • Zöff";
if(!window.mobilecheck()){ if(!window.mobilecheck()){
document.getElementsByName('v')[0].placeholder = title + " • " + v + " " + outPutWord; document.getElementById('search').placeholder = title + " • " + v + " " + outPutWord;
}else }else
{ {
document.getElementById("mobileTitle").innerHTML = title; document.getElementById("mobileTitle").innerHTML = title;
document.getElementsByName('v')[0].placeholder = "Search • 1 " + v + " " + outPutWord; document.getElementById('search').placeholder = "Search • 1 " + v + " " + outPutWord;
//document.getElementById("viewers").innerHTML = viewers[5].length + " " + outPutWord; //document.getElementById("viewers").innerHTML = viewers[5].length + " " + outPutWord;
} }
} }
@@ -215,7 +215,7 @@ function setBGimage(id){
var hsl=[getRandomInt(0,360), getRandomInt(20,80)] var hsl=[getRandomInt(0,360), getRandomInt(20,80)]
var colorTxt = "hsla("+hsl[0]+", "+hsl[1]+"%, 22%, 0.5);"; var colorTxt = "hsla("+hsl[0]+", "+hsl[1]+"%, 22%, 0.5);";
$("#controls").css("background-color", colorTxt); $("#controls").css("background-color", colorTxt);
$("#search").css("background-color", colortxt); $("#search").css("background-color", colorTxt);
}else if(window.mobilecheck()){ }else if(window.mobilecheck()){
$("#mobile-banner").css("background-image", "url(http://img.youtube.com/vi/"+id+"/hqdefault.jpg)"); $("#mobile-banner").css("background-image", "url(http://img.youtube.com/vi/"+id+"/hqdefault.jpg)");
$("#mobile-banner").css("width",$(window).width()); $("#mobile-banner").css("width",$(window).width());