Ooof, got the dependencies all up to date as well

Lots of tests needed fixing, but it seemed to be a whitespace parsing
error in the view files 🤔
This commit is contained in:
Jonny Barnes 2019-10-27 16:15:14 +00:00
parent ec01b3c6a2
commit b2b6693aec
61 changed files with 2057 additions and 1441 deletions

View file

@ -3,28 +3,30 @@
@section('title')New Article « Admin CP « @stop
@section('content')
@if(isset($message)) <p class="error">{{ $message }}</p>@endif
<form action="/admin/blog/" method="post" accept-charset="utf-8" enctype="multipart/form-data" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="title">Title (URL):</label>
<input type="text" name="title" id="title" value="{{ old('title') }}" placeholder="Title here">
<input type="text" name="url" id="url" value="{{ old('url') }}" placeholder="Article URL">
</div>
<div>
<label for="main">Main:</label>
<textarea name="main" id="main" placeholder="Article here">{{ old('main') }}</textarea>
</div>
<div class="form-row">
<label for="published">Published:</label>
<input type="checkbox" name="published" id="published" value="1">
</div>
<p>Or you can upload an <code>.md</code> file:</p>
<div>
<input type="file" accept=".md" name="article">
</div>
<div>
<button type="submit" name="save">Save</button>
</div>
</form>
@if(isset($message))
<p class="error">{{ $message }}</p>
@endif
<form action="/admin/blog/" method="post" accept-charset="utf-8" enctype="multipart/form-data" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="title">Title (URL):</label>
<input type="text" name="title" id="title" value="{{ old('title') }}" placeholder="Title here">
<input type="text" name="url" id="url" value="{{ old('url') }}" placeholder="Article URL">
</div>
<div>
<label for="main">Main:</label>
<textarea name="main" id="main" placeholder="Article here">{{ old('main') }}</textarea>
</div>
<div class="form-row">
<label for="published">Published:</label>
<input type="checkbox" name="published" id="published" value="1">
</div>
<p>Or you can upload an <code>.md</code> file:</p>
<div>
<input type="file" accept=".md" name="article">
</div>
<div>
<button type="submit" name="save">Save</button>
</div>
</form>
@stop

View file

@ -3,32 +3,32 @@
@section('title')Edit Article « Admin CP « @stop
@section('content')
<form action="/admin/blog/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="title">Title (URL):</label>
<input type="text" name="title" id="title" value="{!! $post['0']['title'] !!}">
<input type="url" name="url" id="url" value="{!! $post['0']['url'] !!}">
</div>
<div>
<label for="main">Main:</label>
<textarea name="main" id="main">{{ $post['0']['main'] }}</textarea>
</div>
<div class="form-row">
<label for="published">Published:</label>
<input type="checkbox" name="published" value="1"@if($post['0']['published'] == '1') checked="checked"@endif>
</div>
<div>
<button type="submit" name="save">Save</button>
</div>
</form>
<hr>
<form action="/admin/blog/{{ $id }}" method="post" class="admin-form form">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<div>
<button type="submit" name="delete">Delete</button>
</div>
</form>
<form action="/admin/blog/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="title">Title (URL):</label>
<input type="text" name="title" id="title" value="{!! $post['0']['title'] !!}">
<input type="url" name="url" id="url" value="{!! $post['0']['url'] !!}">
</div>
<div>
<label for="main">Main:</label>
<textarea name="main" id="main">{{ $post['0']['main'] }}</textarea>
</div>
<div class="form-row">
<label for="published">Published:</label>
<input type="checkbox" name="published" value="1"@if($post['0']['published'] == '1') checked="checked"@endif>
</div>
<div>
<button type="submit" name="save">Save</button>
</div>
</form>
<hr>
<form action="/admin/blog/{{ $id }}" method="post" class="admin-form form">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<div>
<button type="submit" name="delete">Delete</button>
</div>
</form>
@stop

View file

@ -3,10 +3,13 @@
@section('title')List Articles « Admin CP « @stop
@section('content')
<p>Select article to edit:</p>
<ol reversed>
@foreach($posts as $post)
<li><a href="/admin/blog/{{ $post['id'] }}/edit">{{ $post['title'] }}</a>@if($post['published'] == '0')<span class="notpublished">not published</span>@endif
@endforeach
</ol>
<p>Select article to edit:</p>
<ol reversed>
@foreach($posts as $post)
<li>
<a href="/admin/blog/{{ $post['id'] }}/edit">{{ $post['title'] }}</a>
@if($post['published'] == '0')<span class="notpublished">not published</span>@endif
</li>
@endforeach
</ol>
@stop

View file

@ -3,19 +3,19 @@
@section('title')New Client « Admin CP « @stop
@section('content')
<h1>New Client</h1>
<form action="/admin/clients/" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="client_url">Client URL:</label>
<input type="text" name="client_url" id="client_url" placeholder="client_url">
</div>
<div>
<label for="client_name">Client Name:</label>
<input type="text" name="client_name" id="client_name" placeholder="client_name">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
<h1>New Client</h1>
<form action="/admin/clients/" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="client_url">Client URL:</label>
<input type="text" name="client_url" id="client_url" placeholder="client_url">
</div>
<div>
<label for="client_name">Client Name:</label>
<input type="text" name="client_name" id="client_name" placeholder="client_name">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
@stop

View file

@ -3,26 +3,26 @@
@section('title')Edit Client « Admin CP « @stop
@section('content')
<h1>Edit Client</h1>
<form action="/admin/clients/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="client_url">Client URL:</label>
<input type="text" name="client_url" id="client_url" value="{{ $client_url }}">
</div>
<div>
<label for="client_name">Client Name:</label>
<input type="text" name="client_name" id="client_name" value="{{ $client_name }}">
</div>
<div>
<button type="submit" name="edit">Edit</button>
</div>
</form>
<hr>
<form action="/admin/clients/{{ $id }}" method="post">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<button type="submit" name="delete">Delete Client</button>
</form>
<h1>Edit Client</h1>
<form action="/admin/clients/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="client_url">Client URL:</label>
<input type="text" name="client_url" id="client_url" value="{{ $client_url }}">
</div>
<div>
<label for="client_name">Client Name:</label>
<input type="text" name="client_name" id="client_name" value="{{ $client_name }}">
</div>
<div>
<button type="submit" name="edit">Edit</button>
</div>
</form>
<hr>
<form action="/admin/clients/{{ $id }}" method="post">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<button type="submit" name="delete">Delete Client</button>
</form>
@stop

View file

@ -3,13 +3,16 @@
@section('title')List Clients « Admin CP « @stop
@section('content')
<h1>Clients</h1>
<ul>
@foreach($clients as $client)
<li>{{ $client['client_url'] }} : {{ $client['client_name'] }}
<a href="/admin/clients/{{ $client['id'] }}/edit">edit?</a>
</li>
@endforeach
</ul>
<p>Create a <a href="/admin/clients/new">new entry</a>?</p>
<h1>Clients</h1>
<ul>
@foreach($clients as $client)
<li>
{{ $client['client_url'] }} : {{ $client['client_name'] }}
<a href="/admin/clients/{{ $client['id'] }}/edit">edit?</a>
</li>
@endforeach
</ul>
<p>
Create a <a href="/admin/clients/new">new entry</a>?
</p>
@stop

View file

