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

Merge pull request #440 from zoff-music/feature/client-settings

Browse Source 
Moved some settings to a separate accordion to gather stuff more
This commit is contained in:
Kasper Rynning-Tønnesen
2018-10-29 15:01:04 +01:00
committed by GitHub
parent f0fc0ed424 d684efe405
commit 8aeb80dfe5
3 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/public/assets/js/channel.js
View File

@@ -179,7 +179,9 @@ var Channel = {
}
if(!Helper.mobilecheck() && (document.querySelectorAll("#alreadychannel").length === 0 || !Hostcontroller.old_id || document.getElementById("code-text").innerText.toUpperCase() == "ABBADUR")) setup_host_initialization();
setup_suggested_listener();
if(!Helper.mobilecheck()) Helper.removeClass(".intelligent-accordion", "hide-on-small-only");
if(!Helper.mobilecheck()) {
showOnSmallNotMobile();
}
if(document.querySelectorAll("#alreadychannel").length === 0 || Helper.mobilecheck()){
setup_now_playing_listener();
get_list_listener();

7
server/public/assets/js/functions.js
View File

@@ -611,6 +611,13 @@ function loadChromecastVideo() {
});
}
function showOnSmallNotMobile() {
var elements = document.querySelectorAll(".hide-on-mobile-only");
for(var i = 0; i < elements.length; i++) {
Helper.removeClass(elements[i], "hide-on-small-only");
}
}
function enable_intelligent_list() {
if(Crypt.get_intelligent_list_enabled()) {
intelligentList = true;

77
server/public/partials/channel/panel.handlebars
View File

@@ -25,13 +25,13 @@
</ul>
</div>
</li>
<li class="no-padding hide-on-small-only intelligent-accordion">
<div class="collapsible-header bold waves-effect">Intelligent Playlist
<i class="material-icons">sentiment_satisfied_alt</i>
<li class="no-padding">
<div class="collapsible-header bold waves-effect">Client Settings
<i class="material-icons">settings</i>
</div>
<div class="collapsible-body info_collapsible">
<ul>
<li>
<li class="hide-on-small-only hide-on-mobile-only">
<span class="switch-text">
Intelligent
</span>
@@ -42,11 +42,44 @@
Enabled
</label>
</div>
</li>
{{#unless client}}
<li class="hide-on-small-only hide-on-mobile-only">
<span class="switch-text">
Remote
</span>
<div class="switch">
<label>
Disabled
<input name="remote_switch" type="checkbox" class="remote_switch_class" checked /><span class="lever"></span>
Enabled
</label>
</div>
</li>
<li>
<span class="switch-text">
Local Mode
</span>
<div class="switch">
<label>
Disabled
<input name="offline_switch" type="checkbox" class="offline_switch_class" /><span class="lever"></span>
Enabled
</label>
</div>
</li>
{{/unless}}
<li>
<div class="row">
<div class="col s10 offset-s1">
<p class="initial-line-height">
<p class="initial-line-height hide-on-mobile-only hide-on-small-only">
When enabling intelligent playlist, playlist elements are not updated and moved around when the playlist is in focus. If things are jumping too much around in the playlist when voting, you should enable this.
</p>
{{#unless client}}
<p class="initial-line-height">
By enabling local mode, you won't receive updates in position of the currently playing song, you'll be able to vote as many times as you please, and you can skip to a specific location in the song.
</p>
{{/unless}}
</div>
</div>
</li>
@@ -61,16 +94,6 @@
<div class="collapsible-body">
<ul>
<li>
<span class="switch-text">
Enable Remote
</span>
<div class="switch">
<label>
Disabled
<input name="remote_switch" type="checkbox" class="remote_switch_class" checked /><span class="lever"></span>
Enabled
</label>
</div>
<div><a id="code-link" target="_blank">
<img id="code-qr" alt="QR code for control" title="Link to control this Zoff player" src="https://chart.googleapis.com/chart?chs=221x221&amp;cht=qr&amp;choe=UTF-8&amp;chld=L%7C1&amp;chl=http://zoff.me" />
@@ -83,30 +106,6 @@
</ul>
</div>
</li>
<li class="no-padding offline-panel">
<div class="collapsible-header bold waves-effect">Local Mode
<i class="material-icons">visibility_off</i>
</div>
<div class="collapsible-body">
<ul>
<li>
<span class="switch-text">
Local Mode
</span>
<div class="switch">
<label>
Disabled
<input name="offline_switch" type="checkbox" class="offline_switch_class" /><span class="lever"></span>
Enabled
</label>
</div>
<div id="offline-info">
By enabling local mode, you won't receive updates in position of the currently playing song, you'll be able to vote as many times as you please, and you can skip to a specific location in the song.
</div>
</li>
</ul>
</div>
</li>
<li class="no-padding host-mode-panel hide-on-small-only">
<div class="collapsible-header bold waves-effect">Host Mode
<i class="material-icons">hearing</i>