diff --git a/app/Place.php b/app/Place.php index ccf38b1b..e3bc6acc 100644 --- a/app/Place.php +++ b/app/Place.php @@ -41,6 +41,7 @@ class Place extends Model return [ 'slug' => [ 'source' => 'name', + 'onUpdate' => true, ], ]; } diff --git a/changelog.md b/changelog.md index 4dcb88a2..a56629b2 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,10 @@ # Changelog +## Version 0.5.16 + - Allow place `slug`s to be re-generated + - Add syndication links for swarm and instagram + - Move bio to its own template, next step database? + ## Version 0.5.15 (2017-06-17) - Add support for ownyourgram.com sending h-card locations - change sluggable implementation diff --git a/database/seeds/NotesTableSeeder.php b/database/seeds/NotesTableSeeder.php index c6688ecb..334ba2df 100644 --- a/database/seeds/NotesTableSeeder.php +++ b/database/seeds/NotesTableSeeder.php @@ -40,5 +40,12 @@ class NotesTableSeeder extends Seeder 'note' => 'Note from somehwere', 'location' => '53.499,-2.379' ]); + $noteSyndicated = App\Note::create([ + 'note' => 'This note has all the syndication targets', + 'tweet_id' => '123456', + 'facebook_url' => 'https://www.facebook.com/post/12345789', + 'swarm_url' => 'https://www.swarmapp.com/checking/123456789', + 'instagram_url' => 'https://www.instagra.com/p/aWsEd123Jh', + ]); } } diff --git a/resources/views/notes/index.blade.php b/resources/views/notes/index.blade.php index d3087269..b892d27e 100644 --- a/resources/views/notes/index.blade.php +++ b/resources/views/notes/index.blade.php @@ -28,19 +28,4 @@ Notes « @stop -@section('bio') - @if ($homepage === true) -
-

My name is Jonny Barnes, and jonnybarnes.uk is my site. I’m from Manchester, UK.

-

I am active to varying degrees on several silos:

- -

My usual online nickname is normally jonnybarnes for other services. Here’s a profile pic. I also have a PGP key, with fingerprint. You can email me at jonny at my domain, or message me on XMPP using the same address.

-
- @endif -@stop +@if ($homepage === true)@include('templates.bio')@endif diff --git a/resources/views/templates/bio.blade.php b/resources/views/templates/bio.blade.php new file mode 100644 index 00000000..4c448f41 --- /dev/null +++ b/resources/views/templates/bio.blade.php @@ -0,0 +1,15 @@ +@section('bio') +
+

My name is Jonny Barnes, and jonnybarnes.uk is my site. I’m from Manchester, UK.

+

I am active to varying degrees on several silos:

+ +

My usual online nickname is normally jonnybarnes for other services. Here’s a profile pic. I also have a PGP key, with fingerprint. You can email me at jonny at my domain, or message me on XMPP using the same address.

+
+@stop diff --git a/resources/views/templates/note.blade.php b/resources/views/templates/note.blade.php index 9789dd3d..958d6103 100644 --- a/resources/views/templates/note.blade.php +++ b/resources/views/templates/note.blade.php @@ -23,7 +23,18 @@ @if($note->replies > 0) @include('templates.replies-icon'): {{ $note->replies }}@endif
- @if($note->tweet_id || $note->facebook_url)@include('templates.social-links', ['tweet_id' => $note->tweet_id, 'facebook_url' => $note->facebook_url])@endif + @if( + $note->tweet_id || + $note->facebook_url || + $note->swarm_url || + $note->instagram_url) + @include('templates.social-links', [ + 'tweet_id' => $note->tweet_id, + 'facebook_url' => $note->facebook_url, + 'swarm_url' => $note->swarm_url, + 'instagram_url' => $note->instagram_url, + ]) + @endif
@if ($note->placeLink) diff --git a/resources/views/templates/social-links.blade.php b/resources/views/templates/social-links.blade.php index 2717e440..f6017c83 100644 --- a/resources/views/templates/social-links.blade.php +++ b/resources/views/templates/social-links.blade.php @@ -17,3 +17,13 @@ /> @endif +@if($swarm_url !== null) + + + +@endif +@if($instagram_url !== null) + + + +@endif