Skip to content

Commit

Permalink
Merge pull request #321
Browse files Browse the repository at this point in the history
Fix components
  • Loading branch information
portableant authored May 10, 2022
2 parents 0c084e0 + 0774266 commit 8468a9c
Show file tree
Hide file tree
Showing 30 changed files with 144 additions and 89 deletions.
6 changes: 4 additions & 2 deletions resources/views/components/associated-curator.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,16 @@
<img class="card-img-top" src="{{ $curator['associated_people_id']['profile_image']['data']['thumbnails'][2]['url']}}"
alt="A profile image of {{ $curator['associated_people_id']['display_name'] }}"
width="{{ $curator['associated_people_id']['profile_image']['data']['thumbnails'][2]['width'] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@else
<a href="{{ route('exhibition-externals', $curator['associated_people_id']['slug']) }}">
<img class="card-img-top"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in image for {{ $curator['associated_people_id']['display_name'] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@endisset
<div class="card-body h-100">
Expand Down
6 changes: 4 additions & 2 deletions resources/views/components/audioguide-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
<img class="card-img-top" src="{{ $image['data']['thumbnails'][2]['url']}}"
alt="{{ $altTag }}"
width="{{ $image['data']['thumbnails'][2]['width'] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@else
<a href="{{ route($route, $params) }}">
<img class="card-img-top"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in image for {{ $title }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@endisset
<div class="card-body h-100">
Expand Down
8 changes: 4 additions & 4 deletions resources/views/components/carousel-slide.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
@if($slugify)
<a href="{{ route($route, Str::slug($slide[0][$param],'-')) }}" class="stretched-link">
<img class="card-img-top" alt="{{$slide[0][$title]}}"
src="{{ $slide[0][$imageObject]['data']['thumbnails'][13]['url'] }}">
src="{{ $slide[0][$imageObject]['data']['thumbnails'][13]['url'] }} /">
</a>
@else
<a href="{{ route($route, $slide[0][$param]) }}" class="stretched-link">
<img class="card-img-top" alt="{{$slide[0][$title]}}"
src="{{ $slide[0][$imageObject]['data']['thumbnails'][13]['url'] }}">
src="{{ $slide[0][$imageObject]['data']['thumbnails'][13]['url'] }}"/>
</a>
@endif
<div class="card-body">
Expand All @@ -37,12 +37,12 @@ class="stretched-link">
@if($slugify)
<a href="{{ route($route, Str::slug($slide[$param],'-')) }}" class="stretched-link">
<img class="card-img-top" alt="{{$slide[$title]}}"
src="{{ $slide[$imageObject]['data']['thumbnails'][13]['url'] }}">
src="{{ $slide[$imageObject]['data']['thumbnails'][13]['url'] }}"/>
</a>
@else
<a href="{{ route($route, $slide[$param]) }}" class="stretched-link">
<img class="card-img-top" alt="{{$slide[$title]}}"
src="{{ $slide[$imageObject]['data']['thumbnails'][13]['url'] }}">
src="{{ $slide[$imageObject]['data']['thumbnails'][13]['url'] }}"/>

</a>
@endif
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/ciim-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
<a href="{{ env('COLLECTION_URL') }}/id/object/{{ $pris[0] }}">
<img class="results_image__thumbnail"
src="https://content.fitz.ms/fitz-website/assets/no-image-available.png?key=directus-medium-crop"
alt="A stand in image for {{ ucfirst($record['_source']['summary_title']) }}}"/>
alt="A stand in image for {{ ucfirst($record['_source']['summary_title']) }}}"
/>
</a>
@endif
<div class="card-body ">
Expand All @@ -38,7 +39,6 @@
<p class="text-info">
{{ $record['_source']['identifier'][0]['accession_number'] }}
</p>

</div>
</div>
</div>
Expand Down
12 changes: 7 additions & 5 deletions resources/views/components/exhibition-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,19 @@
<img class="card-img-top" src="{{ $image['data']['thumbnails'][13]['url']}}"
alt="{{ $altTag }}"
width="{{ $image['data']['thumbnails'][13]['width'] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@else
<a href="{{ route($route, $params) }}">
<img class="card-img-top"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in image for {{ $title }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@endisset

<div class="card-body h-100">
<div class="contents-label mb-3">
<h3>
Expand All @@ -35,10 +38,9 @@
</p>
@if($status === 'archived')
<span class="badge bg-maroon p-2 d-block">
This is now closed
</span>
This is now closed
</span>
@endif

</div>
</div>
@isset($copyright)
Expand Down
4 changes: 3 additions & 1 deletion resources/views/components/exhibition-files.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<ul>
@foreach($files as $file)
<li>
<a href="{{ $file['directus_files_id']['data']['full_url'] }}">{{ $file['directus_files_id']['title'] }}</a>
<a href="{{ $file['directus_files_id']['data']['full_url'] }}">
{{ $file['directus_files_id']['title'] }}
</a>
</li>
@endforeach
</ul>
Expand Down
4 changes: 3 additions & 1 deletion resources/views/components/exhibition-thanks.blade.php
Original file line number Diff line number Diff line change
@@ -1,7 +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>Acknowledgements</h3>
<h3>
Acknowledgements
</h3>
@markdown($exhibition['exhibition_thank_you'])
</div>
</div>
Expand Down
6 changes: 5 additions & 1 deletion resources/views/components/faq.blade.php
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<div>
<h3>{{ $faq['question'] }}</h3>
<h3>
{{ $faq['question'] }}
</h3>

@markdown($faq['answer'])

</div>
6 changes: 4 additions & 2 deletions resources/views/components/fundraising-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
<a href="{{ $donate['url'] }}">
<img class="card-img-top" src="{{ $donate['hero_image']['data']['thumbnails'][2]['url']}}"
alt="{{ $donate['hero_image_alt_text'] }}"
loading="lazy" width="{{ $donate['hero_image']['data']['thumbnails'][2]['width'] }}"/>
loading="lazy" width="{{ $donate['hero_image']['data']['thumbnails'][2]['width'] }}"
/>
</a>
@else
<a href="{{ $donate['url'] }}">
<img class="card-img-top"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in image for {{ $donate['title'] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@endisset
<div class="card-body h-100">
Expand Down
6 changes: 4 additions & 2 deletions resources/views/components/gallery-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
<img class="card-img-top" src="{{ $image['data']['thumbnails'][2]['url']}}"
alt="{{ $altTag }}"
width="{{ $image['data']['thumbnails'][2]['width'] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@else
<a href="{{ route($route, $params) }}">
<img class="card-img-top"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in image for {{ $title }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@endisset
<div class="card-body h-100">
Expand Down
6 changes: 4 additions & 2 deletions resources/views/components/governance-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
<img class="card-img-top" src="{{ $image['data']['thumbnails'][4]['url']}}"
alt="{{ $altTag }}"
width="{{ $image['data']['thumbnails'][4]['width'] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@else
<a href="{{ $file['data']['full_url'] }}">
<img class="card-img-top"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in image for {{ $title }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@endisset
<div class="card-body h-100">
Expand Down
6 changes: 4 additions & 2 deletions resources/views/components/image-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
<img class="card-img-top" src="{{ $image['data']['thumbnails'][13]['url']}}"
alt="{{ $altTag }}"
width="{{ $image['data']['thumbnails'][13]['width'] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@else
<a href="{{ route($route, $params) }}">
<img class="card-img-top"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in image for {{ $title }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@endisset
<div class="card-body h-100">
Expand Down
18 changes: 11 additions & 7 deletions resources/views/components/instagram-card.blade.php
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
<div class="col-md-4 mb-3">
<div class="card h-100">
@if(!empty($instagram['hero_image']))
<a href="{{ route('instagram.story', $instagram['slug']) }}"><img class="img-fluid"
src="{{ $instagram['hero_image']['data']['thumbnails'][2]['url']}}"
alt="{{ $instagram['hero_image_alt_text'] }}"
width="{{ $instagram['hero_image']['data']['thumbnails'][5]['width'] }}"
height="{{ $instagram['hero_image']['data']['thumbnails'][5]['height'] }}"
loading="lazy"/></a>
<a href="{{ route('instagram.story', $instagram['slug']) }}">
<img class="img-fluid"
src="{{ $instagram['hero_image']['data']['thumbnails'][2]['url']}}"
alt="{{ $instagram['hero_image_alt_text'] }}"
width="{{ $instagram['hero_image']['data']['thumbnails'][5]['width'] }}"
height="{{ $instagram['hero_image']['data']['thumbnails'][5]['height'] }}"
loading="lazy"/>
</a>
@else
<a href="{{ route('instagram.story', $instagram['slug']) }}">
<img class="img-fluid"
Expand All @@ -20,7 +22,9 @@
<h3>
<a href="{{ route('instagram.story', $instagram['slug']) }}">{{ $instagram['title'] }}</a>
</h3>
<p class="text-info">{{ Carbon\Carbon::parse($instagram['date_posted'])->format('l j F Y') }}</p>
<p class="text-info">
{{ Carbon\Carbon::parse($instagram['date_posted'])->format('l j F Y') }}
</p>
</div>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions resources/views/components/learning-file-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
<li>File type: PDF</li>
@endif
</ul>
<a href="{{ $file['learning_files_id']['file']['data']['url'] }}" class="btn btn-dark d-block"><i class="fa fa-download mr-2" aria-hidden="true"></i> Download file</a>

<a href="{{ $file['learning_files_id']['file']['data']['url'] }}" class="btn btn-dark d-block">
<i class="fa fa-download mr-2" aria-hidden="true"></i> Download file
</a>
</div>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions resources/views/components/learning-profile-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
{{ $profile['display_name'] }}
</h3>
<p>
{{ $profile['job_title']}}<br />
Telephone: {{ $profile['telephone_number']}}<br />
{{ $profile['job_title']}}<br/>
Telephone: {{ $profile['telephone_number']}}<br/>
Email: <a href="mailto:{{ $profile['email_address']}}">{{ $profile['email_address']}}</a>
</p>
</div>
Expand Down
6 changes: 4 additions & 2 deletions resources/views/components/partner-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
<a href="{{ $url }}">
<img class="card-img-top" src="{{ $image['data']['thumbnails'][2]['url']}}"
alt="{{ $altTag }}"
loading="lazy" width="{{ $image['data']['thumbnails'][2]['width'] }}"/>
loading="lazy" width="{{ $image['data']['thumbnails'][2]['width'] }}"
/>
</a>
@else
<a href="{{ $url }}">
<img class="card-img-top"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in image for {{ $title }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@endisset
<div class="card-body h-100">
Expand Down
10 changes: 5 additions & 5 deletions resources/views/components/press-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
<img class="img-fluid" src="{{ $release['hero_image']['data']['thumbnails'][4]['url']}}"
width="{{ $release['hero_image']['data']['thumbnails'][4]['width'] }}"
height="{{ $release['hero_image']['data']['thumbnails'][4]['height'] }}"
alt="{{ $release['hero_image_alt_text'] }}" loading="lazy"/>
alt="{{ $release['hero_image_alt_text'] }}" loading="lazy"
/>
@endif
<div class="card-body ">

<div class="contents-label mb-3">
<h3>
<a class="stretched-link"
Expand All @@ -21,9 +21,9 @@
{{ Carbon\Carbon::parse($release['release_date'])->format('l j F Y') }}
</p>
<p> @mime($release['file']['type']) - @humansize($release['file']['filesize'])</p>
<a href="{{ $release['file']['data']['full_url'] }}" class="btn d-block btn-dark stretched-link">Download
file</a>

<a href="{{ $release['file']['data']['full_url'] }}" class="btn d-block btn-dark stretched-link">
Download file
</a>
</div>
</div>
</div>
6 changes: 4 additions & 2 deletions resources/views/components/shopify-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
<a href="{{ $result['url'][0] }}">
<img class="card-img-top" src="{{ $result['thumbnail'][0]}}"
alt="A product image depicting {{ $result['title'][0] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@else
<a href="{{ $result['url'][0] }}">
<img class="card-img-top"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in product image depicting {{ $result['title'][0] }}"
loading="lazy"/>
loading="lazy"
/>
</a>
@endisset
<div class="card-body h-100">
Expand Down
6 changes: 4 additions & 2 deletions resources/views/components/shopify-live-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@
<a href="{{ env('SHOPIFY_FME_PROTOCOL') }}{{ env('SHOPIFY_FME_LIVE_URL') }}{{ env('SHOPIFY_FME_CATALOGUE') }}{{ $result['handle'] }}">
<img class="card-img-top" src="{{ $result['image']['src']}}"
alt="A product image depicting {{ $result['image']['src'] }}"
loading="lazy"/>
loading="lazy"
/>
</a>

<div class="card-body h-100">
<div class="contents-label mb-3">
<h3>
<a href="{{ env('SHOPIFY_FME_PROTOCOL') }}{{ env('SHOPIFY_FME_LIVE_URL') }}{{ env('SHOPIFY_FME_CATALOGUE') }}{{ $result['handle'] }}" class="stretched-link">
<a href="{{ env('SHOPIFY_FME_PROTOCOL') }}{{ env('SHOPIFY_FME_LIVE_URL') }}{{ env('SHOPIFY_FME_CATALOGUE') }}{{ $result['handle'] }}"
class="stretched-link">
{{ $result['title'] }}
</a>
</h3>
Expand Down
7 changes: 4 additions & 3 deletions resources/views/components/solr-card.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,16 @@
@if(!is_null($result['smallimage']))
<a href="{{ $result['url'][0] }}" class="stretched-link">
<div class="ratio ratio-4x3">
<img src="{{ $result['smallimage'][0]}}"
alt="Highlight image for {{ $result['title'][0] }}" loading="lazy"/>
<img src="{{ $result['smallimage'][0]}}" alt="Highlight image for {{ $result['title'][0] }}"
loading="lazy"/>
</div>
</a>
@else
<img class="ratio ratio-4x3"
src="https://content.fitz.ms/fitz-website/assets/gallery3_roof.jpg?key=directus-large-crop"
alt="A stand in image for {{ $result['title'][0] }}"
loading="lazy"/>
loading="lazy"
/>
@endif
<div class="card-body h-100">
<div class="contents-label mb-3">
Expand Down
Loading

0 comments on commit 8468a9c

Please sign in to comment.