0ct0pu5/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Change html page structure

Browse source 
Removed <h2> headings from <aside> blocks.
Moved debug block to <footer>.
This commit is contained in:
Visman 2023-04-11 21:40:51 +07:00
parent af462633cf
commit 82e595b3e0
11 changed files with 64 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/lang/en/common.po
View file

@ -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"

2
app/lang/en/index.po
View file

@ -34,7 +34,7 @@ msgid "Online users"
msgstr "Online:"
msgid "Stats info"
msgstr "Board information"
msgstr "Board information:"
msgid "Board stats"
msgstr "Board statistics"

2
app/lang/en/topic.po
View file

@ -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"

6
app/lang/ru/common.po
View file

@ -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 запросов выполнено"

2
app/lang/ru/index.po
View file

@ -34,7 +34,7 @@ msgid "Online users"
msgstr "Активны:"
msgid "Stats info"
msgstr "Информация о форуме"
msgstr "Информация о форуме:"
msgid "Board stats"
msgstr "Статистика форума"

2
app/lang/ru/topic.po
View file

@ -91,7 +91,7 @@ msgid "Online users"
msgstr "Активны:"
msgid "Stats info"
msgstr "Информация о теме"
msgstr "Информация о теме:"
msgid "Merge posts"
msgstr "Соединить с предыдущим сообщением, если оно ваше"

44
app/templates/layouts/debug.forkbb.php
View file

@ -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>

30
app/templates/layouts/iswev.forkbb.php
View file

@ -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>

18
app/templates/layouts/main.forkbb.php
View file

@ -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'])

2
app/templates/layouts/stats.forkbb.php
View file

@ -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>

15
public/style/ForkBB/style.css
View file

@ -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;