diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index a7910dadf..c305efcfc 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -106,7 +106,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'); diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml index fc46df5c4..b11a22d5c 100644 --- a/airtime_mvc/application/layouts/scripts/layout.phtml +++ b/airtime_mvc/application/layouts/scripts/layout.phtml @@ -11,7 +11,7 @@ partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?> -
+
versionNotify(); $sss = $this->SourceSwitchStatus(); diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index 44e0db75b..16f0fc8fc 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -143,8 +143,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; @@ -152,7 +166,6 @@ select { left:0; } - #master-panel { background:#3d3d3d url(images/masterpanel_bg.png) repeat-x 0 0; height:100px; @@ -363,6 +376,8 @@ select { .wrapper { + position: absolute; + top: 139px; margin: 0 5px 0 5px; padding:10px 0 0 0; } @@ -1110,10 +1125,10 @@ input[type="checkbox"] { left:0; margin-bottom:140px; }*/ -.sticky { - padding:0; - width:100%; -} +/*.sticky {*/ + /*padding:0;*/ + /*width:100%;*/ +/*}*/ .floated-panel { margin-top:0; diff --git a/airtime_mvc/public/js/airtime/common/common.js b/airtime_mvc/public/js/airtime/common/common.js index 7a043c286..2a8ce9d04 100644 --- a/airtime_mvc/public/js/airtime/common/common.js +++ b/airtime_mvc/public/js/airtime/common/common.js @@ -1,11 +1,11 @@ $(document).ready(function() { - $("#Panel").stickyPanel({ - topPadding: 1, - afterDetachCSSClass: "floated-panel", - savePanelSpace: true - }); - + /* Removed as this is now (hopefully) unnecessary */ + //$("#Panel").stickyPanel({ + // topPadding: 1, + // 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