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

Merge branch 'saas-dev' into soundcloud

Browse source
This commit is contained in:
Duncan Sommerville 2015-06-17 10:14:03 -04:00
commit 3a1d34dffe
10 changed files with 27 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
airtime_mvc/application/views/scripts/embed/weekly-program.phtml
View file

@ -4,8 +4,6 @@
<head>
<link rel="stylesheet" href="<?php echo $this->css?>" type="text/css">
<script src="<?php echo $this->jquery ?>" type="text/javascript"></script>
<script src="<?php echo $this->jquery_custom ?>" type="text/javascript"></script>
<script src="<?php echo $this->widget_js ?>" type="text/javascript"></script>
<link href='https://fonts.googleapis.com/css?family=Roboto:400,100,300,700' rel='stylesheet' type='text/css'>
<script type="text/javascript">
$(document).ready(function() {

2
airtime_mvc/application/views/scripts/error/error.phtml
View file

@ -8,7 +8,7 @@
</head>
<body>
<div class="error-content">
<h2><?php echo _("Page not found!")?></h2>
<h2><?php echo $this->escape($this->message)?></h2>
<p><?php echo _("Looks like the page you were looking for doesn't exist!")?></p>
<div class="button-bar">
<a class="toggle-button" href="<?php echo $this->baseUrl('dashboard/help'); ?>"><?php echo _("Help") ?></a>

9
airtime_mvc/application/views/scripts/index/index.phtml
View file

@ -4,10 +4,11 @@ var newheight;
var newwidth;
if(document.getElementById){
newheight=document.getElementById(id).contentWindow.document .body.scrollHeight;
newwidth=document.getElementById(id).contentWindow.document .body.scrollWidth;
newheight=document.getElementById(id).contentWindow.document.body.scrollHeight;
// Hack to get height in Firefox
if (newheight == 0) newheight = newheight = document.getElementById(id).contentWindow.document.documentElement.scrollHeight;
newwidth=document.getElementById(id).contentWindow.document.body.scrollWidth;
}
document.getElementById(id).height= (newheight) + "px";
document.getElementById(id).width= (newwidth) + "px";
}
@ -31,7 +32,6 @@ document.getElementById(id).width= (newwidth) + "px";
</div>
<div id="tab-1" class="schedule tab_content current">
<?php //echo $this->action('weekly-program','embed', 'default', array('style' => 'premium', 'useiframe' => '1')); ?>
<iframe onLoad="autoResize('schedule_iframe');" id="schedule_iframe" height="300px" scrolling="yes" frameborder="0" src=<?php echo $this->stationUrl."embed/weekly-program?style=premium"?>></iframe>
</div>
@ -68,6 +68,7 @@ document.getElementById(id).width= (newwidth) + "px";
$("#player_iframe").contents().find('.bottom_bar .button').removeClass('current');
$('.tab_content').removeClass('current');
window.scrollTo(0,0);
$(this).addClass('current');
$("#"+tab_id).addClass('current');
});