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

Merge branch 'saas-dev' into saas-showbuilder

Browse source 
Conflicts:
	airtime_mvc/public/css/styles.css
This commit is contained in:
Duncan Sommerville 2015-07-20 12:23:11 -04:00
commit ba90b1f1eb
27 changed files with 454 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

15
airtime_mvc/application/views/scripts/form/add-show-when.phtml
View file

@ -1,8 +1,18 @@
<fieldset>
<dl>
<dt id="add_show_start_now-label">
<label for="add_show_start_now">
<?php echo $this->element->getElement('add_show_start_now')->getLabel()?>
</label>
</dt>
<dd>
<?php echo $this->element->getElement('add_show_start_now') ?>
</dd>
<dt id="add_show_start_date-label">
<label for="add_show_start_date" class="required">
<?php echo $this->element->getElement('add_show_start_date')->getLabel()?>
<?php //echo $this->element->getElement('add_show_start_date')->getLabel()?>
</label>
</dt>
<dd>
@ -19,6 +29,9 @@
<?php endforeach; ?>
</ul>
<?php } ?>
<dt id="add_show_end_date_no_repeat-label">
<label for="add_show_end_date_no_repeat" class="required">
<?php echo $this->element->getElement('add_show_end_date_no_repeat')->getLabel()?>

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

@ -8,6 +8,7 @@
<table id="library_display" cellpadding="0" cellspacing="0" class="datatable"></table>
</div>
<div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">
<div id="builder-dialog-hint"><p><?php echo _("Drag files from the library on the left to add them to your show."); ?></p></div>
<table id="show_builder_table" cellpadding="0" cellspacing="0" class="datatable"></table>
</div>
</div>