Update

15 files changed, 200 insertions, 114 deletions

diff --git a/resources/views/components/lastfm.blade.php b/resources/views/components/lastfm.blade.php
index a44afc5..83312e1 100644
--- a/resources/views/components/lastfm.blade.php
+++ b/resources/views/components/lastfm.blade.php
@@ -16,6 +16,6 @@ $count = 0;
         @break
     @endif
     {{ str_pad($count+1, 2, '0', STR_PAD_LEFT) }}] <a href="{{ $track->url }}">{{ $track->name }} • {{ $track->artist }}</a>
-            <small>({{ $track->plays }} plays)</small><br/>
+            <small>({{ $track->plays }} plays)</small><br>
 @php $count++ @endphp
 @endforeach
diff --git a/resources/views/errors/generic-error.blade.php b/resources/views/errors/generic-error.blade.php
index 9764a02..6f08ea5 100644
--- a/resources/views/errors/generic-error.blade.php
+++ b/resources/views/errors/generic-error.blade.php
@@ -2,7 +2,7 @@
 @section('title', 'Error 401: Unauthorized User!')
 @section('content')
     <h1>{{ $error }}</h1>
-    <hr/>
+    <hr>
     @if(isset($description))
         <p>{{ $description }}</p>
     @endif
diff --git a/resources/views/errors/guestbook-ipban.blade.php b/resources/views/errors/guestbook-ipban.blade.php
index 257dd72..386d22a 100644
--- a/resources/views/errors/guestbook-ipban.blade.php
+++ b/resources/views/errors/guestbook-ipban.blade.php
@@ -2,11 +2,11 @@
 @section('title', 'Error 403: IP Blocked!')
 @section('content')
     <h1>Error 403: IP Blocked!</h1>
-    <hr/>
+    <hr>
     <p>Your IP has been banned from submitting to the guestbook.</p>
     @if (isset($reason))
         <p><b>Reason:</b> {{ $reason }}</p>
     @endif
-    <br/>
+    <br>
     Click <a href="/guestbook">here</a> to go back to the guestbook.
 @stop
diff --git a/resources/views/errors/guestbook-ratelimit.blade.php b/resources/views/errors/guestbook-ratelimit.blade.php
index 1890789..7fecd97 100644
--- a/resources/views/errors/guestbook-ratelimit.blade.php
+++ b/resources/views/errors/guestbook-ratelimit.blade.php
@@ -2,9 +2,9 @@
 @section('title', 'Error 429: Overclocking Detected!')
 @section('content')
     <h1>Error 429: Overclocking Detected!</h1>
-    <hr/>
+    <hr>
     <p>Whoa there! Your submissions are going at warp speed.</p>
     <p>Remember you can only submit an entry <u>once every hour</u>!</p>
-    <br/>
+    <br>
     Click <a href="/guestbook">here</a> to go back to the guestbook.
 @stop
diff --git a/resources/views/errors/no-auth.blade.php b/resources/views/errors/no-auth.blade.php
index 8682010..1d99498 100644
--- a/resources/views/errors/no-auth.blade.php
+++ b/resources/views/errors/no-auth.blade.php
@@ -2,7 +2,7 @@
 @section('title', 'Error 401: Unauthorized User!')
 @section('content')
     <h1>Error 401: Unauthorized User!</h1>
-    <hr/>
+    <hr>
     <p>Woah there! Only authorized users can access this page. Please <a href="/login">log in</a> to proceed.</p>
     <p>Ended up here on accident? Click <a href="/">here</a> to return to the homepage</u>!</p>
 @stop
diff --git a/resources/views/includes/footer.blade.php b/resources/views/includes/footer.blade.php
index f9d3590..60d3f46 100644
--- a/resources/views/includes/footer.blade.php
+++ b/resources/views/includes/footer.blade.php
@@ -4,7 +4,7 @@
             <a href="https://www.linux.org/"><img src="{{ URL::asset ('images/buttons/linuxnow.gif') }}" width="88" height="31" alt="Linux NOW!"></a>&nbsp;
             <a href="https://www.vim.org/"><img src="{{ URL::asset ('images/buttons/vim.gif') }}" width="88" height="31" alt="vim"></a>&nbsp;
             <a href="http://jigsaw.w3.org/css-validator/check/referer"><img src="{{ URL::asset ('images/buttons/vcss-blue.gif') }}" width="88" height="31" alt="Valid CSS!"></a>&nbsp;
