Selaa lähdekoodia

Make the <h1> heading dependent on the page content

Start.
Live can be seen on the  https://forkbb.ru/
Visman 2 vuotta sitten
vanhempi
commit
c1ccab16e6

+ 3 - 2
app/Models/Pages/Email.php

@@ -125,7 +125,8 @@ class Email extends Page
 
         $this->nameTpl   = 'email';
         $this->robots    = 'noindex';
-        $this->crumbs    = $this->crumbs([null, ['Send email to %s', $this->curUser->username]]);
+        $this->legend    = ['Send email to %s', $this->curUser->username];
+        $this->crumbs    = $this->crumbs([null, $this->legend]);
         $this->form      = $this->formEmail($args, $data);
 
         return $this;
@@ -144,7 +145,7 @@ class Email extends Page
             ],
             'sets'   => [
                 'send-email' => [
-                    'legend' => ['Send email to %s', $this->curUser->username],
+                    'legend' => $this->legend,
                     'fields' => [
                         'subject' => [
                             'type'      => 'text',

+ 3 - 0
app/lang/en/forum.po

@@ -41,3 +41,6 @@ msgstr "Receive email notification of new topics"
 
 msgid "Unsubscribe forum"
 msgstr "Unsubscribe from email notifications of new topics"
+
+msgid "Topic list"
+msgstr "Topic list"

+ 3 - 0
app/lang/en/index.po

@@ -47,3 +47,6 @@ msgstr "User information"
 
 msgid "Visitors online"
 msgstr "Registered users online: <b>%1$s</b>, guests: <b>%2$s</b>."
+
+msgid "Forum list"
+msgstr "Forum list"

+ 3 - 0
app/lang/en/topic.po

@@ -106,3 +106,6 @@ msgstr "Receive email notification of new posts"
 
 msgid "Unsubscribe topic"
 msgstr "Unsubscribe from email notifications of new posts"
+
+msgid "Post list"
+msgstr "Posts"

+ 1 - 1
app/lang/en/userlist.po

@@ -28,7 +28,7 @@ msgid "All users"
 msgstr "< All >"
 
 msgid "User_list"
-msgstr "User list"
+msgstr "Sorted/found users"
 
 msgid "<b>%s</b><small> post,</small>"
 msgid_plural "<b>%s</b><small> posts,</small>"

+ 3 - 0
app/lang/ru/forum.po

@@ -41,3 +41,6 @@ msgstr "Получать уведомления о новых темах по э
 
 msgid "Unsubscribe forum"
 msgstr "Отказаться от получения уведомлений о новых темах"
+
+msgid "Topic list"
+msgstr "Список тем"

+ 3 - 0
app/lang/ru/index.po

@@ -47,3 +47,6 @@ msgstr "Информация о пользователях"
 
 msgid "Visitors online"
 msgstr "Сейчас пользователей: <b>%1$s</b>, гостей: <b>%2$s</b>."
+
+msgid "Forum list"
+msgstr "Список разделов"

+ 3 - 0
app/lang/ru/topic.po

@@ -107,3 +107,6 @@ msgstr "Получать уведомления о новых сообщения
 
 msgid "Unsubscribe topic"
 msgstr "Отказаться от получения уведомлений о новых сообщениях"
+
+msgid "Post list"
+msgstr "Сообщения"

+ 1 - 1
app/lang/ru/userlist.po

@@ -28,7 +28,7 @@ msgid "All users"
 msgstr "< Все >"
 
 msgid "User_list"
-msgstr "Список пользователей"
+msgstr "Отсортированные/найденные пользователи"
 
 msgid "<b>%s</b><small> post,</small>"
 msgid_plural "<b>%s</b><small> posts,</small>"

+ 3 - 0
app/templates/email.forkbb.php

@@ -1,5 +1,8 @@
 @include ('layouts/crumbs')
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __($p->legend) !!}</h1>
+    </div>
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>

+ 11 - 5
app/templates/forum.forkbb.php

@@ -21,6 +21,16 @@
     @endif
 @endsection
 @extends ('layouts/main')
+    <div class="f-mheader">
+    @if (\is_array($p->model->name))
+      <h1 id="fork-h1">{!! __($p->model->name) !!}</h1>
+    @else
+      <h1 id="fork-h1">{{ $p->model->forum_name or $p->model->name }}</h1>
+    @endif
+    @if ('' != $p->model->forum_desc)
+      <p class="f-fdesc">{!! $p->model->forum_desc !!}</p>
+    @endif
+    </div>
 @if ($forums = $p->model->subforums)
     <div class="f-nav-links">
     @yield ('crumbs')
@@ -58,11 +68,7 @@
     </div>
 @if ($p->topics)
     <section id="fork-forum" class="f-main">
-    @if (\is_array($p->model->name))
-      <h2>{!! __($p->model->name) !!}</h2>
-    @else
-      <h2>{{ $p->model->forum_name or $p->model->name }}</h2>
-    @endif
+      <h2>{!! __('Topic list') !!}</h2>
       <div class="f-ftlist">
         <ol class="f-table">
           <li hidden class="f-row f-thead" value="0">

+ 5 - 2
app/templates/index.forkbb.php

@@ -1,6 +1,9 @@
 @extends ('layouts/main')
 @if ($p->categoryes)
-    <section class="f-main">
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __('Forum list') !!}</h1>
+    </div>
+    <div class="f-main">
       <ol class="f-ftlist">
     @foreach ($p->categoryes as $id => $forums)
         <li id="cat-{{ $id }}" class="f-category">
@@ -16,7 +19,7 @@
         </li>
     @endforeach
       </ol>
-    </section>
+    </div>
     @if ($p->linkMarkRead)
     <div class="f-nav-links">
       <div class="f-nlinks">

+ 1 - 1
app/templates/layouts/main.forkbb.php

@@ -15,7 +15,7 @@
 <body>
   <div id="fork" @if ($p->fNavigation) class="f-with-nav" @endif>
     <header id="fork-header">
-      <h1 id="id-fhth1"><a id="id-fhtha" rel="home" href="{{ $p->fRootLink }}">{{ $p->fTitle }}</a></h1>
+      <p id="id-fhth1"><a id="id-fhtha" rel="home" href="{{ $p->fRootLink }}">{{ $p->fTitle }}</a></p>
 @if ('' != $p->fDescription)
       <p id="id-fhtdesc">{!! $p->fDescription !!}</p>
 @endif

+ 3 - 0
app/templates/post.forkbb.php

@@ -1,5 +1,8 @@
 @include ('layouts/crumbs')
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __($p->formTitle) !!}</h1>
+    </div>
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>

+ 5 - 3
app/templates/profile.forkbb.php

@@ -2,6 +2,9 @@
 @section ('avatar')<img class="f-avatar-img" src="{{ $p->curUser->avatar }}" alt="{{ $p->curUser->username }}"> @endsection
 @section ('signature') @if ($p->signatureSection){!! $p->curUser->htmlSign !!} @endif @endsection
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __(['%s\'s profile', $p->curUser->username]) !!}</h1>
+    </div>
     <div class="f-nav-links">
 @yield ('crumbs')
 @if ($p->actionBtns)
