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

Merge branch 'saas-dev' into saas-dev-publishing

Browse source 
Conflicts:
	airtime_mvc/public/js/airtime/library/spl.js
This commit is contained in:
Albert Santoni 2015-09-21 18:12:27 -04:00
commit 5bd8a508b1
8 changed files with 43 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
airtime_mvc/public/css/billing.css
View file

@ -274,3 +274,25 @@
color: #ff611f;
font-weight: bold;
}
.billing-panel .educational-discount {
border: 1px solid #306999;
border-radius: 3px;
margin-top: 10px;
margin-bottom: 10px;
box-sizing: border-box;
padding: 16px;
background-color: #b8d9f4;
color: #234f5d;
}
.billing-panel .educational-discount h4 {
color: #1e415d;
font-weight: bold;
margin: 0px;
padding: 0px;
margin-bottom: 5px;
}
.billing-panel .educational-discount p {
margin: 0px;
}

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

@ -550,7 +550,7 @@ var AIRTIME = (function(AIRTIME) {
"bProcessing": true,
"bServerSide": true,
"aLengthMenu": [5, 10, 15, 20, 25, 50, 100],
"aLengthMenu": [25, 50, 100],
"bStateSave": true,
"fnStateSaveParams": function (oSettings, oData) {

8
airtime_mvc/public/js/airtime/library/spl.js
View file

@ -387,7 +387,7 @@ var AIRTIME = (function(AIRTIME){
redrawLib();
}
function setFadeIcon(){
mod.setFadeIcon = function() {
var contents = $pl.find(".spl_sortable");
var show = contents.is(":visible");
var empty = $pl.find(".spl_empty");
@ -899,7 +899,7 @@ var AIRTIME = (function(AIRTIME){
dt.fnStandingRedraw();
}
}
setFadeIcon();
mod.setFadeIcon();
disableLoadingIcon();
}
);
@ -1142,7 +1142,7 @@ var AIRTIME = (function(AIRTIME){
}
else {
setPlaylistContent(json);
setFadeIcon();
mod.setFadeIcon();
$pl.find('.errors').hide();
}
@ -1445,7 +1445,7 @@ var AIRTIME = (function(AIRTIME){
setPlaylistEntryEvents();
setCueEvents();
setFadeEvents();
setFadeIcon();
mod.setFadeIcon();
initialEvents();
setUpPlaylist();

1
airtime_mvc/public/js/airtime/showbuilder/tabs.js
View file

@ -103,6 +103,7 @@ var AIRTIME = (function(AIRTIME){
appendAddButton();
appendModAddButton();
removeButtonCheck();
AIRTIME.playlist.setFadeIcon();
}
/* #####################################################