Update topic templates and style

app/lang/en/topic.po

@@ -42,8 +42,17 @@ msgid "Registered: %s"
 msgstr "<span>Registered: </span>%s"
 
 msgid "Website"
+msgstr "<span>Website</span>"
+
+msgid "Website title"
 msgstr "Website"
 
+msgid "Email "
+msgstr "<span>Email</span>"
+
+msgid "Email title"
+msgstr "Email"
+
 msgid "Online"
 msgstr "Online"
 

app/lang/ru/topic.po

@@ -43,8 +43,17 @@ msgid "Registered: %s"
 msgstr "<span>Здесь с </span>%s"
 
 msgid "Website"
+msgstr "<span>Сайт</span>"
+
+msgid "Website title"
 msgstr "Сайт"
 
+msgid "Email "
+msgstr "<span>Почта</span>"
+
+msgid "Email title"
+msgstr "Почта"
+
 msgid "Online"
 msgstr "Online"
 

app/templates/pm/topic.forkbb.php

@@ -84,15 +84,23 @@
               <li class="f-postcount"><span class="f-psfont">{!! __(['%s post', $post->user->num_posts, num($post->user->num_posts)]) !!}</span></li>
         @endif
             </ul>
-        @if (! $post->user->isGuest && $p->user->showUserInfo)
+        @if ($p->user->showUserInfo)
             <ul class="f-user-info-add">
             @if ($p->user->isAdmMod && '' != $post->user->admin_note)
               <li class="f-admin-note" title="{{ __('Admin note') }}">{{ $post->user->admin_note }}</li>
             @endif
+            @if (! $post->user->isGuest )
               <li class="f-registered"><span class="f-psfont">{!! __(['Registered: %s', dt($post->user->registered, true)]) !!}</span></li>
+            @endif
             @if ($post->user->location)
               <li class="f-location"><span class="f-psfont">{!! __(['From %s', $post->user->censorLocation]) !!}</span></li>
             @endif
+            @if ($post->user->url)
+              <li class="f-user-contacts f-website"><a href="{{ $post->user->censorUrl }}" title="{{ __('Website title') }}" rel="ugc"><span class="f-psfont">{!! __('Website') !!}</span></a></li>
+            @endif
+            @if (($post->user->isGuest && $post->user->email && $p->user->isAdmMod) || 0 === $post->user->email_setting)
+              <li class="f-user-contacts f-email"><a href="mailto:{{ $post->user->censorEmail }}" title="{{ __('Email title') }}" rel="ugc"><span class="f-psfont">{!! __('Email ') !!}</span></a></li>
+            @endif
             </ul>
         @endif
           </div>

app/templates/topic.forkbb.php

@@ -98,18 +98,26 @@
               <li class="f-promoteuser"><a href="{{ $linkPromote }}" title="{{ __('Promote user title') }}"><span class="f-psfont">{!! __('Promote user') !!}</span></a></li>
         @endif
             </ul>
-        @if (! $post->user->isGuest && $p->user->showUserInfo)
+        @if ($p->user->showUserInfo)
             <ul class="f-user-info-add">
             @if ($p->user->isAdmMod && '' != $post->user->admin_note)
               <li class="f-admin-note" title="{{ __('Admin note') }}">{{ $post->user->admin_note }}</li>
             @endif
+            @if (! $post->user->isGuest )
               <li class="f-registered"><span class="f-psfont">{!! __(['Registered: %s', dt($post->user->registered, true)]) !!}</span></li>
+            @endif
             @if ($post->user->location)
               <li class="f-location"><span class="f-psfont">{!! __(['From %s', $post->user->censorLocation]) !!}</span></li>
             @endif
             @if ($p->showIpAddrs)
               <li class="f-poster-ip"><a href="{{ $post->linkGetHost }}" title="{{ $post->poster_ip }}"><span class="f-psfont">{!! __('IP address logged') !!}</span></a></li>
             @endif
+            @if ($post->user->url)
+              <li class="f-user-contacts f-website"><a href="{{ $post->user->censorUrl }}" title="{{ __('Website title') }}" rel="ugc"><span class="f-psfont">{!! __('Website') !!}</span></a></li>
+            @endif
+            @if (($post->user->isGuest && $post->user->email && $p->user->isAdmMod) || 0 === $post->user->email_setting)
+              <li class="f-user-contacts f-email"><a href="mailto:{{ $post->user->censorEmail }}" title="{{ __('Email title') }}" rel="ugc"><span class="f-psfont">{!! __('Email ') !!}</span></a></li>
+            @endif
             </ul>
         @endif
           </div>

public/style/ForkBB/style.css

@@ -1501,6 +1501,10 @@ body,
   order: 2;
 }
 
+#fork .f-user-contacts {
+  display: inline-block;
+}
+
 #fork .f-username {
   font-size: 1.25rem;
   word-break: break-all;
@@ -1578,6 +1582,12 @@ body,
   color: #D8000C;
 }
 
+.f-post-user .f-psfont::before {
+  display: inline-block;
+  font-family: "fa";
+  font-weight: 900;
+}
+
 @media screen and (max-width: 49.9999rem) {
   #fork .f-user-info > li:not(.f-username),
   #fork .f-user-info-add > li {
@@ -1591,37 +1601,45 @@ body,
     padding-inline-end: 0.3125rem;
   }
 
-  .f-post-user .f-psfont::before {
-    display: inline-block;
-    font-family: "fa";
-    font-weight: 900;
-    padding-inline-end: 0.3125rem;
-  }
-
   .f-post-user .f-psfont > span {
     display: none;
   }
 
   .f-postcount > .f-psfont::before {
     font-weight: 400;
-    content: "\f086";
+    content: "\f086\a0";
   }
 
   .f-registered > .f-psfont::before {
-    content: "\f2f6";
+    content: "\f2f6\a0";
   }
 
   .f-location > .f-psfont::before {
-    content: "\f041";
+    content: "\f041\a0";
   }
 
   .f-promoteuser > a > .f-psfont::before {
-    padding-inline-end: 0;
     content: "\f007\f30c"; /* \e539 */
   }
+
+  .f-website > a > .f-psfont::before {
+    content: "\f0c1";
+  }
+
+  .f-email > a > .f-psfont::before {
+    content: "\40";
+  }
 }
 
 @media screen and (min-width: 50rem) {
+  .f-website > a > .f-psfont::before {
+    content: "\f0c1\a0";
+  }
+
+  .f-email > a > .f-psfont::before {
+    content: "\40\a0";
+  }
+
   #fork .f-post {
     display: flex;
     flex-wrap: wrap;