diff --git a/airtime_mvc/application/views/scripts/form/showbuilder.phtml b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
index bba94655c..a22bf98f4 100644
--- a/airtime_mvc/application/views/scripts/form/showbuilder.phtml
+++ b/airtime_mvc/application/views/scripts/form/showbuilder.phtml
@@ -4,7 +4,7 @@
element->getElement('sb_date_end'); ?>
element->getElement('sb_time_end'); ?>
-
+
element->getElement('sb_show_filter') ?>
diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css
index 3d08be114..9129c1a8e 100644
--- a/airtime_mvc/public/css/dashboard.css
+++ b/airtime_mvc/public/css/dashboard.css
@@ -8,6 +8,7 @@
box-sizing: border-box;
height: 100%;
+ min-height: 300px;
border: 1px solid #202020;
border-top: 1px solid #353535;
@@ -22,16 +23,18 @@
@media screen and (max-width: 1600px) {
#library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > span,
- #show_builder button:not(.dropdown-toggle):not(.btn-new) > span {
+ #show_builder button:not(.dropdown-toggle):not(.btn-new) > span,
+ #show_builder #sb_submit > span {
display: none;
}
#library_display_wrapper button:not(.dropdown-toggle):not(.btn-new) > i,
- #show_builder button:not(.dropdown-toggle):not(.btn-new) > i {
+ #show_builder button:not(.dropdown-toggle):not(.btn-new) > i,
+ #show_builder #sb_submit > i {
margin-right: 0 !important;
}
}
-@media screen and (max-width: 1280px) {
+@media screen and (max-width: 1200px) {
.wrapper {
-webkit-flex-flow: column !important;
flex-flow: column !important;
diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
index f378b2d93..25228af79 100644
--- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
+++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js
@@ -88,19 +88,16 @@ var AIRTIME = (function(AIRTIME) {
});
// TODO: once the new manual pages are added, change links!
$.getJSON( "ajax/library_placeholders.json", function( data ) {
- var opts = data[mediaType],
- wrapper = $('#library_display_wrapper').find('.dataTables_scrolling');
+ var opts = data[mediaType];
img.addClass("icon-white " + opts.icon);
$('#library_empty_text').html(
$.i18n._("You haven't added any " + opts.media + ".")
+ "
" + $.i18n._(opts.subtext)
+ "
" + $.i18n._("Learn about " + opts.media) + ""
-
);
libEmpty.show();
- libEmpty.css('margin-left', (wrapper.width() / 2) - (libEmpty.width() / 2));
- libEmpty.css('margin-top', (wrapper.height() / 2) - (libEmpty.height() / 2) - 19);
+ AIRTIME.library.onResize();
});
} else {
libEmpty.hide();
@@ -379,8 +376,8 @@ var AIRTIME = (function(AIRTIME) {
mod.onResize = function() {
var libEmpty = $('#library_empty'), wrapper = $('#library_display_wrapper').find('.dataTables_scrolling');
- libEmpty.css('margin-left', (wrapper.width() / 2) - (libEmpty.width() / 2));
- libEmpty.css('margin-top', (wrapper.height() / 2) - (libEmpty.height() / 2) - 19);
+ libEmpty.css('left', wrapper.offset().left + (wrapper.width() / 2) - (libEmpty.width() / 2) - $(window).scrollLeft());
+ libEmpty.css('top', wrapper.offset().top + (wrapper.height() / 2) - (libEmpty.height() / 2) + 19 - $(window).scrollTop());
};
return AIRTIME;
@@ -388,3 +385,7 @@ var AIRTIME = (function(AIRTIME) {
}(AIRTIME || {}));
$(window).resize(AIRTIME.library.onResize);
+$(window).scroll(AIRTIME.library.onResize);
+$(document).ready(function() {
+ $('#content').scroll(AIRTIME.library.onResize);
+});