From 82e595b3e0e67a0dd1f1bd5a6e644f0663a46647 Mon Sep 17 00:00:00 2001
From: Visman <visman2008@googlemail.com>
Date: Tue, 11 Apr 2023 21:40:51 +0700
Subject: [PATCH] Change html page structure

Removed <h2> headings from <aside> blocks.
Moved debug block to <footer>.
---
 app/lang/en/common.po                  |  6 ++--
 app/lang/en/index.po                   |  2 +-
 app/lang/en/topic.po                   |  2 +-
 app/lang/ru/common.po                  |  6 ++--
 app/lang/ru/index.po                   |  2 +-
 app/lang/ru/topic.po                   |  2 +-
 app/templates/layouts/debug.forkbb.php | 44 +++++++++++++-------------
 app/templates/layouts/iswev.forkbb.php | 30 +++++++++---------
 app/templates/layouts/main.forkbb.php  | 18 ++++++-----
 app/templates/layouts/stats.forkbb.php |  2 +-
 public/style/ForkBB/style.css          | 15 ++++-----
 11 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/app/lang/en/common.po b/app/lang/en/common.po
index d4c4373d..2527312e 100644
--- a/app/lang/en/common.po
+++ b/app/lang/en/common.po
@@ -80,7 +80,7 @@ msgid "Hidden text"
 msgstr "Hidden text"
 
 msgid "Announcement"
-msgstr "Announcement"
+msgstr "Announcement:"
 
 msgid "Options"
 msgstr "Options"
@@ -309,13 +309,13 @@ msgid "Send PM"
 msgstr "Send private message"
 
 msgid "Board footer"
-msgstr "Board footer"
+msgstr "Board footer:"
 
 msgid "Powered by"
 msgstr "Powered by <a href=\"https://forkbb.ru\">ForkBB</a>"
 
 msgid "Debug table"
-msgstr "Debug information"
+msgstr "Debug information:"
 
 msgid "Querytime"
 msgstr "Generated in %1$s seconds, %2$s queries executed"
diff --git a/app/lang/en/index.po b/app/lang/en/index.po
index 97fe33d6..b40c2186 100644
--- a/app/lang/en/index.po
+++ b/app/lang/en/index.po
@@ -34,7 +34,7 @@ msgid "Online users"
 msgstr "Online:"
 
 msgid "Stats info"
-msgstr "Board information"
+msgstr "Board information:"
 
 msgid "Board stats"
 msgstr "Board statistics"
diff --git a/app/lang/en/topic.po b/app/lang/en/topic.po
index 21c79341..fd8d91b9 100644
--- a/app/lang/en/topic.po
+++ b/app/lang/en/topic.po
@@ -90,7 +90,7 @@ msgid "Online users"
 msgstr "Online:"
 
 msgid "Stats info"
-msgstr "Topic information"
+msgstr "Topic information:"
 
 msgid "Merge posts"
 msgstr "Merge with previous if it yours"
diff --git a/app/lang/ru/common.po b/app/lang/ru/common.po
index b5c516b9..0a15e86a 100644
--- a/app/lang/ru/common.po
+++ b/app/lang/ru/common.po
@@ -80,7 +80,7 @@ msgid "Hidden text"
 msgstr "Скрытый текст"
 
 msgid "Announcement"
-msgstr "Объявление"
+msgstr "Объявление:"
 
 msgid "Options"
 msgstr "Параметры"
@@ -311,13 +311,13 @@ msgid "Send PM"
 msgstr "Отправить личное сообщение"
 
 msgid "Board footer"
-msgstr "Подвал форума"
+msgstr "Подвал форума:"
 
 msgid "Powered by"
 msgstr "Под управлением <a href=\"https://forkbb.ru\">ForkBB</a>"
 
 msgid "Debug table"
-msgstr "Отладочная информация"
+msgstr "Отладочная информация:"
 
 msgid "Querytime"
 msgstr "Сгенерировано за %1$s сек, %2$s запросов выполнено"
diff --git a/app/lang/ru/index.po b/app/lang/ru/index.po
index 75712481..f88ea96b 100644
--- a/app/lang/ru/index.po
+++ b/app/lang/ru/index.po
@@ -34,7 +34,7 @@ msgid "Online users"
 msgstr "Активны:"
 
 msgid "Stats info"
-msgstr "Информация о форуме"
+msgstr "Информация о форуме:"
 
 msgid "Board stats"
 msgstr "Статистика форума"
