Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix for vertical scrollbar issue

Browse source
This commit is contained in:
Duncan Sommerville 2015-04-27 13:52:55 -04:00
parent 3d8a1cf9a6
commit 4b307d6b47
4 changed files with 31 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/Bootstrap.php
View file

@ -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/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/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/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'); $view->headScript()->appendFile($baseUrl.'js/sprintf/sprintf-0.7-beta1.js?'.$CC_CONFIG['airtime_version'],'text/javascript');

2
airtime_mvc/application/layouts/scripts/layout.phtml
View file

@ -11,7 +11,7 @@
<body> <body>
<?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?> <?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
<div id="Panel"> <div id="Panel" class="sticky">
<div class="logo"></div> <div class="logo"></div>
<?php echo $this->versionNotify(); <?php echo $this->versionNotify();
$sss = $this->SourceSwitchStatus(); $sss = $this->SourceSwitchStatus();

27
airtime_mvc/public/css/styles.css
View file

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

16
airtime_mvc/public/js/airtime/common/common.js
View file

@ -1,11 +1,11 @@
$(document).ready(function() { $(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 //this statement tells the browser to fade out any success message after 5 seconds
setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000); setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000);
@ -52,8 +52,8 @@ var i18n_days_short = [
$.i18n._("We"), $.i18n._("We"),
$.i18n._("Th"), $.i18n._("Th"),
$.i18n._("Fr"), $.i18n._("Fr"),
$.i18n._("Sa"), $.i18n._("Sa")
] ];
function adjustDateToServerDate(date, serverTimezoneOffset){ function adjustDateToServerDate(date, serverTimezoneOffset){
//date object stores time in the browser's localtime. We need to artificially shift //date object stores time in the browser's localtime. We need to artificially shift