@ -3,27 +3,27 @@
@section('title')New Contact « Admin CP « @stop
@section('content')
<h1>New Contact</h1>
<form action="/admin/contacts/" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="name">Real Name:</label>
<input type="text" name="name" id="name" placeholder="Real Name">
</div>
<div>
<label for="nick">Nick:</label>
<input type="text" name="nick" id="nick" placeholder="local_nick">
</div>
<div>
<label for="homepage">Homepage:</label>
<input type="text" name="homepage" id="homepage" placeholder="https://homepage.com">
</div>
<div>
<label for="twitter">Twitter Nick:</label>
<input type="text" name="twitter" id="twitter" placeholder="Twitter handle">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
<h1>New Contact</h1>
<form action="/admin/contacts/" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="name">Real Name:</label>
<input type="text" name="name" id="name" placeholder="Real Name">
</div>
<div>
<label for="nick">Nick:</label>
<input type="text" name="nick" id="nick" placeholder="local_nick">
</div>
<div>
<label for="homepage">Homepage:</label>
<input type="text" name="homepage" id="homepage" placeholder="https://homepage.com">
</div>
<div>
<label for="twitter">Twitter Nick:</label>
<input type="text" name="twitter" id="twitter" placeholder="Twitter handle">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
@stop

View file

@ -3,37 +3,42 @@
@section('title')Edit Contact « Admin CP « @stop
@section('content')
<h1>Edit Contact</h1>
<form action="/admin/contacts/{{ $contact->id }}" method="post" enctype="multipart/form-data" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="name">Real Name:</label>
<input type="text" name="name" id="name" placeholder="Real Name" value="{{ $contact->name }}">
</div>
<div>
<label for="nick">Nick:</label>
<input type="text" name="nick" id="nick" placeholder="local_nick" value="{{ $contact->nick }}">
</div>
<div>
<label for="homepage">Website:</label>
<input type="text" name="homepage" id="homepage" placeholder="https://homepage.com" value="{{ $contact->homepage }}">
</div>
<div>
<label for="twitter">Twitter Nick:</label>
<input type="text" name="twitter" id="twitter" placeholder="Twitter handle" value="{{ $contact->twitter }}">
</div>
<div>
<label for="facebook">Facebook Profile ID:</label>
<input type="text" name="facebook" id="facebook" placeholder="Facebook ID" value="{{ $contact->facebook }}">
</div>
<div>
<label for="avatar">Avatar:</label>
<input type="file" accept="image/*" value="Upload" name="avatar" id="avatar">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
<p>Instead of uploading an image, you can <a href="/admin/contacts/edit/{{ $contact->id }}/getavatar">grab from their homepage</a>?</p>
<h1>Edit Contact</h1>
<form action="/admin/contacts/{{ $contact->id }}" method="post" enctype="multipart/form-data" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="name">Real Name:</label>
<input type="text" name="name" id="name" placeholder="Real Name" value="{{ $contact->name }}">
</div>
<div>
<label for="nick">Nick:</label>
<input type="text" name="nick" id="nick" placeholder="local_nick" value="{{ $contact->nick }}">
</div>
<div>
<label for="homepage">Website:</label>
<input type="text" name="homepage" id="homepage" placeholder="https://homepage.com" value="{{ $contact->homepage }}">
</div>
<div>
<label for="twitter">Twitter Nick:</label>
<input type="text" name="twitter" id="twitter" placeholder="Twitter handle" value="{{ $contact->twitter }}">
</div>
<div>
<label for="facebook">Facebook Profile ID:</label>
<input type="text" name="facebook" id="facebook" placeholder="Facebook ID" value="{{ $contact->facebook }}">
</div>
<div>
<label for="avatar">Avatar:</label>
<input type="file" accept="image/*" value="Upload" name="avatar" id="avatar">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
<p>
Instead of uploading an image, you can
<a href="/admin/contacts/edit/{{ $contact->id }}/getavatar">
grab from their homepage
</a>?
</p>
@stop

View file

@ -5,6 +5,6 @@ New Contact Avatar « Admin CP
@stop
@section('content')
<p>Successfully saved the avatar contact</p>
<img src="/assets/profile-images/{{ $homepage }}/image">
<p>Successfully saved the avatar contact</p>
<img src="/assets/profile-images/{{ $homepage }}/image">
@stop

View file

@ -3,25 +3,25 @@
@section('title')List Contacts « Admin CP « @stop
@section('content')
<h1>Contacts</h1>
<table>
<tr>
<th>Real Name</th>
<th>Nick</th>
<th>Homepage</th>
<th>Twitter</th>
<th>Facebook</th>
<th></th>
</tr>
@foreach($contacts as $contact)
<tr>
<td>{{ $contact->name }}</td>
<td>{{ $contact->nick }}</td>
<td>{{ $contact->homepage }}</td>
<td>{{ $contact->twitter }}</td>
<td>{{ $contact->facebook }}</td>
<td><a href="/admin/contacts/{{ $contact->id }}/edit">edit</a></td>
</tr>
@endforeach
</table>
<h1>Contacts</h1>
<table>
<tr>
<th>Real Name</th>
<th>Nick</th>
<th>Homepage</th>
<th>Twitter</th>
<th>Facebook</th>
<th></th>
</tr>
@foreach($contacts as $contact)
<tr>
<td>{{ $contact->name }}</td>
<td>{{ $contact->nick }}</td>
<td>{{ $contact->homepage }}</td>
<td>{{ $contact->twitter }}</td>
<td>{{ $contact->facebook }}</td>
<td><a href="/admin/contacts/{{ $contact->id }}/edit">edit</a></td>
</tr>
@endforeach
</table>
@stop

View file

@ -3,15 +3,15 @@
@section('title')New Like « Admin CP « @stop
@section('content')
<h1>New Like</h1>
<form action="/admin/likes/" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="like_url">Like URL:</label>
<input type="text" name="like_url" id="like_url" placeholder="Like URL">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
<h1>New Like</h1>
<form action="/admin/likes/" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="like_url">Like URL:</label>
<input type="text" name="like_url" id="like_url" placeholder="Like URL">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
@stop

View file

@ -3,22 +3,22 @@
@section('title')Edit Like « Admin CP « @stop
@section('content')
<h1>Edit Like</h1>
<form action="/admin/likes/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="like_url">Like URL:</label>
<input type="text" name="like_url" id="like_url" value="{{ $like_url }}">
</div>
<div>
<button type="submit" name="edit">Edit</button>
</div>
</form>
<hr>
<form action="/admin/likes/{{ $id }}" method="post">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<button type="submit" name="delete">Delete Like</button>
</form>
<h1>Edit Like</h1>
<form action="/admin/likes/{{ $id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="like_url">Like URL:</label>
<input type="text" name="like_url" id="like_url" value="{{ $like_url }}">
</div>
<div>
<button type="submit" name="edit">Edit</button>
</div>
</form>
<hr>
<form action="/admin/likes/{{ $id }}" method="post">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<button type="submit" name="delete">Delete Like</button>
</form>
@stop

View file

@ -3,13 +3,16 @@
@section('title')List Likes « Admin CP « @stop
@section('content')
<h1>Likes</h1>
<ul>
@foreach($likes as $like)
<li>{{ $like['url'] }}
<a href="/admin/likes/{{ $like['id'] }}/edit">edit?</a>
</li>
@endforeach
</ul>
<p>Create a <a href="/admin/likes/create">new like</a>?</p>
<h1>Likes</h1>
<ul>
@foreach($likes as $like)
<li>
{{ $like['url'] }}
<a href="/admin/likes/{{ $like['id'] }}/edit">edit?</a>
</li>
@endforeach
</ul>
<p>
Create a <a href="/admin/likes/create">new like</a>?
</p>
@stop

View file

