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

Merge branch 'saas-dev' into soundcloud

Browse source 
Conflicts:
	airtime_mvc/application/configs/constants.php
This commit is contained in:
Duncan Sommerville 2015-06-29 10:02:58 -04:00
commit 5cc8774e56
30 changed files with 194 additions and 182 deletions
Download patch file Download diff file Expand all files Collapse all files

11
airtime_mvc/public/css/styles.css
View file

@ -536,6 +536,12 @@ input[type="text"]:focus, input[type="password"]:focus, textarea:focus, .input_t
width: 150px;
}
/***** Show Builder *****/
#show_builder {
min-width: 470px;
}
/***** LIBRARY QTIP METADATA SPECIFIC STYLES BEGIN *****/
table.library-track-md{
width: 280px;
@ -1243,11 +1249,14 @@ input[type="checkbox"] {
margin: 0;
}
.dataTables_scrolling {
min-height: 150px;
}
.ui-dialog #schedule_playlist_dialog.ui-dialog-content {
padding:0;
}
#schedule_playlist_dialog > div {
background: none repeat scroll 0 0 transparent;
border: 1px solid #8f8f8f;

3
airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
View file

@ -10,7 +10,8 @@ var AIRTIME = (function(AIRTIME) {
mod.checkAddButton = function() {
var selected = mod.getChosenItemsLength(), $cursor = $('tr.sb-selected'), check = false,
shows = $('tr.sb-header'), current = $('tr.sb-current-show'),
cursorText = $.i18n._('Add to next show');
// TODO: this is an ugly way of doing this... we should find a more robust way of checking which view we're in.
cursorText = (window.location.href.toLowerCase().includes("schedule")) ? $.i18n._('Add to show') : $.i18n._('Add to next show');
// make sure library items are selected and a cursor is selected.
if (selected !== 0) {

2
airtime_mvc/public/js/airtime/library/library.js
View file

@ -148,7 +148,7 @@ var AIRTIME = (function(AIRTIME) {
mod.checkDeleteButton = function() {
var selected = mod.getChosenItemsLength(),
check = false;
if (selected !== 0) {
check = true;
}

13
airtime_mvc/public/js/airtime/showbuilder/builder.js
View file

@ -134,12 +134,15 @@ var AIRTIME = (function(AIRTIME){
mod.checkDeleteButton = function() {
var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked");
var button = $("#show_builder").find(".icon-trash").parent(),
DISABLED_CLASS = 'ui-state-disabled';
if ($selected.length !== 0) {
AIRTIME.button.enableButton("icon-trash", true);
}
else {
AIRTIME.button.disableButton("icon-trash", true);
button.removeClass(DISABLED_CLASS);
button.removeAttr('disabled');
} else {
button.addClass(DISABLED_CLASS);
button.attr('disabled', 'disabled');
}
};