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

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

This commit is contained in:
mkonecny 2011-02-09 18:54:28 -05:00
parent 292996fc5b 8d311a7cc3
commit 5a3dbdb671
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/forms/AddShowRepeats.php
View File

@ -9,6 +9,7 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
$this->addElement('select', 'add_show_repeat_type', array( $this->addElement('select', 'add_show_repeat_type', array(
'required' => true, 'required' => true,
'label' => 'Repeat Type:', 'label' => 'Repeat Type:',
'class' => ' input_select',
'multiOptions' => array( 'multiOptions' => array(
"0" => "weekly", "0" => "weekly",
"1" => "bi-weekly", "1" => "bi-weekly",

6
public/js/airtime/schedule/full-calendar-functions.js
View File

@ -23,13 +23,15 @@ function dayClick(date, allDay, jsEvent, view) {
function viewDisplay( view ) { function viewDisplay( view ) {
$('.schedule_change_slots').remove(); var td = $('.schedule_change_slots').parent();
td.prev().remove();
td.remove();
if(view.name === 'agendaDay' || view.name === 'agendaWeek') { if(view.name === 'agendaDay' || view.name === 'agendaWeek') {
var calendarEl = this; var calendarEl = this;
var select = $('<select class="schedule_change_slots"/>') var select = $('<select class="schedule_change_slots input_select"/>')
.append('<option value="5">5 min</option>') .append('<option value="5">5 min</option>')
.append('<option value="10">10 min</option>') .append('<option value="10">10 min</option>')
.append('<option value="15">15 min</option>') .append('<option value="15">15 min</option>')