-            <img src="{{ URL::asset ('images/buttons/valid-html401-blue.png') }}" width="88" height="31" alt="Valid HTML 4.01!"><br/>
-            This site is best viewed at 1024x768 with 16-bit color or better<br/>
-            &copy; floppydisk 2021-{{ date('Y') }}, Site Version {{ config('app.version') }}, <a href="https://github.com/floppydisk05/diskfloppy.me">GitHub</a><br/>
+            <img src="{{ URL::asset ('images/buttons/valid-html401-blue.png') }}" width="88" height="31" alt="Valid HTML 4.01!"><br>
+            This site is best viewed at 1024x768 with 16-bit color or better<br>
+            &copy; floppydisk 2021-{{ date('Y') }}, Site Version {{ config('app.version') }}, <a href="https://github.com/floppydisk05/diskfloppy.me">GitHub</a><br>
         </div>
diff --git a/resources/views/includes/header.blade.php b/resources/views/includes/header.blade.php
index 01de256..1804077 100644
--- a/resources/views/includes/header.blade.php
+++ b/resources/views/includes/header.blade.php
@@ -1,18 +1,27 @@
     <nav>
         <div>
-            <a href="/">home</a> |
-	        <a href="//git.diskfloppy.me/">cgit</a> |
-            <a href="//wiki.diskfloppy.me/">wiki</a> |
+            <!--<a href="/">home</a> |
+ <a href="//git.diskfloppy.me/">cgit</a> |
             <a href="/projects/">projects</a> |
             <a href="/calculators/">calculators</a> |
             <a href="/computers/">computers</a> |
             <a href="/bookmarks/">bookmarks</a> |
             <a href="/guestbook/">guestbook</a>
             @if (auth()->check())
-                | <a href="/admin/">admin</a>
+| <a href="/admin/">admin</a>
                 | ({{ auth()->user()->name }}) <a href="/logout">logout</a>
-            @else
-                | <a href="/login">login</a>
-            @endif
+@else
+| <a href="/login">login</a>
+@endif
+            -->
+            <h1>diskfloppy.me | <strong>@yield('title')</strong></h1>
+            <a href="/" title="Home"><img src="/images/icons/nav/home.png"></a>
+            <a href="//git.diskfloppy.me/" title="cgit"><img src="/images/icons/nav/repo.png"></a>
+            <a href="/bookmarks/" title="Bookmarks"><img src="/images/icons/nav/bookmarks.png"></a>
+            <a href="/guestbook/" title="Guestbook"><img src="/images/icons/nav/guestbook.png"></a>
+            <a href="/contact/" title="Contact"><img src="/images/icons/nav/mail.png"></a>
+            <a href="/weather/" title="Weather"><img src="/images/icons/nav/weather.png"></a>
+            <a href="/music/" title="Music"><img src="/images/icons/nav/music.png"></a>&nbsp;&nbsp;
+            <a href="/login/" title="Log in"><img src="/images/icons/nav/login.png"></a>
         </div>
     </nav>
diff --git a/resources/views/pages/admin/guestbook-del-confirm.blade.php b/resources/views/pages/admin/guestbook-del-confirm.blade.php
index 99d2a4c..ebdafd2 100644
--- a/resources/views/pages/admin/guestbook-del-confirm.blade.php
+++ b/resources/views/pages/admin/guestbook-del-confirm.blade.php
@@ -2,7 +2,7 @@
 @section('title', 'Delete confirm')
 @section('content')
     <h1>Delete Confirmation</h1>
-    <hr/>
+    <hr>
     <p>Are you sure you want to delete this entry?</p>
 
     <h3>Entry Details:</h3>
diff --git a/resources/views/pages/admin/guestbook.blade.php b/resources/views/pages/admin/guestbook.blade.php
index 1480ea9..a3b073f 100644
--- a/resources/views/pages/admin/guestbook.blade.php
+++ b/resources/views/pages/admin/guestbook.blade.php
@@ -1,5 +1,5 @@
 @extends('layouts.default-admin')
