From a2599ee52e5bc585bd6b7c1da2c96705dc883e1e Mon Sep 17 00:00:00 2001
From: Daniel Supernault <danielsupernault@gmail.com>
Date: Thu, 8 Nov 2018 22:46:00 -0700
Subject: [PATCH] Update timeline template

---
 resources/views/timeline/template.blade.php | 80 +++++++++++++--------
 1 file changed, 49 insertions(+), 31 deletions(-)

diff --git a/resources/views/timeline/template.blade.php b/resources/views/timeline/template.blade.php
index 46e680a05..e428f09b4 100644
--- a/resources/views/timeline/template.blade.php
+++ b/resources/views/timeline/template.blade.php
@@ -4,9 +4,10 @@
 
 <noscript>
   <div class="container">
-    <div class="card border-left-primary mt-5">
+    <div class="card border-left-blue mt-5">
       <div class="card-body">
-        <p class="mb-0 font-weight-bold">Javascript is required for an optimized experience, please enable it or use the <a href="#">lite</a> version.</p>
+        <p class="mb-0 font-weight-bold">Javascript is required for an optimized experience, please enable it to use this site.</p>
+        <p class="mb-0 font-weight-bold text-muted">(We are working on a lite version that does not require javascript)</p>
       </div>
     </div>
   </div>
@@ -72,38 +73,54 @@
 
     </div>
     <div class="col-md-2 col-lg-4 pt-4 my-3">
-
-      <div class="media d-flex align-items-center mb-4">
-        <a href="{{Auth::user()->profile->url()}}">
-          <img class="mr-3 rounded-circle box-shadow" src="{{Auth::user()->profile->avatarUrl()}}" alt="{{Auth::user()->username}}'s avatar" width="64px">
-        </a>
-        <div class="media-body">
-          <p class="mb-0 px-0 font-weight-bold"><a href="{{Auth::user()->profile->url()}}">&commat;{{Auth::user()->username}}</a></p>
-          <p class="mb-0 small text-muted">{{Auth::user()->name}}</p>
+        <div class="media d-flex align-items-center mb-4">
+          <a href="{{Auth::user()->profile->url()}}">
+            <img class="mr-3 rounded-circle box-shadow" src="{{Auth::user()->profile->avatarUrl()}}" alt="{{Auth::user()->username}}'s avatar" width="64px">
+          </a>
+          <div class="media-body">
+            <p class="mb-0 px-0 font-weight-bold"><a href="{{Auth::user()->profile->url()}}">&commat;{{Auth::user()->username}}</a></p>
+            <p class="mb-0 text-muted text-truncate pb-0">{{Auth::user()->name}}</p>
+          </div>
         </div>
-      </div>
 
-      <follow-suggestions></follow-suggestions>
-
-      <footer>
-        <div class="container pb-5">
-            <p class="mb-0 text-uppercase font-weight-bold text-muted small">
-              <a href="{{route('site.about')}}" class="text-dark pr-2">About Us</a>
-              <a href="{{route('site.help')}}" class="text-dark pr-2">Support</a>
-              <a href="{{route('site.opensource')}}" class="text-dark pr-2">Open Source</a>
-              <a href="{{route('site.language')}}" class="text-dark pr-2">Language</a>
-              <a href="{{route('site.terms')}}" class="text-dark pr-2">Terms</a>
-              <a href="{{route('site.privacy')}}" class="text-dark pr-2">Privacy</a>
-              <a href="{{route('site.platform')}}" class="text-dark pr-2">API</a>
-              <a href="#" class="text-dark pr-2">Directory</a>
-              <a href="#" class="text-dark pr-2">Profiles</a>
-              <a href="#" class="text-dark">Hashtags</a>
-            </p>
-            <p class="mb-0 text-uppercase font-weight-bold text-muted small">
-              <a href="http://pixelfed.org" class="text-muted" rel="noopener">Powered by PixelFed</a>
-            </p>
+        <div class="mb-4">
+          <ul class="nav nav-pills flex-column timeline-sidenav" style="max-width: 240px;">
+            <li class="nav-item">
+              <a class="nav-link font-weight-bold" href="/" data-type="personal">
+                <i class="far fa-user pr-1"></i> My Timeline
+              </a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link font-weight-bold" href="/timeline/public" data-type="local">
+                <i class="fas fa-bars pr-1"></i> Local Timeline
+              </a>
+            </li>
+            <li class="nav-item" data-toggle="tooltip" data-placement="bottom" title="The network timeline is not available yet.">
+              <span class="nav-link font-weight-bold">
+                <i class="fas fa-globe pr-1"></i> Network Timeline
+              </span>
+            </li>
+          </ul>
         </div>
-      </footer>
+
+        {{-- <follow-suggestions></follow-suggestions> --}}
+
+        <footer>
+          <div class="container pb-5">
+              <p class="mb-0 text-uppercase font-weight-bold text-muted small">
+                <a href="{{route('site.about')}}" class="text-dark pr-2">About Us</a>
+                <a href="{{route('site.help')}}" class="text-dark pr-2">Support</a>
+                <a href="{{route('site.opensource')}}" class="text-dark pr-2">Open Source</a>
+                <a href="{{route('site.language')}}" class="text-dark pr-2">Language</a>
+                <a href="{{route('site.terms')}}" class="text-dark pr-2">Terms</a>
+                <a href="{{route('site.privacy')}}" class="text-dark pr-2">Privacy</a>
+                <a href="{{route('site.platform')}}" class="text-dark pr-2">API</a>
+              </p>
+              <p class="mb-0 text-uppercase font-weight-bold text-muted small">
+                <a href="http://pixelfed.org" class="text-muted" rel="noopener">Powered by PixelFed</a>
+              </p>
+          </div>
+        </footer>
     </div>
   </div>
 </div>
@@ -112,4 +129,5 @@
 
 @push('scripts')
 <script type="text/javascript" src="{{mix('js/timeline.js')}}"></script>
+
 @endpush 
\ No newline at end of file