diff --git a/php/controller.php b/php/controller.php index 3757bc33..e8712915 100644 --- a/php/controller.php +++ b/php/controller.php @@ -12,9 +12,10 @@ @@ -54,26 +55,6 @@

-
-
- - -
-

- +

+
+
+ + +
+
- + 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/footer.php b/php/footer.php index 7efe7b92..93f3f71b 100755 --- a/php/footer.php +++ b/php/footer.php @@ -81,7 +81,7 @@ - + diff --git a/php/nochan.php b/php/nochan.php index 01e1030a..ec4ff3b1 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 27b7e454..d3f2a11d 100755 --- a/php/panel.php +++ b/php/panel.php @@ -101,11 +101,12 @@ diff --git a/static/css/style.css b/static/css/style.css index 5e64f779..136684d4 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -770,3 +770,8 @@ ul #chat-log{ text-align: center; } +#code-link + span{ + line-height: normal; + color: black; + text-align: center; +} diff --git a/static/js/hostcontroller.js b/static/js/hostcontroller.js index b3e46d7a..7d140aba 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/remotecontroller.js b/static/js/remotecontroller.js index da26d65c..372d6508 100644 --- a/static/js/remotecontroller.js +++ b/static/js/remotecontroller.js @@ -27,14 +27,19 @@ document.getElementById("remote_skip").addEventListener("click", function() document.getElementById("volume-control").addEventListener("click", function() { - socket.emit("id", [id, "volume", $("#volume-control").val()]); + console.log("Sending...") + socket.emit("id", [id, "volume", $("#volume-control").val()]); + console.log("Sent new vol signal") }); function control() { + console.log("Start controlling") if(start) { - if(!id)id = $("#code-input").val().toLowerCase(); + if($("#code-input").val()) + id = $("#code-input").val().toLowerCase(); + console.log("id="+id) $("#code-input").val(""); start = false; @@ -49,5 +54,5 @@ function control() socket.emit("id", [id, "channel", $("#code-input").val().toLowerCase()]); $("#code-input").val(""); } - + return false; }