@@ -17,10 +20,9 @@
 @endif
     </div>
 @if ($form = $p->form)
-    <section id="fork-profile" class="f-main">
-      <h2>{!! __(['%s\'s profile', $p->curUser->username]) !!}</h2>
+    <div id="fork-profile" class="f-main">
       <div class="f-fdiv">
     @include ('layouts/form')
       </div>
-    </section>
+    </div>
 @endif

+ 5 - 3
app/templates/report.forkbb.php

@@ -1,13 +1,15 @@
 @include ('layouts/crumbs')
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __('Report post') !!}</h1>
+    </div>
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>
 @if ($form = $p->form)
-    <section id="fork-report" class="f-post-form">
-      <h2>{!! __('Report post') !!}</h2>
+    <div id="fork-report" class="f-post-form">
       <div class="f-fdiv">
     @include ('layouts/form')
       </div>
-    </section>
+    </div>
 @endif

+ 5 - 3
app/templates/rules.forkbb.php

@@ -1,14 +1,16 @@
 @include ('layouts/crumbs')
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __('Forum rules') !!}</h1>
+    </div>
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>
-    <section id="fork-rules" class="f-main">
-      <h2>{!! __('Forum rules') !!}</h2>
+    <div id="fork-rules" class="f-main">
       <div id="id-rules">{!! $p->rules !!}</div>
 @if ($form = $p->form)
       <div class="f-fdiv f-lrdiv">
     @include ('layouts/form')
       </div>
 @endif
-    </section>
+    </div>

+ 5 - 3
app/templates/search.forkbb.php

@@ -1,13 +1,15 @@
 @include ('layouts/crumbs')
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __('Search') !!}</h1>
+    </div>
     <div class="f-nav-links">
 @yield ('crumbs')
     </div>
 @if ($form = $p->form)
-    <section id="fork-search" class="f-main">
-      <h2>{!! __('Search') !!}</h2>
+    <div id="fork-search" class="f-main">
       <div class="f-fdiv">
     @include ('layouts/form')
       </div>
-    </section>
+    </div>
 @endif

+ 4 - 1
app/templates/topic.forkbb.php

@@ -21,6 +21,9 @@
     @endif
 @endsection
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{{ $p->model->name }}</h1>
+    </div>
     <div class="f-nav-links">
 @yield ('crumbs')
 @if ($p->model->canReply || $p->model->closed || $p->model->pagination)
