Merge pull request #408

Update components
FitzwilliamMuseum · May 25, 2022 · 8186cc2 · 8186cc2
2 parents fea9702 + 59342c4
commit 8186cc2
Show file tree

Hide file tree

Showing 34 changed files with 135 additions and 131 deletions.
diff --git a/app/Http/Controllers/highlightsController.php b/app/Http/Controllers/highlightsController.php
@@ -220,25 +220,4 @@ public function bytheme(string $theme): View
         $theme = HighlightThemes::getDetails($theme);
         return view('highlights.bytheme', compact('pharos', 'theme'));
     }
-
-    /**
-     * @param Request $request
-     * @return View
-     */
-    public function fitzobjects(Request $request): View
-    {
-        $paginator = StaffObjects::list($request);
-        $week = $paginator->items();
-        return view('highlights.fitz-objects', compact('week', 'paginator'));
-    }
-
-    /**
-     * @param string $slug
-     * @return View
-     */
-    public function fitzobject(string $slug): View
-    {
-        $week = StaffObjects::find($slug);
-        return view('highlights.fitz-object', compact('week'));
-    }
 }
diff --git a/app/Models/StaffObjects.php b/app/Models/StaffObjects.php
diff --git a/config/breadcrumbs.php b/config/breadcrumbs.php
@@ -0,0 +1,75 @@
+<?php
+
+return [
+
+    /*
+    |--------------------------------------------------------------------------
+    | View Name
+    |--------------------------------------------------------------------------
+    |
+    | Choose a view to display when Breadcrumbs::render() is called.
+    | Built in templates are:
+    |
+    | - 'breadcrumbs::bootstrap5'  - Bootstrap 5
+    | - 'breadcrumbs::bootstrap4'  - Bootstrap 4
+    | - 'breadcrumbs::bulma'       - Bulma
+    | - 'breadcrumbs::foundation6' - Foundation 6
+    | - 'breadcrumbs::json-ld'     - JSON-LD Structured Data
+    | - 'breadcrumbs::materialize' - Materialize
+    | - 'breadcrumbs::tailwind'    - Tailwind CSS
+    | - 'breadcrumbs::uikit'       - UIkit
+    |
+    | Or a custom view, e.g. '_partials/breadcrumbs'.
+    |
+    */
+
+    'view' => 'breadcrumbs::bootstrap5',
+
+    /*
+    |--------------------------------------------------------------------------
+    | Breadcrumbs File(s)
+    |--------------------------------------------------------------------------
+    |
+    | The file(s) where breadcrumbs are defined. e.g.
+    |
+    | - base_path('routes/breadcrumbs.php')
+    | - glob(base_path('breadcrumbs/*.php'))
+    |
+    */
+
+    'files' => base_path('routes/breadcrumbs.php'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Exceptions
+    |--------------------------------------------------------------------------
+    |
+    | Determine when to throw an exception.
+    |
+    */
+
+    // When route-bound breadcrumbs are used but the current route doesn't have a name (UnnamedRouteException)
+    'unnamed-route-exception' => true,
+
+    // When route-bound breadcrumbs are used and the matching breadcrumb doesn't exist (InvalidBreadcrumbException)
+    'missing-route-bound-breadcrumb-exception' => true,
+
+    // When a named breadcrumb is used but doesn't exist (InvalidBreadcrumbException)
+    'invalid-named-breadcrumb-exception' => true,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Classes
+    |--------------------------------------------------------------------------
+    |
+    | Subclass the default classes for more advanced customisations.
+    |
+    */
+
+    // Manager
+    'manager-class' => Diglactic\Breadcrumbs\Manager::class,
+
+    // Generator
+    'generator-class' => Diglactic\Breadcrumbs\Generator::class,
+
+];
diff --git a/public/css/fitzwilliam.css b/public/css/fitzwilliam.css
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,5 +1,5 @@
 {
     "/js/app.js": "/js/app.js?id=1072f3bf5674b0bbd5892213a7f75ff1",
     "/css/app.css": "/css/app.css?id=bf846dd8edf2f05e55bd3e13cc3a439d",
-    "/css/fitzwilliam.css": "/css/fitzwilliam.css?id=77a35cfaed6c45d6581e734762fb43ad"
+    "/css/fitzwilliam.css": "/css/fitzwilliam.css?id=56a205941c75e7705762b6f1a1eee6bb"
 }
diff --git a/resources/css/site.css b/resources/css/site.css
@@ -171,7 +171,7 @@ h3, h2 {
     font-weight: 500;
 }
 
-h3 {
+h3,h2 {
     font-size: 1.25rem;
 }
 

diff --git a/resources/views/components/associated-curator.blade.php b/resources/views/components/associated-curator.blade.php
@@ -21,11 +21,11 @@
         @endisset
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a href="{{ route('exhibition-externals', $curator['associated_people_id']['slug']) }}" class="stretched-link">
                         {{ $curator['associated_people_id']['display_name'] }}
                     </a>
-                </h3>
+                </h2>
                 @isset($curator['associated_people_id']['associated_role'])
                 <p class="text-black-50">
                     {{$curator['associated_people_id']['associated_role']}}

diff --git a/resources/views/components/audioguide-card.blade.php b/resources/views/components/audioguide-card.blade.php
@@ -20,11 +20,11 @@
         @endisset
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a href="{{ route($route, $params) }}" class="stretched-link">
                         {{ $title }}
                     </a>
-                </h3>
+                </h2>
                 @isset($stop)
                     <p class="text-info">
                         Stop number: {{ $stop }}

diff --git a/resources/views/components/ciim-card.blade.php b/resources/views/components/ciim-card.blade.php
@@ -24,11 +24,11 @@
         <div class="card-body ">
             <div class="contents-label mb-3">
                 @if(array_key_exists('title',$record['_source'] ))
-                    <h3>
+                    <h2>
                         <a href="{{ env('COLLECTION_URL') }}/id/object/{{ $pris[0] }}" class="stretched-link">
                             {{ ucfirst($record['_source']['title'][0]['value']) }}
                         </a>
-                    </h3>
+                    </h2>
                 @else
                     <h3>
                         <a href="{{ env('COLLECTION_URL') }}/id/object/{{ $pris[0] }}" class="stretched-link">

diff --git a/resources/views/components/exhibition-card.blade.php b/resources/views/components/exhibition-card.blade.php
@@ -21,11 +21,11 @@
 
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a href="{{ route($route, $params) }}" class="stretched-link">
                         {{ $title }}
                     </a>
-                </h3>
+                </h2>
                 @if($status === 'current' && $ticketed === true && !is_null($tessitura))
                     <p class="text-info">Ticket and timed entry</p>
                     <a class="btn btn-dark mb-2" href="https://tickets.museums.cam.ac.uk/overview/{{ $tessitura }}">Book

diff --git a/resources/views/components/exhibition-files.blade.php b/resources/views/components/exhibition-files.blade.php
@@ -1,7 +1,7 @@
 @if(!empty($files))
     <div class="container">
         <div class="col-12 shadow-sm p-3 mx-auto mb-3 ">
-            <h3>Exhibition files and maps</h3>
+            <h2>Exhibition files and maps</h2>
             <ul>
                 @foreach($files as $file)
                     <li>

diff --git a/resources/views/components/exhibition-thanks.blade.php b/resources/views/components/exhibition-thanks.blade.php
@@ -1,9 +1,9 @@
 @if(!empty($exhibition['exhibition_thank_you']))
     <div class="container">
         <div class="col-12 shadow-sm p-3 mx-auto mb-3 mt-3">
-            <h3>
+            <h2>
                 Acknowledgements
-            </h3>
+            </h2>
             @markdown($exhibition['exhibition_thank_you'])
         </div>
     </div>

diff --git a/resources/views/components/family-video.blade.php b/resources/views/components/family-video.blade.php
@@ -15,7 +15,9 @@
         @endif
         <div class="card-body ">
             <div class="contents-label mb-3">
-                <h3>{{ $session['title'] }}</h3>
+                <h2>
+                    {{ $session['title'] }}
+                </h2>
             </div>
         </div>
     </div>

diff --git a/resources/views/components/gallery-card.blade.php b/resources/views/components/gallery-card.blade.php
@@ -21,11 +21,11 @@
         @endisset
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a href="{{ route($route, $params) }}" class="stretched-link">
                         {{ $title }}
                     </a>
-                </h3>
+                </h2>
                 @if($status)
                     @foreach($status as $stat)
                         <span class="badge badge-wine mb-1">{{$stat}}</span>

diff --git a/resources/views/components/governance-card.blade.php b/resources/views/components/governance-card.blade.php
@@ -21,11 +21,11 @@
         @endisset
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a href="{{ $file['data']['full_url'] }}" class="stretched-link">
                         {{ $title }}
                     </a>
-                </h3>
+                </h2>
                 <p>@mime($file['type']) - @humansize($file['filesize'])</p>
                 <p class="text-info">
                     Document type: {{ ucfirst($type) }}

diff --git a/resources/views/components/image-card.blade.php b/resources/views/components/image-card.blade.php
@@ -21,11 +21,11 @@
         @endisset
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a href="{{ route($route, $params) }}" class="stretched-link">
                         {{ $title }}
                     </a>
-                </h3>
+                </h2>
             </div>
         </div>
     </div>

diff --git a/resources/views/components/learning-file-card.blade.php b/resources/views/components/learning-file-card.blade.php
@@ -2,9 +2,9 @@
     <div class="card card-fitz h-100">
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     {{ $file['learning_files_id']['title'] }}
-                </h3>
+                </h2>
                 <ul>
                     <li>Resource type: {{ ucfirst($file['learning_files_id']['type']) }}</li>
                     <li>File size: @humansize($file['learning_files_id']['file']['filesize'],2)</li>

diff --git a/resources/views/components/learning-profile-card.blade.php b/resources/views/components/learning-profile-card.blade.php
@@ -2,9 +2,9 @@
     <div class="card card-fitz h-100 ">
         <div class="card-body">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     {{ $profile['display_name'] }}
-                </h3>
+                </h2>
                 <p>
                     {{ $profile['job_title']}}<br/>
                     Telephone: {{ $profile['telephone_number']}}<br/>

diff --git a/resources/views/components/partner-card.blade.php b/resources/views/components/partner-card.blade.php
@@ -21,11 +21,11 @@
         @endisset
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a href="{{ $url }}" class="stretched-link">
                         {{ $title }}
                     </a>
-                </h3>
+                </h2>
                 @isset($subtitle)
                     <p class="text-info">{{ $subtitle }}</p>
                 @endisset

diff --git a/resources/views/components/press-card.blade.php b/resources/views/components/press-card.blade.php
@@ -11,11 +11,11 @@
         @endif
         <div class="card-body ">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a class="stretched-link" href="{{ $release['file']['data']['full_url'] }}">
                         {{ $release['title']}}
                     </a>
-                </h3>
+                </h2>
             </div>
             <p class="card-text">{{ substr(strip_tags(htmlspecialchars_decode($release['body'])),0,200) }}...</p>
             <p class="text-info">

diff --git a/resources/views/components/shopify-card.blade.php b/resources/views/components/shopify-card.blade.php
@@ -18,11 +18,11 @@
         @endisset
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a href="{{ $result['url'][0] }}" class="stretched-link">
                         {{ $result['title'][0] }}
                     </a>
-                </h3>
+                </h2>
                 <p class="text-info">£{{ number_format((float)$result['price'][0], 2, '.', '') }}</p>
             </div>
         </div>

diff --git a/resources/views/components/shopify-live-card.blade.php b/resources/views/components/shopify-live-card.blade.php
@@ -9,12 +9,12 @@
 
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3>
+                <h2>
                     <a href="{{ env('SHOPIFY_FME_PROTOCOL') }}{{ env('SHOPIFY_FME_LIVE_URL') }}{{ env('SHOPIFY_FME_CATALOGUE') }}{{ $result['handle'] }}"
                        class="stretched-link">
                         {{ $result['title'] }}
                     </a>
-                </h3>
+                </h2>
                 <p class="text-info">£{{ number_format((float)$result['variants'][0]['price'], 2, '.', '') }}</p>
             </div>
         </div>

diff --git a/resources/views/components/solr-card.blade.php b/resources/views/components/solr-card.blade.php
@@ -19,7 +19,9 @@ class="card-img-top"
         @endif
         <div class="card-body h-100">
             <div class="contents-label mb-3">
-                <h3><a href="{{ $result['url'][0] }}" class="stretched-link">{{ $result['title'][0] }}</a></h3>
+                <h2>
+                    <a href="{{ $result['url'][0] }}" class="stretched-link">{{ $result['title'][0] }}</a>
+                </h2>
                 @isset($result['publication_date'][0])
                     <p class="text-info">{{ Carbon\Carbon::parse($result['publication_date'][0] )->format('l dS F Y')}}</p>
                     @if(Carbon\Carbon::parse($result['publication_date'][0])->diffInDays() > 120)