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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
airtime_mvc/application/models/Block.php
View file

@ -1297,6 +1297,9 @@ SQL;
$i++;
}
}
// check if file exists
$qry->add("file_exists", "true", Criteria::EQUAL);
$qry->addAscendingOrderByColumn('random()');
}
// construct limit restriction

4
airtime_mvc/application/models/StoredFile.php
View file

@ -776,9 +776,9 @@ SQL;
$row['image'] = '<img title="Playlist preview" src="/css/images/icon_playlist.png">';
} elseif ($type == "st") {
$row['audioFile'] = $row['id'];
$row['image'] = '<img title="Webstream preview" src="/css/images/record_icon.png">';
$row['image'] = '<img title="Webstream preview" src="/css/images/icon_webstream.png">';
} elseif ($type == "bl") {
$row['image'] = '<img title="Smart Block" src="/css/images/delete.png">';
$row['image'] = '<img title="Smart Block" src="/css/images/icon_smart-block.png">';
}
}

6
airtime_mvc/application/views/scripts/form/showbuilder.phtml
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;">

6
airtime_mvc/application/views/scripts/showbuilder/index.phtml
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>