@ -3,37 +3,37 @@
@section('title')New Note « Admin CP « @stop
@section('content')
@if (count($errors) > 0)
<div class="errors">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
<form action="/admin/notes" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="in-reply-to" accesskey="r">Reply-to: </label>
<input type="text"
name="in-reply-to"
id="in-reply-to"
placeholder="in-reply-to-1 in-reply-to-2 …"
>
</div>
<div>
<label for="content" accesskey="n">Note: </label>
<textarea name="content"
id="content"
placeholder="Note"
autofocus="autofocus"
>{{ old('content') }}</textarea>
</div>
<div>
<button type="submit"
name="submit"
>Submit</button>
</div>
</form>
@if (count($errors) > 0)
<div class="errors">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
<form action="/admin/notes" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="in-reply-to" accesskey="r">Reply-to: </label>
<input type="text"
name="in-reply-to"
id="in-reply-to"
placeholder="in-reply-to-1 in-reply-to-2 …"
>
</div>
<div>
<label for="content" accesskey="n">Note: </label>
<textarea name="content"
id="content"
placeholder="Note"
autofocus="autofocus"
>{{ old('content') }}</textarea>
</div>
<div>
<button type="submit"
name="submit"
>Submit</button>
</div>
</form>
@stop

View file

@ -3,31 +3,31 @@
@section('title')Edit Note « Admin CP « @stop
@section('content')
<form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="in-reply-to" accesskey="r">Reply-to: </label>
<input type="text" name="in-reply-to" id="in-reply-to" placeholder="in-reply-to-1 in-reply-to-2 …" tabindex="1" value="{{ $note->in_reply_to }}">
</div>
<div>
<label for="content" accesskey="n">Note: </label>
<textarea name="content" id="content" placeholder="Note" tabindex="2">{{ $note->originalNote }}</textarea>
</div>
<div class="form-row">
<label for="webmentions" accesskey="w">Send webmentions: </label>
<input type="checkbox" name="webmentions" id="webmentions" checked="checked" tabindex="3">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
<hr>
<form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="form">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<div>
<button type="submit" name="delete">Delete</button>
</div>
</form>
<form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="in-reply-to" accesskey="r">Reply-to: </label>
<input type="text" name="in-reply-to" id="in-reply-to" placeholder="in-reply-to-1 in-reply-to-2 …" tabindex="1" value="{{ $note->in_reply_to }}">
</div>
<div>
<label for="content" accesskey="n">Note: </label>
<textarea name="content" id="content" placeholder="Note" tabindex="2">{{ $note->originalNote }}</textarea>
</div>
<div class="form-row">
<label for="webmentions" accesskey="w">Send webmentions: </label>
<input type="checkbox" name="webmentions" id="webmentions" checked="checked" tabindex="3">
</div>
<div>
<button type="submit" name="submit">Submit</button>
</div>
</form>
<hr>
<form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8" class="form">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<div>
<button type="submit" name="delete">Delete</button>
</div>
</form>
@stop

View file

@ -3,10 +3,12 @@
@section('title')List Notes « Admin CP « @stop
@section('content')
<p>Select note to edit:</p>
<ol reversed>
@foreach($notes as $note)
<li><a href="/admin/notes/{{ $note->id }}/edit">{{ $note->originalNote }}</a></li>
@endforeach
</ol>
<p>Select note to edit:</p>
<ol reversed>
@foreach($notes as $note)
<li>
<a href="/admin/notes/{{ $note->id }}/edit">{{ $note->originalNote }}</a>
</li>
@endforeach
</ol>
@stop

View file

@ -3,37 +3,36 @@
@section('title')New Place « Admin CP « @stop
@section('content')
<h1>New Place</h1>
<form action="/admin/places/" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="name">Name:</label>
<input type="text" name="name" id="name" placeholder="Place Name">
</div>
<div>
<label for="description">Description:</label>
<input type="text" name="description" id="description" placeholder="Description">
</div>
<div>
<label for="latitude">Latitude:</label>
<input type="text" name="latitude" id="latitude" placeholder="Latitude">
</div>
<div>
<label for="longitude">Longitude:</label>
<input type="text" name="longitude" id="longitude" placeholder="Longitude">
</div>
<div>
<input type="submit" name="submit" value="Submit">
</div>
<h2>Location</h2>
<div>
<button type="button" name="locate" id="locate">Locate</button>
</div>
</form>
<h1>New Place</h1>
<form action="/admin/places/" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
<div>
<label for="name">Name:</label>
<input type="text" name="name" id="name" placeholder="Place Name">
</div>
<div>
<label for="description">Description:</label>
<input type="text" name="description" id="description" placeholder="Description">
</div>
<div>
<label for="latitude">Latitude:</label>
<input type="text" name="latitude" id="latitude" placeholder="Latitude">
</div>
<div>
<label for="longitude">Longitude:</label>
<input type="text" name="longitude" id="longitude" placeholder="Longitude">
</div>
<div>
<input type="submit" name="submit" value="Submit">
</div>
<h2>Location</h2>
<div>
<button type="button" name="locate" id="locate">Locate</button>
</div>
</form>
@stop
@section('scripts')
@include('templates.mapbox-links')
<script src="/assets/js/newplace.js"></script>
@include('templates.mapbox-links')
<script src="/assets/js/newplace.js"></script>
@stop

View file

