Merge pull request #1115 from pixelfed/frontend-ui-refactor

Frontend ui refactor

resources/views/site/help.blade.php

@@ -132,7 +132,7 @@
         </div>
       </a>
     </div> --}}
-    {{-- <div class="col-12 col-md-6 mb-3">
+    <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.timelines')}}" class="text-decoration-none">
         <div class="card">
           <div class="card-body">
@@ -141,13 +141,13 @@
             </p>
             <p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.timelines')}}</p>
             <div class="text-center pt-3">
-              <p class="small text-dark font-weight-bold mb-0">&nbsp;</p>
-              <p class="small text-dark font-weight-bold mb-0">&nbsp;</p>
+              <p class="small text-dark font-weight-bold mb-0">Personal Timeline</p>
+              <p class="small text-dark font-weight-bold mb-0">Public Timeline</p>
             </div>
           </div>
         </div>
       </a>
-    </div> --}}
+    </div>
 
     {{-- <div class="col-12 col-md-6 mb-3">
       <a href="{{route('help.community-guidelines')}}" class="text-decoration-none">

resources/views/site/help/partial/sidebar.blade.php

@@ -21,9 +21,9 @@
       {{-- <li class="nav-item {{request()->is('*/direct-messages')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.dm')}}">{{__('helpcenter.directMessages')}}</a>
       </li> --}}
-      {{-- <li class="nav-item {{request()->is('*/timelines')?'active':''}}">
+      <li class="nav-item {{request()->is('*/timelines')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.timelines')}}">{{__('helpcenter.timelines')}}</a>
-      </li> --}}
+      </li>
       {{-- <li class="nav-item {{request()->is('*/embed')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.embed')}}">{{__('helpcenter.embed')}}</a>
       </li> --}}

resources/views/site/help/sharing-media.blade.php

@@ -148,4 +148,19 @@
 			</div>
 		</div>
 	</p> --}}
+	<p>	
+		<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse10" role="button" aria-expanded="false" aria-controls="collapse10">
+			<i class="fas fa-chevron-down mr-2"></i>
+			How can I disable comments/replies on my post?
+		</a>
+		<div class="collapse" id="collapse10">
+			<div>
+				To enable or disable comments/replies using a desktop or mobile browser:
+				<ul>
+					<li>Open the menu, click the <i class="fas fa-ellipsis-v text-muted mx-2 cursor-pointer"></i> button</li>
+					<li>Click on <span class="small font-weight-bold cursor-pointer">Enable Comments</span> or <span class="small font-weight-bold cursor-pointer">Disable Comments</span></li>
+				</ul>
+			</div>
+		</div>
+	</p>
 @endsection

resources/views/site/help/timelines.blade.php

@@ -6,21 +6,24 @@
     <h3 class="font-weight-bold">Timelines</h3>
   </div>
   <hr>
-  <div class="card">
-  	<div class="card-body">
-  		<div class="row">
-  			<div class="col-12 col-md-3 text-center">
-  				<div class="icon-wrapper">
-  					<i class="far fa-question-circle fa-3x text-light"></i>
-  				</div>
-  			</div>
-  			<div class="col-12 col-md-9 d-flex align-items-center">
-  				<div class="text-center">
-	  				<p class="h3 font-weight-bold mb-0">This page isn't available</p>
-	  				<p class="font-weight-light mb-0">We haven't finished it yet, it will be updated soon!</p>
-  				</div>
-  			</div>
-  		</div>
-  	</div>
-  </div>
+  <p class="lead">Timelines are chronological feeds of posts from accounts you follow or from other instances.</p>
+  <p class="font-weight-bold h5 py-3">Pixelfed has 2 different timelines:</p>
+
+  <ul>
+    <li class="lead">
+      <span class="font-weight-bold"><i class="fas fa-home text-muted mr-2"></i> Personal</span>
+      <span class="px-2">&mdash;</span>
+      <span class="font-weight-light">Timeline with posts from accounts you follow</span>
+    </li>
+    <li class="lead">
+      <span class="font-weight-bold"><i class="far fa-map text-muted mr-2"></i> Public</span>
+      <span class="px-2">&mdash;</span>
+      <span class="font-weight-light">Timeline with posts from other users on the same instance</span>
+    </li>
+    {{-- <li class="lead text-muted">
+      <span class="font-weight-bold"><i class="fas fa-globe text-muted mr-2"></i> Network</span>
+      <span class="px-2">&mdash;</span>
+      <span class="font-weight-light text-muted">Timeline with posts from local and remote accounts - coming soon!</span>
+    </li> --}}
+  </ul>
 @endsection