Merge branch 'release-3.1'

module/VuFind/tests/integration-tests/src/VuFindTest/Mink/SearchActionsTest.php

@@ -357,7 +357,37 @@ class SearchActionsTest extends \VuFindTest\Unit\MinkTestCase
         $genreMore->click();
         $this->facetListProcedure($page, $limit, true);
         $this->assertEquals(1, count($page->find('css', '.list-group.filters')));
-   }
+    }
+
+    /**
+     * Test that exclusion works properly deep in lightbox results.
+     *
+     * @return void
+     */
+    public function testHierarchicalFacets()
+    {
+        $this->changeConfigs(
+            [
+                'facets' => [
+                    'Results' => [
+                        'hierarchical_facet_str_mv' => 'hierarchy'
+                    ],
+                    'SpecialFacets' => [
+                        'hierarchical[]' => 'hierarchical_facet_str_mv'
+                    ]
+                ]
+            ]
+        );
+        $page = $this->performSearch('');
+        $this->findCss($page, '#j1_1.jstree-closed .jstree-icon');
+        $session = $this->getMinkSession();
+        $session->executeScript("$('#j1_1.jstree-closed .jstree-icon').click();");
+        $this->findCss($page, '#j1_1.jstree-open .jstree-icon');
+        $this->findCss($page, '#j1_2 a')->click();
+        $filter = $this->findCss($page, '.filters .list-group-item.active');
+        $this->assertEquals('hierarchy: 1/level1a/level2a/', $filter->getText());
+        $this->findCss($page, '#j1_2 .fa-check');
+    }
 
     /**
      * Standard teardown method.

themes/bootstrap3/less/components/js-tree.less

@@ -93,3 +93,6 @@ li.jstree-node {
 }
 li.jstree-facet .badge {cursor: text;}
 li.jstree-facet ul {padding-left: 20px;}
+
+.list-group.facet .jstree-node { padding-left: 19px; }
+.list-group.facet .jstree-icon::before { margin-left: -12px; }

themes/bootstrap3/scss/components/js-tree.scss

@@ -93,3 +93,6 @@ li.jstree-node {
 }
 li.jstree-facet .badge {cursor: text;}
 li.jstree-facet ul {padding-left: 20px;}
+
+.list-group.facet .jstree-node { padding-left: 19px; }
+.list-group.facet .jstree-icon::before { margin-left: -12px; }

themes/bootstrap3/scss/components/record.scss

@@ -48,3 +48,5 @@
 .marc-row-008 {
   white-space: pre-wrap;
 }
+
+.comment-form textarea.form-control { display: block; }