Add voteskip button, fix bugs

This commit is contained in:
calzoneman 2013-06-18 16:18:41 -04:00
parent b60981c8d8
commit dc5c6801ed
6 changed files with 37 additions and 18 deletions

View File

@ -318,3 +318,7 @@ html, body {
border: 1px solid #aaaaaa;
border-radius: 5px;
}
#channelsettingswrap3 {
margin-top: 20px;
}

View File

@ -14,6 +14,13 @@
});
}
$("#hide_settings").click(function() {
$("#csdropdown_title").text("Moderation Menu");
$("#channelsettingswrap div.span12").each(function() {
$(this).hide();
});
});
clickHandler("#show_optedit", "#optedit");
clickHandler("#show_permedit", "#permedit");
clickHandler("#show_motdedit", "#motdedit");

View File

@ -215,6 +215,10 @@ $("#qlockbtn").click(function() {
socket.emit("togglePlaylistLock");
});
$("#voteskip").click(function() {
socket.emit("voteskip");
});
$("#getplaylist").click(function() {
var callback = function(data) {
PLAYER.hide();

View File

@ -661,8 +661,8 @@ function handlePermissionChange() {
if(CLIENT.rank >= 2) {
$("#channelsettingswrap3").show();
if($("#channelsettingswrap").html() == "")
$("#channelsettingswrap").load("channeloptions.html");
if($("#channelsettingswrap").html() == "") {
$("#channelsettingswrap").load("channeloptions.html", function() {
/* update channel controls */
$("#opt_pagetitle").val(CHANNEL.opts.pagetitle);
$("#opt_externalcss").val(CHANNEL.opts.externalcss);
@ -679,6 +679,8 @@ function handlePermissionChange() {
setVisible("#jsedit_tab", CLIENT.rank >= 3);
setVisible("#filteredit_tab", hasPermission("filteredit"));
setVisible("#channelranks_tab", CLIENT.rank >= 3);
});
}
}
else {
$("#channelsettingswrap").html("");

View File

@ -162,6 +162,7 @@
</div>
</div>
</div>
<button class="btn btn-block" id="voteskip">Voteskip</button>
<!-- video queue -->
<ul class="span12 videolist" id="queue">
</ul>

View File

@ -14,6 +14,7 @@
<li id="banlist_tab"><a href="javascript:void(0);" id="show_banlist">Ban List</a></li>
<li id="channelranks_tab"><a href="javascript:void(0);" id="show_channelranks">Channel Ranks</a></li>
<li id="loginhistory_tab"><a href="javascript:void(0);" id="show_loginhistory">Recent Connections</a></li>
<li id="hidesettings_tab"><a href="javascript:void(0);" id="hide_settings">Hide Menu</a></li>
</ul>
</div>
<hr>