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

Frontend ui refactor

resources/lang/en/helpcenter.php

@@ -13,6 +13,7 @@ return [
 	'discover' => 'Discover',
 	'directMessages' => 'Direct Messages',
 	'timelines' => 'Timelines',
+	'embed'	=> 'Embed',
 
 	'communityGuidelines' => 'Community Guidelines',
 	'whatIsTheFediverse' => 'What is the fediverse?',

resources/views/site/help.blade.php

@@ -43,7 +43,7 @@
             <p class="py-1 text-center">
               <i class="fas fa-hashtag text-lighter fa-2x"></i>
             </p>
-            <p class="text-center text-muted font-weight-bold h4 mb-0">Hashtags</p>
+            <p class="text-center text-muted font-weight-bold h4 mb-0">{{__('helpcenter.hashtags')}}</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>

resources/views/site/help/getting-started.blade.php

@@ -1,9 +1,9 @@
-@extends('site.help.partial.template', ['breadcrumb'=>'Getting Started'])
+@extends('site.help.partial.template', ['breadcrumb'=>__('helpcenter.gettingStarted')])
 
 @section('section')
 
 <div class="title">
-	<h3 class="font-weight-bold">Getting Started</h3>
+	<h3 class="font-weight-bold">{{__('helpcenter.gettingStarted')}}</h3>
 </div>
 <hr>
 <p class="lead font-weight-light">Welcome to Pixelfed!</p>

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

@@ -1,66 +1,66 @@
   <div class="col-12 col-md-3 py-3" style="border-right:1px solid #ccc;">
     <ul class="nav flex-column settings-nav">
       <li class="nav-item {{request()->is('*/getting-started')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.getting-started')}}">Getting Started</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.getting-started')}}">{{__('helpcenter.gettingStarted')}}</a>
       </li>
       <li class="nav-item {{request()->is('*/sharing-media')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.sharing-media')}}">Sharing Photos & Videos</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.sharing-media')}}">{{__('helpcenter.sharingMedia')}}</a>
       </li>
       <li class="nav-item {{request()->is('*/your-profile')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.your-profile')}}">Your Profile</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.your-profile')}}">{{__('helpcenter.profile')}}</a>
       </li>
       <li class="nav-item {{request()->is('*/stories')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.stories')}}">Stories</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.stories')}}">{{__('helpcenter.stories')}}</a>
       </li>
       <li class="nav-item {{request()->is('*/hashtags')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.hashtags')}}">Hashtags</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.hashtags')}}">{{__('helpcenter.hashtags')}}</a>
       </li>
       <li class="nav-item {{request()->is('*/discover')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.discover')}}">Discover</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.discover')}}">{{__('helpcenter.discover')}}</a>
       </li>
       <li class="nav-item {{request()->is('*/direct-messages')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.dm')}}">Direct Messages</a>
+        <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':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.timelines')}}">Timelines</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.timelines')}}">{{__('helpcenter.timelines')}}</a>
       </li>
       <li class="nav-item {{request()->is('*/embed')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.embed')}}">Embed</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.embed')}}">{{__('helpcenter.embed')}}</a>
       </li>
       <li class="nav-item">
         <hr>
       </li>
       <li class="nav-item {{request()->is('*/community-guidelines')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.community-guidelines')}}">
-          Community Guidelines
+          {{__('helpcenter.communityGuidelines')}}
         </a>
       </li>
       <li class="nav-item {{request()->is('*/what-is-the-fediverse')?'active':''}}">
-        <a class="nav-link font-weight-light text-muted" href="{{route('help.what-is-fediverse')}}">What is the fediverse?</a>
+        <a class="nav-link font-weight-light text-muted" href="{{route('help.what-is-fediverse')}}">{{__('helpcenter.whatIsTheFediverse')}}</a>
       </li>
       <li class="nav-item {{request()->is('*/controlling-visibility')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.controlling-visibility')}}">
-          Controlling Visibility
+          {{__('helpcenter.controllingVisibility')}}
         </a>
       </li>
       <li class="nav-item {{request()->is('*/blocking-accounts')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.blocking-accounts')}}">
-          Blocking Accounts
+          {{__('helpcenter.blockingAccounts')}}
         </a>
       </li>
       <li class="nav-item {{request()->is('*/safety-tips')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.safety-tips')}}">
-          Safety Tips
+          {{__('helpcenter.safetyTips')}}
         </a>
       </li>
       <li class="nav-item {{request()->is('*/report-something')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.report-something')}}">
-          Report Something
+          {{__('helpcenter.reportSomething')}}
         </a>
       </li>
       <li class="nav-item {{request()->is('*/data-policy')?'active':''}}">
         <a class="nav-link font-weight-light text-muted" href="{{route('help.data-policy')}}">
-          Data Policy
+          {{__('helpcenter.dataPolicy')}}
         </a>
       </li>
     </ul>

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

@@ -6,7 +6,7 @@
   <div class="col-12">
     <div class="card mt-5">
       <div class="card-header font-weight-bold text-muted bg-white py-4">
-        <a href="{{route('site.help')}}" class="text-muted">Help Center</a>
+        <a href="{{route('site.help')}}" class="text-muted">{{__('helpcenter.helpcenter')}}</a>
         <span class="px-2 font-weight-light">&mdash;</span>
         {{ $breadcrumb ?? ''}}
       </div>