@ -3,144 +3,146 @@
@section('title')Edit Place « Admin CP « @stop
@section('content')
<h1>Edit Place</h1>
<form action="/admin/places/{{ $place->id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="name">Name:</label>
<input type="text" name="name" id="name" value="{{ $place->name }}">
</div>
<div>
<label for="description">Description</label>
<textarea name="description" id="description">{{ $place->description }}</textarea>
</div>
<div>
<p>Location</p>
<div class="map" data-latitude="{{ $place->latitude }}" data-longitude="{{ $place->longitude }}" data-id="{{ $place->id }}"></div>
<script>
var geojson{{ $place->id }} = {
"type": "FeatureCollection",
"features": [{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [{{ $place->longitude }}, {{ $place->latitude }}]
},
"properties": {
"title": "{{ $place->name }}",
"icon": "{{ $place->icon ?? 'marker' }}"
}
}]
<h1>Edit Place</h1>
<form action="/admin/places/{{ $place->id }}" method="post" accept-charset="utf-8" class="admin-form form">
{{ csrf_field() }}
{{ method_field('PUT') }}
<div>
<label for="name">Name:</label>
<input type="text" name="name" id="name" value="{{ $place->name }}">
</div>
<div>
<label for="description">Description</label>
<textarea name="description" id="description">{{ $place->description }}</textarea>
</div>
<div>
<p>Location</p>
<div class="map" data-latitude="{{ $place->latitude }}" data-longitude="{{ $place->longitude }}" data-id="{{ $place->id }}"></div>
<script>
var geojson{{ $place->id }} = {
"type": "FeatureCollection",
"features": [{
"type": "Feature",
"geometry": {
"type": "Point",
"coordinates": [{{ $place->longitude }}, {{ $place->latitude }}]
},
"properties": {
"title": "{{ $place->name }}",
"icon": "{{ $place->icon ?? 'marker' }}"
}
</script>
</div>
<div>
<label for="latitude">Latitude:</label>
<input type="text" name="latitude" id="latitude" value="{{ $place->latitude }}">
</div>
<div>
<label for="longitude">Longitude:</label>
<input type="text" name="longitude" id="longitude" value="{{ $place->longitude }}">
</div>
<div class="form-row">
<label for="icon">Map Icon</label>
<select name="icon" id="icon">
<option value="airfield"@if($place->icon == 'airfield')selected @endif>airfield</option>
<option value="airport"@if($place->icon == 'airport')selected @endif>airport</option>
<option value="alcohol-shop"@if($place->icon == 'alcohol-shop')selected @endif>alcohol-shop</option>
<option value="amusement-park"@if($place->icon == 'amusement-park')selected @endif>amusement-park</option>
<option value="aquarium"@if($place->icon == 'aquarium')selected @endif>aquarium</option>
<option value="art-gallery"@if($place->icon == 'art-gallery')selected @endif>art-gallery</option>
<option value="attraction"@if($place->icon == 'attraction')selected @endif>attraction</option>
<option value="bakery"@if($place->icon == 'bakery')selected @endif>bakery</option>
<option value="bank"@if($place->icon == 'bank')selected @endif>bank</option>
<option value="bar"@if($place->icon == 'bar')selected @endif>bar</option>
<option value="beer"@if($place->icon == 'beer')selected @endif>beer</option>
<option value="bicycle"@if($place->icon == 'bicycle')selected @endif>bicycle</option>
<option value="bicycle-share"@if($place->icon == 'bicycle-share')selected @endif>bicycle-share</option>
<option value="bus"@if($place->icon == 'bus')selected @endif>bus</option>
<option value="cafe"@if($place->icon == 'cafe')selected @endif>cafe</option>
<option value="campsite"@if($place->icon == 'campsite')selected @endif>campsite</option>
<option value="car"@if($place->icon == 'car')selected @endif>car</option>
<option value="castle"@if($place->icon == 'castle')selected @endif>castle</option>
<option value="cemetery"@if($place->icon == 'cemetery')selected @endif>cemetery</option>
<option value="cinema"@if($place->icon == 'cinema')selected @endif>cinema</option>
<option value="circle"@if($place->icon == 'circle')selected @endif>circle</option>
<option value="circle-stroked"@if($place->icon == 'circle-stroked')selected @endif>circle-stroked</option>
<option value="clothing-store"@if($place->icon == 'clothing-store')selected @endif>clothing-store</option>
<option value="college"@if($place->icon == 'college')selected @endif>college</option>
<option value="dentist"@if($place->icon == 'dentist')selected @endif>dentist</option>
<option value="doctor"@if($place->icon == 'doctor')selected @endif>doctor</option>
<option value="dog-park"@if($place->icon == 'dog-park')selected @endif>dog-park</option>
<option value="drinking-water"@if($place->icon == 'drinking-water')selected @endif>drinking-water</option>
<option value="embassy"@if($place->icon == 'embassy')selected @endif>embassy</option>
<option value="entrance"@if($place->icon == 'entrance')selected @endif>entrance</option>
<option value="fast-food"@if($place->icon == 'fast-food')selected @endif>fast-food</option>
<option value="ferry"@if($place->icon == 'ferry')selected @endif>ferry</option>
<option value="fire-station"@if($place->icon == 'fire-station')selected @endif>fire-station</option>
<option value="fuel"@if($place->icon == 'fuel')selected @endif>fuel</option>
<option value="garden"@if($place->icon == 'garden')selected @endif>garden</option>
<option value="golf"@if($place->icon == 'golf')selected @endif>golf</option>
<option value="grocery"@if($place->icon == 'grocery')selected @endif>grocery</option>
<option value="harbor"@if($place->icon == 'harbor')selected @endif>harbor</option>
<option value="heliport"@if($place->icon == 'heliport')selected @endif>heliport</option>
<option value="hospital"@if($place->icon == 'hospital')selected @endif>hospital</option>
<option value="ice-cream"@if($place->icon == 'ice-cream')selected @endif>ice-cream</option>
<option value="information"@if($place->icon == 'information')selected @endif>information</option>
<option value="laundry"@if($place->icon == 'laundry')selected @endif>laundry</option>
<option value="library"@if($place->icon == 'library')selected @endif>library</option>
<option value="lodging"@if($place->icon == 'lodging')selected @endif>lodging</option>
<option value="marker"@if($place->icon == 'marker')selected @endif>marker</option>
<option value="monument"@if($place->icon == 'monument')selected @endif>monument</option>
<option value="mountain"@if($place->icon == 'mountain')selected @endif>mountain</option>
<option value="museum"@if($place->icon == 'museum')selected @endif>museum</option>
<option value="music"@if($place->icon == 'music')selected @endif>music</option>
<option value="park"@if($place->icon == 'park')selected @endif>park</option>
<option value="pharmacy"@if($place->icon == 'pharmacy')selected @endif>pharmacy</option>
<option value="picnic-site"@if($place->icon == 'picnic-site')selected @endif>picnic-site</option>
<option value="place-of-worship"@if($place->icon == 'place-of-worship')selected @endif>place-of-worship</option>
<option value="playground"@if($place->icon == 'playground')selected @endif>playground</option>
<option value="police"@if($place->icon == 'police')selected @endif>police</option>
<option value="post"@if($place->icon == 'post')selected @endif>post</option>
<option value="prison"@if($place->icon == 'prison')selected @endif>prison</option>
<option value="rail"@if($place->icon == 'rail')selected @endif>rail</option>
<option value="rail-light"@if($place->icon == 'rail-light')selected @endif>rail-light</option>
<option value="rail-metro"@if($place->icon == 'rail-metro')selected @endif>rail-metro</option>
<option value="religious-christian"@if($place->icon == 'religious-christian')selected @endif>religious-christian</option>
<option value="religious-jewish"@if($place->icon == 'religious-jewish')selected @endif>religious-jewish</option>
<option value="religious-muslim"@if($place->icon == 'religious-muslim')selected @endif>religious-muslim</option>
<option value="restaurant"@if($place->icon == 'restaurant')selected @endif>restaurant</option>
<option value="rocket"@if($place->icon == 'rocket')selected @endif>rocket</option>
<option value="school"@if($place->icon == 'school')selected @endif>school</option>
<option value="shop"@if($place->icon == 'shop')selected @endif>shop</option>
<option value="stadium"@if($place->icon == 'stadium')selected @endif>stadium</option>
<option value="star"@if($place->icon == 'star')selected @endif>star</option>
<option value="suitcase"@if($place->icon == 'suitcase')selected @endif>suitcase</option>
<option value="swimming"@if($place->icon == 'swimming')selected @endif>swimming</option>
<option value="theatre"@if($place->icon == 'theatre')selected @endif>theatre</option>
<option value="toilet"@if($place->icon == 'toilet')selected @endif>toilet</option>
<option value="town-hall"@if($place->icon == 'town-hall')selected @endif>town-hall</option>
<option value="triangle"@if($place->icon == 'triangle')selected @endif>triangle</option>
<option value="triangle-stroked"@if($place->icon == 'triangle-stroked')selected @endif>triangle-stroked</option>
<option value="veterinary"@if($place->icon == 'veterinary')selected @endif>veterinary</option>
<option value="volcano"@if($place->icon == 'volcano')selected @endif>volcano</option>
<option value="zoo"@if($place->icon == 'zoo')selected @endif>zoo</option>
</select>
</div>
<div>
<button type="submit" name="edit">Edit</button>
</div>
<hr>
<div>
<button type="submit" name="delete">Delete</button>
</div>
</form>
}]
}
</script>
</div>
<div>
<label for="latitude">Latitude:</label>
<input type="text" name="latitude" id="latitude" value="{{ $place->latitude }}">
</div>
<div>
<label for="longitude">Longitude:</label>
<input type="text" name="longitude" id="longitude" value="{{ $place->longitude }}">
</div>
<div class="form-row">
<label for="icon">Map Icon</label>
<select name="icon" id="icon">
<option value="airfield"@if($place->icon == 'airfield')selected @endif>airfield</option>
<option value="airport"@if($place->icon == 'airport')selected @endif>airport</option>
<option value="alcohol-shop"@if($place->icon == 'alcohol-shop')selected @endif>alcohol-shop</option>
<option value="amusement-park"@if($place->icon == 'amusement-park')selected @endif>amusement-park</option>
<option value="aquarium"@if($place->icon == 'aquarium')selected @endif>aquarium</option>
<option value="art-gallery"@if($place->icon == 'art-gallery')selected @endif>art-gallery</option>
<option value="attraction"@if($place->icon == 'attraction')selected @endif>attraction</option>
<option value="bakery"@if($place->icon == 'bakery')selected @endif>bakery</option>
<option value="bank"@if($place->icon == 'bank')selected @endif>bank</option>
<option value="bar"@if($place->icon == 'bar')selected @endif>bar</option>
<option value="beer"@if($place->icon == 'beer')selected @endif>beer</option>
<option value="bicycle"@if($place->icon == 'bicycle')selected @endif>bicycle</option>
<option value="bicycle-share"@if($place->icon == 'bicycle-share')selected @endif>bicycle-share</option>
<option value="bus"@if($place->icon == 'bus')selected @endif>bus</option>
<option value="cafe"@if($place->icon == 'cafe')selected @endif>cafe</option>
<option value="campsite"@if($place->icon == 'campsite')selected @endif>campsite</option>
<option value="car"@if($place->icon == 'car')selected @endif>car</option>
<option value="castle"@if($place->icon == 'castle')selected @endif>castle</option>
<option value="cemetery"@if($place->icon == 'cemetery')selected @endif>cemetery</option>
<option value="cinema"@if($place->icon == 'cinema')selected @endif>cinema</option>
<option value="circle"@if($place->icon == 'circle')selected @endif>circle</option>
<option value="circle-stroked"@if($place->icon == 'circle-stroked')selected @endif>circle-stroked</option>
<option value="clothing-store"@if($place->icon == 'clothing-store')selected @endif>clothing-store</option>
<option value="college"@if($place->icon == 'college')selected @endif>college</option>
<option value="dentist"@if($place->icon == 'dentist')selected @endif>dentist</option>
<option value="doctor"@if($place->icon == 'doctor')selected @endif>doctor</option>
<option value="dog-park"@if($place->icon == 'dog-park')selected @endif>dog-park</option>
<option value="drinking-water"@if($place->icon == 'drinking-water')selected @endif>drinking-water</option>
<option value="embassy"@if($place->icon == 'embassy')selected @endif>embassy</option>
<option value="entrance"@if($place->icon == 'entrance')selected @endif>entrance</option>
<option value="fast-food"@if($place->icon == 'fast-food')selected @endif>fast-food</option>
<option value="ferry"@if($place->icon == 'ferry')selected @endif>ferry</option>
<option value="fire-station"@if($place->icon == 'fire-station')selected @endif>fire-station</option>
<option value="fuel"@if($place->icon == 'fuel')selected @endif>fuel</option>
<option value="garden"@if($place->icon == 'garden')selected @endif>garden</option>
<option value="golf"@if($place->icon == 'golf')selected @endif>golf</option>
<option value="grocery"@if($place->icon == 'grocery')selected @endif>grocery</option>
<option value="harbor"@if($place->icon == 'harbor')selected @endif>harbor</option>
<option value="heliport"@if($place->icon == 'heliport')selected @endif>heliport</option>
<option value="hospital"@if($place->icon == 'hospital')selected @endif>hospital</option>
<option value="ice-cream"@if($place->icon == 'ice-cream')selected @endif>ice-cream</option>
<option value="information"@if($place->icon == 'information')selected @endif>information</option>
<option value="laundry"@if($place->icon == 'laundry')selected @endif>laundry</option>
<option value="library"@if($place->icon == 'library')selected @endif>library</option>
<option value="lodging"@if($place->icon == 'lodging')selected @endif>lodging</option>
<option value="marker"@if($place->icon == 'marker')selected @endif>marker</option>
<option value="monument"@if($place->icon == 'monument')selected @endif>monument</option>
<option value="mountain"@if($place->icon == 'mountain')selected @endif>mountain</option>
<option value="museum"@if($place->icon == 'museum')selected @endif>museum</option>
<option value="music"@if($place->icon == 'music')selected @endif>music</option>
<option value="park"@if($place->icon == 'park')selected @endif>park</option>
<option value="pharmacy"@if($place->icon == 'pharmacy')selected @endif>pharmacy</option>
<option value="picnic-site"@if($place->icon == 'picnic-site')selected @endif>picnic-site</option>
<option value="place-of-worship"@if($place->icon == 'place-of-worship')selected @endif>place-of-worship</option>
<option value="playground"@if($place->icon == 'playground')selected @endif>playground</option>
<option value="police"@if($place->icon == 'police')selected @endif>police</option>
<option value="post"@if($place->icon == 'post')selected @endif>post</option>
<option value="prison"@if($place->icon == 'prison')selected @endif>prison</option>
<option value="rail"@if($place->icon == 'rail')selected @endif>rail</option>
<option value="rail-light"@if($place->icon == 'rail-light')selected @endif>rail-light</option>
<option value="rail-metro"@if($place->icon == 'rail-metro')selected @endif>rail-metro</option>
<option value="religious-christian"@if($place->icon == 'religious-christian')selected @endif>religious-christian</option>
<option value="religious-jewish"@if($place->icon == 'religious-jewish')selected @endif>religious-jewish</option>
<option value="religious-muslim"@if($place->icon == 'religious-muslim')selected @endif>religious-muslim</option>
<option value="restaurant"@if($place->icon == 'restaurant')selected @endif>restaurant</option>
<option value="rocket"@if($place->icon == 'rocket')selected @endif>rocket</option>
<option value="school"@if($place->icon == 'school')selected @endif>school</option>
<option value="shop"@if($place->icon == 'shop')selected @endif>shop</option>
<option value="stadium"@if($place->icon == 'stadium')selected @endif>stadium</option>
<option value="star"@if($place->icon == 'star')selected @endif>star</option>
<option value="suitcase"@if($place->icon == 'suitcase')selected @endif>suitcase</option>
<option value="swimming"@if($place->icon == 'swimming')selected @endif>swimming</option>
<option value="theatre"@if($place->icon == 'theatre')selected @endif>theatre</option>
<option value="toilet"@if($place->icon == 'toilet')selected @endif>toilet</option>
<option value="town-hall"@if($place->icon == 'town-hall')selected @endif>town-hall</option>
<option value="triangle"@if($place->icon == 'triangle')selected @endif>triangle</option>
<option value="triangle-stroked"@if($place->icon == 'triangle-stroked')selected @endif>triangle-stroked</option>
<option value="veterinary"@if($place->icon == 'veterinary')selected @endif>veterinary</option>
<option value="volcano"@if($place->icon == 'volcano')selected @endif>volcano</option>
<option value="zoo"@if($place->icon == 'zoo')selected @endif>zoo</option>
</select>
</div>
<div>
<button type="submit" name="edit">Edit</button>
</div>
<hr>
<div>
<button type="submit" name="delete">Delete</button>
</div>
</form>
<p><a href="/admin/places/{{ $place->id }}/merge">Merge with another place?</a></p>
<p>
<a href="/admin/places/{{ $place->id }}/merge">Merge with another place?</a>
</p>
@stop
@section('scripts')
<script src="/assets/js/places.js"></script>
<link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
<script src="/assets/js/places.js"></script>
<link rel="stylesheet" href="/assets/frontend/mapbox-gl.css">
@stop

