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

Merge branch 'master' of dev.sourcefabric.org:campcaster

Browse source 
Conflicts:
	.zfproject.xml
	application/configs/airtime-conf.php
	build/build.properties
	public/css/styles.css
This commit is contained in:
mkonecny 2011-02-09 13:07:36 -05:00
commit 50054befd6
18 changed files with 309 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

12
application/controllers/ScheduleController.php
View file

@ -306,7 +306,8 @@ class ScheduleController extends Zend_Controller_Action
$end = explode(" ", $end_timestamp);
$startTime = explode(":", $start[1]);
$endTime = explode(":", $end[1]);
$dateInfo = getDate(strtotime($start_timestamp));
$dateInfo_s = getDate(strtotime($start_timestamp));
$dateInfo_e = getDate(strtotime($end_timestamp));
$this->view->showContent = $show->getShowContent();
$this->view->timeFilled = $show->getTimeScheduled();
@ -314,9 +315,12 @@ class ScheduleController extends Zend_Controller_Action
$this->view->showLength = $show->getShowLength();
$this->view->percentFilled = $show->getPercentScheduledInRange();
$this->view->wday = $dateInfo['weekday'];
$this->view->month = $dateInfo['month'];
$this->view->day = $dateInfo['mday'];
$this->view->s_wday = $dateInfo_s['weekday'];
$this->view->s_month = $dateInfo_s['month'];
$this->view->s_day = $dateInfo_s['mday'];
$this->view->e_wday = $dateInfo_e['weekday'];
$this->view->e_month = $dateInfo_e['month'];
$this->view->e_day = $dateInfo_e['mday'];
$this->view->startTime = sprintf("%d:%02d", $startTime[0], $startTime[1]);
$this->view->endTime = sprintf("%d:%02d", $endTime[0], $endTime[1]);