New style for the website

Squashed commit of the following:

commit ade162a90192325721fb5007dbd9976a3121c968
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Nov 4 12:08:51 2017 +0000

    Compress frontend assets

commit cbb35750b1068f0cc5eaccd330ac5ba6ad514491
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Nov 4 12:02:58 2017 +0000

    the brotli executable has been renamed to `brotli`

commit 413b330d6982653fb7edf49c83a3464335dde1ad
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Nov 4 11:17:32 2017 +0000

    Update changelog

commit 4fc41cf546743fc6ae31a4c62c0f8152f13067d7
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sat Nov 4 09:47:55 2017 +0000

    Add some minor layout improvements for mobile

commit 5b4c5a16589f54469bdbb6aa3829a5e0d2ed2591
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Nov 2 10:26:47 2017 +0000

    Recompiled assets

commit fe14725f39d529c560f47c525e4deb70ea60b990
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Nov 2 10:26:11 2017 +0000

    Add solarized light colour scheme

commit e359f66b069efbe65b60780687a8d21d09f259c2
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Nov 2 10:24:50 2017 +0000

    Refer to termcolors not base16 base numbers

commit 0d794e1b69dc2f98bc663d4b4804fa47d484dc98
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Nov 2 10:23:07 2017 +0000

    Use termcolors so we can pull in other colour schemes such as solarized

commit 28e2ec2a4495d045876677703158ff3c547dd503
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Wed Nov 1 20:56:55 2017 +0000

    Allow theme to be selected, save the selection in the session

commit 53e2aafa93324538dbcc8220b1eca5a1087d2a2f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 30 15:41:18 2017 +0000

    colour picker now shows current value

commit 6a9a0a880bbd0d01394bf6403f5ec607d5b300f6
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 30 15:14:19 2017 +0000

    Use a form element

commit ff7f0e35c3e17872bebc45c8eba328f4a4352903
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 30 15:10:57 2017 +0000

    Add option to change colour scheme in the HTML, js to add next

commit 6b9de5869835cc44d9db162f0d217f302f7025ec
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 30 15:07:52 2017 +0000

    Add the base16 colour schemes

commit e18ff119c33edd135e4b4b34052381803d39734f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 30 11:59:40 2017 +0000

    Remove bullet points from tags

commit f4f013c323073f7b4e8b7e196d0078aab3d29878
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 30 10:30:39 2017 +0000

    Some more styling, particularly tags, added a base16 colour scheme

commit 81e8773969503e8d52840039b6fe0922cabd3dcc
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Fri Oct 27 16:20:29 2017 +0100

    Compiled app.css

commit 19e960b713fd880cccfd7e2db63013b5b2127dbd
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Fri Oct 27 16:17:17 2017 +0100

    Remove unused .scss files

commit 5900d8a4bb4fc54003b84e42dd938d44e8fb46ea
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Fri Oct 27 16:14:58 2017 +0100

    Most pages now have acceptible layout, removed colour scheme, will be in future commit

commit ec15d1c5e388f8224ffbc3a2074714cc9bc4ce6b
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Oct 26 19:02:40 2017 +0100

    Updated frontend css

commit 2000e5c582ac3dd45c9b67bf680d219a60190725
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Thu Oct 26 19:01:14 2017 +0100

    Very basic restyling of the site

commit a3959377ff4595ab956dfb82fa7404fcdde81310
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Mon Oct 23 09:00:30 2017 +0100

    Improved spacing/indenting of html in views

commit 66f2dcfd1f2c5a779cedad78c11f627c2d39e01f
Author: Jonny Barnes <jonny@jonnybarnes.uk>
Date:   Sun Oct 22 22:45:10 2017 +0100

    Remove most styles
This commit is contained in:
Jonny Barnes 2017-11-04 12:10:46 +00:00
parent 32de1142e7
commit f8e27600ef
207 changed files with 3235 additions and 1355 deletions

View file

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

View file

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

View file

@ -1,14 +1,12 @@
@extends('master')
@section('title')
List Articles « Admin CP
@stop
@section('title')List Articles « Admin CP « @stop
@section('content')
<p>Select article to edit:</p>
<ol reversed>
<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><a href="/admin/blog/{{ $post['id'] }}/edit">{{ $post['title'] }}</a>@if($post['published'] == '0')<span class="notpublished">not published</span>@endif
@endforeach
</ol>
</ol>
@stop

