diff --git a/airtime_mvc/public/css/media_library.css b/airtime_mvc/public/css/media_library.css index 2c0e956b5..dc7b6cd73 100644 --- a/airtime_mvc/public/css/media_library.css +++ b/airtime_mvc/public/css/media_library.css @@ -1,3 +1,7 @@ +.lib-content { + +} + #library_content { float: left; width: 50%; @@ -32,12 +36,12 @@ padding-top:16px; } -#library_display th.ui-state-default { - border: 1px solid #8f8f8f; - background-color: #a2a2a2; +.lib-content table th.ui-state-default { background: -moz-linear-gradient(top, #b2b2b2 0, #a2a2a2 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #b2b2b2), color-stop(100%, #a2a2a2)); - color: #363636; + background: linear-gradient(top, #b2b2b2 0, #a2a2a2 100%); + border: 1px solid #8F8F8F; + color: #363636; } .paginationControl { diff --git a/airtime_mvc/public/css/showbuilder.css b/airtime_mvc/public/css/showbuilder.css index 3fce5794a..4aaa38a4d 100644 --- a/airtime_mvc/public/css/showbuilder.css +++ b/airtime_mvc/public/css/showbuilder.css @@ -103,6 +103,11 @@ tr.cursor-selected-row .marker { opacity: .6; } +.sb-placeholder { + height: 35px; + padding: 5px; +} + .sb-boundry td.sb-image, .sb-boundry td.sb-starts, .sb-boundry td.sb-ends, diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index b030c75da..fc8a160ff 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -637,10 +637,6 @@ dl.inline-list dd { background-color:#c7c7c7; } -.datatable .show-builder-placeholder { - height: 30px; -} - .datatable tr.even.selected td { background-color: #abcfe2; } @@ -698,15 +694,30 @@ dl.inline-list dd { line-height:22px; } .dataTables_filter { - margin:0 0 0 8px; + margin:0 0 8px 8px; } .dataTables_filter .auto-search { width:55%; } +.dt-process-rel { + position: relative; +} .dataTables_processing { - font-size:11px; - font-weight:normal; - margin:2px 0 3px 8px; + opacity: 1 !important; + position: absolute; + top: 100px; + left: 10%; + width: 80%; + height: 50px; + text-align: center; + font-size:14px; + font-weight:bold; + padding-top: 40px; + background: -moz-linear-gradient(top, #b2b2b2 0, #a2a2a2 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #b2b2b2), color-stop(100%, #a2a2a2)); + background: linear-gradient(top, #b2b2b2 0, #a2a2a2 100%); + border: 1px solid #8F8F8F; + color: #ffffff; } #library_display_wrapper .ui-widget-header:first-child { background:none; diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index b6d4999be..3a93fc1bf 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -44,7 +44,7 @@ var AIRTIME = (function(AIRTIME) { libraryInit = function() { var oTable, libContentDiv = $("#library_content"), - tableHeight = libContentDiv.height() - 140, + tableHeight = libContentDiv.height() - 130, libLength, libType, libFilter; @@ -250,7 +250,7 @@ var AIRTIME = (function(AIRTIME) { }, // R = ColReorder, C = ColVis, T = TableTools - "sDom": 'Rl<"#library_display_type">fr<"H"T<"library_toolbar"C>><"dataTables_scrolling"t><"F"ip>', + "sDom": 'Rl<"#library_display_type">f<"dt-process-rel"r><"H"T<"library_toolbar"C>><"dataTables_scrolling"t><"F"ip>', "oTableTools": { "sRowSelect": "multi", diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index 606232929..6513bb056 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -140,10 +140,10 @@ function buildScheduleDialog (json) { //set max heights of datatables. dialog.find(".lib-content .dataTables_scrolling") - .css("max-height", height - 110 - 155); + .css("max-height", height - 90 - 155); dialog.find(".sb-content .dataTables_scrolling") - .css("max-height", height - 110 - 60); + .css("max-height", height - 90 - 60); dialog.dialog('open'); } diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 5fee3a8af..312f2d848 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -474,7 +474,7 @@ var AIRTIME = (function(AIRTIME){ }, // R = ColReorderResize, C = ColVis, T = TableTools - "sDom": 'Rr<"sb-padded"<"H"CT>><"dataTables_scrolling sb-padded"t>', + "sDom": 'R<"dt-process-rel"r><"sb-padded"<"H"CT>><"dataTables_scrolling sb-padded"t>', "sAjaxDataProp": "schedule", "sAjaxSource": "/showbuilder/builder-feed" @@ -593,8 +593,9 @@ var AIRTIME = (function(AIRTIME){ }; return { - placeholder: "placeholder show-builder-placeholder ui-state-highlight", + placeholder: "sb-placeholder ui-state-highlight", forcePlaceholderSize: true, + distance: 10, helper: function(event, item) { var oTT = TableTools.fnGetInstance('show_builder_table'), selected = oTT.fnGetSelectedData(), diff --git a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js index 3a45e905e..e7b77196b 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/main_builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/main_builder.js @@ -4,7 +4,7 @@ $(document).ready(function(){ $lib = $("#library_content"), $libWrapper, $builder = $("#show_builder"), - widgetHeight = viewport.height - 185, + widgetHeight = viewport.height - 180, screenWidth = Math.floor(viewport.width - 120), oBaseDatePickerSettings, oBaseTimePickerSettings, @@ -62,7 +62,7 @@ $(document).ready(function(){ $libWrapper = $lib.find("#library_display_wrapper"); $libWrapper.prepend($libClose); - $builder.find('.dataTables_scrolling').css("max-height", widgetHeight - 110); + $builder.find('.dataTables_scrolling').css("max-height", widgetHeight - 95); $builder.on("click", "#sb_submit", function(ev){ var fn,