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

CC-3712 : Trial end date overlaps with Airtime Clock

Browse source
This commit is contained in:
Naomi Aro 2012-05-22 12:45:42 +02:00
parent 78fe946e57
commit 95003c3571
3 changed files with 4 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,8 +13,6 @@ class PlayoutHistoryController extends Zend_Controller_Action
public function indexAction()
{
global $CC_CONFIG;
$this->_helper->layout->setLayout('playouthistory');
$request = $this->getRequest();
$baseUrl = $request->getBaseUrl();

37
airtime_mvc/application/layouts/scripts/playouthistory.phtml
View file

@ -1,37 +0,0 @@
<?php echo $this->doctype() ?>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<?php echo $this->headTitle() ?>
<?php echo $this->headScript() ?>
<?php echo $this->headLink() ?>
<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
</head>
<body>
<div id="Panel">
<div class="logo"></div>
<?php echo $this->versionNotify();
$sss = $this->SourceSwitchStatus();
$scs = $this->SourceConnectionStatus();
?>
<?php echo $this->partial('partialviews/header.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining(),
"live_dj_switch"=>$sss['live_dj'], "live_dj_connection"=>$scs['live_dj'], "master_dj_switch"=>$sss['master_dj'], "master_dj_connection"=>$scs['master_dj'],
"scheduled_play_switch"=>$sss['scheduled_play'])) ?>
<?php $partial = array('menu.phtml', 'default');
$this->navigation()->menu()->setPartial($partial); ?>
<div class="personal-block solo">
<ul>
<li><span class="name"><?php echo $this->loggedInAs()?></span> | <a href="/Login/logout">Logout</a></li>
</ul>
</div>
<?php echo $this->navigation()->menu() ?>
</div>
<div class="wrapper">
<div id="history_content" class="ui-widget ui-widget-content block-shadow alpha-block padded"><?php echo $this->layout()->content ?></div>
</div>
</body>
</html>

6
airtime_mvc/application/views/scripts/playouthistory/index.phtml
View file

@ -1,2 +1,4 @@
<?php echo $this->date_form; ?>
<table id="history_table" cellpadding="0" cellspacing="0" class="datatable"></table>
<div id="history_content" class="ui-widget ui-widget-content block-shadow alpha-block padded">
<?php echo $this->date_form; ?>
<table id="history_table" cellpadding="0" cellspacing="0" class="datatable"></table>
</div>