View file

@ -1,15 +1,13 @@
@extends('master')
@section('title')
New Client « Admin CP
@stop
@section('title')New Client « Admin CP « @stop
@section('content')
<h1>New Client</h1>
<form action="/admin/clients/" method="post" accept-charset="utf-8">
{{ csrf_field() }}
<input type="text" name="client_url" id="client_url" placeholder="client_url"><br>
<input type="text" name="client_name" id="client_name" placeholder="client_name"><br>
<input type="submit" name="submit" value="Submit">
</form>
<h1>New Client</h1>
<form action="/admin/clients/" method="post" accept-charset="utf-8">
{{ csrf_field() }}
<input type="text" name="client_url" id="client_url" placeholder="client_url"><br>
<input type="text" name="client_name" id="client_name" placeholder="client_name"><br>
<input type="submit" name="submit" value="Submit">
</form>
@stop

View file

@ -1,22 +1,20 @@
@extends('master')
@section('title')
Edit Client « Admin CP
@stop
@section('title')Edit Client « Admin CP « @stop
@section('content')
<h1>Edit Client</h1>
<form action="/admin/clients/{{ $id }}" method="post" accept-charset="utf-8">
{{ csrf_field() }}
{{ method_field('PUT') }}
<input type="text" name="client_url" id="client_url" value="{{ $client_url }}"><br>
<input type="text" name="client_name" id="client_name" value="{{ $client_name }}"><br>
<input type="submit" name="submit" value="Edit">
</form>
<hr>
<form action="/admin/clients/{{ $id }}" method="post">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<button type="submit">Delete Client</button>
</form>
<h1>Edit Client</h1>
<form action="/admin/clients/{{ $id }}" method="post" accept-charset="utf-8">
{{ csrf_field() }}
{{ method_field('PUT') }}
<input type="text" name="client_url" id="client_url" value="{{ $client_url }}"><br>
<input type="text" name="client_name" id="client_name" value="{{ $client_name }}"><br>
<input type="submit" name="submit" value="Edit">
</form>
<hr>
<form action="/admin/clients/{{ $id }}" method="post">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<button type="submit">Delete Client</button>
</form>
@stop

View file

@ -1,17 +1,15 @@
@extends('master')
@section('title')
List Clients « Admin CP
@stop
@section('title')List Clients « Admin CP « @stop
@section('content')
<h1>Clients</h1>
<ul>
<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>
<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>
</ul>
<p>Create a <a href="/admin/clients/new">new entry</a>?</p>
@stop

View file

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

View file

@ -1,42 +1,40 @@
@extends('master')
@section('title')
Edit Contact « Admin CP
@stop
@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">
{{ csrf_field() }}
{{ method_field('PUT') }}
<fieldset class="note-ui">
<legend>Conctact</legend>
<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>
<input type="submit" name="submit" value="Submit">
</fieldset>
</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">
{{ csrf_field() }}
{{ method_field('PUT') }}
<fieldset class="note-ui">
<legend>Conctact</legend>
<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>
<input type="submit" name="submit" value="Submit">
</fieldset>
</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

@ -1,29 +1,27 @@
@extends('master')
@section('title')
List Contacts « Admin CP
@stop
@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>
<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>
<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>
</table>
@stop

View file

