Merge branch 'master' into dev

www/assets/css/ytsync.css

@@ -159,7 +159,7 @@ html, body {
 }
 
 #messagebuffer div, #messagebuffer code, #filteredit code,
-#channeldata td, #currenttitle {
+#channeldata td, #currenttitle, .profile-box {
     white-space: pre-wrap; /* css-3 */
     white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
     white-space: -pre-wrap; /* Opera 4-6 */

www/assets/js/callbacks.js

@@ -758,7 +758,7 @@ Callbacks = {
         }
         makeAlert("Error", data, "alert-error")
             .addClass("span12")
-            .insertAfter($("#mediaurl").parent());
+            .insertBefore($("#extended_controls"));
     },
 
     setTemp: function(data) {

www/assets/js/data.js

@@ -117,7 +117,8 @@ var USEROPTS = {
     ignore_channelcss    : getOrDefault("ignore_channelcss", false),
     ignore_channeljs     : getOrDefault("ignore_channeljs", false),
     sort_rank            : getOrDefault("sort_rank", false),
-    sort_afk             : getOrDefault("sort_afk", false)
+    sort_afk             : getOrDefault("sort_afk", false),
+    default_quality      : getOrDefault("default_quality", "#quality_auto")
 };
 
 var NO_WEBSOCKETS = USEROPTS.altsocket;

www/assets/js/ui.js

@@ -224,10 +224,15 @@ $("#userpl_save").click(function() {
 });
 
 /* video controls */
+function selectQuality(select, preset) {
+
+}
 (function() {
     function qualHandler(select, preset) {
         $(select).click(function() {
             VIDEOQUALITY = preset;
+            USEROPTS.default_quality = select;
+            saveOpts();
             var btn = $("#qualitywrap .btn.dropdown-toggle");
             var caret = btn.find(".caret").detach();
             btn.text($(select).text());
@@ -236,11 +241,14 @@ $("#userpl_save").click(function() {
                 PLAYER.player.setPlaybackQuality(VIDEOQUALITY);
         });
     }
+    qualHandler("#quality_auto", "");
     qualHandler("#quality_240p", "small");
     qualHandler("#quality_360p", "medium");
     qualHandler("#quality_480p", "large");
     qualHandler("#quality_720p", "hd720");
     qualHandler("#quality_1080p", "hd1080");
+    if($(USEROPTS.default_quality).length > 0)
+        $(USEROPTS.default_quality).click();
 })();
 
 $("#mediarefresh").click(function() {

www/channel.html

@@ -149,6 +149,7 @@
                         Quality <span class="caret"></span>
                       </a>
                       <ul class="dropdown-menu">
+                        <li><a id="quality_auto" href="javascript:void(0)">Quality: Auto</a></li>
                         <li><a id="quality_240p" href="javascript:void(0)">240p</a></li>
                         <li><a id="quality_360p" href="javascript:void(0)">360p</a></li>
                         <li><a id="quality_480p" href="javascript:void(0)">480p</a></li>

www/index.html

@@ -47,7 +47,7 @@
         </div>
         <div class="row">
             <div class="span8">
-                <h3>Loaded Channels</h3>
+                <h3>Public Channels</h3>
                 <table id="channeldata" class="table table-striped table-bordered">
                     <thead>
                         <tr>