View file

@ -3,11 +3,16 @@
@section('title')List Places « Admin CP « @stop
@section('content')
<h1>Places</h1>
<ul>
@foreach($places as $place)
<li>{{ $place['name'] }} <a href="/admin/places/{{ $place['id'] }}/edit">edit?</a></li>
@endforeach
</ul>
<p>Create a <a href="/admin/places/create">new entry</a>?</p>
<h1>Places</h1>
<ul>
@foreach($places as $place)
<li>
{{ $place['name'] }}
<a href="/admin/places/{{ $place['id'] }}/edit">edit?</a>
</li>
@endforeach
</ul>
<p>
Create a <a href="/admin/places/create">new entry</a>?
</p>
@stop

View file

@ -3,43 +3,43 @@
@section('title')Merge Places « Admin CP « @stop
@section('content')
<h1>Merge places</h1>
<p>When a place is deleted, it is removed from the database, and all the notes associated with it, will be re-associated with the other place.</p>
<table>
<tr>
<th></th>
<th>Place 1</th>
<th>Place 2</th>
</tr>
<tr>
<th>Name</th>
<td>{{ $place1->name }}</td>
<td>{{ $place2->name }}</td>
</tr>
<tr>
<th>Description</th>
<td>{{ $place1->description }}</td>
<td>{{ $place2->description }}</td>
</tr>
<tr>
<th>location</th>
<td>{{ $place1->latitude }}, {{ $place1->longitude }}</td>
<td>{{ $place2->latitude }}, {{ $place2->longitude }}</td>
</tr>
<tr>
<th>Foursquare</th>
<td>{{ $place1->foursquare }}</td>
<td>{{ $place2->foursquare }}</td>
</tr>
<tr>
<td></td>
<form action="/admin/places/merge" method="post">
{{ csrf_field() }}
<input type="hidden" name="place1" value="{{ $place1->id }}">
<input type="hidden" name="place2" value="{{ $place2->id }}">
<td><button type="submit" name="delete" value="1">Delete Place 1</button></td>
<td><button type="submit" name="delete" value="2">Delete Place 2</button></td>
</form>
</tr>
</table>
<h1>Merge places</h1>
<p>When a place is deleted, it is removed from the database, and all the notes associated with it, will be re-associated with the other place.</p>
<table>
<tr>
<th></th>
<th>Place 1</th>
<th>Place 2</th>
</tr>
<tr>
<th>Name</th>
<td>{{ $place1->name }}</td>
<td>{{ $place2->name }}</td>
</tr>
<tr>
<th>Description</th>
<td>{{ $place1->description }}</td>
<td>{{ $place2->description }}</td>
</tr>
<tr>
<th>location</th>
<td>{{ $place1->latitude }}, {{ $place1->longitude }}</td>
<td>{{ $place2->latitude }}, {{ $place2->longitude }}</td>
</tr>
<tr>
<th>Foursquare</th>
<td>{{ $place1->foursquare }}</td>
<td>{{ $place2->foursquare }}</td>
</tr>
<tr>
<td></td>
<form action="/admin/places/merge" method="post">
{{ csrf_field() }}
<input type="hidden" name="place1" value="{{ $place1->id }}">
<input type="hidden" name="place2" value="{{ $place2->id }}">
<td><button type="submit" name="delete" value="1">Delete Place 1</button></td>
<td><button type="submit" name="delete" value="2">Delete Place 2</button></td>
</form>
</tr>
</table>
@stop