@@ -43,7 +46,7 @@
 @endif
     </div>
     <section id="fork-topic" class="f-main">
-      <h2>{{ $p->model->name }}</h2>
+      <h2>{!! __('Post list') !!}</h2>
 @foreach ($p->posts as $id => $post)
     @if (empty($post->id) && $iswev = ['e' => [['Message %s was not found in the database', $id]]])
         @include ('layouts/iswev')

+ 4 - 1
app/templates/topic_in_search.forkbb.php

@@ -21,6 +21,9 @@
     @endif
 @endsection
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __($p->model->name) !!}</h1>
+    </div>
     <div class="f-nav-links">
 @yield ('crumbs')
 @if ($p->model->pagination)
@@ -30,7 +33,7 @@
 @endif
     </div>
     <section id="fork-topic-ins" class="f-main">
-      <h2>{!! __($p->model->name) !!}</h2>
+      <h2>{!! __('Post list') !!}</h2>
 @foreach ($p->posts as $id => $post)
     @if (empty($post->id) && $iswev = ['e' => [['Message %s was not found in the database', $id]]])
         @include ('layouts/iswev')

+ 3 - 0
app/templates/userlist.forkbb.php

@@ -21,6 +21,9 @@
     @endif
 @endsection
 @extends ('layouts/main')
+    <div class="f-mheader">
+      <h1 id="fork-h1">{!! __('User list') !!}</h1>
+    </div>
     <div class="f-nav-links">
 @yield ('crumbs')
 @if ($p->pagination)

+ 42 - 10
public/style/ForkBB/style.css

@@ -146,7 +146,8 @@ body,
 
 #fork main {
   order: 2;
-  display: block;
+  /*display: flex;
+  flex-direction: column;*/
 }
 
 #fork b,
@@ -224,6 +225,36 @@ body,
   background-color: #AA7939;
 }
 
+#fork #fork-h1,
+#fork #id-fhth1,
+#fork .f-category .f-ftch2,
+#fork .f-category .f-finfo-h3,
+#fork .f-fsub {
+  font-family: Avenir, "Avenir Next LT Pro", Montserrat, Corbel, "URW Gothic", source-sans-pro, sans-serif;
+}
+
+#fork #fork-h1 {
+  font-size: 1.5rem;
+  font-style: italic;
+  line-height: 1.1;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+#fork .f-mheader {
+  padding: 0.625rem;
+  margin-top: 0.625rem;
+  border: 0.0625rem solid #814A00;
+  background-color: #E0C8B3; /*#DABCA0; #D3B58D;*/
+}
+
+@media screen and (min-width: 34.0625rem) {
+  #fork #fork-h1 {
+    font-size: 1.75rem;
+  }
+}
+
 #fork section > h2,
 #fork aside > h2 {
   display: none;
@@ -241,15 +272,12 @@ body,
 #fork #id-fhth1,
 #fork .f-category .f-finfo-h3,
 #fork .f-fsub {
-  font-family: Avenir, "Avenir Next LT Pro", Montserrat, Corbel, "URW Gothic", source-sans-pro, sans-serif;;
   font-weight: bold;
   font-style: italic;
 }
 
 #fork .f-category .f-ftch2 {
-  font-family: Avenir, "Avenir Next LT Pro", Montserrat, Corbel, "URW Gothic", source-sans-pro, sans-serif;;
   font-size: 1.5rem;
-  font-style: normal;
 }
 
 #fork .f-category .f-finfo-h3 {
@@ -905,13 +933,13 @@ body,
   content: " /";
 }
 
-#fork .f-crumb-a:not(.active) {
+/*#fork .f-crumb-a:not(.active) {
   border-bottom: 0.0625rem solid;
-}
+}*/
 
-#fork .f-crumb-a.active {
+/*#fork .f-crumb-a.active {
   font-weight: bold;
-}
+}*/
 
 #fork .f-subscribed > .f-crumb-a::after {
   display: inline;
@@ -1440,7 +1468,7 @@ body,
 
 #fork-topic .f-post-edited {
   font-style: italic;
-  opacity: 0.5;
+  /*opacity: 0.5;*/
 }
 
 #fork .f-post-number {
@@ -1641,7 +1669,7 @@ body,
 }
 
 #fork .f-bb-after {
-  opacity: 0.5;
+  /*opacity: 0.5;*/
   font-style: italic;
   font-size: 0.875rem;
   padding-top: 0.625rem;
@@ -2150,6 +2178,10 @@ body,
 /**********/
 /* Репорт */
 /**********/
+#fork-report.f-post-form {
+  border-top: 0;
+}
+
 #id-fs-report .f-fleg {
   display: none;
 }