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

Merge branch '2.5.x' into 2.5.x-saas

Browse source 
Conflicts:
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
This commit is contained in:
Naomi Aro 2013-12-17 17:20:38 -05:00
commit 49474ab5c4
214 changed files with 57623 additions and 61229 deletions
Download patch file Download diff file Expand all files Collapse all files

10
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
View file

@ -1,22 +1,22 @@
<div id="schedule-add-show" class="tabs ui-widget ui-widget-content block-shadow alpha-block padded">
<div class="button-bar">
<a href="#" id="add-show-close" class="icon-link add-show-close"><span class="ui-icon ui-icon-circle-close"></span><? echo _("Close") ?></a>
<a href="#" id="add-show-close" class="icon-link add-show-close"><span class="ui-icon ui-icon-circle-close"></span><?php echo _("Close") ?></a>
<button data-action="<?php echo isset($this->action) ? $this->action : "add-show" ?>" aria-disabled="false" role="button" class="add-show-submit right-floated ui-button ui-widget ui-state-default ui-button-text-icon-primary">
<span class="ui-icon ui-icon-plusthick"></span>
<span class="ui-button-text"><?php echo ($this->addNewShow ? _("Add this show") : _("Update show")); ?></span>
</button>
</div>
<div class="clear"></div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("What") ?></h3>
<h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("What") ?></h3>
<div id="schedule-show-what" class="collapsible-content">
<?php echo $this->what; ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("When") ?></h3>
<h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("When") ?></h3>
<div id="schedule-show-when" class="collapsible-content">
<?php echo $this->when; ?>
<?php echo $this->repeats; ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Live Stream Input") ?></h3>
<h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("Live Stream Input") ?></h3>
<div id="live-stream-override" class="collapsible-content">
<?php echo $this->live; ?>
</div>
@ -24,7 +24,7 @@
<div id="schedule-show-who" class="collapsible-content">
<?php echo $this->who; ?>
</div>
<h3 class="collapsible-header"><span class="arrow-icon"></span><? echo _("Style") ?></h3>
<h3 class="collapsible-header"><span class="arrow-icon"></span><?php echo _("Style") ?></h3>
<div id="schedule-show-style" class="collapsible-content">
<?php echo $this->style; ?>
</div>

20
airtime_mvc/application/views/scripts/schedule/index.phtml
View file

@ -1,7 +1,15 @@
<form id="add-show-form" method="post" action="" style="display:none;">
<?php if($this->preloadShowForm){
echo $this->render('schedule/add-show-form.phtml');
}?>
</form>
<div id='schedule_calendar' class="ui-widget-content block-shadow padded omega-block"></div>
<table id="schedule_block_table">
<tr>
<td>
<form id="add-show-form" method="post" action="" style="display:none;">
<?php if($this->preloadShowForm){
echo $this->render('schedule/add-show-form.phtml');
}?>
</form>
</td>
<td id="schedule_calendar_cell">
<div id='schedule_calendar' class="ui-widget-content block-shadow padded omega-block"></div>
</td>
</tr>
</table>

12
airtime_mvc/application/views/scripts/schedule/show-content-dialog.phtml
View file

@ -2,12 +2,12 @@
<div><?php echo $this->additionalShowInfo; ?></div>
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="datatable">
<tr>
<th><? echo _("Start") ?></th>
<th><? echo _("Title") ?></th>
<th><? echo _("Creator") ?></th>
<th><? echo _("Album") ?></th>
<th><? echo _("Length") ?></th>
<th><? echo _("Genre") ?></th>
<th><?php echo _("Start") ?></th>
<th><?php echo _("Title") ?></th>
<th><?php echo _("Creator") ?></th>
<th><?php echo _("Album") ?></th>
<th><?php echo _("Length") ?></th>
<th><?php echo _("Genre") ?></th>
</tr>
<?php $i=0; ?>
<?php foreach($this->showContent as $row): ?>