View file

@ -3,10 +3,12 @@
@section('title')Merge Places « Admin CP « @stop
@section('content')
<p>We shall be merging {{ $first->name }}. Its location is <code>Point({{ $first->location }})</code>.</p>
<ul>
@foreach($places as $place)
<li><a href="/admin/places/{{ $first->id }}/merge/{{ $place->id }}">{{ $place->name }}</a></li>
@endforeach
</ul>
<p>We shall be merging {{ $first->name }}. Its location is <code>Point({{ $first->location }})</code>.</p>
<ul>
@foreach($places as $place)
<li>
<a href="/admin/places/{{ $first->id }}/merge/{{ $place->id }}">{{ $place->name }}</a>
</li>
@endforeach
</ul>
@stop

View file

@ -3,23 +3,41 @@
@section('title')Admin CP « @stop
@section('content')
<h1>Hello {{ $name }}!</h1>
<h1>Hello {{ $name }}!</h1>
<h2>Articles</h2>
<p>You can either <a href="/admin/blog/create">create</a> new blog posts, or <a href="/admin/blog/">edit</a> them.<p>
<h2>Articles</h2>
<p>
You can either <a href="/admin/blog/create">create</a> new blog posts,
or <a href="/admin/blog/">edit</a> them.
<p>
<h2>Notes</h2>
<p>You can either <a href="/admin/notes/create">create</a> new notes, or <a href="/admin/notes/">edit</a> them.<p>
<h2>Notes</h2>
<p>
You can either <a href="/admin/notes/create">create</a> new notes,
or <a href="/admin/notes/">edit</a> them.
<p>
<h2>Likes</h2>
<p>You can either <a href="/admin/likes/create">create</a> a new like, or <a href="/admin/likes/">edit</a> them.<p>
<h2>Likes</h2>
<p>
You can either <a href="/admin/likes/create">create</a> a new like,
or <a href="/admin/likes/">edit</a> them.
<p>
<h2>Clients</h2>
<p>You can either <a href="/admin/clients/create">create</a> new client names, or <a href="/admin/clients/">edit</a> them.</p>
<h2>Clients</h2>
<p>
You can either <a href="/admin/clients/create">create</a> new client names,
or <a href="/admin/clients/">edit</a> them.
</p>
<h2>Contacts</h2>
<p>You can either <a href="/admin/contacts/create">create</a> new contacts, or <a href="/admin/contacts/">edit</a> them.</p>
<h2>Contacts</h2>
<p>
You can either <a href="/admin/contacts/create">create</a> new contacts,
or <a href="/admin/contacts/">edit</a> them.
</p>
<h2>Places</h2>
<p>You can either <a href="/admin/places/create">create</a> new places, or <a href="/admin/places/">edit</a> them.</p>
<h2>Places</h2>
<p>
You can either <a href="/admin/places/create">create</a> new places,
or <a href="/admin/places/">edit</a> them.
</p>
@stop

View file

@ -3,9 +3,11 @@
@section('title')Places « @stop
@section('content')
<ul>
@foreach($places as $place)
<li><a href="/places/{{ $place->slug }}">{{ $place->name }}</a></li>
@endforeach
</ul>
<ul>
@foreach($places as $place)
<li>
<a href="/places/{{ $place->slug }}">{{ $place->name }}</a>
</li>
@endforeach
</ul>
@stop

View file