diff --git a/app/lang/ru/topic.po b/app/lang/ru/topic.po
index 282fed9f..1ed81e3f 100644
--- a/app/lang/ru/topic.po
+++ b/app/lang/ru/topic.po
@@ -91,7 +91,7 @@ msgid "Online users"
 msgstr "Активны:"
 
 msgid "Stats info"
-msgstr "Информация о теме"
+msgstr "Информация о теме:"
 
 msgid "Merge posts"
 msgstr "Соединить с предыдущим сообщением, если оно ваше"
diff --git a/app/templates/layouts/debug.forkbb.php b/app/templates/layouts/debug.forkbb.php
index 62badf72..3abb57c1 100644
--- a/app/templates/layouts/debug.forkbb.php
+++ b/app/templates/layouts/debug.forkbb.php
@@ -1,26 +1,26 @@
-    <aside id="fork-debug">
-      <h2>{!! __('Debug table') !!}</h2>
-      <p id="id-fdebugtime">[ {!! __(['Querytime', num($p->time, 3), $p->numQueries]) !!} - {!! __(['Memory usage', size($p->memory)]) !!} {!! __(['Peak usage', size($p->peak)]) !!} ]</p>
+      <aside id="fork-debug">
+        <p class="f-sim-header">{!! __('Debug table') !!}</p>
+        <p id="id-fdebugtime">[ {!! __(['Querytime', num($p->time, 3), $p->numQueries]) !!} - {!! __(['Memory usage', size($p->memory)]) !!} {!! __(['Peak usage', size($p->peak)]) !!} ]</p>
 @if ($p->queries)
-      <table id="fork-dgtable">
-        <thead id="fork-dgthead">
-          <tr>
-            <th class="f-tcl" scope="col">{!! __('Query times') !!}</th>
-            <th class="f-tcr" scope="col">{!! __('Query') !!}</th>
-          </tr>
-        </thead>
-        <tbody>
+        <table id="fork-dgtable">
+          <thead id="fork-dgthead">
+            <tr>
+              <th class="f-tcl" scope="col">{!! __('Query times') !!}</th>
+              <th class="f-tcr" scope="col">{!! __('Query') !!}</th>
+            </tr>
+          </thead>
+          <tbody>
     @foreach ($p->queries as $cur)
-          <tr>
-            <td class="f-tcl">{{ num($cur[1], 3) }}</td>
-            <td class="f-tcr">{{ $cur[0] }}</td>
-          </tr>
+            <tr>
+              <td class="f-tcl">{{ num($cur[1], 3) }}</td>
+              <td class="f-tcr">{{ $cur[0] }}</td>
+            </tr>
     @endforeach
-          <tr>
-            <td class="f-tcl">{{ num($p->total, 3) }}</td>
-            <td class="f-tcr"></td>
-          </tr>
-        </tbody>
-      </table>
+            <tr>
+              <td class="f-tcl">{{ num($p->total, 3) }}</td>
+              <td class="f-tcr"></td>
+            </tr>
+          </tbody>
+        </table>
 @endif
-    </aside>
+      </aside>
diff --git a/app/templates/layouts/iswev.forkbb.php b/app/templates/layouts/iswev.forkbb.php
index 247ec1fb..b033b0aa 100644
--- a/app/templates/layouts/iswev.forkbb.php
+++ b/app/templates/layouts/iswev.forkbb.php
@@ -1,52 +1,52 @@
       <aside class="f-iswev-wrap">
 @if ($iswev['i'])
-        <section class="f-iswev f-info">
-          <h2>Info message</h2>
+        <div class="f-iswev f-info">
+          <p class="f-sim-header">Info message:</p>
           <ul>
     @foreach ($iswev['i'] as $cur)
             <li class="f-icontent">{!! __($cur) !!}</li>
     @endforeach
           </ul>
-        </section>
+        </div>
 @endif
 @if ($iswev['s'])
-        <section class="f-iswev f-success">
-          <h2>Successful operation message</h2>
+        <div class="f-iswev f-success">
+          <p class="f-sim-header">Successful operation message:</p>
           <ul>
     @foreach ($iswev['s'] as $cur)
             <li class="f-scontent">{!! __($cur) !!}</li>
     @endforeach
           </ul>
-        </section>
+        </div>
 @endif
 @if ($iswev['w'])
-        <section class="f-iswev f-warning">
-          <h2>Warning message</h2>
+        <div class="f-iswev f-warning">
+          <p class="f-sim-header">Warning message:</p>
           <ul>
     @foreach ($iswev['w'] as $cur)
             <li class="f-wcontent">{!! __($cur) !!}</li>
     @endforeach
           </ul>
