Merge branch 'release/0.5.16'
This commit is contained in:
commit
52f7cd85fe
7 changed files with 51 additions and 17 deletions
|
|
@ -41,6 +41,7 @@ class Place extends Model
|
|||
return [
|
||||
'slug' => [
|
||||
'source' => 'name',
|
||||
'onUpdate' => true,
|
||||
],
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -28,19 +28,4 @@ Notes «
|
|||
<link rel="stylesheet" href="/assets/prism/prism.css">
|
||||
@stop
|
||||
|
||||
@section('bio')
|
||||
@if ($homepage === true)
|
||||
<div class="h-card">
|
||||
<p>My name is <span class="p-name p-author">Jonny Barnes</span>, and <a rel="me" href="https://jonnybarnes.uk" class="u-url"><code>jonnybarnes.uk</code></a> is my site. I’m from <a href="https://en.wikipedia.org/wiki/Manchester" class="h-adr p-adr"><span class="p-locality">Manchester</span>, <abbr class="p-country-name" title="United Kingdom">UK</abbr></a>.</p>
|
||||
<p>I am active to varying degrees on several <a href="https://indieweb.org/silo">silos</a>:</p>
|
||||
<ul class="social-list">
|
||||
<li>I keep in touch with friends on <a rel="me" href="https://www.facebook.com/jonnybarnes" class="u-url">Facebook</a></li>
|
||||
<li>I follow people I find interesting on <a rel="me" href="https://twitter.com/jonnybarnes" class="u-url">Twitter</a></li>
|
||||
<li>I push code to <a rel="me" href="https://github.com/jonnybarnes" class="u-url">GitHub</a></li>
|
||||
<li>I scrobble songs to <a rel="me" href="https://last.fm/user/jonnymbarnes" class="u-url">last.fm</a> that I listen to on <a rel="me" href="https://open.spotify.com/user/jonnybarnes89" class="u-url">Spotify</a></li>
|
||||
<li>I post photos to <a rel="me" href="https://www.instagram.com/jonnybarnes/">Instagram</a></li>
|
||||
</ul>
|
||||
<p>My usual online nickname is normally <code class="nickname">jonnybarnes</code> for other services. Here’s a <a href="/assets/img/jmb-bw.png" class="u-photo photo">profile pic</a>. I also have a <a class="pgpkey" href="/assets/jonnybarnes-public-key-ecc.asc">PGP key</a>, with <a href="/notes/5g">fingerprint</a>. You can email me at jonny at my domain, or message me on XMPP using the same address.</p>
|
||||
</div>
|
||||
@endif
|
||||
@stop
|
||||
@if ($homepage === true)@include('templates.bio')@endif
|
||||
|
|
|
|||
15
resources/views/templates/bio.blade.php
Normal file
15
resources/views/templates/bio.blade.php
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
@section('bio')
|
||||
<div class="h-card">
|
||||
<p>My name is <span class="p-name p-author">Jonny Barnes</span>, and <a rel="me" href="https://jonnybarnes.uk" class="u-url"><code>jonnybarnes.uk</code></a> is my site. I’m from <a href="https://en.wikipedia.org/wiki/Manchester" class="h-adr p-adr"><span class="p-locality">Manchester</span>, <abbr class="p-country-name" title="United Kingdom">UK</abbr></a>.</p>
|
||||
<p>I am active to varying degrees on several <a href="https://indieweb.org/silo">silos</a>:</p>
|
||||
<ul class="social-list">
|
||||
<li>I keep in touch with friends on <a rel="me" href="https://www.facebook.com/jonnybarnes" class="u-url">Facebook</a></li>
|
||||
<li>I follow people I find interesting on <a rel="me" href="https://twitter.com/jonnybarnes" class="u-url">Twitter</a></li>
|
||||
<li>I push code to <a rel="me" href="https://github.com/jonnybarnes" class="u-url">GitHub</a></li>
|
||||
<li>I scrobble songs to <a rel="me" href="https://last.fm/user/jonnymbarnes" class="u-url">last.fm</a> that I listen to on <a rel="me" href="https://open.spotify.com/user/jonnybarnes89" class="u-url">Spotify</a></li>
|
||||
<li>I post photos to <a rel="me" href="https://www.instagram.com/jonnybarnes/">Instagram</a></li>
|
||||
<li>I also post to <a rel="me" href="https://pnut.io/@jonnybarnes">pnut.io</a></li>
|
||||
</ul>
|
||||
<p>My usual online nickname is normally <code class="nickname">jonnybarnes</code> for other services. Here’s a <a href="/assets/img/jmb-bw.png" class="u-photo photo">profile pic</a>. I also have a <a class="pgpkey" href="/assets/jonnybarnes-public-key-ecc.asc">PGP key</a>, with <a href="/notes/5g">fingerprint</a>. You can email me at jonny at my domain, or message me on XMPP using the same address.</p>
|
||||
</div>
|
||||
@stop
|
||||
|
|
@ -23,7 +23,18 @@
|
|||
@if($note->replies > 0) @include('templates.replies-icon'): {{ $note->replies }}@endif
|
||||
</div>
|
||||
<div class="social-links">
|
||||
@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
|
||||
</div>
|
||||
</div>
|
||||
@if ($note->placeLink)
|
||||
|
|
|
|||
|
|
@ -17,3 +17,13 @@
|
|||
/>
|
||||
</svg>
|
||||
</a>@endif
|
||||
@if($swarm_url !== null)<a class="u-syndication" href="{{ $swarm_url }}" title="View note on Swarm">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMinYMin meet" viewBox="0 0 215.6059 201.1292" xml:space="preserve" xmlns:xlink="http://www.w3.org/1999/xlink" class="icon">
|
||||
<g><path d="M209.3608,107.7425c-4.8398-10.875-11.8672-20.0664-19.7891-25.8711 c-8.5742-6.293-17.2812-7.9766-24.4961-4.7617c-14.3438,6.3828-17.3633,29.8438-6.8711,53.4063 c4.8398,10.875,11.8672,20.0664,19.7891,25.8711c5.7344,4.207,11.5234,6.3555,16.8906,6.3555c2.6602,0,5.2148-0.5273,7.6094-1.5938 h-0.0039C216.8335,154.7659,219.853,131.305,209.3608,107.7425z" fill="#314E55"/><path d="M199.2397,153.844c-0.0039,0-0.0039,0-0.0039,0c-4.4844,1.9961-10.3516,0.6133-16.5117-3.9062 c-6.8164-4.9961-12.9297-13.0508-17.2148-22.6719c-8.375-18.8203-7.0859-38.4414,2.8203-42.8516 c1.3398-0.5977,2.8008-0.8906,4.3594-0.8906c3.6562,0,7.832,1.6289,12.1523,4.7969c6.8164,4.9961,12.9297,13.0508,17.2148,22.6719 C210.4311,129.8128,209.1421,149.4339,199.2397,153.844z" fill="#E4AD40"/><path d="M192.396,173.6604c-15.0117,2.832-35.3242-15.1172-46.2266-40.8086 c-8.1953-19.3047-9.8203-39.3789-4.2422-52.3828c0.6054-1.4062,0.3516-3.0352-0.6484-4.1953 c-1.0039-1.1562-2.582-1.6328-4.0547-1.25c-26.7539,7.1133-45.4414,32.6523-45.4414,62.1055c0,35.2891,26.9141,64,60,64 c16.8594,0,33.043-7.6328,44.3906-20.9375c1.1016-1.293,1.2695-3.1328,0.418-4.6016 C195.7475,174.1253,194.0796,173.3714,192.396,173.6604z" fill="#314E55"/><path d="M151.7827,193.1292c-28.6719,0-52-25.1211-52-56c0-23.0625,12.9492-43.3594,32.2734-51.8438 c-3.1523,14.3555-0.7812,32.9531,6.7461,50.6914c10.5195,24.7852,28.168,42.1719,44.8086,45.4258 C174.56,188.9339,163.3452,193.1292,151.7827,193.1292z" fill="#E4AD40"/><path d="M87.4468,163.5276c-4.75-10.8672-9.6953-34.957-9.7461-35.1992c-0.3086-1.5156-1.4648-2.7149-2.9648-3.082 c-1.5-0.3711-3.082,0.1602-4.0586,1.3594c-4.5703,5.6289-27.1562,34.3828-22.6875,47.7891 c4.4102,13.2383,41.7656,20.7031,53.1094,22.6758c0.2266,0.0391,0.457,0.0586,0.6836,0.0586c1.3789,0,2.6797-0.7148,3.4141-1.918 c0.8555-1.4023,0.7656-3.1836-0.2227-4.4922C104.8413,190.5393,91.56,172.9221,87.4468,163.5276z" fill="#314E55"/><path d="M55.5757,171.8636c-1.9023-5.7188,7.1484-21.2188,16.1445-33.5 c1.9375,8.3555,5.1406,20.9219,8.3984,28.3672c2.5781,5.8945,8.1055,14.2773,12.4453,20.4883 C74.5796,183.1956,57.271,176.9417,55.5757,171.8636z" fill="#E4AD40"/><path d="M69.1655,85.3128c26.1523,0,42.25-11.457,42.9688-11.9805c1.7539-1.2734,2.1719-3.7148,0.9453-5.5 c-1.5156-2.2031-37.5-53.957-73.3203-54.6953c-12.625-0.2148-23.5742,5.707-32.5938,17.7383 c-9.1719,12.2305-7.8789,21.7734-5.1758,27.625C9.978,75.805,39.0054,83.6057,63.5054,85.137 C65.4429,85.2581,67.3296,85.3128,69.1655,85.3128z" fill="#314E55"/><path d="M9.2515,55.1487C6.6499,49.512,8.103,42.9612,13.564,35.6721c7.3359-9.7813,15.6523-14.543,25.4063-14.543 c0.2031,0,0.4102,0,0.6172,0.0078c26.8164,0.5469,55.8477,36.4102,64.4023,47.8008c-6.1836,3.3438-20.4062,9.4336-39.9844,8.2148 C36.5405,75.4378,14.5366,66.594,9.2515,55.1487z" fill="#E4AD40"/><path d="M121.7788,64.8401c0.1992,0,0.3984-0.0156,0.5977-0.043c1.0039-0.1523,24.7656-3.8867,34.4609-20.668 c4.6094-7.9883,7.1952-16.5781,7.2812-24.1875c0.0938-8.4414-2.8672-14.832-8.3359-17.9883 c-10.6758-6.1562-26.9531,2.6914-37.0547,20.1758c-9.6875,16.7813-1.0391,39.2305-0.668,40.1758 C118.6694,63.8518,120.1577,64.8401,121.7788,64.8401z" fill="#314E55"/><path d="M125.6577,26.1292c6.8047-11.7852,16.2539-18.1133,22.5742-18.1133c1.3438,0,2.5469,0.2852,3.5508,0.8672 c2.8164,1.625,4.3984,5.625,4.3359,10.9688c-0.0703,6.2578-2.2734,13.4609-6.2109,20.2773 c-5.8751,10.1719-19.2344,14.5352-25.4414,16.0625C122.685,50.0511,119.7827,36.3011,125.6577,26.1292z" fill="#E4AD40"/></g>
|
||||
</svg>
|
||||
</a>@endif
|
||||
@if($instagram_url !== null)<a class="u-syndication" href="{{ $instagram_url }}" title="View note on Instagram">
|
||||
<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" preserveAspectRatio="xMinYMin meet" viewBox="0 0 130 130" class="icon">
|
||||
<defs><linearGradient id="b"><stop offset="0" stop-color="#3771c8"/><stop stop-color="#3771c8" offset=".128"/><stop offset="1" stop-color="#60f" stop-opacity="0"/></linearGradient><linearGradient id="a"><stop offset="0" stop-color="#fd5"/><stop offset=".1" stop-color="#fd5"/><stop offset=".5" stop-color="#ff543e"/><stop offset="1" stop-color="#c837ab"/></linearGradient><radialGradient id="c" cx="158.429" cy="578.088" r="65" xlink:href="#a" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0 -1.98198 1.8439 0 -1031.402 454.004)" fx="158.429" fy="578.088"/><radialGradient id="d" cx="147.694" cy="473.455" r="65" xlink:href="#b" gradientUnits="userSpaceOnUse" gradientTransform="matrix(.17394 .86872 -3.5818 .71718 1648.348 -458.493)" fx="147.694" fy="473.455"/></defs><path fill="url(#c)" d="M65.03 0C37.888 0 29.95.028 28.407.156c-5.57.463-9.036 1.34-12.812 3.22-2.91 1.445-5.205 3.12-7.47 5.468C4 13.126 1.5 18.394.595 24.656c-.44 3.04-.568 3.66-.594 19.188-.01 5.176 0 11.988 0 21.125 0 27.12.03 35.05.16 36.59.45 5.42 1.3 8.83 3.1 12.56 3.44 7.14 10.01 12.5 17.75 14.5 2.68.69 5.64 1.07 9.44 1.25 1.61.07 18.02.12 34.44.12 16.42 0 32.84-.02 34.41-.1 4.4-.207 6.955-.55 9.78-1.28 7.79-2.01 14.24-7.29 17.75-14.53 1.765-3.64 2.66-7.18 3.065-12.317.088-1.12.125-18.977.125-36.81 0-17.836-.04-35.66-.128-36.78-.41-5.22-1.305-8.73-3.127-12.44-1.495-3.037-3.155-5.305-5.565-7.624C116.9 4 111.64 1.5 105.372.596 102.335.157 101.73.027 86.19 0H65.03z" transform="translate(1.004 1)"/><path fill="url(#d)" d="M65.03 0C37.888 0 29.95.028 28.407.156c-5.57.463-9.036 1.34-12.812 3.22-2.91 1.445-5.205 3.12-7.47 5.468C4 13.126 1.5 18.394.595 24.656c-.44 3.04-.568 3.66-.594 19.188-.01 5.176 0 11.988 0 21.125 0 27.12.03 35.05.16 36.59.45 5.42 1.3 8.83 3.1 12.56 3.44 7.14 10.01 12.5 17.75 14.5 2.68.69 5.64 1.07 9.44 1.25 1.61.07 18.02.12 34.44.12 16.42 0 32.84-.02 34.41-.1 4.4-.207 6.955-.55 9.78-1.28 7.79-2.01 14.24-7.29 17.75-14.53 1.765-3.64 2.66-7.18 3.065-12.317.088-1.12.125-18.977.125-36.81 0-17.836-.04-35.66-.128-36.78-.41-5.22-1.305-8.73-3.127-12.44-1.495-3.037-3.155-5.305-5.565-7.624C116.9 4 111.64 1.5 105.372.596 102.335.157 101.73.027 86.19 0H65.03z" transform="translate(1.004 1)"/><path fill="#fff" d="M66.004 18c-13.036 0-14.672.057-19.792.29-5.11.234-8.598 1.043-11.65 2.23-3.157 1.226-5.835 2.866-8.503 5.535-2.67 2.668-4.31 5.346-5.54 8.502-1.19 3.053-2 6.542-2.23 11.65C18.06 51.327 18 52.964 18 66s.058 14.667.29 19.787c.235 5.11 1.044 8.598 2.23 11.65 1.227 3.157 2.867 5.835 5.536 8.503 2.667 2.67 5.345 4.314 8.5 5.54 3.054 1.187 6.543 1.996 11.652 2.23 5.12.233 6.755.29 19.79.29 13.037 0 14.668-.057 19.788-.29 5.11-.234 8.602-1.043 11.656-2.23 3.156-1.226 5.83-2.87 8.497-5.54 2.67-2.668 4.31-5.346 5.54-8.502 1.18-3.053 1.99-6.542 2.23-11.65.23-5.12.29-6.752.29-19.788 0-13.036-.06-14.672-.29-19.792-.24-5.11-1.05-8.598-2.23-11.65-1.23-3.157-2.87-5.835-5.54-8.503-2.67-2.67-5.34-4.31-8.5-5.535-3.06-1.187-6.55-1.996-11.66-2.23-5.12-.233-6.75-.29-19.79-.29zm-4.306 8.65c1.278-.002 2.704 0 4.306 0 12.816 0 14.335.046 19.396.276 4.68.214 7.22.996 8.912 1.653 2.24.87 3.837 1.91 5.516 3.59 1.68 1.68 2.72 3.28 3.592 5.52.657 1.69 1.44 4.23 1.653 8.91.23 5.06.28 6.58.28 19.39s-.05 14.33-.28 19.39c-.214 4.68-.996 7.22-1.653 8.91-.87 2.24-1.912 3.835-3.592 5.514-1.68 1.68-3.275 2.72-5.516 3.59-1.69.66-4.232 1.44-8.912 1.654-5.06.23-6.58.28-19.396.28-12.817 0-14.336-.05-19.396-.28-4.68-.216-7.22-.998-8.913-1.655-2.24-.87-3.84-1.91-5.52-3.59-1.68-1.68-2.72-3.276-3.592-5.517-.657-1.69-1.44-4.23-1.653-8.91-.23-5.06-.276-6.58-.276-19.398s.046-14.33.276-19.39c.214-4.68.996-7.22 1.653-8.912.87-2.24 1.912-3.84 3.592-5.52 1.68-1.68 3.28-2.72 5.52-3.592 1.692-.66 4.233-1.44 8.913-1.655 4.428-.2 6.144-.26 15.09-.27zm29.928 7.97c-3.18 0-5.76 2.577-5.76 5.758 0 3.18 2.58 5.76 5.76 5.76 3.18 0 5.76-2.58 5.76-5.76 0-3.18-2.58-5.76-5.76-5.76zm-25.622 6.73c-13.613 0-24.65 11.037-24.65 24.65 0 13.613 11.037 24.645 24.65 24.645C79.617 90.645 90.65 79.613 90.65 66S79.616 41.35 66.003 41.35zm0 8.65c8.836 0 16 7.163 16 16 0 8.836-7.164 16-16 16-8.837 0-16-7.164-16-16 0-8.837 7.163-16 16-16z"/>
|
||||
</svg>
|
||||
</a>@endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue