diff --git a/index.php b/index.php index 00e1645c..62af6865 100755 --- a/index.php +++ b/index.php @@ -85,11 +85,5 @@ - - diff --git a/php/footer.php b/php/footer.php index 3a840aa6..bb4f1589 100755 --- a/php/footer.php +++ b/php/footer.php @@ -37,6 +37,12 @@ + + diff --git a/php/nochan.php b/php/nochan.php index 1908f29b..0d6e7766 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -53,7 +53,7 @@ if(isset($_GET['chan'])){
- + diff --git a/static/css/style.css b/static/css/style.css index d0a860f2..417c4fb4 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -110,14 +110,14 @@ hide mdi-action-visibility mdi-action-visibility-off transition: padding 1s ease; } -#channels li{opacity: 0;} +/*#channels li{opacity: 0;}*/ /*------------------- Channel page ---------------------------------------------------------------------------- */ #searchform{ width: 50%; margin-left: 25%; - + } .main{ diff --git a/static/js/nochan.js b/static/js/nochan.js index c62d56e6..8a866f65 100644 --- a/static/js/nochan.js +++ b/static/js/nochan.js @@ -59,15 +59,17 @@ $(document).ready(function (){ list_html = $("#chan-html").html(); $("#channels").empty(); - var socket = io.connect('http://localhost:3000'); + var socket = io.connect('http://'+window.location.hostname+':3000'); var playlists = []; socket.emit('frontpage_lists'); socket.on('playlists', function(msg){ + console.log(msg); populate_channels(msg); }) - +/* Materialize.showStaggeredList('#channels'); +*/ var pad = 0; document.getElementById("zicon").addEventListener("click", function(){ pad+=10; @@ -91,4 +93,5 @@ $(document).ready(function (){ } } } + }); diff --git a/static/js/youtube.js b/static/js/youtube.js index 7e130c45..63589c9d 100755 --- a/static/js/youtube.js +++ b/static/js/youtube.js @@ -172,11 +172,11 @@ function getTitle(titt, v) var title= titt.replace(/\\\'/g, "'").replace(/"/g,"'").replace(/&/g,"&"); document.title = title + " • Zöff"; if(!window.mobilecheck()){ - document.getElementsByName('v')[0].placeholder = title + " • " + v + " " + outPutWord; + document.getElementById('search').placeholder = title + " • " + v + " " + outPutWord; }else { 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; } } @@ -215,7 +215,7 @@ function setBGimage(id){ var hsl=[getRandomInt(0,360), getRandomInt(20,80)] var colorTxt = "hsla("+hsl[0]+", "+hsl[1]+"%, 22%, 0.5);"; $("#controls").css("background-color", colorTxt); - $("#search").css("background-color", colortxt); + $("#search").css("background-color", colorTxt); }else if(window.mobilecheck()){ $("#mobile-banner").css("background-image", "url(http://img.youtube.com/vi/"+id+"/hqdefault.jpg)"); $("#mobile-banner").css("width",$(window).width());