diff --git a/php/controller.php b/php/controller.php index 518f646c..c9796254 100644 --- a/php/controller.php +++ b/php/controller.php @@ -12,9 +12,10 @@ @@ -54,6 +55,11 @@

+ + +
+ + + + + + - +
-
- +
+ Here you can control another Zöff player from any device. +
+ To find the ID of your player, click the Conf icon on the top right of the player page, then "Remote Control". +
You can either scan the QR code or type the ID manually.
diff --git a/php/nochan.php b/php/nochan.php index 01e1030a..70026e06 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -19,9 +19,10 @@ if(isset($_GET['chan'])){
diff --git a/php/panel.php b/php/panel.php index 8a3416e4..f94b5b1c 100755 --- a/php/panel.php +++ b/php/panel.php @@ -100,46 +100,12 @@
diff --git a/static/css/style.css b/static/css/style.css index a2c3a2e4..419a3561 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -770,6 +770,12 @@ ul #chat-log{ text-align: center; } + +#code-link + a{ + line-height: normal; + color: black; + text-align: center; +} #volume-control { cursor:pointer; float:left; @@ -795,11 +801,22 @@ ul #chat-log{ } #volume-control .ui-slider-handle { - height:15px; - width:5px; - background-color:black; - position: absolute; - cursor: pointer; - outline: none; - border: none; + height: 15px; + width: 36px; + background-color: rgb(255, 44, 44); + position: absolute; + cursor: pointer; + outline: none; + border: none; + border-radius: 17px; + margin-left: -17px; } + +.slider-vol{ + float: left; + font-size: 22px; +} + +.about-remote{ + padding-top: 50px; +} \ No newline at end of file diff --git a/static/js/hostcontroller.js b/static/js/hostcontroller.js index d9058519..56172486 100644 --- a/static/js/hostcontroller.js +++ b/static/js/hostcontroller.js @@ -8,6 +8,7 @@ socket.on("id", function(id) $("#code-text").text(id.toUpperCase()) $("#code-qr").attr("src", "https://chart.googleapis.com/chart?chs=221x221&cht=qr&choe=UTF-8&chld=L|1&chl="+codeURL); $("#code-link").attr("href", codeURL); + if(!began) { socket.on(id, function(arr) diff --git a/static/js/nochan.js b/static/js/nochan.js index 3f0f60b8..b57c6c4e 100755 --- a/static/js/nochan.js +++ b/static/js/nochan.js @@ -76,7 +76,7 @@ function sortFunction(a, b) { $(document).ready(function (){ - Materialize.toast("Try out our new feature, remote!", 8000) + //Materialize.toast("Try out our new feature, remote!", 8000) list_html = $("#channels").html(); $("#channels").empty(); diff --git a/static/js/remotecontroller.js b/static/js/remotecontroller.js index 3bcb9afb..12ce3be0 100644 --- a/static/js/remotecontroller.js +++ b/static/js/remotecontroller.js @@ -51,24 +51,24 @@ function control() $("#forsearch").html("Type new channel name to change to"); $("#volume-control").slider({ - min: 0, - max: 100, - value: 100, - range: "min", - animate: true, - /*slide: function(event, ui) { + min: 0, + max: 100, + value: 100, + range: "min", + animate: true, + /*slide: function(event, ui) { console.log(ui.value); - //localStorage.setItem("volume", ui.value); - },*/ + //localStorage.setItem("volume", ui.value); + },*/ stop:function(event, ui) { socket.emit("id", [id, "volume", ui.value]); //console.log(ui.value); } - }); + }); }else { socket.emit("id", [id, "channel", $("#search").val().toLowerCase()]); $("#search").val(""); } -} +} \ No newline at end of file