Address points 3-5 of #174

This commit is contained in:
calzoneman 2013-06-20 17:01:22 -04:00
parent 247862355c
commit 8251a29b8d
3 changed files with 6 additions and 6 deletions

View File

@ -757,7 +757,6 @@ function handlePermissionChange() {
$("#queue").removeClass("queue_sortable"); $("#queue").removeClass("queue_sortable");
} }
setVisible("#getplaylist", hasPermission("playlistgeturl"));
setVisible("#clearplaylist", hasPermission("playlistclear")); setVisible("#clearplaylist", hasPermission("playlistclear"));
setVisible("#shuffleplaylist", hasPermission("playlistshuffle")); setVisible("#shuffleplaylist", hasPermission("playlistshuffle"));
@ -1203,7 +1202,6 @@ function genPermissionsEditor() {
makeOption("Queue livestream", "playlistaddlive", standard, CHANNEL.perms.playlistaddlive+""); makeOption("Queue livestream", "playlistaddlive", standard, CHANNEL.perms.playlistaddlive+"");
makeOption("Add nontemporary media", "addnontemp", standard, CHANNEL.perms.addnontemp+""); makeOption("Add nontemporary media", "addnontemp", standard, CHANNEL.perms.addnontemp+"");
makeOption("Temp/untemp playlist item", "settemp", standard, CHANNEL.perms.settemp+""); makeOption("Temp/untemp playlist item", "settemp", standard, CHANNEL.perms.settemp+"");
makeOption("Retrieve playlist URLs", "playlistgeturl", standard, CHANNEL.perms.playlistgeturl+"");
makeOption("Shuffle playlist", "playlistshuffle", standard, CHANNEL.perms.playlistshuffle+""); makeOption("Shuffle playlist", "playlistshuffle", standard, CHANNEL.perms.playlistshuffle+"");
makeOption("Clear playlist", "playlistclear", standard, CHANNEL.perms.playlistclear+""); makeOption("Clear playlist", "playlistclear", standard, CHANNEL.perms.playlistclear+"");

View File

@ -156,13 +156,15 @@
</div> </div>
<div id="extended_controls" class="span12"> <div id="extended_controls" class="span12">
<button class="btn btn-danger btn-block" id="qlockbtn">Unlock Queue</button> <button class="btn btn-danger btn-block" id="qlockbtn">Unlock Queue</button>
<button class="btn btn-block" id="getplaylist">Get Playlist URLs</button>
<button class="btn btn-block" id="clearplaylist">Clear Playlist</button> <button class="btn btn-block" id="clearplaylist">Clear Playlist</button>
<button class="btn btn-block" id="shuffleplaylist">Shuffle Playlist</button> <button class="btn btn-block" id="shuffleplaylist">Shuffle Playlist</button>
</div> </div>
</div> </div>
</div> </div>
<button class="btn btn-block" id="voteskip">Voteskip</button> <div class="btn-group span12">
<button class="btn" style="width: 50%" id="voteskip">Voteskip</button>
<button class="btn" style="width: 50%" id="getplaylist">Get Playlist URLs</button>
</div>
<!-- video queue --> <!-- video queue -->
<ul class="span12 videolist" id="queue"> <ul class="span12 videolist" id="queue">
</ul> </ul>

View File

@ -1,5 +1,6 @@
<script src="/assets/js/channelsettings.js"></script> <script src="/assets/js/channelsettings.js"></script>
<div class="btn-group"> <button id="hide_settings" class="pull-right close">&times;</button>
<div class="btn-group dropup">
<a class="btn dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)"> <a class="btn dropdown-toggle" data-toggle="dropdown" href="javascript:void(0)">
<span id="csdropdown_title">Moderation Menu</span> <span id="csdropdown_title">Moderation Menu</span>
<span class="caret"></span> <span class="caret"></span>
@ -14,7 +15,6 @@
<li id="banlist_tab"><a href="javascript:void(0);" id="show_banlist">Ban List</a></li> <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="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="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> </ul>
</div> </div>
<hr> <hr>