Merge branch '5.0/search-chart-table-wrap' into 5.0-trunk

bestpractical · Sep 5, 2023 · 52d3e1a · 52d3e1a
2 parents 337f191 + 2501a23
commit 52d3e1a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/share/html/Elements/CollectionAsTable/Header b/share/html/Elements/CollectionAsTable/Header
@@ -128,7 +128,11 @@ foreach my $col ( @Format ) {
     my $span = $col->{'span'};
     $item += ($span || 1);
 
-    $m->out('<th class="collection-as-table"');
+    my $class = 'collection-as-table';
+    $class .= ' allow-sorting' if $AllowSorting;
+    $class .= ' allow-filtering' if $AllowFiltering;
+
+    $m->out(qq{<th class="$class"});
     $m->out(' colspan="' . $m->interp->apply_escapes($span  => 'h') . '"')
         if $span;
 

diff --git a/share/html/Search/Elements/ChartTable b/share/html/Search/Elements/ChartTable
@@ -58,7 +58,7 @@ my $interp = $m->interp;
 my $eh  = sub { $interp->apply_escapes( @_, 'h' ) };
 my $eu  = sub { $interp->apply_escapes( @_, 'u' ) };
 
-$m->out('<table class="table table-bordered collection-as-table chart">'. "\n");
+$m->out('<table class="table table-bordered table-responsive collection-as-table chart">'. "\n");
 foreach my $section (qw(thead tbody tfoot)) {
     next unless $Table{ $section } && @{ $Table{ $section } };
 

diff --git a/share/static/css/elevator-light/collection.css b/share/static/css/elevator-light/collection.css
@@ -58,11 +58,11 @@ th.collection-as-table svg.fa-sort {
 }
 
 /* To not wrap icons in header */
-th.collection-as-table {
+th.collection-as-table.allow-sorting {
     white-space: nowrap;
 }
 
-th.collection-as-table span.title {
+th.collection-as-table.allow-sorting span.title {
     white-space: normal;
 }