Merge branch 'release-4.0'

themes/bootprint3/less/bootprint.less

@@ -78,13 +78,10 @@ footer ul { padding-left: 30px; }
 [id^=list].list-group .col-sm-9 { margin: 0; }
 
 /* --- Channels --- */
-.channel { margin-bottom: 2rem; }
-.channel-title {
-  margin-top: 1rem;
-  margin-left: -56px;
-}
+.channel,
+.channel-title.no-results { margin-bottom: 2rem; }
+.channel-title { margin-top: 1rem; }
 .channel-title .fa { margin-top: 4px; }
-.channel-title h2 { padding-left: 50px; }
 
 /* --- Offcanvas --- */
 body.offcanvas {

themes/bootstrap3/js/channels.js

@@ -85,10 +85,22 @@ function bindChannelAddMenu(iteration, scope) {
   $(scope).find('.channel-add-menu .dropdown-menu a').click(function selectAddedChannel(e) {
     $.ajax(e.target.href).done(function addChannelAjaxDone(data) {
       var list = $(e.target).closest('.dropdown-menu');
-      $(e.target).closest('.channel').after(data);
+      var $testEl = $(data);
+      // Make sure the channel has content
+      if ($testEl.find('.channel-record').length === 0) {
+        $(e.target).closest('.channel').after(
+          '<div class="channel-title no-results">'
+          + '<h2>' + $testEl.find('h2').html() + '</h2>'
+          + VuFind.translate('nohit_heading')
+          + '</div>'
+        );
+      } else {
+        $(e.target).closest('.channel').after(data);
+        $('.channel').each(setupChannelSlider);
+        $('.channel').each(bindChannelAddMenu);
+      }
+      // Remove dropdown link
       $('[data-token="' + e.target.dataset.token + '"]').parent().remove();
-      $('.channel').each(setupChannelSlider);
-      $('.channel').each(bindChannelAddMenu);
 
       if (list.children().length === 0) {
         $('.channel-add-menu[data-group="' + list.closest('.channel-add-menu').data('group') + '"]').remove();

themes/bootstrap3/templates/channels/channelList.phtml

@@ -6,6 +6,7 @@
   $this->jsTranslations()->addStrings([
     'channel_expand' => 'channel_expand',
     'channel_search' => 'channel_search',
+    'nohit_heading' => 'nohit_heading',
     'View Record' => 'View Record',
   ]);
 ?>

themes/sandal/less/sandal.less

@@ -128,6 +128,11 @@ header {
 /* --- Cart --- */
 #cartSummary strong { font-weight: inherit; }
 
+/* --- Channels --- */
+.channel-title { margin-top: 1rem; }
+.channel,
+.channel-title.no-results { margin-bottom: 2rem; }
+
 /* --- MyResearch --- */
 .myresearch-menu a:hover { background-color: @white; }