From 0722225211c5ba00aead897d36f046654d954fd8 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 2 Sep 2015 12:45:37 -0400 Subject: [PATCH] Front end tweaks and fixes --- airtime_mvc/public/css/dashboard.css | 3 +++ .../js/airtime/library/events/library_showbuilder.js | 7 ++++--- airtime_mvc/public/js/airtime/library/spl.js | 4 ++++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/public/css/dashboard.css b/airtime_mvc/public/css/dashboard.css index d92d1041b..d8220ea6a 100644 --- a/airtime_mvc/public/css/dashboard.css +++ b/airtime_mvc/public/css/dashboard.css @@ -150,6 +150,9 @@ div.btn > span { #library_empty_image { opacity: .3; + width: 16px; + height: 20px; + top: -20px; margin-top: -2px; padding-right: 2px; /* For the webstream icon */ 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 2bb35ee04..3459c862d 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -77,6 +77,7 @@ var AIRTIME = (function(AIRTIME) { cb.append(""); } + var libEmpty = $('#library_empty'); if (emptyRow.length > 0) { emptyRow.hide(); var mediaType = parseInt($('.media_type_selector.selected').attr('data-selection-id')), @@ -94,11 +95,11 @@ var AIRTIME = (function(AIRTIME) { + "
" + $.i18n._(opts.subtext) + "
" + $.i18n._("Learn about " + opts.media) + "" ); - }) ; + }); - $('#library_empty').show(); + libEmpty.show(); } else { - $('#library_empty').hide(); + libEmpty.hide(); } if ($("#show_builder_table").is(":visible")) { diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index 27c0aa743..6ec41c6fd 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -569,6 +569,10 @@ var AIRTIME = (function(AIRTIME){ if (pane.get(0) == curr.get(0)) { // Closing the current tab, otherwise we don't need to switch tabs AIRTIME.showbuilder.switchTab(toPane, toTab); } + + // If we close a tab that was causing tabs to wrap to the next row, we need to resize to change the + // margin for the tab nav + AIRTIME.playlist.onResize(); } mod.closeTab = function(id) {