small optimization on item table layout

wielebenwir · Apr 26, 2021 · 197aa4e · 197aa4e
1 parent e7c472f
commit 197aa4e
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 19 deletions.
diff --git a/assets/public/css/public.css b/assets/public/css/public.css
diff --git a/assets/public/css/public.css.map b/assets/public/css/public.css.map
diff --git a/assets/public/sass/partials/_shortcodeItemsTable.scss b/assets/public/sass/partials/_shortcodeItemsTable.scss
@@ -1,17 +1,22 @@
 $table-font-size: 12px;
 
+.tscroll {
+    width:100%;
+    overflow: scroll;
+    border: solid gray 1px;
+}
+
 .cb-items-table {
 
     font-size: $table-font-size;
-    overflow-x: auto;
-    overflow-y: auto;
 
     th {
         font-size: $table-font-size;
         padding: 0;
         text-align: center;
         vertical-align: middle;
         font-weight: 600;
+        border: 1px solid rgb(167, 167, 167);
     }
 
     thead tr:nth-child(2) {
@@ -27,6 +32,8 @@ $table-font-size: 12px;
         padding: 0;
         text-align: center;
         vertical-align: middle;
+        border: 1px solid rgb(167, 167, 167);
+        z-index: 11;
 
         &:nth-child(1),
         &:nth-child(2) {

diff --git a/src/Map/MapAdmin.php b/src/Map/MapAdmin.php
@@ -117,7 +117,7 @@ class MapAdmin
     const MARKER_ITEM_DRAFT_ICON_ANCHOR_X_DEFAULT = 0;
     const MARKER_ITEM_DRAFT_ICON_ANCHOR_Y_DEFAULT = 0;
     const AVAILABILITY_MAX_DAYS_TO_SHOW_DEFAULT = 11;
-    const AVAILABILITY_MAX_DAY_COUNT_DEFAULT = 20;
+    const AVAILABILITY_MAX_DAY_COUNT_DEFAULT = 14;
 
     //const MARKER_POPUP_CONTENT_DEFAULT = "'<b>' + location.location_name + '</b><br>' + location.address.street + '<br>' + location.address.zip + ' ' + location.address.city + '<p>' + location.opening_hours + '</p>'";
 

diff --git a/src/View/Calendar.php b/src/View/Calendar.php
@@ -359,7 +359,8 @@ public static function renderTable($atts): string
         $dayStr = implode($divider, $days_display);
         $colStr = implode(' ', $days_cols);
 
-        $print = "<table class='cb-items-table tablesorter'><colgroup><col><col>" . $colStr . "</colgroup><thead>";
+        $print = '<div class="tscroll">';
+        $print .= "<table class='cb-items-table tablesorter'><colgroup><col><col>" . $colStr . "</colgroup><thead>";
         $print .= "<tr><th colspan='2' class='sortless'>" . $desc . "</th><th class='sortless' colspan='" . $colspan . "'>";
 
         if ($colspan > 1) {
@@ -414,7 +415,7 @@ public static function renderTable($atts): string
                 // Collect unique locations from timeframes
                 $locations = [];
                 foreach ($timeframes as $timeframe) {
-                    $locations[$timeframe->getLocation()->ID] = $timeframe->getLocation()->title();
+                    $locations[$timeframe->getLocation()->ID] = $timeframe->getLocation()->post_title;
                 }
 
                 // loop through location
@@ -469,14 +470,17 @@ public static function renderTable($atts): string
                         }
                     }
 
+
                     $dayStr = implode($divider, $days_display);
                     $itemLink = add_query_arg('location', $locationId, get_permalink($item->ID));
-                    $print .= "<tr><td><b><a href='" . $itemLink . "'>" . $item_name . "</a></b>" . $divider . $locationName . $divider . $dayStr . "</td></tr>";
+                    $locationString = '<div data-title="' . $locationName . '">' . $locationName . '</div>';
+                    $print .= "<tr><td><b><a href='" . $itemLink . "'>" . $item_name . "</a></b>" . $divider . $locationString . $divider . $dayStr . "</td></tr>";
                 }
             }
         }
 
         $print .= "</tbody></table>";
+        $print .= '</div>';
         return $print;
     }