Merged 2.5.x into saas

airtime_mvc/application/Bootstrap.php

@@ -147,7 +147,7 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
 
         $view->headScript()->appendFile($baseUrl . 'js/libs/underscore-min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
 
-        $view->headScript()->appendFile($baseUrl . 'js/libs/jquery.stickyPanel.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
+        // $view->headScript()->appendFile($baseUrl . 'js/libs/jquery.stickyPanel.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
         $view->headScript()->appendFile($baseUrl . 'js/qtip/jquery.qtip.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
         $view->headScript()->appendFile($baseUrl . 'js/jplayer/jquery.jplayer.min.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
         $view->headScript()->appendFile($baseUrl . 'js/sprintf/sprintf-0.7-beta1.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');

airtime_mvc/application/layouts/scripts/layout.phtml

@@ -21,7 +21,7 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
 
 <?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
 
-<div id="Panel">
+    <div id="Panel" class="sticky">
     <?php if($this->suspended) : ?>
         <?php echo $this->partial('partialviews/suspended.phtml'); ?>
     <?php else : ?>

airtime_mvc/public/css/styles.css

@@ -141,8 +141,22 @@ select {
 * html .clearfix, * html li { height: 1%;}
 .clearfix, #side_playlist li {    display: block;    }
 
-
 /* Master Panel */
+
+.sticky {
+    position: fixed;
+    width: 100%;
+    left: 0;
+    top: 0;
+    z-index: 2000;
+    border-top: 0;
+}
+
+.push {
+    width: 100%;
+    height: 139px;
+}
+
 #sticky {
     position:fixed;
     height:130px;
@@ -150,7 +164,6 @@ select {
     left:0;
 }
 
-
 #master-panel {
     background:#3d3d3d url(images/masterpanel_bg.png) repeat-x 0 0;
     height:100px;
@@ -427,6 +440,8 @@ select {
 
 
 .wrapper {
+    position: absolute;
+    top: 139px;
     margin: 0 5px 0 5px;
     padding:10px 0 0 0;
 }
@@ -1182,10 +1197,10 @@ input[type="checkbox"] {
     left:0;
     margin-bottom:140px;
 }*/
-.sticky {
+/*.sticky {*/
-    padding:0;
+    /*padding:0;*/
-    width:100%;
+    /*width:100%;*/
-}
+/*}*/
 
 .floated-panel {
     margin-top:0;

airtime_mvc/public/js/airtime/common/common.js

@@ -1,11 +1,11 @@
 $(document).ready(function() {
 
-    $("#Panel").stickyPanel({
+    /* Removed as this is now (hopefully) unnecessary */
-	    topPadding: 1,
+    //$("#Panel").stickyPanel({
-	    afterDetachCSSClass: "floated-panel",
+    //    topPadding: 1,
-	    savePanelSpace: true
+    //    afterDetachCSSClass: "floated-panel",
-    });
+    //    savePanelSpace: true
-
+    //});
 
     //this statement tells the browser to fade out any success message after 5 seconds
     setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000);
@@ -52,8 +52,8 @@ var i18n_days_short = [
     $.i18n._("We"),
     $.i18n._("Th"),
     $.i18n._("Fr"),
-    $.i18n._("Sa"),
+    $.i18n._("Sa")
-]
+];
 
 function adjustDateToServerDate(date, serverTimezoneOffset){
     //date object stores time in the browser's localtime. We need to artificially shift