Merge branch 'master' of dev.sourcefabric.org:campcaster
This commit is contained in:
mkonecny
commit
e28a1421c5
|
|
@ -35,12 +35,6 @@ class Application_Form_AddShowRepeats extends Zend_Form_SubForm
|
|||
),
|
||||
));
|
||||
|
||||
$checkboxes = $this->getElement('add_show_day_check');
|
||||
|
||||
$checkboxes->setDecorators(array(array('ViewScript', array(
|
||||
'viewScript' => 'form/add-show-checkbox.phtml'
|
||||
))));
|
||||
|
||||
// Add end date element
|
||||
$this->addElement('text', 'add_show_end_date', array(
|
||||
'label' => 'Date End:',
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
|
|||
$this->addElement('text', 'add_show_duration', array(
|
||||
'label' => 'Duration:',
|
||||
'class' => 'input_text',
|
||||
'value' => '1:00',
|
||||
'required' => true,
|
||||
'filters' => array('StringTrim'),
|
||||
'validators' => array(
|
||||
|
|
|
|||
|
|
@ -80,7 +80,10 @@ class Show {
|
|||
//only want the day of the week from the start date.
|
||||
if(!$data['add_show_repeats']) {
|
||||
$data['add_show_day_check'] = array($startDow);
|
||||
}
|
||||
}
|
||||
else if($data['add_show_repeats'] && $data['add_show_day_check'] == "") {
|
||||
$data['add_show_day_check'] = array($startDow);
|
||||
}
|
||||
|
||||
//find repeat type or set to a non repeating show.
|
||||
if($data['add_show_repeats']) {
|
||||
|
|
@ -89,7 +92,7 @@ class Show {
|
|||
else {
|
||||
$repeat_type = -1;
|
||||
}
|
||||
|
||||
|
||||
$show = new CcShow();
|
||||
$show->setDbName($data['add_show_name']);
|
||||
$show->setDbDescription($data['add_show_description']);
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
<dt id="<?php echo $this->element->getName() ?>-label" class="block-display">
|
||||
<?php echo $this->formLabel($this->element->getName(),
|
||||
$this->element->getLabel()) ?>
|
||||
</dt>
|
||||
<dd id="<?php echo $this->element->getName() ?>-element" class="block-display clearfix">
|
||||
<?php $i=0 ?>
|
||||
<?php foreach ($this->element->getMultiOptions() as $opt) : ?>
|
||||
<label class="wrapp-label" for="<?php echo $this->element->getName() ?>-<?php echo $i ?>">
|
||||
<input id="<?php echo $this->element->getName() ?>-<?php echo $i ?>" value="<?php echo $i ?>" type="checkbox" name="add_show_day_check[]"><?php echo $opt ?></input>
|
||||
</label>
|
||||
<?php $i=$i+1 ?>
|
||||
<?php endforeach; ?>
|
||||
<?php if($this->element->hasErrors()) { echo $this->formErrors($this->element->getMessages());} ?>
|
||||
</dd>
|
||||
|
|
@ -1,12 +1,24 @@
|
|||
<div id="show_content_dialog">
|
||||
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="datatable">
|
||||
<tr>
|
||||
<th>Start</th>
|
||||
<th>Title</th>
|
||||
<th>Creator</th>
|
||||
<th>Album</th>
|
||||
<th>Length</th>
|
||||
<th>Genre</th>
|
||||
</tr>
|
||||
<?php $i=0; ?>
|
||||
<?php foreach($this->showContent as $row): ?>
|
||||
<div>
|
||||
<span><?php echo $row["starts"] ?></span>
|
||||
<span><?php echo $row["track_title"] ?></span>
|
||||
<span><?php echo $row["artist_name"] ?></span>
|
||||
<span><?php echo $row["album_title"] ?></span>
|
||||
<span><?php echo $row["length"] ?></span>
|
||||
<span><?php echo $row["genre"] ?></span>
|
||||
</div>
|
||||
<tr class="<?php if($i&1){echo "even";}else{echo "odd";}?>">
|
||||
<td><?php echo $row["starts"] ?></td>
|
||||
<td><?php echo $row["track_title"] ?></td>
|
||||
<td><?php echo $row["artist_name"] ?></td>
|
||||
<td><?php echo $row["album_title"] ?></td>
|
||||
<td><?php echo $row["length"] ?></td>
|
||||
<td><?php echo $row["genre"] ?></td>
|
||||
</tr>
|
||||
<?php $i=$i+1; ?>
|
||||
<?php endforeach; ?>
|
||||
</table>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1301,11 +1301,15 @@ ul.errors li {
|
|||
background-color:#ff753c;
|
||||
}
|
||||
.playing-list {
|
||||
background-color:#b4e0f7;
|
||||
background-color:#b0dcf2;
|
||||
}
|
||||
.odd.playing-list {
|
||||
background-color:#bfe5f8;
|
||||
}
|
||||
.gap {
|
||||
background-color:#da5454;
|
||||
}
|
||||
/*---//////////////////// END NOW PLAYING COLORS ////////////////////---*/
|
||||
.icon-link, .ui-widget-content a.icon-link {
|
||||
color: #646464;
|
||||
position: relative;
|
||||
|
|
@ -1335,4 +1339,14 @@ ul.errors li {
|
|||
.button-bar .icon-link {
|
||||
float:left;
|
||||
margin:7px 0 0 1px;
|
||||
}
|
||||
|
||||
#show_content_dialog .datatable tr:first-child td {
|
||||
border-top:none;
|
||||
}
|
||||
|
||||
#show_content_dialog .datatable {
|
||||
margin-top:8px;
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -59,46 +59,54 @@ function findHosts(request, callback) {
|
|||
|
||||
function setAddShowEvents() {
|
||||
|
||||
$("h3").click(function(){
|
||||
var form = $("#add-show-form");
|
||||
|
||||
form.find("h3").click(function(){
|
||||
$(this).next().toggle();
|
||||
});
|
||||
|
||||
if(!$("#add_show_repeats").attr('checked')) {
|
||||
$("#schedule-show-when > fieldset:last").hide();
|
||||
if(!form.find("#add_show_repeats").attr('checked')) {
|
||||
form.find("#schedule-show-when > fieldset:last").hide();
|
||||
}
|
||||
|
||||
$("#add_show_repeats").click(function(){
|
||||
$("#schedule-show-when > fieldset:last").toggle();
|
||||
form.find("#add_show_repeats").click(function(){
|
||||
form.find("#schedule-show-when > fieldset:last").toggle();
|
||||
});
|
||||
|
||||
$("#add_show_repeat_type").change(function(){
|
||||
form.find("#add_show_repeat_type").change(function(){
|
||||
if($(this).val() == 2) {
|
||||
$("#add_show_day_check-label, #add_show_day_check-element").hide();
|
||||
form.find("#add_show_day_check-label, #add_show_day_check-element").hide();
|
||||
}
|
||||
else {
|
||||
$("#add_show_day_check-label, #add_show_day_check-element").show();
|
||||
form.find("#add_show_day_check-label, #add_show_day_check-element").show();
|
||||
}
|
||||
});
|
||||
|
||||
$("#add_show_no_end").click(function(){
|
||||
$("#add_show_end_date").toggle();
|
||||
form.find("#add_show_day_check-label").addClass("block-display");
|
||||
form.find("#add_show_day_check-element").addClass("block-display clearfix");
|
||||
form.find("#add_show_day_check-element label").addClass("wrapp-label");
|
||||
form.find("#add_show_day_check-element br").remove();
|
||||
|
||||
form.find("#add_show_no_end").click(function(){
|
||||
form.find("#add_show_end_date").toggle();
|
||||
});
|
||||
|
||||
createDateInput($("#add_show_start_date"), startDpSelect);
|
||||
createDateInput($("#add_show_end_date"), endDpSelect);
|
||||
createDateInput(form.find("#add_show_start_date"), startDpSelect);
|
||||
createDateInput(form.find("#add_show_end_date"), endDpSelect);
|
||||
|
||||
$("#add_show_start_time").timepicker();
|
||||
$("#add_show_duration").timepicker({
|
||||
amPmText: ['', '']
|
||||
form.find("#add_show_start_time").timepicker();
|
||||
form.find("#add_show_duration").timepicker({
|
||||
amPmText: ['', ''],
|
||||
defaultTime: '01:00'
|
||||
});
|
||||
|
||||
$("#add_show_hosts_autocomplete").autocomplete({
|
||||
form.find("#add_show_hosts_autocomplete").autocomplete({
|
||||
source: findHosts,
|
||||
select: autoSelect,
|
||||
delay: 200
|
||||
});
|
||||
|
||||
$("#schedule-show-style input").ColorPicker({
|
||||
form.find("#schedule-show-style input").ColorPicker({
|
||||
onChange: function (hsb, hex, rgb, el) {
|
||||
$(el).val(hex);
|
||||
},
|
||||
|
|
@ -112,7 +120,7 @@ function setAddShowEvents() {
|
|||
});
|
||||
|
||||
|
||||
$("#add-show-close")
|
||||
form.find("#add-show-close")
|
||||
.click(function(event){
|
||||
event.stopPropagation();
|
||||
event.preventDefault();
|
||||
|
|
@ -124,7 +132,7 @@ function setAddShowEvents() {
|
|||
$("#add-show-form").hide();
|
||||
});
|
||||
|
||||
$("#add-show-submit")
|
||||
form.find("#add-show-submit")
|
||||
.button()
|
||||
.click(function(event){
|
||||
event.preventDefault();
|
||||
|
|
|
|||
Loading…
Reference in New Issue