-        </section>
+        </div>
 @endif
 @if ($iswev['e'])
-        <section class="f-iswev f-error">
-          <h2>Error message</h2>
+        <div class="f-iswev f-error">
+          <p class="f-sim-header">Error message:</p>
           <ul>
     @foreach ($iswev['e'] as $cur)
             <li class="f-econtent">{!! __($cur) !!}</li>
     @endforeach
           </ul>
-        </section>
+        </div>
 @endif
 @if ($iswev['v'])
-        <section class="f-iswev f-validation">
-          <h2>Validation message</h2>
+        <div class="f-iswev f-validation">
+          <p class="f-sim-header">Validation message:</p>
           <ul>
     @foreach ($iswev['v'] as $cur)
             <li class="f-vcontent">{!! __($cur) !!}</li>
     @endforeach
           </ul>
-        </section>
+        </div>
 @endif
       </aside>
diff --git a/app/templates/layouts/main.forkbb.php b/app/templates/layouts/main.forkbb.php
index 57b06f81..de7efc5f 100644
--- a/app/templates/layouts/main.forkbb.php
+++ b/app/templates/layouts/main.forkbb.php
@@ -80,10 +80,10 @@
 @endif
     <main>
 @if ($p->fAnnounce)
-      <aside id="fork-announce">
-        <h2>{!! __('Announcement') !!}</h2>
-        <p id="id-facontent">{!! $p->fAnnounce !!}</p>
-      </aside>
+    <aside id="fork-announce">
+      <p class="f-sim-header">{!! __('Announcement') !!}</p>
+      <p id="id-facontent">{!! $p->fAnnounce !!}</p>
+    </aside>
 @endif
 @if ($iswev = $p->fIswev)
     @include ('layouts/iswev')
@@ -91,11 +91,13 @@
 @yield ('content')
     </main>
     <footer id="fork-footer">
-      <h2>{!! __('Board footer') !!}</h2>
-      <div></div>
-      <div><p id="id-fpoweredby">{!! __('Powered by') !!}</p></div>
-    </footer>
+      <p class="f-sim-header">{!! __('Board footer') !!}</p>
+      <div id="fork-footer-in">
+        <div></div>
+        <div><p id="id-fpoweredby">{!! __('Powered by') !!}</p></div>
+      </div>
 <!-- debuginfo -->
+    </footer>
   </div>
 @foreach ($p->pageHeaders as $pageHeader)
     @if ('script' === $pageHeader['type'])
diff --git a/app/templates/layouts/stats.forkbb.php b/app/templates/layouts/stats.forkbb.php
index 71e7ad80..9bd6bd5c 100644
--- a/app/templates/layouts/stats.forkbb.php
+++ b/app/templates/layouts/stats.forkbb.php
@@ -1,5 +1,5 @@
     <aside id="fork-stats">
-      <h2>{!! __('Stats info') !!}</h2>
+      <p class="f-sim-header">{!! __('Stats info') !!}</p>
 @if ($p->stats)
       <dl id="fork-stboard">
         <dt class="f-stats-dt">{!! __('Board stats') !!}</dt>
diff --git a/public/style/ForkBB/style.css b/public/style/ForkBB/style.css
index 4d6494bb..a0f8ce86 100644
--- a/public/style/ForkBB/style.css
+++ b/public/style/ForkBB/style.css
@@ -183,7 +183,8 @@ body,
   resize: vertical;
 }
 
-#fork small {
+#fork small,
+#fork .f-sim-header {
   display: none;
 }
 
@@ -813,7 +814,7 @@ body,
 /**********/
 /* Подвал */
 /**********/
-#fork #fork-footer {
+#fork #fork-footer-in {
   border-bottom: 0.0625rem solid #AA7939;
   border-top: 0.0625rem solid #AA7939;
   background-color: #F8F4E3;
@@ -823,11 +824,7 @@ body,
   position: relative;
 }
 
-#fork-footer > h2 {
-  display: none;
-}
-
-#fork-footer > div {
+#fork-footer-in > div {
   padding: 0.625rem;
 }
 
@@ -2731,10 +2728,10 @@ body,
     width: 100%;
   }
 
-  #fork.f-with-nav #fork-debug {
+  /* #fork.f-with-nav #fork-debug {
     order: 4;
     width: 100%;
-  }
+  } */
 
   #fork.f-with-nav #fork-navdir {
     position: sticky;