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

Merge branch 'saas-dev' into saas-speedy

Browse source
This commit is contained in:
Duncan Sommerville 2015-05-04 13:09:51 -04:00
commit 8b380086c3
32 changed files with 4981 additions and 1287 deletions
Download patch file Download diff file Expand all files Collapse all files

16
airtime_mvc/public/js/airtime/common/common.js
View file

@ -1,11 +1,11 @@
$(document).ready(function() {
$("#Panel").stickyPanel({
topPadding: 1,
afterDetachCSSClass: "floated-panel",
savePanelSpace: true
});
/* Removed as this is now (hopefully) unnecessary */
//$("#Panel").stickyPanel({
// topPadding: 1,
// afterDetachCSSClass: "floated-panel",
// savePanelSpace: true
//});
//this statement tells the browser to fade out any success message after 5 seconds
setTimeout(function(){$(".success").fadeOut("slow", function(){$(this).empty()});}, 5000);
@ -52,8 +52,8 @@ var i18n_days_short = [
$.i18n._("We"),
$.i18n._("Th"),
$.i18n._("Fr"),
$.i18n._("Sa"),
]
$.i18n._("Sa")
];
function adjustDateToServerDate(date, serverTimezoneOffset){
//date object stores time in the browser's localtime. We need to artificially shift

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

@ -1445,7 +1445,7 @@ var AIRTIME = (function(AIRTIME){
initialEvents();
setUpPlaylist();
};
function setWidgetSize() {
viewport = AIRTIME.utilities.findViewportDimensions();
widgetHeight = viewport.height - 185;
@ -1458,7 +1458,7 @@ var AIRTIME = (function(AIRTIME){
.find(".dataTables_scrolling")
.css("max-height", libTableHeight)
.end()
.width(Math.floor(width * 0.55));
.width(Math.floor(width * 0.54));
$pl.height(widgetHeight)
.width(Math.floor(width * 0.45));

8
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
View file

@ -53,8 +53,8 @@ AIRTIME = (function(AIRTIME) {
function setWidgetSize() {
viewport = AIRTIME.utilities.findViewportDimensions();
widgetHeight = viewport.height - 180;
screenWidth = Math.floor(viewport.width - 40);
screenWidth = Math.floor(viewport.width - 50);
var libTableHeight = widgetHeight - 175,
builderTableHeight = widgetHeight - 95,
oTable;
@ -77,9 +77,9 @@ AIRTIME = (function(AIRTIME) {
if ($lib.filter(':visible').length > 0) {
$lib.width(Math.floor(screenWidth * 0.48));
$lib.width(Math.floor(screenWidth * 0.47));
$builder.width(Math.floor(screenWidth * 0.48))
$builder.width(Math.floor(screenWidth * 0.47))
.find("#sb_edit")
.remove()
.end()