From 8251a29b8d92537b44bbff5ef6b48ee1f7436e18 Mon Sep 17 00:00:00 2001
From: calzoneman <calzoneman@gmail.com>
Date: Thu, 20 Jun 2013 17:01:22 -0400
Subject: [PATCH] Address points 3-5 of #174

---
 www/assets/js/util.js   | 2 --
 www/channel.html        | 6 ++++--
 www/channeloptions.html | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/www/assets/js/util.js b/www/assets/js/util.js
index 9f7f0d62..db1771e6 100644
--- a/www/assets/js/util.js
+++ b/www/assets/js/util.js
@@ -757,7 +757,6 @@ function handlePermissionChange() {
         $("#queue").removeClass("queue_sortable");
     }
 
-    setVisible("#getplaylist", hasPermission("playlistgeturl"));
     setVisible("#clearplaylist", hasPermission("playlistclear"));
     setVisible("#shuffleplaylist", hasPermission("playlistshuffle"));
 
@@ -1203,7 +1202,6 @@ function genPermissionsEditor() {
     makeOption("Queue livestream", "playlistaddlive", standard, CHANNEL.perms.playlistaddlive+"");
     makeOption("Add nontemporary media", "addnontemp", standard, CHANNEL.perms.addnontemp+"");
     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("Clear playlist", "playlistclear", standard, CHANNEL.perms.playlistclear+"");
 
diff --git a/www/channel.html b/www/channel.html
index bfd82492..835e28e6 100644
--- a/www/channel.html
+++ b/www/channel.html
@@ -156,13 +156,15 @@
                 </div>
                 <div id="extended_controls" class="span12">
                   <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="shuffleplaylist">Shuffle Playlist</button>
                 </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 -->
               <ul class="span12 videolist" id="queue">
               </ul>
diff --git a/www/channeloptions.html b/www/channeloptions.html
index 6b37ce50..bb4aa2f6 100644
--- a/www/channeloptions.html
+++ b/www/channeloptions.html
@@ -1,5 +1,6 @@
 <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)">
         <span id="csdropdown_title">Moderation Menu</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="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>