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

CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.

Browse source 
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/public/js/airtime/library/library.js
This commit is contained in:
Daniel 2012-03-12 10:23:50 -04:00
commit d713f830cd
61 changed files with 5112 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/application/views/scripts/form/daterange.phtml Normal file
View file

@ -0,0 +1,7 @@
<div class="his-timerange">
<?php echo $this->element->getElement('his_date_start') ?>
<?php echo $this->element->getElement('his_time_start') ?>
<?php echo $this->element->getElement('his_date_end') ?>
<?php echo $this->element->getElement('his_time_end') ?>
<input type="button" id="his_submit" class="ui-button ui-state-default" value="GO"></input>
</div>

1
airtime_mvc/application/views/scripts/form/showbuilder.phtml
View file

@ -1,4 +1,5 @@
<div class="sb-timerange">
<?php echo $this->element->getElement('sb_timestamp') ?>
<?php echo $this->element->getElement('sb_date_start') ?>
<?php echo $this->element->getElement('sb_time_start') ?>
<?php echo $this->element->getElement('sb_date_end') ?>

2
airtime_mvc/application/views/scripts/playouthistory/index.phtml Normal file
View file

@ -0,0 +1,2 @@
<?php echo $this->date_form; ?>
<table id="history_table" cellpadding="0" cellspacing="0" class="datatable"></table>

1
airtime_mvc/application/views/scripts/showbuilder/index.phtml
View file

@ -0,0 +1 @@
<?php echo $this->dialog ?>