Merge branch 'hotfix/8.9.1'

waynestate · Feb 29, 2024 · b5e0a36 · b5e0a36
2 parents 02374e0 + 1d614bb
commit b5e0a36
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 11 deletions.
diff --git a/resources/views/components/events-column.blade.php b/resources/views/components/events-column.blade.php
@@ -33,6 +33,6 @@
 </ul>
 @if(!empty($component['cal_name']) || !empty($base['site']['events']['path']))
     <div class="mt-4">
-        <a class="button" href="//events.wayne.edu/{{ $component['cal_name'] ?? $base['site']['events']['path'].'main/' }}upcoming">{{ $component['link_text'] ?? 'More events' }}</a>
+        <a class="button" href="//events.wayne.edu/{{ $component['cal_name'] ?? $base['site']['events']['path'] }}upcoming">{{ $component['link_text'] ?? 'More events' }}</a>
     </div>
 @endif
diff --git a/resources/views/components/events-featured-column.blade.php b/resources/views/components/events-featured-column.blade.php
@@ -19,6 +19,6 @@
 </ul>
 @if(!empty($component['cal_name']) || !empty($base['site']['events']['path']))
     <div class="mt-4">
-        <a class="button" href="//events.wayne.edu/{{ $component['cal_name'] ?? $base['site']['events']['path'].'main/' }}upcoming">{{ $component['link_text'] ?? 'More events' }}</a>
+        <a class="button" href="//events.wayne.edu/{{ $component['cal_name'] ?? $base['site']['events']['path'] }}upcoming">{{ $component['link_text'] ?? 'More events' }}</a>
     </div>
 @endif
diff --git a/resources/views/components/events-featured-row.blade.php b/resources/views/components/events-featured-row.blade.php
@@ -19,6 +19,6 @@
 </ul>
 @if(!empty($component['cal_name']) || !empty($base['site']['events']['path']))
     <div class="text-center mt-6">
-        <a class="button" href="//events.wayne.edu/{{ $component['cal_name'] ?? $base['site']['events']['path'].'main/' }}upcoming">{{ $component['link_text'] ?? 'More events' }}</a>
+        <a class="button" href="//events.wayne.edu/{{ $component['cal_name'] ?? $base['site']['events']['path'] }}upcoming">{{ $component['link_text'] ?? 'More events' }}</a>
     </div>
 @endif
diff --git a/resources/views/components/events-row.blade.php b/resources/views/components/events-row.blade.php
@@ -29,6 +29,6 @@
 
 @if(!empty($component['cal_name']) || !empty($base['site']['events']['path']))
     <div class="text-center mt-6">
-        <a class="button" href="//events.wayne.edu/{{ $component['cal_name'] ?? $base['site']['events']['path'].'main/' }}upcoming">{{ $component['link_text'] ?? 'More events' }}</a>
+        <a class="button" href="//events.wayne.edu/{{ $component['cal_name'] ?? $base['site']['events']['path'] }}upcoming">{{ $component['link_text'] ?? 'More events' }}</a>
     </div>
 @endif
diff --git a/resources/views/components/news-column.blade.php b/resources/views/components/news-column.blade.php
@@ -15,6 +15,6 @@
     </ul>
 
     <div class="mt-6">
-        <a href="/{{ !empty($base['site']['subsite-folder']) ?? '' }}{{ $component['news_route'] ?? config('base.news_listing_route') }}" class="button">{{ $component['link_text'] ?? 'More news' }}</a>
+        <a href="/{{ $base['site']['subsite-folder'] ?? '' }}{{ $component['news_route'] ?? config('base.news_listing_route') }}" class="button">{{ $component['link_text'] ?? 'More news' }}</a>
     </div>
 @endif
diff --git a/resources/views/components/news-featured-column.blade.php b/resources/views/components/news-featured-column.blade.php
@@ -29,6 +29,6 @@
     </ul>
 
     <div class="mt-6">
-        <a href="/{{ !empty($base['site']['subsite-folder']) ?? '' }}{{ $component['news_route'] ?? config('base.news_listing_route') }}" class="button">{{ $component['link_text'] ?? 'More news' }}</a>
+        <a href="/{{ $base['site']['subsite-folder'] ?? '' }}{{ $component['news_route'] ?? config('base.news_listing_route') }}" class="button">{{ $component['link_text'] ?? 'More news' }}</a>
     </div>
 @endif
diff --git a/resources/views/components/news-row.blade.php b/resources/views/components/news-row.blade.php
@@ -17,6 +17,6 @@
         @endforeach
     </ul>
     <div class="text-center mt-6">
-        <a href="/{{ !empty($base['site']['subsite-folder']) ?? '' }}{{ $component['news_route'] ?? config('base.news_listing_route') }}" class="button">{{ $component['link_text'] ?? 'More news' }}</a>
+        <a href="/{{ $base['site']['subsite-folder'] ?? '' }}{{ $component['news_route'] ?? config('base.news_listing_route') }}" class="button">{{ $component['link_text'] ?? 'More news' }}</a>
     </div>
 @endif
diff --git a/styleguide/Http/Controllers/FullWidthController.php b/styleguide/Http/Controllers/FullWidthController.php
@@ -135,7 +135,6 @@ public function index(Request $request): View
                 'component' => [
                     'heading' => 'Special events',
                     'filename' => 'events-column',
-                    'calendar_url' => '/myurl'
                 ],
             ],
 

diff --git a/styleguide/Pages/ChildpageWithComponents.php b/styleguide/Pages/ChildpageWithComponents.php
@@ -25,6 +25,9 @@ public function getPageData()
                 'news' => [
                     'application_id' => 1,
                 ],
+                'events' => [
+                    'path' => 'main'
+                ],
             ],
         ]);
     }

diff --git a/styleguide/Pages/Fullwidth.php b/styleguide/Pages/Fullwidth.php
@@ -27,6 +27,15 @@ public function getPageData()
                     <p>'.$this->faker->paragraph(8).'</p>',
                 ],
             ],
+            'site' => [
+                'subsite-folder' => 'styleguide/',
+                'news' => [
+                    'application_id' => 1,
+                ],
+                'events' => [
+                    'path' => 'main'
+                ],
+            ],
         ]);
     }
 }
diff --git a/styleguide/Pages/Homepage.php b/styleguide/Pages/Homepage.php
@@ -28,6 +28,9 @@ public function getPageData()
                 'news' => [
                     'application_id' => 1,
                 ],
+                'events' => [
+                    'path' => 'main'
+                ],
             ],
         ]);
     }

diff --git a/styleguide/Views/styleguide-fullwidth.blade.php b/styleguide/Views/styleguide-fullwidth.blade.php
@@ -56,9 +56,6 @@
             @if(!empty($events_column['data']))
                 <div class="col-span-full lg:col-span-6 xl:col-span-8">
                     @include('components/'.$events_column['component']['filename'], ['data' => $events_column['data'], 'component' => $events_column['component']])
-                    <div class="text-right">
-                        <a href="#" class="button mt-4">More events</a>
-                    </div>
                 </div>
             @endif
         </div>