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

CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window.

Browse source 
upgrading to jPlayer 2.5.0
This commit is contained in:
Naomi 2013-12-16 17:14:00 -05:00
parent 0afaeadb15
commit 424de61a11
13 changed files with 134 additions and 1951 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/controllers/DashboardController.php
View file

@ -97,7 +97,7 @@ class DashboardController extends Zend_Controller_Action
$baseUrl = Application_Common_OsPath::getBaseDir();
$this->view->headLink()->appendStylesheet($baseUrl.'js/jplayer/skin/jplayer.blue.monday.css?'.$CC_CONFIG['airtime_version']);
$this->_helper->layout->setLayout('bare');
$this->_helper->layout->setLayout('livestream');
$logo = Application_Model_Preference::GetStationLogo();
if ($logo) {

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

@ -2,7 +2,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title><?php echo _("Live stream") ?></title>
<title></title>
<?php echo $this->headLink() ?>
<?php echo $this->headScript() ?>
<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>

17
airtime_mvc/application/layouts/scripts/livestream.phtml Normal file
View file

@ -0,0 +1,17 @@
<?php echo $this->doctype() ?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
<META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
<META HTTP-EQUIV="Expires" CONTENT="-1">
<title><?php echo _("Live stream") ?></title>
<?php echo $this->headLink() ?>
<?php echo $this->headScript() ?>
<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
</head>
<body>
<div id="content"><?php echo $this->layout()->content ?></div>
</body>
</html>