Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

airtime_mvc/application/models/Preference.php

@@ -154,10 +154,13 @@ class Application_Model_Preference
         $fade = self::GetValue("default_fade");
         
         if ($fade === "") {
-            return null;
+            // the default value of the fade is 00.500000
+            return "00.500000";
         } 
         
         $fade = number_format($fade, 6);
+        //fades need 2 leading zeros for DateTime conversion
+        $fade = str_pad($fade, 9, "0", STR_PAD_LEFT);
         return $fade;
     }
     

airtime_mvc/application/views/scripts/dashboard/stream-player.phtml

@@ -75,7 +75,7 @@ $(document).ready(function(){
             <ul class="jp-controls">
                 <li><a title="mute" tabindex="1" class="jp-mute" href="javascript:;">mute</a></li>
                 <li><a title="unmute" tabindex="1" class="jp-unmute" href="javascript:;">unmute</a></li>
-                <li><a title="max volume" tabindex="1" class="jp-volume-max" href="javascript:;">max volume</a></li>
+                <!--<li><a title="max volume" tabindex="1" class="jp-volume-max" href="javascript:;">max volume</a></li>-->
             </ul>
             <div class="jp-volume-bar">
                 <div class="jp-volume-bar-value"></div>