Merge pull request #5 from UNC-Libraries/full-days

Adjust hours layout

Author: ebrassel

public/class-wplibcalhours-public.php

@@ -197,7 +197,7 @@ private function setDays($num_days, $data): array
             $date->add(new \DateInterval("P${i}D"));
             $key = $date->format('Y-m-d');
 
-            $day = array('date' => $date);
+            $day = ['date' => $date];
             $day['text'] = (array_key_exists($key, $data)) ? $data[$key] : __('n/a', 'wplibcalhours');
             $day['is_today'] = $key === $today->format('Y-m-d');
             $days[] = $day;

public/css/wplibcalhours-public.css

@@ -21,11 +21,13 @@
 /* UNC additions */
 .hours-list-view {
     display: grid;
+    grid-template-columns: 160px auto;
     grid-auto-flow: column;
-    grid-template-columns: 1fr 1fr;
     grid-template-rows: repeat(4, 1fr);
+    list-style-type: none;
     margin-top: 0 !important;
     padding-left: 5px !important;
+    text-align: left;
 }
 
 .hours-list-view-stacked {
@@ -34,9 +36,7 @@
 }
 
 .hours-list-view li {
-    display: inline-flex;
-    justify-content: flex-start;
-    width: 195px;
+    padding-bottom: 5px;
 }
 .hours-day {
     font-weight: bold;
@@ -72,6 +72,10 @@
     text-align: left;
 }
 
+.hours-more {
+    margin-top: 25px;
+}
+
 .hours-more button {
     border-radius: 5px;
     padding: 8px 10px;

public/partials/grid.php

@@ -1,5 +1,10 @@
 <?php
-$first_day = $days[array_key_first($days)]['text']['status'];
+try {
+    $first_day = $days[array_key_first($days)]['text']['status'];
+} catch (TypeError $e) {
+    $first_day = 'closed';
+}
+
 $open_class = ($first_day == 'open') ? 'circle-green' : 'circle-red';
 $stacked = $attrs['display_type'] == 'stacked';
 $hours_display = ($stacked) ? '-stacked' : '';
@@ -38,7 +43,7 @@ class="hours-list-view <?php echo $this->setClassList($stacked) ?>">
                     $day = $chunked_week[$i];
                     $today = $day['is_today'];
                     $date = $day['date'];
-                    $day_text = ($today) ? 'Today' : $date->format('D'); ?>
+                    $day_text = ($today) ? 'Today' : $date->format('l'); ?>
 
                     <li <?php echo $this->setToday($today) ?>>
                         <?php if ($week_number > 0): ?>