@ -1,30 +1,76 @@
@extends('master')
@section('title')
New Note « Admin CP
@stop
@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>
<div class="errors">
<ul>
@foreach ($errors->all() as $error)
<li>{{ $error }}</li>
@endforeach
</ul>
</div>
@endif
@include('templates.new-note-form', [
'micropub' => false,
'action' => '/admin/note',
'id' => 'newnote-admin'
])
<form action="{{ $action }}" method="post" enctype="multipart/form-data" accept-charset="utf-8"@if($micropub) name="micropub"@endif>
{{ csrf_field() }}
<fieldset>
<legend>New Note</legend>
<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 …"
value="{{ old('in-reply-to') }}"
>
</div>
<div>
<label for="content" accesskey="n">Note: </label>
<textarea name="content"
id="content"
placeholder="Note"
autofocus="autofocus">
{{ old('content') }}
</textarea>
</div>
<div>
<label for="photo" accesskey="p">Photo: </label>
<input type="file"
accept="image/*"
value="Upload"
name="photo[]"
id="photo"
multiple
>
</div>
<div>
<label for="locate" accesskey="l"></label>
<button type="button"
name="locate"
id="locate"
value="Locate"
disabled
>Locate</button>
<button type="submit"
name="submit"
id="submit"
value="Submit"
>Submit</button>
</div>
</fieldset>
</form>
@stop
@section('scripts')
@include('templates.mapbox-links')
<script src="/assets/js/newnote.js"></script>
<script src="/assets/js/newnote.js"></script>
<link rel="stylesheet" href="/assets/frontend/alertify.css">
<link rel="stylesheet" href="/assets/frontend/alertify.css">
@stop

View file

@ -1,28 +1,26 @@
@extends('master')
@section('title')
Edit Note « Admin CP
@stop
@section('title')Edit Note « Admin CP « @stop
@section('content')
<form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8">
{{ csrf_field() }}
{{ method_field('PUT') }}
<fieldset class="note-ui">
<legend>Edit Note</legend>
<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 }}"><br>
<label for="content" accesskey="n">Note: </label><textarea name="content" id="content" placeholder="Note" tabindex="2">{{ $note->originalNote }}</textarea><br>
<label for="webmentions" accesskey="w">Send webmentions: </label><input type="checkbox" name="webmentions" id="webmentions" checked="checked" tabindex="3"><br>
<label for="kludge"></label><input type="submit" value="Submit" id="kludge" tabindex="6">
</fieldset>
</form>
<form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<fieldset class="note-ui">
<legend>Delete Note</legend>
<label for"delete" accesskey="d">Delete: </label><input type="checkbox" name="delete" id="delete" checked="checked">
<label for="kludge"></label><input type="submit" value="Submit" id="kludge">
</fieldset>
</form>
<form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8">
{{ csrf_field() }}
{{ method_field('PUT') }}
<fieldset>
<legend>Edit Note</legend>
<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 }}"><br>
<label for="content" accesskey="n">Note: </label><textarea name="content" id="content" placeholder="Note" tabindex="2">{{ $note->originalNote }}</textarea><br>
<label for="webmentions" accesskey="w">Send webmentions: </label><input type="checkbox" name="webmentions" id="webmentions" checked="checked" tabindex="3"><br>
<label for="kludge"></label><input type="submit" value="Submit" id="kludge" tabindex="6">
</fieldset>
</form>
<form action="/admin/notes/{{ $note->id }}" method="post" accept-charset="utf-8">
{{ csrf_field() }}
{{ method_field('DELETE') }}
<fieldset>
<legend>Delete Note</legend>
<label for"delete" accesskey="d">Delete: </label><input type="checkbox" name="delete" id="delete" checked="checked">
<label for="kludge"></label><input type="submit" value="Submit" id="kludge">
</fieldset>
</form>
@stop

View file

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

View file

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

View file

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

View file

@ -1,15 +1,13 @@
@extends('master')
@section('title')
List Places « Admin CP
@stop
@section('title')List Places « Admin CP « @stop
@section('content')
<h1>Places</h1>
<ul>
<h1>Places</h1>
<ul>
@foreach($places as $place)
<li>{{ $place['name'] }} <a href="/admin/places/{{ $place['id'] }}/edit">edit?</a></li>
<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>
</ul>
<p>Create a <a href="/admin/places/create">new entry</a>?</p>
@stop

View file

@ -1,47 +1,45 @@
@extends('master')
@section('title')
Merge Places « Admin CP
@stop
@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

@ -1,14 +1,12 @@
@extends('master')
@section('title')
Merge Places « Admin CP
@stop
@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>
<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>
<li><a href="/admin/places/{{ $first->id }}/merge/{{ $place->id }}">{{ $place->name }}</a></li>
@endforeach
</ul>
</ul>
@stop

View file

@ -1,24 +1,22 @@
@extends('master')
@section('title')
Admin CP
@stop
@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>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