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

Styling and shit

Browse Source
This commit is contained in:
Nicolas A. Tonne
2015-06-08 00:19:56 +02:00
parent 664d12a99b
commit 47c5c414b6
4 changed files with 66 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
php/controller.php
View File

@@ -56,6 +56,30 @@
</div> </div>
<div class="section"> <div class="section">
<!--<p class="range-field">
<input type="range" title="Volume" id="volume-control" style="display:none;" min="0" value="100" max="100" />
</p>-->
<form class="row" id="base" onsubmit="window.location.href = '/remote/'+this.chan.value;return false;">
<div class="input-field col s12">
<input
class="input-field"
type="text"
id="search"
name="chan"
title="Type channel name here to create or listen to a channel. Only alphanumerical chars. [a-zA-Z0-9]+"
autocomplete="off"
list="searches"
required pattern="[a-zA-Z0-9]+"
spellcheck="false"
maxlength="8"
autocomplete
length="8"
/>
<label for="search" id="forsearch">Type ID of host to be controlled (it can be found under settings on a channel)</label>
</div>
</form>
<div id="remote-controls" style="display:none;"> <div id="remote-controls" style="display:none;">
<a class="chan-link waves-effect btn green" onclick="play();"> <a class="chan-link waves-effect btn green" onclick="play();">
<i id="remote_play" class="mdi-av-play-arrow"></i> <i id="remote_play" class="mdi-av-play-arrow"></i>
@@ -68,32 +92,11 @@
</a> </a>
</div> </div>
<div id="volume-control" style="display:none;"></div> <i class="mdi-av-volume-up slider-vol"></i>
<div id="volume-control" style="display:none;" title="Volume">
</div>
<!--<p class="range-field">
<input type="range" title="Volume" id="volume-control" style="display:none;" min="0" value="100" max="100" />
</p>-->
<form class="row" id="base" onsubmit="window.location.href = '/remote/'+this.chan.value;return false;">
<div class="input-field col s12">
<input
class="input-field"
type="text"
id="search"
name="id"
title="Type channel name here to create or listen to a channel. Only alphanumerical chars. [a-zA-Z0-9]+"
autocomplete="off"
list="searches"
required pattern="[a-zA-Z0-9]+"
spellcheck="false"
maxlength="8"
autocomplete
length="8"
value="<?php /*if(isset($_GET('id'))echo($_GET('id'));*/?>"
/>
<label for="search" id="forsearch">Type ID of host to be controlled (it can be found under settings on a channel)</label>
</div>
</form>
<!--<p class="range-field" onclick="console.log('test');"> <!--<p class="range-field" onclick="console.log('test');">
<input type="range" id="volume-control" style="display:none;" min="0" value="100" max="100" /> <input type="range" id="volume-control" style="display:none;" min="0" value="100" max="100" />
@@ -101,7 +104,7 @@
</div> </div>
<div class="section"> <div class="section about-remote">
<b>Here you can control another Zöff player from any device.</b> <b>Here you can control another Zöff player from any device.</b>
<br> <br>
To find the ID of your player, click the Conf <i class="mdi-action-settings"></i> icon on the top right of the player page, then "Remote Control". To find the ID of your player, click the Conf <i class="mdi-action-settings"></i> icon on the top right of the player page, then "Remote Control".

45
php/panel.php
View File

@@ -100,47 +100,12 @@
<div class="collapsible-body"> <div class="collapsible-body">
<ul> <ul>
<li> <li>
<a id="code-link" target="_blank"> <a id="code-link" target="_blank">
<img id="code-qr" alt="QR code for control" title="Link to control this Zöff player"> <img id="code-qr" alt="QR code for control" title="Link to control this Zöff player">
<h4 id="code-text">ABBADUR</h4> <h4 id="code-text">ABBADUR</h4>
</a> </a>
<span>You can control this Zöff instance from another device by going to <b>http://zoff.no/remote</b><span> <a>You can control this Zöff instance from another device by going to <b>http://zoff.no/remote</b><a>
</li> </li>
<!--
<li>
<form class="row" id="base" onsubmit="controll();return false;">
<div class="input-field">
<input
class="input-field"
type="text"
id="code-input"
name="chan"
title="Type channel name here to create or listen to a channel. Only alphanumerical chars. [a-zA-Z0-9]+"
autocomplete="off"
list="searches"
required pattern="[a-zA-Z0-9]+"
spellcheck="false"
maxlength="8"
autocomplete
length="8"
/>
<label for="code-input" id="forcode">Type ID of host to be controlled</label>
</div>
</form>
</li>
<li>
<div id="remote-controls" style="display:none;">
<i id="remote_play" class="mdi-av-play-arrow"></i>
<i id="remote_pause" class="mdi-av-pause"></i>
<i id="remote_skip" class="mdi-av-skip-next"></i>
</div>
</li>
<li>
<p class="range-field">
<input type="range" id="volume-control" style="display:none;" min="0" max="100" />
</p>
</li>
-->
</ul> </ul>
</div> </div>
</li> </li>

29
static/css/style.css
View File

@@ -771,11 +771,11 @@ ul #chat-log{
} }
#code-link + span{ #code-link + a{
line-height: normal; line-height: normal;
color: black; color: black;
text-align: center; text-align: center;
}
#volume-control { #volume-control {
cursor:pointer; cursor:pointer;
float:left; float:left;
@@ -801,11 +801,22 @@ ul #chat-log{
} }
#volume-control .ui-slider-handle { #volume-control .ui-slider-handle {
height:15px; height: 15px;
width:5px; width: 36px;
background-color:black; background-color: rgb(255, 44, 44);
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;
outline: none; outline: none;
border: none; border: none;
border-radius: 17px;
margin-left: -17px;
} }
.slider-vol{
float: left;
font-size: 22px;
}
.about-remote{
padding-top: 50px;
}

28
static/js/remotecontroller.js
View File

@@ -32,16 +32,12 @@ document.getElementById("volume-control").addEventListener("click", function()
{ {
socket.emit("id", [id, "volume", $("#volume-control").val()]); socket.emit("id", [id, "volume", $("#volume-control").val()]);
});*/ });*/
>>>>>>> 126fe2fec4a1d36ec179e889d4d7162118b4fc49
function control() function control()
{ {
console.log("Start controlling")
if(start) if(start)
{ {
if($("#code-input").val()) if(!id)id = $("#code-input").val().toLowerCase();
id = $("#code-input").val().toLowerCase();
console.log("id="+id)
$("#code-input").val(""); $("#code-input").val("");
start = false; start = false;
@@ -55,24 +51,24 @@ function control()
$("#forsearch").html("Type new channel name to change to"); $("#forsearch").html("Type new channel name to change to");
$("#volume-control").slider({ $("#volume-control").slider({
min: 0, min: 0,
max: 100, max: 100,
value: 100, value: 100,
range: "min", range: "min",
animate: true, animate: true,
/*slide: function(event, ui) { /*slide: function(event, ui) {
console.log(ui.value); console.log(ui.value);
//localStorage.setItem("volume", ui.value); //localStorage.setItem("volume", ui.value);
},*/ },*/
stop:function(event, ui) { stop:function(event, ui) {
socket.emit("id", [id, "volume", ui.value]); socket.emit("id", [id, "volume", ui.value]);
//console.log(ui.value); //console.log(ui.value);
} }
}); });
}else }else
{ {
socket.emit("id", [id, "channel", $("#search").val().toLowerCase()]); socket.emit("id", [id, "channel", $("#search").val().toLowerCase()]);
$("#search").val(""); $("#search").val("");
} }
return false;
} }