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

SAAS-948 - Frontend tweaks and fixes

This commit is contained in:
Duncan Sommerville 2015-07-29 13:35:01 -04:00
parent fcbc37977f
commit 661a87dfbc
13 changed files with 806 additions and 711 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/application/controllers/ShowBuilderController.php
View File

@ -29,25 +29,25 @@ class ShowBuilderController extends Zend_Controller_Action {
$this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'css/datatables/css/ColVis.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/datatables/css/ColVis.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'css/datatables/css/ColReorder.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/datatables/css/ColReorder.css?'.$CC_CONFIG['airtime_version']);
$this->view->headScript()->appendFile($baseUrl.'js/airtime/library/library-test.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/_library.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/library/events/library_showbuilder_test.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/events/_library_showbuilder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
// PLUPLOAD // PLUPLOAD
$this->view->headScript()->appendFile($baseUrl.'js/libs/dropzone.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/libs/dropzone.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'css/dropzone/dropzone.min.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/dropzone/dropzone.min.css?'.$CC_CONFIG['airtime_version']);
$this->view->headScript()->appendFile($baseUrl.'js/timepicker/jquery.ui.timepicker.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/timepicker/jquery.ui.timepicker.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/showbuilder/builder_test.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/showbuilder/_builder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/showbuilder/main_builder_test.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/showbuilder/_main_builder.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
// MEDIA BUILDER // MEDIA BUILDER
$this->view->headScript()->appendFile($baseUrl.'js/airtime/library/spl-test.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/_spl.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $this->view->headScript()->appendFile($baseUrl.'js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'css/playlist_builder.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.ui.timepicker.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/jquery.ui.timepicker.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'css/showbuilder.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/showbuilder.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'css/showbuilder-test.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'css/_showbuilder.css?'.$CC_CONFIG['airtime_version']);
$csrf_namespace = new Zend_Session_Namespace('csrf_namespace'); $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
$csrf_element = new Zend_Form_Element_Hidden('csrf'); $csrf_element = new Zend_Form_Element_Hidden('csrf');
@ -68,7 +68,7 @@ class ShowBuilderController extends Zend_Controller_Action {
$end = DateTime::createFromFormat("U", $to, $utcTimezone); $end = DateTime::createFromFormat("U", $to, $utcTimezone);
$end->setTimezone($displayTimeZone); $end->setTimezone($displayTimeZone);
$form = new Application_Form_ShowBuilderTest(); $form = new Application_Form_ShowBuilderNew();
$form->populate(array( $form->populate(array(
'sb_date_start' => $start->format("Y-m-d"), 'sb_date_start' => $start->format("Y-m-d"),
'sb_time_start' => $start->format("H:i"), 'sb_time_start' => $start->format("H:i"),

6
airtime_mvc/application/forms/ShowBuilderTest.php → airtime_mvc/application/forms/ShowBuilderNew.php
View File

@ -1,6 +1,6 @@
<?php <?php
class Application_Form_ShowBuilderTest extends Zend_Form_SubForm class Application_Form_ShowBuilderNew extends Zend_Form_SubForm
{ {
public function init() public function init()
@ -69,7 +69,7 @@ class Application_Form_ShowBuilderTest extends Zend_Form_SubForm
// add a select to choose a show. // add a select to choose a show.
$showSelect = new Zend_Form_Element_Select("sb_show_filter"); $showSelect = new Zend_Form_Element_Select("sb_show_filter");
$showSelect->setLabel(_("Show:")); $showSelect->setLabel(_("Filter by Show"));
$showSelect->setMultiOptions($this->getShowNames()); $showSelect->setMultiOptions($this->getShowNames());
$showSelect->setValue(null); $showSelect->setValue(null);
$showSelect->setDecorators(array('ViewHelper')); $showSelect->setDecorators(array('ViewHelper'));
@ -85,7 +85,7 @@ class Application_Form_ShowBuilderTest extends Zend_Form_SubForm
private function getShowNames() private function getShowNames()
{ {
$showNames = array("0" => "-------------------------"); $showNames = array("0" => "Filter by Show");
$shows = CcShowQuery::create() $shows = CcShowQuery::create()
->setFormatter(ModelCriteria::FORMAT_ON_DEMAND) ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND)

22
airtime_mvc/application/views/scripts/form/show-builder.phtml
View File

@ -1,8 +1,16 @@
<?php echo $this->element->getElement('sb_date_start'); ?> <div class="sb-options-form">
<?php echo $this->element->getElement('sb_time_start'); ?> <?php echo $this->element->getElement('sb_date_start'); ?>
<?php echo $this->element->getElement('sb_date_end'); ?> <?php echo $this->element->getElement('sb_time_start'); ?>
<?php echo $this->element->getElement('sb_time_end'); ?> <?php echo $this->element->getElement('sb_date_end'); ?>
<?php echo $this->element->getElement('sb_time_end'); ?>
<a id="sb_submit" class="btn btn-small" href="#" title="Display shows in the specified date and time range">
<i class="icon-white icon-search"></i><?php echo " "._("Find Shows") ?>
</a>
<a id="sb_submit" class="btn btn-small" href="#" title="Display shows in the specified date and time range"> <?php echo $this->element->getElement('sb_show_filter') ?>
<i class="icon-white icon-search"></i><?php echo " "._("Find Shows") ?>
</a> <?php if ($this->element->getElement('sb_my_shows')):?>
<label><?php echo $this->element->getElement('sb_my_shows')->getLabel(); ?></label>
<?php echo $this->element->getElement('sb_my_shows'); ?>
<?php endif;?>
</div>

9
airtime_mvc/application/views/scripts/show-builder/index.phtml
View File

@ -10,11 +10,14 @@
.wrapper { .wrapper {
position: absolute; position: absolute;
background: #242424; background: #242424;
top: 138px;
left: 0; left: 0;
right: 0; right: 0;
/*padding: 0;*/ padding: 0 12em;
padding: 2em; height: calc(100% - 141px); /* Height of top panel + border */
}
.usability_hint {
margin-top: 1em;
} }
</style> </style>
<form action="/rest/media" method="post" id="upload_form" class="dropzone dz-clickable" <?php if ($this->quotaLimitReached) { ?> class="hidden" <?php } ?>> <form action="/rest/media" method="post" id="upload_form" class="dropzone dz-clickable" <?php if ($this->quotaLimitReached) { ?> class="hidden" <?php } ?>>

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

@ -21,7 +21,7 @@
<?php endif; ?> <?php endif; ?>
</div> </div>
<?php if (isset($this->obj)) : ?> <?php if (isset($this->obj)) : ?>\
<input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"/> <input id="obj_id" type="hidden" value="<?php echo $this->obj->getId(); ?>"/>
<input id="obj_lastMod" type="hidden" value="<?php echo "1";//$this->obj->getLastModified('U'); ?>"/> <input id="obj_lastMod" type="hidden" value="<?php echo "1";//$this->obj->getLastModified('U'); ?>"/>
<input id="obj_type" type="hidden" value="webstream"/> <input id="obj_type" type="hidden" value="webstream"/>

59
airtime_mvc/public/css/showbuilder-test.css → airtime_mvc/public/css/_showbuilder.css
View File

@ -1,7 +1,8 @@
/* Show Builder*/ /* Show Builder*/
@media screen and (max-width: 1175px) { @media screen and (max-width: 1475px) {
.lib-test, .sb-test, .media-builder-test, #media_type_nav { .lib-test, .sb-test, .media-builder-test, #media_type_nav {
height: auto !important;
width: 100% !important; width: 100% !important;
} }
.media-builder-test { .media-builder-test {
@ -28,6 +29,20 @@
width: calc(100% - 1em) !important; width: calc(100% - 1em) !important;
margin: 0 .5em .5em 0; margin: 0 .5em .5em 0;
} }
.wrapper {
padding: 1em !important;
}
}
@media screen and (max-width: 555px) {
#sb_show_filter {
float: none !important;
margin-top: 4px;
}
}
.btn {
color: #efefef;
} }
.lib-test .dataTables_filter { .lib-test .dataTables_filter {
@ -36,7 +51,7 @@
.lib-test .dataTables_filter input[type="text"], .lib-test .dataTables_filter select { .lib-test .dataTables_filter input[type="text"], .lib-test .dataTables_filter select {
margin-top: .5em; margin-top: .5em;
width: 30%; width: 20%;
float: right; float: right;
height: 26px; height: 26px;
} }
@ -63,26 +78,56 @@
overflow: hidden !important; overflow: hidden !important;
} }
.lib-test .dataTables_scrolling {
/* Subtract Advanced search (32) + header (38) + footer (38) */
height: calc(100% - 108px);
}
#library_display_wrapper, #show_builder_table_wrapper {
background-color: #474747;
}
.lib-test, .sb-test, .media-builder-test { .lib-test, .sb-test, .media-builder-test {
height: 70%;
/* 1em for the middle margin, 6 for half the width of the left pane */ /* 1em for the middle margin, 6 for half the width of the left pane */
width: calc(50% - 8em); width: calc(50% - 8em);
min-width: 470px; min-width: 470px;
} }
#library_display_wrapper, #show_builder_table_wrapper {
height: 100%;
}
/* Timeline */ /* Timeline */
.sb-test { .sb-test {
margin-top: 1.5em; margin-top: 2em;
} }
#sb_submit { #sb_submit {
text-decoration: none; text-decoration: none;
padding: .35em; padding: .35em;
color: #efefef; color: #efefef;
float: none;
} }
.sb-timerange { .sb-options-form {
margin-bottom: 5px; width: 100%;
float: left;
padding-bottom: 5px;
}
.sb-options-form label {
color: #efefef;
line-height: 26px;
}
#sb_show_filter {
float: right;
}
#show_builder_table_wrapper {
clear: both;
} }
/* Media builder */ /* Media builder */
@ -102,7 +147,7 @@
#media_type_nav { #media_type_nav {
float: left; float: left;
margin: 2em 0 0 0; margin: 5.2em 0 0 0;
width: 12em; width: 12em;
@ -159,4 +204,6 @@
font-size: 20px; font-size: 20px;
font-weight: 300; font-weight: 300;
line-height: 1.4rem; line-height: 1.4rem;
margin-top: 1em;
} }

2
airtime_mvc/public/css/media_library.css
View File

@ -166,7 +166,7 @@ td.library_bitrate {
} }
.lib-content fieldset.closed { .lib-content fieldset.closed {
border-width: 1px 0 0; border-width: 1px 0 0;
margin-bottom: -6px; margin-bottom: 0;
margin-left: 1px; margin-left: 1px;
} }
.dataTables_filter input[type="text"], .dataTables_filter select { .dataTables_filter input[type="text"], .dataTables_filter select {

2
airtime_mvc/public/css/styles.css
View File

@ -550,7 +550,7 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_t
border: 1px solid #5b5b5b; border: 1px solid #5b5b5b;
font-family: Arial,Helvetica,sans-serif; font-family: Arial,Helvetica,sans-serif;
font-size: 12px; font-size: 12px;
height: 25px; height: 26px;
margin: 0; margin: 0;
padding: 2px 2px 2px 0; padding: 2px 2px 2px 0;
vertical-align: top; vertical-align: top;

169
airtime_mvc/public/js/airtime/library/library-test.js → airtime_mvc/public/js/airtime/library/_library.js
View File

@ -112,17 +112,17 @@ var AIRTIME = (function(AIRTIME) {
$button.text(btnText); $button.text(btnText);
}; };
mod.createToolbarButtons = function() { mod.createToolbarButtons = function () {
$menu = $("<div class='btn-toolbar' />"); $menu = $("<div class='btn-toolbar' />");
$menu $menu
.append("<div class='btn-group'>" + .append("<div class='btn-group'>" +
"<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" + "<button class='btn btn-small dropdown-toggle' data-toggle='dropdown'>" +
$.i18n._("Select")+" <span class='caret'></span>" + $.i18n._("Select") + " <span class='caret'></span>" +
"</button>" + "</button>" +
"<ul class='dropdown-menu'>" + "<ul class='dropdown-menu'>" +
"<li id='sb-select-page'><a href='#'>"+$.i18n._("Select this page")+"</a></li>" + "<li id='sb-select-page'><a href='#'>" + $.i18n._("Select this page") + "</a></li>" +
"<li id='sb-dselect-page'><a href='#'>"+$.i18n._("Deselect this page")+"</a></li>" + "<li id='sb-dselect-page'><a href='#'>" + $.i18n._("Deselect this page") + "</a></li>" +
"<li id='sb-dselect-all'><a href='#'>"+$.i18n._("Deselect all")+"</a></li>" + "<li id='sb-dselect-all'><a href='#'>" + $.i18n._("Deselect all") + "</a></li>" +
"</ul>" + "</ul>" +
"</div>") "</div>")
.append("<div class='btn-group'>" + .append("<div class='btn-group'>" +
@ -334,6 +334,7 @@ var AIRTIME = (function(AIRTIME) {
mod.selectNone = function() { mod.selectNone = function() {
var $trs = $libTable.find("tr"); var $trs = $libTable.find("tr");
$trs.removeClass(LIB_SELECTED_CLASS); $trs.removeClass(LIB_SELECTED_CLASS);
$previouslySelected = undefined;
chosenItems = {}; chosenItems = {};
@ -376,7 +377,7 @@ var AIRTIME = (function(AIRTIME) {
if (temp !== null && temp.hasOwnProperty('id') ) { if (temp !== null && temp.hasOwnProperty('id') ) {
aMedia.push({"id": temp.id, "type": temp.ftype}); aMedia.push({"id": temp.id, "type": temp.ftype});
if ( (temp.id == currentObjId && temp.ftype === currentObjType) || if ( (temp.id == currentObjId && temp.ftype === currentObjType) ||
temp.id == currentObjId && temp.ftype === "stream" && currentObjType === "webstream") { temp.id == currentObjId && temp.ftype === "stream" && currentObjType === "webstream") {
closeObj = true; closeObj = true;
} }
} }
@ -424,7 +425,7 @@ var AIRTIME = (function(AIRTIME) {
$libTable = $libContent.find("table"); $libTable = $libContent.find("table");
function getTableHeight() { function getTableHeight() {
return $libContent.height() - 175; return $libContent.height() - 175;
} }
function setColumnFilter(oTable){ function setColumnFilter(oTable){
@ -448,14 +449,14 @@ var AIRTIME = (function(AIRTIME) {
if (ele.bVisible) { if (ele.bVisible) {
advanceSearchDiv.append( advanceSearchDiv.append(
"<div id='advanced_search_col_"+currentColId+"' class='control-group'>" + "<div id='advanced_search_col_"+currentColId+"' class='control-group'>" +
"<label class='control-label'"+labelStyle+">"+ele.sTitle+" : </label>" + "<label class='control-label'"+labelStyle+">"+ele.sTitle+" : </label>" +
"<div id='"+ele.mDataProp+"' class='controls "+inputClass+"'></div>" + "<div id='"+ele.mDataProp+"' class='controls "+inputClass+"'></div>" +
"</div>"); "</div>");
} else { } else {
advanceSearchDiv.append( advanceSearchDiv.append(
"<div id='advanced_search_col_"+currentColId+"' class='control-group' style='display:none;'>" + "<div id='advanced_search_col_"+currentColId+"' class='control-group' style='display:none;'>" +
"<label class='control-label'"+labelStyle+">"+ele.sTitle+"</label>" + "<label class='control-label'"+labelStyle+">"+ele.sTitle+"</label>" +
"<div id='"+ele.mDataProp+"' class='controls "+inputClass+"'></div>" + "<div id='"+ele.mDataProp+"' class='controls "+inputClass+"'></div>" +
"</div>"); "</div>");
} }
@ -471,9 +472,9 @@ var AIRTIME = (function(AIRTIME) {
}); });
oTable.columnFilter({ oTable.columnFilter({
aoColumns: colsForAdvancedSearch, aoColumns: colsForAdvancedSearch,
bUseColVis: true, bUseColVis: true,
sPlaceHolder: "head:before" sPlaceHolder: "head:before"
} }
); );
} }
@ -491,8 +492,8 @@ var AIRTIME = (function(AIRTIME) {
//resize to prevent double scroll bars. //resize to prevent double scroll bars.
var $fs = $el.parents("fieldset"), var $fs = $el.parents("fieldset"),
tableHeight = getTableHeight(), tableHeight = getTableHeight(),
searchHeight = $fs.height(); searchHeight = $fs.height();
$libContent.find(".dataTables_scrolling").css("max-height", tableHeight - searchHeight); $libContent.find(".dataTables_scrolling").css("max-height", tableHeight - searchHeight);
} }
@ -505,43 +506,43 @@ var AIRTIME = (function(AIRTIME) {
//IMPORTANT: WHEN ADDING A NEW COLUMN PLEASE CONSULT WITH THE WIKI //IMPORTANT: WHEN ADDING A NEW COLUMN PLEASE CONSULT WITH THE WIKI
// https://wiki.sourcefabric.org/display/CC/Adding+a+new+library+datatable+column // https://wiki.sourcefabric.org/display/CC/Adding+a+new+library+datatable+column
"aoColumns": [ "aoColumns": [
/* ftype */ { "sTitle" : "" , "mDataProp" : "ftype" , "bSearchable" : false , "bVisible" : false } , /* ftype */ { "sTitle" : "" , "mDataProp" : "ftype" , "bSearchable" : false , "bVisible" : false } ,
/* Type */ { "sTitle" : "" , "mDataProp" : "image" , "bSearchable" : false , "sWidth" : "16px" , "sClass" : "library_type" , "iDataSort" : 0 } , /* Type */ { "sTitle" : "" , "mDataProp" : "image" , "bSearchable" : false , "sWidth" : "16px" , "sClass" : "library_type" , "iDataSort" : 0 } ,
///* Is Scheduled */ { "sTitle" : $.i18n._("Scheduled") , "mDataProp" : "is_scheduled" , "bVisible" : false , "bSearchable" : false , "sWidth" : "90px" , "sClass" : "library_is_scheduled"} , ///* Is Scheduled */ { "sTitle" : $.i18n._("Scheduled") , "mDataProp" : "is_scheduled" , "bVisible" : false , "bSearchable" : false , "sWidth" : "90px" , "sClass" : "library_is_scheduled"} ,
/* Is Playlist */ { "sTitle" : $.i18n._("Playlist / Block") , "mDataProp" : "is_playlist" , "bSearchable" : false , "sWidth" : "110px" , "sClass" : "library_is_playlist"} , /* Is Playlist */ { "sTitle" : $.i18n._("Playlist / Block") , "mDataProp" : "is_playlist" , "bSearchable" : false , "sWidth" : "110px" , "sClass" : "library_is_playlist"} ,
/* Title */ { "sTitle" : $.i18n._("Title") , "mDataProp" : "track_title" , "sClass" : "library_title" , "sWidth" : "170px" } , /* Title */ { "sTitle" : $.i18n._("Title") , "mDataProp" : "track_title" , "sClass" : "library_title" , "sWidth" : "170px" } ,
/* Creator */ { "sTitle" : $.i18n._("Creator") , "mDataProp" : "artist_name" , "sClass" : "library_creator" , "sWidth" : "160px" } , /* Creator */ { "sTitle" : $.i18n._("Creator") , "mDataProp" : "artist_name" , "sClass" : "library_creator" , "sWidth" : "160px" } ,
/* Album */ { "sTitle" : $.i18n._("Album") , "mDataProp" : "album_title" , "sClass" : "library_album" , "sWidth" : "150px" } , /* Album */ { "sTitle" : $.i18n._("Album") , "mDataProp" : "album_title" , "sClass" : "library_album" , "sWidth" : "150px" } ,
/* Bit Rate */ { "sTitle" : $.i18n._("Bit Rate") , "mDataProp" : "bit_rate" , "bVisible" : false , "sClass" : "library_bitrate" , "sWidth" : "80px" }, /* Bit Rate */ { "sTitle" : $.i18n._("Bit Rate") , "mDataProp" : "bit_rate" , "bVisible" : false , "sClass" : "library_bitrate" , "sWidth" : "80px" },
/* BPM */ { "sTitle" : $.i18n._("BPM") , "mDataProp" : "bpm" , "bVisible" : false , "sClass" : "library_bpm" , "sWidth" : "50px" }, /* BPM */ { "sTitle" : $.i18n._("BPM") , "mDataProp" : "bpm" , "bVisible" : false , "sClass" : "library_bpm" , "sWidth" : "50px" },
/* Composer */ { "sTitle" : $.i18n._("Composer") , "mDataProp" : "composer" , "bVisible" : false , "sClass" : "library_composer" , "sWidth" : "150px" }, /* Composer */ { "sTitle" : $.i18n._("Composer") , "mDataProp" : "composer" , "bVisible" : false , "sClass" : "library_composer" , "sWidth" : "150px" },
/* Conductor */ { "sTitle" : $.i18n._("Conductor") , "mDataProp" : "conductor" , "bVisible" : false , "sClass" : "library_conductor" , "sWidth" : "125px" }, /* Conductor */ { "sTitle" : $.i18n._("Conductor") , "mDataProp" : "conductor" , "bVisible" : false , "sClass" : "library_conductor" , "sWidth" : "125px" },
/* Copyright */ { "sTitle" : $.i18n._("Copyright") , "mDataProp" : "copyright" , "bVisible" : false , "sClass" : "library_copyright" , "sWidth" : "125px" }, /* Copyright */ { "sTitle" : $.i18n._("Copyright") , "mDataProp" : "copyright" , "bVisible" : false , "sClass" : "library_copyright" , "sWidth" : "125px" },
/* Cue In */ { "sTitle" : $.i18n._("Cue In") , "mDataProp" : "cuein" , "bVisible" : false , "sClass" : "library_length" , "sWidth" : "80px" }, /* Cue In */ { "sTitle" : $.i18n._("Cue In") , "mDataProp" : "cuein" , "bVisible" : false , "sClass" : "library_length" , "sWidth" : "80px" },
/* Cue Out */ { "sTitle" : $.i18n._("Cue Out") , "mDataProp" : "cueout" , "bVisible" : false , "sClass" : "library_length" , "sWidth" : "80px" }, /* Cue Out */ { "sTitle" : $.i18n._("Cue Out") , "mDataProp" : "cueout" , "bVisible" : false , "sClass" : "library_length" , "sWidth" : "80px" },
/* Encoded */ { "sTitle" : $.i18n._("Encoded By") , "mDataProp" : "encoded_by" , "bVisible" : false , "sClass" : "library_encoded" , "sWidth" : "150px" }, /* Encoded */ { "sTitle" : $.i18n._("Encoded By") , "mDataProp" : "encoded_by" , "bVisible" : false , "sClass" : "library_encoded" , "sWidth" : "150px" },
/* Genre */ { "sTitle" : $.i18n._("Genre") , "mDataProp" : "genre" , "bVisible" : false , "sClass" : "library_genre" , "sWidth" : "100px" }, /* Genre */ { "sTitle" : $.i18n._("Genre") , "mDataProp" : "genre" , "bVisible" : false , "sClass" : "library_genre" , "sWidth" : "100px" },
/* ISRC Number */ { "sTitle" : $.i18n._("ISRC") , "mDataProp" : "isrc_number" , "bVisible" : false , "sClass" : "library_isrc" , "sWidth" : "150px" }, /* ISRC Number */ { "sTitle" : $.i18n._("ISRC") , "mDataProp" : "isrc_number" , "bVisible" : false , "sClass" : "library_isrc" , "sWidth" : "150px" },
/* Label */ { "sTitle" : $.i18n._("Label") , "mDataProp" : "label" , "bVisible" : false , "sClass" : "library_label" , "sWidth" : "125px" }, /* Label */ { "sTitle" : $.i18n._("Label") , "mDataProp" : "label" , "bVisible" : false , "sClass" : "library_label" , "sWidth" : "125px" },
/* Language */ { "sTitle" : $.i18n._("Language") , "mDataProp" : "language" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" }, /* Language */ { "sTitle" : $.i18n._("Language") , "mDataProp" : "language" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" },
/* Last Modified */ { "sTitle" : $.i18n._("Last Modified") , "mDataProp" : "mtime" , "bVisible" : false , "sClass" : "library_modified_time" , "sWidth" : "125px" }, /* Last Modified */ { "sTitle" : $.i18n._("Last Modified") , "mDataProp" : "mtime" , "bVisible" : false , "sClass" : "library_modified_time" , "sWidth" : "125px" },
/* Last Played */ { "sTitle" : $.i18n._("Last Played") , "mDataProp" : "lptime" , "bVisible" : false , "sClass" : "library_modified_time" , "sWidth" : "125px" }, /* Last Played */ { "sTitle" : $.i18n._("Last Played") , "mDataProp" : "lptime" , "bVisible" : false , "sClass" : "library_modified_time" , "sWidth" : "125px" },
/* Length */ { "sTitle" : $.i18n._("Length") , "mDataProp" : "length" , "sClass" : "library_length" , "sWidth" : "80px" } , /* Length */ { "sTitle" : $.i18n._("Length") , "mDataProp" : "length" , "sClass" : "library_length" , "sWidth" : "80px" } ,
/* Mime */ { "sTitle" : $.i18n._("Mime") , "mDataProp" : "mime" , "bVisible" : false , "sClass" : "library_mime" , "sWidth" : "80px" }, /* Mime */ { "sTitle" : $.i18n._("Mime") , "mDataProp" : "mime" , "bVisible" : false , "sClass" : "library_mime" , "sWidth" : "80px" },
/* Mood */ { "sTitle" : $.i18n._("Mood") , "mDataProp" : "mood" , "bVisible" : false , "sClass" : "library_mood" , "sWidth" : "70px" }, /* Mood */ { "sTitle" : $.i18n._("Mood") , "mDataProp" : "mood" , "bVisible" : false , "sClass" : "library_mood" , "sWidth" : "70px" },
/* Owner */ { "sTitle" : $.i18n._("Owner") , "mDataProp" : "owner_id" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" }, /* Owner */ { "sTitle" : $.i18n._("Owner") , "mDataProp" : "owner_id" , "bVisible" : false , "sClass" : "library_language" , "sWidth" : "125px" },
/* Replay Gain */ { "sTitle" : $.i18n._("Replay Gain") , "mDataProp" : "replay_gain" , "bVisible" : false , "sClass" : "library_replay_gain" , "sWidth" : "80px" }, /* Replay Gain */ { "sTitle" : $.i18n._("Replay Gain") , "mDataProp" : "replay_gain" , "bVisible" : false , "sClass" : "library_replay_gain" , "sWidth" : "80px" },
/* Sample Rate */ { "sTitle" : $.i18n._("Sample Rate") , "mDataProp" : "sample_rate" , "bVisible" : false , "sClass" : "library_sr" , "sWidth" : "80px" }, /* Sample Rate */ { "sTitle" : $.i18n._("Sample Rate") , "mDataProp" : "sample_rate" , "bVisible" : false , "sClass" : "library_sr" , "sWidth" : "80px" },
/* Track Number */ { "sTitle" : $.i18n._("Track Number") , "mDataProp" : "track_number" , "bVisible" : false , "sClass" : "library_track" , "sWidth" : "65px" }, /* Track Number */ { "sTitle" : $.i18n._("Track Number") , "mDataProp" : "track_number" , "bVisible" : false , "sClass" : "library_track" , "sWidth" : "65px" },
/* Upload Time */ { "sTitle" : $.i18n._("Uploaded") , "mDataProp" : "utime" , "bVisible" : false , "sClass" : "library_upload_time" , "sWidth" : "125px" } , /* Upload Time */ { "sTitle" : $.i18n._("Uploaded") , "mDataProp" : "utime" , "bVisible" : false , "sClass" : "library_upload_time" , "sWidth" : "125px" } ,
/* Website */ { "sTitle" : $.i18n._("Website") , "mDataProp" : "info_url" , "bVisible" : false , "sClass" : "library_url" , "sWidth" : "150px" }, /* Website */ { "sTitle" : $.i18n._("Website") , "mDataProp" : "info_url" , "bVisible" : false , "sClass" : "library_url" , "sWidth" : "150px" },
/* Year */ { "sTitle" : $.i18n._("Year") , "mDataProp" : "year" , "bVisible" : false , "sClass" : "library_year" , "sWidth" : "60px" } /* Year */ { "sTitle" : $.i18n._("Year") , "mDataProp" : "year" , "bVisible" : false , "sClass" : "library_year" , "sWidth" : "60px" }
], ],
"bProcessing": true, "bProcessing": true,
"bServerSide": true, "bServerSide": true,
"aLengthMenu": [[5, 10, 15, 20, 25, 50, 100], [5, 10, 15, 20, 25, 50, 100]], "aLengthMenu": [5, 10, 15, 20, 25, 50, 100],
"bStateSave": true, "bStateSave": true,
"fnStateSaveParams": function (oSettings, oData) { "fnStateSaveParams": function (oSettings, oData) {
@ -552,13 +553,13 @@ var AIRTIME = (function(AIRTIME) {
"fnStateSave": function (oSettings, oData) { "fnStateSave": function (oSettings, oData) {
localStorage.setItem('datatables-library', JSON.stringify(oData)); localStorage.setItem('datatables-library', JSON.stringify(oData));
/* /*
$.ajax({ $.ajax({
url: baseUrl+"usersettings/set-library-datatable", url: baseUrl+"usersettings/set-library-datatable",
type: "POST", type: "POST",
data: {settings : oData, format: "json"}, data: {settings : oData, format: "json"},
dataType: "json" dataType: "json"
}); });
*/ */
colReorderMap = oData.ColReorder; colReorderMap = oData.ColReorder;
}, },
@ -623,6 +624,8 @@ var AIRTIME = (function(AIRTIME) {
type = (type === undefined) ? 1 : type; type = (type === undefined) ? 1 : type;
aoData.push( { name: "type", value: type} ); aoData.push( { name: "type", value: type} );
getUsabilityHint();
$.ajax( { $.ajax( {
"dataType": 'json', "dataType": 'json',
"type": "POST", "type": "POST",
@ -673,7 +676,7 @@ var AIRTIME = (function(AIRTIME) {
return false; return false;
}); });
}, },
// remove any selected nodes before the draw. // remove any selected nodes before the draw.
"fnPreDrawCallback": function( oSettings ) { "fnPreDrawCallback": function( oSettings ) {
// make sure any dragging helpers are removed or else they'll be // make sure any dragging helpers are removed or else they'll be
@ -696,12 +699,14 @@ var AIRTIME = (function(AIRTIME) {
"aiExclude": [0, 1, 2], "aiExclude": [0, 1, 2],
"sSize": "css", "sSize": "css",
"fnStateChange": setFilterElement, "fnStateChange": setFilterElement,
"buttonText": $.i18n._("Show / hide columns") "buttonText": $.i18n._("Columns")
}, },
"oColReorder": { "oColReorder": {
"iFixedColumns": 3 "iFixedColumns": 3
} },
"bScrollCollapse": false
}); });
@ -713,9 +718,9 @@ var AIRTIME = (function(AIRTIME) {
$libContent.on("click", "legend", function(){ $libContent.on("click", "legend", function(){
$simpleSearch = $libContent.find("#library_display_filter label"); $simpleSearch = $libContent.find("#library_display_filter label");
var $fs = $(this).parents("fieldset"), var $fs = $(this).parents("fieldset"),
searchHeight, searchHeight,
tableHeight = getTableHeight(), tableHeight = getTableHeight(),
height; height;
if ($fs.hasClass("closed")) { if ($fs.hasClass("closed")) {
$fs.removeClass("closed"); $fs.removeClass("closed");
@ -754,7 +759,7 @@ var AIRTIME = (function(AIRTIME) {
$simpleSearch.removeClass("sp-invisible"); $simpleSearch.removeClass("sp-invisible");
$fs.addClass("closed"); $fs.addClass("closed");
//resize the library table to avoid a double scroll bar. CC-4504 //resize the library table to avoid a double scroll bar. CC-4504
$libContent.find(".dataTables_scrolling").css("max-height", tableHeight); $libContent.find(".dataTables_scrolling").css("max-height", tableHeight);
} }
}); });
@ -770,7 +775,7 @@ var AIRTIME = (function(AIRTIME) {
AIRTIME.library.dblClickAdd(data, data.ftype); AIRTIME.library.dblClickAdd(data, data.ftype);
}); });
$libTable.find("tbody").on("click", "tr", function(ev) { $libTable.find("tbody").on("mousedown", "tr", function(ev) {
var $tr = $(this), var $tr = $(this),
// Get the ID of the selected row // Get the ID of the selected row
$rowId = $tr.attr("id"); $rowId = $tr.attr("id");
@ -793,19 +798,31 @@ var AIRTIME = (function(AIRTIME) {
} }
mod.selectItem($tr); mod.selectItem($tr);
} else if (ev.ctrlKey && $previouslySelected !== undefined) { } else if (ev.ctrlKey) {
mod.selectItem($tr); mod.selectItem($tr);
} else { } else {
$("."+LIB_SELECTED_CLASS).each(function(i, el) { if (!$tr.hasClass(LIB_SELECTED_CLASS)) {
mod.deselectItem($(el)) $("." + LIB_SELECTED_CLASS).each(function (i, el) {
}); mod.deselectItem($(el))
});
}
mod.selectItem($tr); mod.selectItem($tr);
} }
// Remember this row so we can properly multiselect // Remember this row so we can properly multiselect
$previouslySelected = $tr; $previouslySelected = $tr;
}); });
$libTable.find("tbody").on("click", "tr", function(ev) {
if (!ev.ctrlKey && !ev.shiftKey) {
$("." + LIB_SELECTED_CLASS).each(function (i, el) {
mod.deselectItem($(el))
});
mod.selectItem($(this));
}
});
}; };
mod.libraryInit = libraryInit; mod.libraryInit = libraryInit;
return AIRTIME; return AIRTIME;
@ -886,16 +903,16 @@ function validateAdvancedSearch(divs) {
addRemoveValidationIcons(valid, $(field), searchTermType); addRemoveValidationIcons(valid, $(field), searchTermType);
/* /*
* Empty fields should not have valid/invalid indicator Range values * Empty fields should not have valid/invalid indicator Range values
* are considered valid even if only the 'From' value is provided. * are considered valid even if only the 'From' value is provided.
* Therefore, if the 'To' value is empty but the 'From' value is not * Therefore, if the 'To' value is empty but the 'From' value is not
* empty we need to keep the validation icon on screen. * empty we need to keep the validation icon on screen.
*/ */
} else if (searchTerm[0] === "" && searchTerm[1] !== "" || } else if (searchTerm[0] === "" && searchTerm[1] !== "" ||
searchTerm[0] === "" && searchTerm[1] === ""){ searchTerm[0] === "" && searchTerm[1] === ""){
if ($(field).closest('div').children(':last-child').hasClass('checked-icon') || if ($(field).closest('div').children(':last-child').hasClass('checked-icon') ||
$(field).closest('div').children(':last-child').hasClass('not-available-icon')) { $(field).closest('div').children(':last-child').hasClass('not-available-icon')) {
$(field).closest('div').children(':last-child').remove(); $(field).closest('div').children(':last-child').remove();
} }
} }

8
airtime_mvc/public/js/airtime/library/spl-test.js → airtime_mvc/public/js/airtime/library/_spl.js
View File

@ -836,6 +836,14 @@ var AIRTIME = (function(AIRTIME){
// We also need to run the draw callback to update how dragged items are drawn // We also need to run the draw callback to update how dragged items are drawn
AIRTIME.library.fnDrawCallback(); AIRTIME.library.fnDrawCallback();
var name = $('#playlist_name_display').text().trim();
if ((name == "Untitled Playlist"
|| name == "Untitled Smart Block")
&& $("#spl_sortable .spl_empty").length == 1) {
mod.fnDelete();
}
$.ajax( { $.ajax( {
url : baseUrl+"usersettings/set-library-screen-settings", url : baseUrl+"usersettings/set-library-screen-settings",
type : "POST", type : "POST",

3
airtime_mvc/public/js/airtime/library/events/library_showbuilder_test.js → airtime_mvc/public/js/airtime/library/events/_library_showbuilder.js
View File

@ -228,7 +228,7 @@ var AIRTIME = (function(AIRTIME) {
$toolbar.append($menu); $toolbar.append($menu);
// add to timeline button // add to timeline button
$toolbar $toolbar
.find('.icon-plus').parent() .find('#library-plus')
.click( .click(
function() { function() {
@ -286,7 +286,6 @@ var AIRTIME = (function(AIRTIME) {
} }
var selection = $(".media_type_selector.selected").attr("selection_id"); var selection = $(".media_type_selector.selected").attr("selection_id");
console.log(selection);
if (selection == 2) { if (selection == 2) {
AIRTIME.playlist.fnNew(); AIRTIME.playlist.fnNew();

235
airtime_mvc/public/js/airtime/showbuilder/builder_test.js → airtime_mvc/public/js/airtime/showbuilder/_builder.js
View File

@ -97,11 +97,11 @@ var AIRTIME = (function(AIRTIME){
// the is_scheduled flag in cc_files // the is_scheduled flag in cc_files
if (schedId > 0) { if (schedId > 0) {
$.post(baseUrl+"schedule/update-future-is-scheduled", $.post(baseUrl+"schedule/update-future-is-scheduled",
{"format": "json", "schedId": schedId}, function(data) { {"format": "json", "schedId": schedId}, function(data) {
if (data.redrawLibTable !== undefined && data.redrawLibTable) { if (data.redrawLibTable !== undefined && data.redrawLibTable) {
$("#library_content").find("#library_display").dataTable().fnStandingRedraw(); $("#library_content").find("#library_display").dataTable().fnStandingRedraw();
} }
}); });
oSchedTable.fnDraw(); oSchedTable.fnDraw();
} }
}; };
@ -160,32 +160,32 @@ var AIRTIME = (function(AIRTIME){
mod.checkCancelButton = function() { mod.checkCancelButton = function() {
var $current = $sbTable.find(".sb-current-show"), var $current = $sbTable.find(".sb-current-show"),
//this user type should be refactored into a separate users module later //this user type should be refactored into a separate users module later
//when there's more time and more JS will need to know user data. //when there's more time and more JS will need to know user data.
userType = localStorage.getItem('user-type'), userType = localStorage.getItem('user-type'),
canCancel = false; canCancel = false;
if ($current.length !== 0 && $current.hasClass("sb-allowed")) { if ($current.length !== 0 && $current.hasClass("sb-allowed")) {
canCancel = true; canCancel = true;
} }
else if ($current.length !== 0 && (userType === 'A' || userType === 'P')) { else if ($current.length !== 0 && (userType === 'A' || userType === 'P')) {
canCancel = true; canCancel = true;
} }
if (canCancel === true) { if (canCancel === true) {
AIRTIME.button.enableButton("icon-ban-circle", true); AIRTIME.button.enableButton("icon-ban-circle", true);
} }
else { else {
AIRTIME.button.disableButton("icon-ban-circle", true); AIRTIME.button.disableButton("icon-ban-circle", true);
} }
}; };
mod.checkToolBarIcons = function() { mod.checkToolBarIcons = function() {
//library may not be on the page. //library may not be on the page.
if (AIRTIME.library !== undefined) { if (AIRTIME.library !== undefined) {
AIRTIME.library.checkAddButton(); AIRTIME.library.checkAddButton();
} }
mod.checkSelectButton(); mod.checkSelectButton();
mod.checkTrimButton(); mod.checkTrimButton();
@ -237,6 +237,7 @@ var AIRTIME = (function(AIRTIME){
mod.selectNone = function () { mod.selectNone = function () {
var $trs = $sbTable.find("tr.lib-audio"); var $trs = $sbTable.find("tr.lib-audio");
$trs.removeClass(SB_SELECTED_CLASS); $trs.removeClass(SB_SELECTED_CLASS);
$previouslySelected = undefined;
mod.checkToolBarIcons(); mod.checkToolBarIcons();
}; };
@ -274,6 +275,8 @@ var AIRTIME = (function(AIRTIME){
mod.enableUI(); mod.enableUI();
//Unneccessary reload of the library pane after moving tracks in the showbuilder pane. //Unneccessary reload of the library pane after moving tracks in the showbuilder pane.
//$("#library_content").find("#library_display").dataTable().fnStandingRedraw(); //$("#library_content").find("#library_display").dataTable().fnStandingRedraw();
getUsabilityHint();
}; };
mod.getSelectedCursors = function() { mod.getSelectedCursors = function() {
@ -326,12 +329,12 @@ var AIRTIME = (function(AIRTIME){
mod.disableUI(); mod.disableUI();
if (confirm($.i18n._("Delete selected item(s)?"))) { if (confirm($.i18n._("Delete selected item(s)?"))) {
$.post( baseUrl+"showbuilder/schedule-remove", $.post( baseUrl+"showbuilder/schedule-remove",
{"items": aItems, "format": "json"}, {"items": aItems, "format": "json"},
mod.fnItemCallback mod.fnItemCallback
); );
}else{ }else{
mod.enableUI(); mod.enableUI();
} }
}; };
@ -407,18 +410,18 @@ var AIRTIME = (function(AIRTIME){
oSchedTable = $sbTable.dataTable( { oSchedTable = $sbTable.dataTable( {
"aoColumns": [ "aoColumns": [
/* Type */ {"mDataProp": "image", "sTitle": "", "sClass": "library_image sb-image", "sWidth": "16px"}, /* Type */ {"mDataProp": "image", "sTitle": "", "sClass": "library_image sb-image", "sWidth": "16px"},
/* starts */ {"mDataProp": "starts", "sTitle": $.i18n._("Start"), "sClass": "sb-starts", "sWidth": "60px"}, /* starts */ {"mDataProp": "starts", "sTitle": $.i18n._("Start"), "sClass": "sb-starts", "sWidth": "60px"},
/* ends */ {"mDataProp": "ends", "sTitle": $.i18n._("End"), "sClass": "sb-ends", "sWidth": "60px"}, /* ends */ {"mDataProp": "ends", "sTitle": $.i18n._("End"), "sClass": "sb-ends", "sWidth": "60px"},
/* runtime */ {"mDataProp": "runtime", "sTitle": $.i18n._("Duration"), "sClass": "library_length sb-length", "sWidth": "65px"}, /* runtime */ {"mDataProp": "runtime", "sTitle": $.i18n._("Duration"), "sClass": "library_length sb-length", "sWidth": "65px"},
/* title */ {"mDataProp": "title", "sTitle": $.i18n._("Title"), "sClass": "sb-title"}, /* title */ {"mDataProp": "title", "sTitle": $.i18n._("Title"), "sClass": "sb-title"},
/* creator */ {"mDataProp": "creator", "sTitle": $.i18n._("Creator"), "sClass": "sb-creator"}, /* creator */ {"mDataProp": "creator", "sTitle": $.i18n._("Creator"), "sClass": "sb-creator"},
/* album */ {"mDataProp": "album", "sTitle": $.i18n._("Album"), "sClass": "sb-album"}, /* album */ {"mDataProp": "album", "sTitle": $.i18n._("Album"), "sClass": "sb-album"},
/* cue in */ {"mDataProp": "cuein", "sTitle": $.i18n._("Cue In"), "bVisible": false, "sClass": "sb-cue-in"}, /* cue in */ {"mDataProp": "cuein", "sTitle": $.i18n._("Cue In"), "bVisible": false, "sClass": "sb-cue-in"},
/* cue out */ {"mDataProp": "cueout", "sTitle": $.i18n._("Cue Out"), "bVisible": false, "sClass": "sb-cue-out"}, /* cue out */ {"mDataProp": "cueout", "sTitle": $.i18n._("Cue Out"), "bVisible": false, "sClass": "sb-cue-out"},
/* fade in */ {"mDataProp": "fadein", "sTitle": $.i18n._("Fade In"), "bVisible": false, "sClass": "sb-fade-in"}, /* fade in */ {"mDataProp": "fadein", "sTitle": $.i18n._("Fade In"), "bVisible": false, "sClass": "sb-fade-in"},
/* fade out */ {"mDataProp": "fadeout", "sTitle": $.i18n._("Fade Out"), "bVisible": false, "sClass": "sb-fade-out"}, /* fade out */ {"mDataProp": "fadeout", "sTitle": $.i18n._("Fade Out"), "bVisible": false, "sClass": "sb-fade-out"},
/* Mime */ {"mDataProp" : "mime", "sTitle" : $.i18n._("Mime"), "bVisible": false, "sClass": "sb-mime"} /* Mime */ {"mDataProp" : "mime", "sTitle" : $.i18n._("Mime"), "bVisible": false, "sClass": "sb-mime"}
], ],
"bJQueryUI": true, "bJQueryUI": true,
@ -469,7 +472,7 @@ var AIRTIME = (function(AIRTIME){
fnPrepareSeparatorRow, fnPrepareSeparatorRow,
$node, $node,
cl="", cl="",
//background-color to imitate calendar color. //background-color to imitate calendar color.
r,g,b,a, r,g,b,a,
$nRow = $(nRow), $nRow = $(nRow),
$image, $image,
@ -583,7 +586,7 @@ var AIRTIME = (function(AIRTIME){
} }
else { else {
//add the play function if the file exists on disk. //add the play function if the file exists on disk.
$image = $nRow.find('td.sb-image'); $image = $nRow.find('td.sb-image');
$image.empty(); $image.empty();
//check if the file exists. //check if the file exists.
@ -707,13 +710,13 @@ var AIRTIME = (function(AIRTIME){
if (temp.length > 0) { if (temp.length > 0) {
aData = temp.data("aData"); aData = temp.data("aData");
// max time interval // max time interval
// setTimeout allows only up to (2^31)-1 millisecs timeout value // setTimeout allows only up to (2^31)-1 millisecs timeout value
maxRefreshInterval = Math.pow(2, 31) - 1; maxRefreshInterval = Math.pow(2, 31) - 1;
refreshInterval = aData.refresh * 1000; refreshInterval = aData.refresh * 1000;
if(refreshInterval > maxRefreshInterval){ if(refreshInterval > maxRefreshInterval){
refreshInterval = maxRefreshInterval; refreshInterval = maxRefreshInterval;
} }
mod.timeout = setTimeout(function() {mod.refresh(aData.id)}, refreshInterval); //need refresh in milliseconds mod.timeout = setTimeout(function() {mod.refresh(aData.id)}, refreshInterval); //need refresh in milliseconds
break; break;
} }
} }
@ -727,7 +730,7 @@ var AIRTIME = (function(AIRTIME){
"oColVis": { "oColVis": {
"aiExclude": [ 0, 1 ], "aiExclude": [ 0, 1 ],
"buttonText": $.i18n._("Show / hide columns"), "buttonText": $.i18n._("Columns")
}, },
"oColReorder": { "oColReorder": {
@ -736,10 +739,12 @@ var AIRTIME = (function(AIRTIME){
"sAjaxDataProp": "schedule", "sAjaxDataProp": "schedule",
"oLanguage": datatables_dict, "oLanguage": datatables_dict,
"sAjaxSource": baseUrl+"showbuilder/builder-feed" "sAjaxSource": baseUrl+"showbuilder/builder-feed" ,
"bScrollCollapseY": false
}); });
$sbTable.find("tbody").on("click", "tr:not(.sb-past, .sb-empty)", function(ev) { $sbTable.find("tbody").on("mousedown", "tr:not(.sb-past, .sb-empty)", function(ev) {
var $tr = $(this), var $tr = $(this),
// Get the ID of the selected row // Get the ID of the selected row
@ -765,7 +770,9 @@ var AIRTIME = (function(AIRTIME){
} else if (ev.ctrlKey && $previouslySelected !== undefined) { } else if (ev.ctrlKey && $previouslySelected !== undefined) {
$tr.addClass(SB_SELECTED_CLASS); $tr.addClass(SB_SELECTED_CLASS);
} else { } else {
$("."+SB_SELECTED_CLASS).removeClass(SB_SELECTED_CLASS); if (!$tr.hasClass(SB_SELECTED_CLASS)) {
$("."+SB_SELECTED_CLASS).removeClass(SB_SELECTED_CLASS);
}
$tr.addClass(SB_SELECTED_CLASS); $tr.addClass(SB_SELECTED_CLASS);
} }
@ -775,6 +782,13 @@ var AIRTIME = (function(AIRTIME){
mod.checkToolBarIcons(); mod.checkToolBarIcons();
}); });
$sbTable.find("tbody").on("click", "tr:not(.sb-past, .sb-empty)", function(ev) {
if (!ev.ctrlKey && !ev.shiftKey) {
$("."+SB_SELECTED_CLASS).removeClass(SB_SELECTED_CLASS);
$(this).addClass(SB_SELECTED_CLASS);
}
});
var sortableConf = (function(){ var sortableConf = (function(){
var origTrs, var origTrs,
aItemData = [], aItemData = [],
@ -830,7 +844,7 @@ var AIRTIME = (function(AIRTIME){
//can't add items outside of shows. //can't add items outside of shows.
if (prev.find("td:first").hasClass("dataTables_empty") if (prev.find("td:first").hasClass("dataTables_empty")
|| prev.length === 0) { || prev.length === 0) {
alert($.i18n._("Cannot schedule outside a show.")); alert($.i18n._("Cannot schedule outside a show."));
ui.item.remove(); ui.item.remove();
return; return;
@ -873,52 +887,51 @@ var AIRTIME = (function(AIRTIME){
distance: 10, distance: 10,
helper: helper:
function(event, item) { function(event, item) {
var selected = mod.getSelectedData(NOW_PLAYING_CLASS), var selected = mod.getSelectedData(NOW_PLAYING_CLASS),
thead = $("#show_builder_table thead"), thead = $("#show_builder_table thead"),
colspan = thead.find("th").length, colspan = thead.find("th").length,
trfirst = thead.find("tr:first"), trfirst = thead.find("tr:first"),
width = trfirst.width(), width = trfirst.width(),
height = trfirst.height(), height = trfirst.height(),
message; message;
//if nothing is checked select the dragged item. //if nothing is checked select the dragged item.
if (selected.length === 0) { if (selected.length === 0) {
selected = [item.data("aData")]; selected = [item.data("aData")];
} }
if (selected.length === 1) { if (selected.length === 1) {
message = sprintf($.i18n._("Moving %s"), selected[0].title); message = sprintf($.i18n._("Moving %s"), selected[0].title);
//draggingContainer = item; //Default DataTables drag and drop //draggingContainer = item; //Default DataTables drag and drop
draggingContainer = $('<tr/>') draggingContainer = $('<tr/>')
.addClass('sb-helper') .addClass('sb-helper')
.append('<td/>') .append('<td/>')
.find("td") .find("td")
.attr("colspan", colspan) .attr("colspan", colspan)
.width(width) .width(width)
.height(height) .height(height)
.addClass("ui-state-highlight") .addClass("ui-state-highlight")
.append(message) .append(message)
.end(); .end();
} }
else { else {
message = sprintf($.i18n._("Moving %s Items"), selected.length); message = sprintf($.i18n._("Moving %s Items"), selected.length);
draggingContainer = $('<tr/>') draggingContainer = $('<tr/>')
.addClass('sb-helper') .addClass('sb-helper')
.append('<td/>') .append('<td/>')
.find("td") .find("td")
.attr("colspan", colspan) .attr("colspan", colspan)
.width(width) .width(width)
.height(height) .height(height)
.addClass("ui-state-highlight") .addClass("ui-state-highlight")
.append(message) .append(message)
.end(); .end();
}
} helperData = selected;
helperData = selected; return draggingContainer;
},
return draggingContainer;
},
items: 'tr:not(:first, :last, .sb-header, .sb-not-allowed, .sb-past, .sb-now-playing, .sb-empty)', items: 'tr:not(:first, :last, .sb-header, .sb-not-allowed, .sb-past, .sb-now-playing, .sb-empty)',
cancel: '.sb-footer', cancel: '.sb-footer',
receive: fnReceive, receive: fnReceive,
@ -941,30 +954,30 @@ var AIRTIME = (function(AIRTIME){
$menu = $("<div class='btn-toolbar'/>"); $menu = $("<div class='btn-toolbar'/>");
$menu.append("<div class='btn-group'>" + $menu.append("<div class='btn-group'>" +
"<button class='btn btn-small dropdown-toggle' id='timeline-select' data-toggle='dropdown'>" + "<button class='btn btn-small dropdown-toggle' id='timeline-select' data-toggle='dropdown'>" +
$.i18n._("Select")+" <span class='caret'></span>" + $.i18n._("Select")+" <span class='caret'></span>" +
"</button>" + "</button>" +
"<ul class='dropdown-menu'>" + "<ul class='dropdown-menu'>" +
"<li id='timeline-sa'><a href='#'>"+$.i18n._("Select all")+"</a></li>" + "<li id='timeline-sa'><a href='#'>"+$.i18n._("Select all")+"</a></li>" +
"<li id='timeline-sn'><a href='#'>"+$.i18n._("Select none")+"</a></li>" + "<li id='timeline-sn'><a href='#'>"+$.i18n._("Select none")+"</a></li>" +
"</ul>" + "</ul>" +
"</div>") "</div>")
.append("<div class='btn-group'>" + .append("<div class='btn-group'>" +
"<button title='"+$.i18n._("Remove overbooked tracks")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" + "<button title='"+$.i18n._("Remove overbooked tracks")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
"<i class='icon-white icon-cut'></i></button></div>") "<i class='icon-white icon-cut'></i></button></div>")
.append("<div class='btn-group'>" + .append("<div class='btn-group'>" +
"<button title='"+$.i18n._("Remove selected scheduled items")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" + "<button title='"+$.i18n._("Remove selected scheduled items")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
"<i class='icon-white icon-trash'></i></button></div>"); "<i class='icon-white icon-trash'></i></button></div>");
//if 'Add/Remove content' was chosen from the context menu //if 'Add/Remove content' was chosen from the context menu
//in the Calendar do not append these buttons //in the Calendar do not append these buttons
if ($(".ui-dialog-content").length === 0) { if ($(".ui-dialog-content").length === 0) {
$menu.append("<div class='btn-group'>" + $menu.append("<div class='btn-group'>" +
"<button title='"+$.i18n._("Jump to the current playing track")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" + "<button title='"+$.i18n._("Jump to the current playing track")+"' class='ui-state-disabled btn btn-small' disabled='disabled'>" +
"<i class='icon-white icon-step-forward'></i></button></div>") "<i class='icon-white icon-step-forward'></i></button></div>")
.append("<div class='btn-group'>" + .append("<div class='btn-group'>" +
"<button title='"+$.i18n._("Cancel current show")+"' class='ui-state-disabled btn btn-small btn-danger' disabled='disabled'>" + "<button title='"+$.i18n._("Cancel current show")+"' class='ui-state-disabled btn btn-small btn-danger' disabled='disabled'>" +
"<i class='icon-white icon-ban-circle'></i></button></div>"); "<i class='icon-white icon-ban-circle'></i></button></div>");
} }
if (localStorage.getItem('user-type') != 'G') { if (localStorage.getItem('user-type') != 'G') {
@ -1019,14 +1032,14 @@ var AIRTIME = (function(AIRTIME){
return; return;
} }
/* /*
var $scroll = $sbContent.find(".dataTables_scrolling"), var $scroll = $sbContent.find(".dataTables_scrolling"),
scrolled = $scroll.scrollTop(), scrolled = $scroll.scrollTop(),
scrollingTop = $scroll.offset().top, scrollingTop = $scroll.offset().top,
current = $sbTable.find("."+NOW_PLAYING_CLASS), current = $sbTable.find("."+NOW_PLAYING_CLASS),
currentTop = current.offset().top; currentTop = current.offset().top;
$scroll.scrollTop(currentTop - scrollingTop + scrolled); $scroll.scrollTop(currentTop - scrollingTop + scrolled);
*/ */
mod.jumpToCurrentTrack(); mod.jumpToCurrentTrack();
}); });

0
airtime_mvc/public/js/airtime/showbuilder/main_builder_test.js → airtime_mvc/public/js/airtime/showbuilder/_main_builder.js
View File