jonny/jonnybarnes.uk
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases 5 Packages Wiki Activity Actions

Ooof, got the dependencies all up to date as well

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

78
resources/views/admin/places/merge/edit.blade.php
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

14
resources/views/admin/places/merge/index.blade.php
View file

@ -3,10 +3,12 @@
@section('title')Merge Places « Admin CP « @stop
@section('content')
<p>We shall be merging {{ $first->name }}. It’s 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 }}. It’s 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