@ -3,37 +3,42 @@
@section('title')Bookmarks « @stop
@section('content')
<div class="h-feed top-space">
@foreach($bookmarks as $bookmark)
<div class="h-entry">
<a class="u-bookmark-of<?php if ($bookmark->name !== null) { echo ' h-cite'; } ?>" href="{{ $bookmark->url }}">
@isset($bookmark->name)
<div class="h-feed top-space">
@foreach($bookmarks as $bookmark)
<div class="h-entry">
<a class="u-bookmark-of<?php if ($bookmark->name !== null) { echo ' h-cite'; } ?>" href="{{ $bookmark->url }}">
@isset($bookmark->name)
{{ $bookmark->name }}
@endisset
@endisset
@empty($bookmark->name)
@empty($bookmark->name)
{{ $bookmark->url }}
@endempty
</a> &nbsp; <a href="{{ $bookmark->longurl }}">🔗</a>
@isset($bookmark->content)
@endempty
</a> &nbsp; <a href="{{ $bookmark->longurl }}">🔗</a>
@isset($bookmark->content)
<p>{{ $bookmark->content }}</p>
@endisset
@isset($bookmark->screenshot)
<img class="screenshot" src="/assets/img/bookmarks/{{ $bookmark->screenshot }}.png">
@endisset
@isset($bookmark->archive)
<p><a href="https://web.archive.org{{ $bookmark->archive }}">Internet Archive backup</a></p>
@endisset
@if($bookmark->tags_count > 0)
<ul class="tags">
@foreach($bookmark->tags as $tag)
<li><a href="/bookmarks/tagged/{{ $tag->tag }}" class="tag">{{ $tag->tag }}</a></li>
@endforeach
</ul>
@endif
</div>
@endforeach
</div>
@endisset
{{ $bookmarks->links() }}
@isset($bookmark->screenshot)
<img class="screenshot" src="/assets/img/bookmarks/{{ $bookmark->screenshot }}.png">
@endisset
@isset($bookmark->archive)
<p><a href="https://web.archive.org{{ $bookmark->archive }}">Internet Archive backup</a></p>
@endisset
@if($bookmark->tags_count > 0)
<ul class="tags">
@foreach($bookmark->tags as $tag)
<li>
<a href="/bookmarks/tagged/{{ $tag->tag }}" class="tag">{{ $tag->tag }}</a>
</li>
@endforeach
</ul>
@endif
</div>
@endforeach
</div>
{{ $bookmarks->links() }}
@stop

View file

@ -3,36 +3,5 @@
@section('title')Bookmark « @stop
@section('content')
<div class="h-entry top-space">
<a class="u-bookmark-of<?php if ($bookmark->name !== null) { echo ' h-cite'; } ?>" href="{{ $bookmark->url }}">
@isset($bookmark->name)
{{ $bookmark->name }}
@endisset
@empty($bookmark->name)
{{ $bookmark->url }}
@endempty
</a>
@isset($bookmark->content)
<p>{{ $bookmark->content }}</p>
@endisset
@isset($bookmark->screenshot)
<img class="screenshot" src="/assets/img/bookmarks/{{ $bookmark->screenshot }}.png">
@endisset
@isset($bookmark->archive)
<p><a href="https://web.archive.org{{ $bookmark->archive }}">Internet Archive backup</a></p>
@endisset
@if(count($bookmark->tags) > 0)
<ul class="tags">
@foreach($bookmark->tags as $tag)
<li><a href="/bookmarks/tagged/{{ $tag->tag }}" class="tag">{{ $tag->tag }}</a></li>
@endforeach
</ul>
@endif
<p class="p-bridgy-facebook-content">🔖 {{ $bookmark->url }} 🔗 {{ $bookmark->longurl }}</p>
<p class="p-bridgy-twitter-content">🔖 {{ $bookmark->url }} 🔗 {{ $bookmark->longurl }}</p>
<!-- these empty tags are for https://brid.gys publishing service -->
<a href="https://brid.gy/publish/twitter"></a>
<a href="https://brid.gy/publish/facebook"></a>
</div>
@include('templates.bookmark', ['bookmark' => $bookmark])
@stop

View file

@ -4,6 +4,6 @@
@section('content')
@foreach($contacts as $contact)
@include('templates.contact', ['contact' => $contact, 'image' => $contact->image])
@include('templates.contact', ['contact' => $contact, 'image' => $contact->image])
@endforeach
@stop

View file

@ -3,5 +3,8 @@
@section('title')Contacts « @stop
@section('content')
@include('templates.contact', ['contact' => $contact, 'image' => $image])
@include('templates.contact', [
'contact' => $contact,
'image' => $image,
])
@stop

View file

@ -20,7 +20,7 @@
@include('templates.like', ['like' => $item])
@break
@case($item instanceof \App\Models\Bookmark)
<p>This is a bookmark</p>
@include('templates.bookmark', ['bookmark' => $item])
@break
@endswitch
@endforeach

View file

@ -4,10 +4,10 @@
<meta charset="UTF-8">
<title>@if (App::environment() == 'local'){!! "[testing] -"!!}@endif @yield('title'){{ config('app.display_name') }}</title>
<meta name="viewport" content="width=device-width">
<link rel="stylesheet" href="https://use.typekit.net/csl8adl.css">
<link rel="stylesheet" href="/assets/frontend/normalize.css">
<link rel="stylesheet" href="/assets/app.css">
<link rel="stylesheet" href="/assets/highlight/zenburn.css">
<link rel="stylesheet" href="https://use.typekit.net/csl8adl.css">
<link rel="alternate" type="application/rss+xml" title="Blog RSS Feed" href="/blog/feed.rss">
<link rel="alternate" type="application/atom+xml" title="Blog Atom Feed" href="/blog/feed.atom">
<link rel="alternate" type="application/json" title="Blog JSON Feed" href="/blog/feed.json">
@ -24,7 +24,7 @@
<link rel="pgpkey" href="/assets/jonnybarnes-public-key-ecc.asc">
</head>
<body>
<header id="topheader">
<header id="top-header">
<a rel="author" href="/">
<h1>{{ config('app.display_name') }}</h1>
</a>

View file

@ -3,11 +3,11 @@
@section('title')Tagged Notes « @stop
@section('content')
<h2>Notes tagged with <em>{{ $tag }}</em></h2>
@foreach ($notes as $note)
<div class="note">
{!! $note->note !!}
<a href="/note/{{ $note->id }}">{{ $note->humandiff }}</a>
</div>
@endforeach
<h2>Notes tagged with <em>{{ $tag }}</em></h2>
@foreach ($notes as $note)
<div class="note">
{!! $note->note !!}
<a href="/note/{{ $note->id }}">{{ $note->humandiff }}</a>
</div>
@endforeach
@stop

View file

@ -0,0 +1,34 @@
<div class="h-entry">
<p>
<a class="u-bookmark-of<?php if ($bookmark->name !== null) { echo ' h-cite'; } ?>" href="{{ $bookmark->url }}">
@isset($bookmark->name)
{{ $bookmark->name }}
@endisset
@empty($bookmark->name)
{{ $bookmark->url }}
@endempty
</a>
</p>
@isset($bookmark->content)
<p>{{ $bookmark->content }}</p>
@endisset
@isset($bookmark->screenshot)
<img class="screenshot" src="/assets/img/bookmarks/{{ $bookmark->screenshot }}.png">
@endisset
@isset($bookmark->archive)
<p><a href="https://web.archive.org{{ $bookmark->archive }}">Internet Archive backup</a></p>
@endisset
@if(count($bookmark->tags) > 0)
<ul class="tags">
@foreach($bookmark->tags as $tag)
<li><a href="/bookmarks/tagged/{{ $tag->tag }}" class="tag">{{ $tag->tag }}</a></li>
@endforeach
</ul>
@endif
<p class="p-bridgy-facebook-content">🔖 {{ $bookmark->url }} 🔗 {{ $bookmark->longurl }}</p>
<p class="p-bridgy-twitter-content">🔖 {{ $bookmark->url }} 🔗 {{ $bookmark->longurl }}</p>
<!-- these empty tags are for https://brid.gys publishing service -->
<a href="https://brid.gy/publish/twitter"></a>
<a href="https://brid.gy/publish/facebook"></a>
</div>

View file

