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

CC-3174 : showbuilder 

dialog improvements, can scroll library, builder independently.
This commit is contained in:
Naomi Aro 2012-03-05 14:43:34 +01:00
parent 59b7f4ab56
commit 62c07107c1
2 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
airtime_mvc/public/css/showbuilder.css
View File

@ -47,10 +47,22 @@ tr.cursor-selected-row .marker {
.ui-dialog .wrapper { .ui-dialog .wrapper {
margin: 0; margin: 0;
padding: 10px 0 0 0; padding: 10px 0 0 0;
overflow: hidden;
}
.ui-dialog #library_content {
margin: 0 10px 10px 0;
overflow: auto;
min-height: 0;
} }
.ui-dialog #show_builder { .ui-dialog #show_builder {
width:45%; margin: 0 0 10px 0;
overflow: auto;
}
.ui-dialog .padded {
padding: 8px 10px 8px 8px;
} }
.ui-dialog .ui-buttonset { .ui-dialog .ui-buttonset {

24
airtime_mvc/public/js/airtime/schedule/schedule.js
View File

@ -100,15 +100,31 @@ function buildScheduleDialog (json) {
var dialog = $(json.dialog), var dialog = $(json.dialog),
viewport = findViewportDimensions(), viewport = findViewportDimensions(),
height = viewport.height * 0.96, height = Math.floor(viewport.height * 0.96),
width = viewport.width * 0.96, width = Math.floor(viewport.width * 0.96),
fnServer = AIRTIME.showbuilder.fnServerData; fnServer = AIRTIME.showbuilder.fnServerData,
//subtract padding in pixels
widgetWidth = width - 50,
libWidth = Math.floor(widgetWidth * 0.5),
builderWidth = Math.floor(widgetWidth * 0.5);
dialog.find("#library_content")
.height(height - 125)
.width(libWidth);
dialog.find("#show_builder")
.height(height - 125)
.width(builderWidth);
dialog.dialog({ dialog.dialog({
autoOpen: false, autoOpen: false,
title: json.title, title: json.title,
width: width, width: width,
height: height, height: height,
resizable: false,
draggable: false,
modal: true, modal: true,
close: closeDialog, close: closeDialog,
buttons: {"Ok": function() { buttons: {"Ok": function() {