Rumperuu/Where-in-the-World-is-Ben
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Compare commits

base: Rumperuu:d8820dd9a5dd34865cc063cf8b41ce3639001f49
Branches Tags
Rumperuu:main
..
compare: Rumperuu:1ea56eaa72cc7073a34ea3d92b6202fe2de1824f
Branches Tags
Rumperuu:main

2 commits
d8820dd9a5 ... 1ea56eaa72

Author SHA1 Message Date
Ben Goldsworthy 1ea56eaa72 Tweak checkin rendering 2022-10-29 23:59:23 +00:00
Ben Goldsworthy b839012cd9 Fix favicon href 2022-10-29 23:58:40 +00:00
2 changed files with 10 additions and 8 deletions
Show stats Expand all files Collapse all files

2
resources/views/partials/head.blade.php
View file

@ -10,7 +10,7 @@
<link rel="license" href="https://creative-commons.org/publicdomain/zero/1.0/"> <link rel="license" href="https://creative-commons.org/publicdomain/zero/1.0/">
<link rel="me" href="mailto:track@bengoldsworthy.net"> <link rel="me" href="mailto:track@bengoldsworthy.net">
<link rel="icon" sizes="32x32" href="/images/icon.png"> <link rel="icon" sizes="32x32" href="/images/favicon.png">
<link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css" <link rel="stylesheet" href="https://unpkg.com/leaflet@1.8.0/dist/leaflet.css"
integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ==" integrity="sha512-hoalWLoI8r4UszCkZ5kL8vayOGVae1oxXe/2A4AO6J9+580uKHDO3JdHb7NzwwzK5xr/Fs0W40kiNHxM9vyTtQ=="

16
resources/views/tracker.blade.php
View file

@ -42,13 +42,15 @@
<li> <li>
<details class="checkin" id="{{ $checkin->id }}" ontoggle="toggleCheckin(this.open, this.id)"> <details class="checkin" id="{{ $checkin->id }}" ontoggle="toggleCheckin(this.open, this.id)">
<summary class="checkin__summary"> <summary class="checkin__summary">
<h2 class="checkin__title">{{ $checkin->title ?? "[No title]" }}</h2> <h2 class="checkin__title">{!! $checkin->title ?? "<i>Untitled</i>" !!}</h2>
<p class="checkin__meta">{!! render_date_difference($checkin->date) !!}</p> <p class="checkin__meta">{!! render_date_difference($checkin->date) !!}</p>
</summary> </summary>
{{ $checkin->note ?? "[No note]" }} @if($checkin->note)
@if($checkin->image_url) {!! $checkin->note !!}
<img class="popup__image" loading="lazy" src="{{ $checkin->image_url }}"> @endif
@endif @if($checkin->image_url)
<img class="popup__image" loading="lazy" src="{{ $checkin->image_url }}">
@endif
</details> </details>
</li> </li>
@endforeach @endforeach
@ -90,8 +92,8 @@
@foreach($trip->checkins as $checkin) @foreach($trip->checkins as $checkin)
marker = L.marker([{{ $checkin->location->latitude }}, {{ $checkin->location->longitude }}]).addTo(map); marker = L.marker([{{ $checkin->location->latitude }}, {{ $checkin->location->longitude }}]).addTo(map);
popupMarkup = '<h2 class="popup__title">{{ $checkin->title ?? "No Title" }}</h2>'; popupMarkup = `<h2 class="popup__title">{!! $checkin->title ?? "<i>Untitled</i>" !!}</h2>`;
popupMarkup += `<p class="popup__note">{{ $checkin->note }}</p>`; popupMarkup += `<p class="popup__note">{!! $checkin->note !!}</p>`;
popupMarkup += '<img class="popup__image" src="{{ $checkin->image_url }}">'; popupMarkup += '<img class="popup__image" src="{{ $checkin->image_url }}">';
marker.bindPopup(popupMarkup).openPopup(); marker.bindPopup(popupMarkup).openPopup();