-@section('title', 'guestbook')
+@section('title', 'Guestbook')
 @section('content')
     @php
         $entries = DB::select('
@@ -13,8 +13,8 @@
         <table class="gb_admin">
             <tr>
                 <td>
-                    Name:&nbsp;{{ $entry->name }}<br/>
-                    IP:&nbsp;&nbsp;&nbsp;{{ $entry->ip_address }}<br/>
+                    Name:&nbsp;{{ $entry->name }}<br>
+                    IP:&nbsp;&nbsp;&nbsp;{{ $entry->ip_address }}<br>
                     Date:&nbsp;{{ gmdate("H:i:s - Y-m-d", $entry->timestamp) }}
                 </td>
                 <td class="gb_del">
@@ -23,7 +23,7 @@
             </tr>
             <tr>
                 <td colspan="2" class="gb_message">
-                    <br/>
+                    <br>
                     {{ htmlspecialchars($entry->message) }}
                 </td>
             </tr></table>
diff --git a/resources/views/pages/bookmarks.blade.php b/resources/views/pages/bookmarks.blade.php
index ee91334..cbc67ee 100644
--- a/resources/views/pages/bookmarks.blade.php
+++ b/resources/views/pages/bookmarks.blade.php
@@ -1,28 +1,46 @@
 @extends('layouts.default')
-@section('title', 'bookmarks')
+@section('title', 'Bookmarks')
 @section('description', 'This is the personal homepage of floppydisk.')
 @section('content')
-@php
-    $categories = DB::select('
+    @php
+        $categories = DB::select('
         SELECT id, name
         FROM bookmark__categories
         ORDER BY priority ASC
     ');
-@endphp
+    @endphp
 
-@foreach ($categories as $category)
-    <h1>{{ $category->name }}</h1>
-    @php
-        $sites = DB::select('
+    @foreach ($categories as $category)
+        <table class="infotable">
+
+            <tr>
+                <td colspan="2">
+                    <h1>{{ $category->name }}</h1>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2">
+                    <hr>
+                </td>
+            </tr>
+
+            @php
+                $sites = DB::select(
+                    '
             SELECT name, url, description
             FROM bookmark__sites
             WHERE category_id = ? ORDER BY priority ASC
-        ', array($category->id));
-    @endphp
-    <ul>
-    @foreach ($sites as $site)
-        <li><a href="{{ $site->url }}">{{ $site->name }}</a> - {{ $site->description }}</li>
+        ',
+                    [$category->id],
+                );
+            @endphp
+            @foreach ($sites as $site)
+                <tr>
+                    <td><a href="{{ $site->url }}">{{ $site->name }}</a>
+                        - {{ $site->description }}</td>
+                </tr>
+            @endforeach
+        </table>
+        <br>
     @endforeach
-    </ul>
-@endforeach
 @stop
diff --git a/resources/views/pages/calculators.blade.php b/resources/views/pages/calculators.blade.php
index b90d8ef..5d629ed 100644
--- a/resources/views/pages/calculators.blade.php
+++ b/resources/views/pages/calculators.blade.php
@@ -1,5 +1,5 @@
 @extends('layouts.default')
-@section('title', 'calculators')
+@section('title', 'Calculators')
 @section('description', 'C a l c u l a t o r s.')
 @section('content')
         <h1>CASIO fx-CG50</h1>
diff --git a/resources/views/pages/computers.blade.php b/resources/views/pages/computers.blade.php
index 4d32de9..667dd03 100644
--- a/resources/views/pages/computers.blade.php
+++ b/resources/views/pages/computers.blade.php
@@ -1,5 +1,5 @@
 @extends('layouts.default')
-@section('title', 'computers')
+@section('title', 'Computers')
 @section('description', 'Computers I own or have owned.')
 @section('content')
         <table class="computers" border="0">
diff --git a/resources/views/pages/guestbook.blade.php b/resources/views/pages/guestbook.blade.php
index 4a6fdca..a0112c1 100644
--- a/resources/views/pages/guestbook.blade.php
+++ b/resources/views/pages/guestbook.blade.php
@@ -1,47 +1,58 @@
 @extends('layouts.default')
-@section('title', 'guestbook')
+@section('title', 'Guestbook')
 @section('content')
-    <br/>
-    <form method="POST" action="/guestbook">
-        @csrf
-        <x-honeypot />
-        <table class="gb_entryform">
-            <tr>
-                <td>
-                    <label for="name">Name:</label>
-                </td>
-                <td>
-                    <input name="name" type="text" id="name" placeholder="John Doe">
-                </td>
-                <td>
-                    <span class="text-danger">{{ $errors->first('name') }}</span>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <label for="message">Message:</label>
-                </td>
-                <td>
-                    <textarea name="message" id="message" rows="3"></textarea>
-                </td>
-                <td>
-                    <span class="text-danger">{{ $errors->first('message') }}</span>
-                </td>
-            </tr>
-            <tr>
-                <td colspan="2">
-                    <button type="submit">Submit</button>
-                </td>
-            </tr>
-        </table>
-    </form>
-    <p>A few things to note:</p>
-    <ul>
-        <li>You can submit an entry <u>once every hour</u>.</li>
-        <li>Your IP address <u>will</u> be logged but <u>will not</u> be publically displayed.</li>
-        <li>Any entries that appear to be spam <u>will</u> be removed.</li>
-    </ul>
-    <hr/>
+    <br>
+    <table class="gb_entryform_container">
+        <tr>
+            <td>
+                <form method="POST" action="/guestbook">
+                    @csrf
+                    <x-honeypot />
+                    <table class="gb_entryform">
+                        <tr>
+                            <td>
+                                <label for="name"><strong>Name:</strong></label>
+                            </td>
+                            <td>
+                                <input name="name" type="text" id="name" placeholder="John Doe">
+                            </td>
+                            <td>
+                                <span class="text-danger">{{ $errors->first('name') }}</span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>
+                                <label for="message"><strong>Message:</strong></label>
+                            </td>
+                            <td>
+                                <textarea name="message" id="message" rows="3"></textarea>
+                            </td>
+                            <td>
+                                <span class="text-danger">{{ $errors->first('message') }}</span>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td></td>
+                            <td>
+                                <button type="submit">Submit</button>
+                            </td>
+                        </tr>
+                    </table>
+                </form>
+            </td>
+            <td>
+                <p>A few things to note:</p>
+                <ul>
+                    <li>You can submit an entry <u>once every hour</u>.</li>
+                    <li>Your IP address is logged but <u>not</u> publically displayed.</li>
+                    <li>Any entries that appear to be spam <u>will</u> be removed.</li>
+                </ul>
+            </td>
+        </tr>
+    </table>
+
+
+    <hr>
     @php
         $entries = DB::select('
             SELECT name, timestamp, message
@@ -51,11 +62,16 @@
     @endphp
     <h1>Entries <small>({{ count($entries) }} total)</small></h1>
     @foreach ($entries as $entry)
-        <table class="gb_entry"><tr><td>
-            Name:&nbsp;{{ $entry->name }}<br/>
-            Date:&nbsp;{{ gmdate("H:i:s - Y-m-d", $entry->timestamp) }}<br/><br/>
-            {{ $entry->message }}
-        </td></tr></table>
+        <table class="gb_entry">
+            <tr>
+                <td>
+                    Submitted by <strong>{{ $entry->name }}</strong>
+                    on <strong>{{ gmdate('H:i:s - Y-m-d', $entry->timestamp) }}</strong>
+                    <hr>
+                    {{ $entry->message }}
+                </td>
+            </tr>
+        </table>
+        <br>
     @endforeach
 @stop
-
diff --git a/resources/views/pages/home.blade.php b/resources/views/pages/home.blade.php
index 6ad3013..9471a9e 100644
--- a/resources/views/pages/home.blade.php
+++ b/resources/views/pages/home.blade.php
@@ -1,18 +1,37 @@
 @extends('layouts.default')
-@section('title', 'home')
+@section('title', 'Home')
 @section('description', 'This is the personal homepage of floppydisk.')
 @section('content')
-        <h1>About me</h1>
-        <p>Hi!<br/>
-            This is the personal homepage of floppydisk.
-        </p>
-        <h2>Interests</h2>
-        <p>
-            &#9670; <b>Tech Theatre</b> - Lighting, Stage Management, etc.<br/>
-            &#9670; <b>Programming</b>&nbsp; - HTML, JavaScript, C#, Java, PHP, Ruby<br/>
-            &#9670; <b>Photography</b>&nbsp; - <a href="https://www.flickr.com/photos/floppydisk/">Flickr</a>
-        </p>
+    <p>Hi! This my personal homepage on the <strong>W</strong>orld <strong>W</strong>ide <strong>W</strong>eb.
+    </p>
 
+    <table class="infotable">
+        <tr>
+            <td colspan="2">
+                <h1>Interests</h1>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2">
+                <hr>
+            </td>
+        </tr>
+        <tr>
+            <td>&#9670; <b>Tech Theatre</b></td>
+            <td>- Lighting, Stage Management, etc.</td>
+        </tr>
+        <tr>
+            <td>&#9670; <b>Programming</b></td>
+            <td>- HTML, JavaScript, C#, Java, PHP, Ruby</td>
+        </tr>
+        <tr>
+            <td>&#9670; <b>Photography</b></td>
+            <td>- <a href="https://www.flickr.com/photos/floppydisk/">Flickr</a></td>
+        </tr>
+    </table>
+    <br>
+
+    {{--
         <!-- Last.fm -->
         @include('components.lastfm')
 
@@ -21,18 +40,42 @@
 
         <!-- Site Updates -->
         @include('components.git')
+        --}}
 
-        <h1>Contact</h1>
-        <p><strong>Mail</strong>:&nbsp;<a href="mailto:contact@diskfloppy.me">contact@diskfloppy.me</a><br/>
-            <strong>IRC</strong>:&nbsp;&nbsp;<a href="https://r-type.ca/page.php?id=1034">floppydisk @ r-type</a><br/>
-        </p>
-
-        <h1>Elsewhere</h1>
-        <p><strong>Mastodon:</strong>&nbsp;<a rel="me" href="https://c.im/@floppydisk">@floppydisk@c.im</a><br/>
-            <strong>Matrix:</strong>&nbsp;&nbsp;&nbsp;<a href="https://matrix.to/#/@floppydisk:arcticfoxes.net">@floppydisk:arcticfoxes.net</a><br/>
-            <strong>Twitter:</strong>&nbsp;&nbsp;<a href="https://twitter.com/floppydisk__">@floppydisk__</a><br/>
-            <strong>GitHub:</strong>&nbsp;&nbsp;&nbsp;<a href="https://github.com/floppydisk05">floppydisk05</a><br/>
-            <strong>SDF:</strong>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="http://floppydisk.sdf.org/">~floppydisk</a><br/>
-            <a href="https://stackoverflow.com/users/15933092/floppydisk"><img src="https://stackoverflow.com/users/flair/15933092.png?theme=dark" width="208" height="58" alt="profile for floppydisk at Stack Overflow, Q&amp;A for professional and enthusiast programmers" title="profile for floppydisk at Stack Overflow, Q&amp;A for professional and enthusiast programmers"></a>
-        </p>
+    <table class="infotable">
+        <tr>
+            <td colspan="2">
+                <h1>Contact &amp; social</h1>
+            </td>
+        </tr>
+        <tr>
+            <td colspan="2">
+                <hr>
+            </td>
+        </tr>
+        <tr>
+            <td><strong>E-mail</strong></td>
+            <td><a href="mailto:contact@diskfloppy.me">contact (at) diskfloppy (dot) me</a></td>
+        </tr>
+        <tr>
+            <td><strong>Mastodon:</strong></td>
+            <td><a rel="me" href="https://c.im/@floppydisk">@floppydisk@c.im</a></td>
+        </tr>
+        <tr>
+            <td><strong>Matrix:</strong></td>
+            <td><a href="https://matrix.to/#/@floppydisk:arcticfoxes.net">@floppydisk:arcticfoxes.net</a></td>
+        </tr>
+        <tr>
+            <td><strong>GitHub:</strong></td>
+            <td><a href="https://github.com/floppydisk05">floppydisk05</a></td>
+        </tr>
+        <!--<tr>
+                    <td colspan="2">
+                        <a href="https://stackoverflow.com/users/15933092/floppydisk"><img
+                                src="https://stackoverflow.com/users/flair/15933092.png?theme=dark" width="208" height="58"
+                                alt="profile for floppydisk at Stack Overflow, Q&amp;A for professional and enthusiast programmers"
+                                title="profile for floppydisk at Stack Overflow, Q&amp;A for professional and enthusiast programmers"></a>
+                    </td>
+                </tr>-->
+    </table>
 @stop
diff --git a/resources/views/pages/projects.blade.php b/resources/views/pages/projects.blade.php
index 08185bf..26a9a0d 100644
--- a/resources/views/pages/projects.blade.php
+++ b/resources/views/pages/projects.blade.php
@@ -1,16 +1,16 @@
 <?php $categories = app('config')->get('projects'); ?>
 @extends('layouts.default')
-@section('title', 'projects')
+@section('title', 'Projects')
 @section('description', 'My projects')
 @section('content')
     @foreach ($categories as $category)
     <h1>{{ $category['name']}}</h1>
     @foreach ($category['projects'] as $project)
     <div>
-            <a href="{{ $project['url'] }}">{{ $project['name'] }}</a> - {{ $project['description'] }}<br/>
+            <a href="{{ $project['url'] }}">{{ $project['name'] }}</a> - {{ $project['description'] }}<br>
             <b>Languages:</b> {{ implode(", ", $project['languages']) }}
         </div>
-        <br/>
+        <br>
     @endforeach
 @endforeach
 @stop