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

This commit is contained in:
Martin Konecny 2012-09-14 14:43:15 -04:00
commit 6e239d08e9
19 changed files with 2389 additions and 1354 deletions

View file

@ -2,9 +2,9 @@
<?php echo $this->element->getElement('sb_time_start'); ?>
<?php echo $this->element->getElement('sb_date_end'); ?>
<?php echo $this->element->getElement('sb_time_end'); ?>
<div id="sb_submit" class="ui-button ui-state-default" title="Find Shows">
<span class="ui-icon ui-icon-search"></span>
</div>
<a id="sb_submit" class="btn btn-small" href="#" title="Find Shows">
<i class="icon-white icon-search"></i> Find Shows</a>
<div class="sb-advanced-options">
<fieldset class="padded display_field push-down-8 closed">
<legend style="cursor: pointer;">

View file

@ -11,9 +11,9 @@
<div id="show_builder" class="sb-content ui-widget ui-widget-content block-shadow omega-block padded">
<div class="sb-timerange">
<?php if(!$this->disableLib && !$this->showLib):?>
<div id="sb_edit" class="ui-button ui-state-default" title="open the library to schedule files.">
<span class="ui-icon ui-icon-arrowthick-1-nw"></span>
</div>
<a id="sb_edit" class="btn btn-small" href="#" title="open the library to schedule files.">
Schedule files
</a>
<?php endif; ?>
<?php echo $this->sb_form; ?>
</div>