@ -28,7 +28,7 @@ try {
@if($note->replies_count > 0) @include('templates.replies-icon'): {{ $note->replies_count }}@endif
</div>
<div class="social-links">
<div class="syndication-links">
@if(
$note->tweet_id ||
$note->facebook_url ||

View file

@ -1,20 +1,39 @@
@if($tweet_id !== null)<a class="u-syndication" href="https://twitter.com/i/web/status/{{ $tweet_id }}" title="View note on Twitter">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMinYMin meet" viewBox="0 0 171.5054 139.37839" class="icon">
<g transform="translate(-282.32053,-396.30734)">
<path fill="#4099FF" d="m 453.82593,412.80619 c -6.3097,2.79897 -13.09189,4.68982 -20.20852,5.54049 7.26413,-4.35454 12.84406,-11.24992 15.47067,-19.46675 -6.79934,4.03295 -14.3293,6.96055 -22.34461,8.53841 -6.41775,-6.83879 -15.56243,-11.111 -25.68298,-11.111 -19.43159,0 -35.18696,15.75365 -35.18696,35.18525 0,2.75781 0.31128,5.44359 0.91155,8.01875 -29.24344,-1.46723 -55.16995,-15.47582 -72.52461,-36.76396 -3.02879,5.19662 -4.76443,11.24048 -4.76443,17.6891 0,12.20777 6.21194,22.97747 15.65332,29.28716 -5.76773,-0.18265 -11.19331,-1.76565 -15.93716,-4.40083 -0.004,0.14663 -0.004,0.29412 -0.004,0.44248 0,17.04767 12.12889,31.26806 28.22555,34.50266 -2.95247,0.80436 -6.06101,1.23398 -9.26989,1.23398 -2.2673,0 -4.47114,-0.22124 -6.62011,-0.63114 4.47801,13.97857 17.47214,24.15143 32.86992,24.43441 -12.04227,9.43796 -27.21366,15.06335 -43.69965,15.06335 -2.84014,0 -5.64082,-0.16722 -8.39349,-0.49223 15.57186,9.98421 34.06703,15.8094 53.93768,15.8094 64.72024,0 100.11301,-53.61524 100.11301,-100.11387 0,-1.52554 -0.0343,-3.04251 -0.10204,-4.55261 6.87394,-4.95995 12.83891,-11.15646 17.55618,-18.21305 z" />
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400">
<defs>
<style>
.cls-1 {
fill:#1da1f2;
}
.cls-2 {
fill:#fff;
}
.cls-3 {
fill:none;
}
</style>
</defs>
<g data-name="Dark Blue">
<rect class="cls-1" width="400" height="400"/>
</g>
<g data-name="Logo — FIXED">
<path class="cls-2" d="M153.62,301.59c94.34,0,145.94-78.16,145.94-145.94,0-2.22,0-4.43-.15-6.63A104.36,104.36,0,0,0,325,122.47a102.38,102.38,0,0,1-29.46,8.07,51.47,51.47,0,0,0,22.55-28.37,102.79,102.79,0,0,1-32.57,12.45,51.34,51.34,0,0,0-87.41,46.78A145.62,145.62,0,0,1,92.4,107.81a51.33,51.33,0,0,0,15.88,68.47A50.91,50.91,0,0,1,85,169.86c0,.21,0,.43,0,.65a51.31,51.31,0,0,0,41.15,50.28,51.21,51.21,0,0,1-23.16.88,51.35,51.35,0,0,0,47.92,35.62,102.92,102.92,0,0,1-63.7,22A104.41,104.41,0,0,1,75,278.55a145.21,145.21,0,0,0,78.62,23"/>
<rect class="cls-3" width="400" height="400"/>
</g>
</svg>
</a>@endif
@if($facebook_url !== null)<a class="u-syndication" href="{{ $facebook_url }}" title="View note on Facebook">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" preserveAspectRatio="xMinYMin meet" viewBox="0 0 266.893 266.895" class="icon">
<path fill="#3C5A99" d="M248.082,262.307c7.854,0,14.223-6.369,14.223-14.225V18.812
c0-7.857-6.368-14.224-14.223-14.224H18.812c-7.857,0-14.224,6.367-14.224,14.224v229.27c0,7.855,6.366,14.225,14.224,14.225
H248.082z"
/>
<path fill="#FFFFFF" d="M182.409,262.307v-99.803h33.499l5.016-38.895h-38.515V98.777c0-11.261,3.127-18.935,19.275-18.935
l20.596-0.009V45.045c-3.562-0.474-15.788-1.533-30.012-1.533c-29.695,0-50.025,18.126-50.025,51.413v28.684h-33.585v38.895h33.585
v99.803H182.409z"
/>
<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="14.2222in" height="14.2222in" version="1.1" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality; fill-rule:evenodd; clip-rule:evenodd" viewBox="0 0 14222 14222" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>
<style type="text/css">
.fil0 {fill:#1977F3;fill-rule:nonzero}
.fil1 {fill:#FEFEFE;fill-rule:nonzero}
</style>
</defs>
<g>
<path class="fil0" d="M14222 7111c0,-3927 -3184,-7111 -7111,-7111 -3927,0 -7111,3184 -7111,7111 0,3549 2600,6491 6000,7025l0 -4969 -1806 0 0 -2056 1806 0 0 -1567c0,-1782 1062,-2767 2686,-2767 778,0 1592,139 1592,139l0 1750 -897 0c-883,0 -1159,548 -1159,1111l0 1334 1972 0 -315 2056 -1657 0 0 4969c3400,-533 6000,-3475 6000,-7025z"/>
<path class="fil1" d="M9879 9167l315 -2056 -1972 0 0 -1334c0,-562 275,-1111 1159,-1111l897 0 0 -1750c0,0 -814,-139 -1592,-139 -1624,0 -2686,984 -2686,2767l0 1567 -1806 0 0 2056 1806 0 0 4969c362,57 733,86 1111,86 378,0 749,-30 1111,-86l0 -4969 1657 0z"/>
</g>
</svg>
</a>@endif
@if($swarm_url !== null)<a class="u-syndication" href="{{ $swarm_url }}" title="View note on Swarm">
@ -23,7 +42,7 @@
</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 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512">
<path d="M224.1 141c-63.6 0-114.9 51.3-114.9 114.9s51.3 114.9 114.9 114.9S339 319.5 339 255.9 287.7 141 224.1 141zm0 189.6c-41.1 0-74.7-33.5-74.7-74.7s33.5-74.7 74.7-74.7 74.7 33.5 74.7 74.7-33.6 74.7-74.7 74.7zm146.4-194.3c0 14.9-12 26.8-26.8 26.8-14.9 0-26.8-12-26.8-26.8s12-26.8 26.8-26.8 26.8 12 26.8 26.8zm76.1 27.2c-1.7-35.9-9.9-67.7-36.2-93.9-26.2-26.2-58-34.4-93.9-36.2-37-2.1-147.9-2.1-184.9 0-35.8 1.7-67.6 9.9-93.9 36.1s-34.4 58-36.2 93.9c-2.1 37-2.1 147.9 0 184.9 1.7 35.9 9.9 67.7 36.2 93.9s58 34.4 93.9 36.2c37 2.1 147.9 2.1 184.9 0 35.9-1.7 67.7-9.9 93.9-36.2 26.2-26.2 34.4-58 36.2-93.9 2.1-37 2.1-147.8 0-184.8zM398.8 388c-7.8 19.6-22.9 34.7-42.6 42.6-29.5 11.7-99.5 9-132.1 9s-102.7 2.6-132.1-9c-19.6-7.8-34.7-22.9-42.6-42.6-11.7-29.5-9-99.5-9-132.1s-2.6-102.7 9-132.1c7.8-19.6 22.9-34.7 42.6-42.6 29.5-11.7 99.5-9 132.1-9s102.7-2.6 132.1 9c19.6 7.8 34.7 22.9 42.6 42.6 11.7 29.5 9 99.5 9 132.1s2.7 102.7-9 132.1z"/>
</svg>
</a>@endif

View file

@ -3,5 +3,5 @@
@section('title')WebMentions « @stop
@section('content')
<p>My WebMention endpoint.</p>
<p>My WebMention endpoint.</p>
@stop