Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Martin Konecny 2012-09-19 17:22:13 -04:00
parent 5a8510b909 29347527cf
commit 9df90414fc
6 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
airtime_mvc/application/models/Datatables.php
View File

@ -100,7 +100,7 @@ class Application_Model_Datatables
*/
$params = array();
if ($data['advSearch'] === 'true') {
if (isset($data['advSearch']) && $data['advSearch'] === 'true') {
$advancedWhere = self::buildWhereClauseForAdvancedSearch($dbname2searchTerm);
if (!empty($advancedWhere['clause'])) {
$where[] = join(" AND ", $advancedWhere['clause']);

2
airtime_mvc/application/views/scripts/playlist/playlist.phtml
View File

@ -4,7 +4,7 @@ if (isset($this->obj)) {
$count = count($contents);
}
?>
<div class="btn-toolbar clearfix">
<div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left">
<button id="spl_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
New <span class="caret"></span>

2
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
View File

@ -4,7 +4,7 @@ if (isset($this->obj)) {
$count = count($contents);
}
?>
<div class="btn-toolbar clearfix">
<div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left">
<button id="spl_new" class="btn dropdown-toggle" data-toggle='dropdown' aria-disabled="false">
New <span class="caret"></span>

2
airtime_mvc/application/views/scripts/webstream/webstream.phtml
View File

@ -1,4 +1,4 @@
<div class="btn-toolbar clearfix">
<div class="btn-toolbar spl-no-top-margin clearfix">
<div class="btn-group pull-left">
<button id="ws_new" class="btn dropdown-toggle" data-toggle="dropdown" aria-disabled="false">
New <span class="caret"></span>

4
airtime_mvc/public/css/playlist_builder.css
View File

@ -56,6 +56,10 @@
}
.spl-no-top-margin {
margin-top: 0px !important;
}
.ui-icon-closethick {
margin-top: 7px;
}

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

@ -260,7 +260,9 @@ function eventRender(event, element, view) {
if (view.name === 'agendaDay' || view.name === 'agendaWeek') {
if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
if (event.soundcloud_id === -1) {
$(element).find(".fc-event-time").before('<span id="'+event.id+'" class="small-icon show-empty"></span>');
$(element)
.find(".fc-event-time")
.before('<span id="'+event.id+'" title="Show is empty" class="small-icon show-empty"></span>');
} else if (event.soundcloud_id > 0) {
} else if (event.soundcloud_id === -2) {
@ -272,7 +274,9 @@ function eventRender(event, element, view) {
} else if (view.name === 'month') {
if (event.show_empty === 1 && event.record === 0 && event.rebroadcast === 0) {
if (event.soundcloud_id === -1) {
$(element).find(".fc-event-title").after('<span id="'+event.id+'" class="small-icon show-empty"></span>');
$(element)
.find(".fc-event-title")
.after('<span id="'+event.id+'" title="Show is empty" class="small-icon show-empty"></span>');
} else if (event.soundcloud_id > 0) {
} else if (event.soundcloud_id === -2) {