diff --git a/app/templates/_default/ban.forkbb.php b/app/templates/_default/ban.forkbb.php index 5ba5a980..85628d1d 100644 --- a/app/templates/_default/ban.forkbb.php +++ b/app/templates/_default/ban.forkbb.php @@ -1,7 +1,11 @@ @extends ('layouts/main') + +

{!! __('Info') !!}

+ +
@if ($p->bannedIp)

{!! __('Your IP is blocked') !!}

@@ -17,3 +21,5 @@ @endif

{!! __(['Ban message contact %s', $p->adminEmail]) !!}

+ + diff --git a/app/templates/_default/change_passphrase.forkbb.php b/app/templates/_default/change_passphrase.forkbb.php index 03a8adf8..a460663d 100644 --- a/app/templates/_default/change_passphrase.forkbb.php +++ b/app/templates/_default/change_passphrase.forkbb.php @@ -1,9 +1,15 @@ @extends ('layouts/main') + @if ($form = $p->form) +
+

{!! __('Change pass') !!}

@include ('layouts/form')
+
+ @endif + diff --git a/app/templates/_default/email.forkbb.php b/app/templates/_default/email.forkbb.php index 48f744e2..cbbeabdf 100644 --- a/app/templates/_default/email.forkbb.php +++ b/app/templates/_default/email.forkbb.php @@ -1,16 +1,26 @@ @include ('layouts/crumbs') @extends ('layouts/main') + +

{!! __($p->legend) !!}

+ +
@yield ('crumbs')
+ @if ($form = $p->form) +
+

{!! __('Send email title') !!}

@include ('layouts/form')
+
+ @endif + diff --git a/app/templates/_default/forum.forkbb.php b/app/templates/_default/forum.forkbb.php index 5ca43e0e..3ddd541a 100644 --- a/app/templates/_default/forum.forkbb.php +++ b/app/templates/_default/forum.forkbb.php @@ -21,6 +21,8 @@ @endif @endsection @extends ('layouts/main') + +
@if (\is_array($p->model->name))

{!! __($p->model->name) !!}

@@ -31,10 +33,14 @@

{!! $p->model->forum_desc !!}

@endif
+ @if ($forums = $p->model->subforums) +
@yield ('crumbs')
+ +
  1. @@ -50,7 +56,9 @@
+ @endif +
@yield ('crumbs') @if ($p->model->canCreateTopic || $p->model->pagination) @@ -66,7 +74,9 @@
@endif + @if ($p->topics) +

{!! __('Topic list') !!}

@@ -172,6 +182,8 @@
+ +
@if ($p->model->canCreateTopic || $p->model->pagination || $p->model->canMarkRead || $p->model->canSubscription)
@@ -201,12 +213,16 @@ @endif @yield ('crumbs')
+ @endif @if ($p->enableMod && $form = $p->formMod) + + @endif + diff --git a/app/templates/_default/index.forkbb.php b/app/templates/_default/index.forkbb.php index 7f22cb12..a98cac1e 100644 --- a/app/templates/_default/index.forkbb.php +++ b/app/templates/_default/index.forkbb.php @@ -1,8 +1,12 @@ @extends ('layouts/main') + @if ($p->categoryes) +

{!! __('Forum list') !!}

+ +
    @foreach ($p->categoryes as $id => $forums) @@ -20,7 +24,9 @@ @endforeach
+ @if ($p->linkMarkRead) +
@@ -30,6 +36,10 @@
+ @endif @endif + @include ('layouts/stats') + + diff --git a/app/templates/_default/layouts/admin.forkbb.php b/app/templates/_default/layouts/admin.forkbb.php index 8cb5cf1a..b4c60dcc 100644 --- a/app/templates/_default/layouts/admin.forkbb.php +++ b/app/templates/_default/layouts/admin.forkbb.php @@ -1,12 +1,19 @@ @include ('layouts/crumbs') @extends ('layouts/main') + +

{!! __($p->adminHeader) !!}

+ +
@yield ('crumbs')
+ +
+
@if ($p->aNavigation) @endif
+ +
@yield ('content')
+
+ + diff --git a/app/templates/_default/layouts/crumbs.forkbb.php b/app/templates/_default/layouts/crumbs.forkbb.php index 1a6b71c7..7a8bf22a 100644 --- a/app/templates/_default/layouts/crumbs.forkbb.php +++ b/app/templates/_default/layouts/crumbs.forkbb.php @@ -1,7 +1,9 @@ @section ('crumbs') + + @endsection diff --git a/app/templates/_default/layouts/debug.forkbb.php b/app/templates/_default/layouts/debug.forkbb.php index 7b29974f..765c0740 100644 --- a/app/templates/_default/layouts/debug.forkbb.php +++ b/app/templates/_default/layouts/debug.forkbb.php @@ -1,4 +1,6 @@ + + diff --git a/app/templates/_default/layouts/form.forkbb.php b/app/templates/_default/layouts/form.forkbb.php index edcf4435..37febd5f 100644 --- a/app/templates/_default/layouts/form.forkbb.php +++ b/app/templates/_default/layouts/form.forkbb.php @@ -1,5 +1,7 @@ + @if ($form['action'])
+ @endif @foreach ($form['sets'] as $setKey => $setVal) @if ($setVal['inform']) @@ -31,6 +33,7 @@
@switch ($cur['type']) + @case ('text') @case ('email') @case ('number') @@ -97,6 +100,7 @@
@break + @endswitch @endforeach @@ -116,12 +120,16 @@ @endif

@foreach ($form['btns'] as $key => $cur) + @if ('submit' === $cur['type']) @elseif ('btn'=== $cur['type']) {{ $cur['value'] }} @endif + @endforeach

+
@endif + diff --git a/app/templates/_default/layouts/iswev.forkbb.php b/app/templates/_default/layouts/iswev.forkbb.php index 0052eaee..2d4a4aad 100644 --- a/app/templates/_default/layouts/iswev.forkbb.php +++ b/app/templates/_default/layouts/iswev.forkbb.php @@ -1,4 +1,6 @@ + + diff --git a/app/templates/_default/layouts/main.forkbb.php b/app/templates/_default/layouts/main.forkbb.php index df71be8e..0eb88676 100644 --- a/app/templates/_default/layouts/main.forkbb.php +++ b/app/templates/_default/layouts/main.forkbb.php @@ -1,6 +1,7 @@ + {{! $p->pageTitle !}} @@ -36,28 +37,39 @@ <{{ $pageHeader['type'] }} @foreach ($pageHeader['values'] as $key => $val) {{ $key }}="{{ $val }}" @endforeach> @endif @endforeach + +
+

{{ $p->fTitle }}

@if ('' != $p->fDescription)

{!! $p->fDescription !!}

@endif
+ +
@if ($p->fAnnounce) @endif @if ($iswev = $p->fIswev) @include ('layouts/iswev') @endif + @yield ('content') +
+ @if ($p->fNavigation) + + @endif +

{!! __('Board footer') !!}

+
+ @foreach ($p->pageHeaders as $pageHeader) @if ('script' === $pageHeader['type']) @empty ($pageHeader['values']['inline']) @@ -140,5 +156,7 @@ @endempty @endif @endforeach + + diff --git a/app/templates/_default/layouts/pm.forkbb.php b/app/templates/_default/layouts/pm.forkbb.php index 9c703a38..9c5b45ca 100644 --- a/app/templates/_default/layouts/pm.forkbb.php +++ b/app/templates/_default/layouts/pm.forkbb.php @@ -1,12 +1,19 @@ @include ('layouts/crumbs') @extends ('layouts/main') + +

{!! __($p->pmHeader) !!}

+ +
@yield ('crumbs')
+ +
+
@if ($p->pmNavigation) @endif
+ +
@yield ('content')
+
+ + diff --git a/app/templates/_default/layouts/poll.forkbb.php b/app/templates/_default/layouts/poll.forkbb.php index 4b90ac22..d783aad4 100644 --- a/app/templates/_default/layouts/poll.forkbb.php +++ b/app/templates/_default/layouts/poll.forkbb.php @@ -1,6 +1,9 @@ +
+ @if ($poll->canVote)
+ @endif @foreach ($poll->question as $q => $question) @@ -41,8 +44,11 @@

+
@elseif (null !== $poll->status)

{!! __($poll->status) !!}

@endif +
+ diff --git a/app/templates/_default/layouts/redirect.forkbb.php b/app/templates/_default/layouts/redirect.forkbb.php index 3e5b8714..44783103 100644 --- a/app/templates/_default/layouts/redirect.forkbb.php +++ b/app/templates/_default/layouts/redirect.forkbb.php @@ -1,6 +1,7 @@ + @@ -16,9 +17,12 @@ <{{ $pageHeader['type'] }} @foreach ($pageHeader['values'] as $key => $val) {{ $key }}="{{ $val }}" @endforeach> @endif @endforeach + +
+
+ +
+
+ diff --git a/app/templates/_default/layouts/stats.forkbb.php b/app/templates/_default/layouts/stats.forkbb.php index 9bd6bd5c..d7733e25 100644 --- a/app/templates/_default/layouts/stats.forkbb.php +++ b/app/templates/_default/layouts/stats.forkbb.php @@ -1,4 +1,6 @@ + + diff --git a/app/templates/_default/login.forkbb.php b/app/templates/_default/login.forkbb.php index b19a0484..9bd43484 100644 --- a/app/templates/_default/login.forkbb.php +++ b/app/templates/_default/login.forkbb.php @@ -1,25 +1,39 @@ @extends ('layouts/main') + @if ($form = $p->form) +
+

{!! __('Login') !!}

@include ('layouts/form')
+
+ @endif @if ($form = $p->formOAuth) +
+
@include ('layouts/form')
+
+ @endif @if ($p->regLink) +
+
{!! __('Not registered') !!}
+
+ @endif + diff --git a/app/templates/_default/maintenance.forkbb.php b/app/templates/_default/maintenance.forkbb.php index 597a8fb6..11da3a12 100644 --- a/app/templates/_default/maintenance.forkbb.php +++ b/app/templates/_default/maintenance.forkbb.php @@ -1,4 +1,5 @@ @extends ('layouts/main') +

Info message

@@ -7,3 +8,4 @@
+ diff --git a/app/templates/_default/message.forkbb.php b/app/templates/_default/message.forkbb.php index dfd4c94e..e7566c80 100644 --- a/app/templates/_default/message.forkbb.php +++ b/app/templates/_default/message.forkbb.php @@ -1,6 +1,8 @@ @extends ('layouts/main') + @if ($p->back)

{!! __('Go back') !!}

@endif + diff --git a/app/templates/_default/moderate.forkbb.php b/app/templates/_default/moderate.forkbb.php index bc13e881..4661e883 100644 --- a/app/templates/_default/moderate.forkbb.php +++ b/app/templates/_default/moderate.forkbb.php @@ -1,15 +1,25 @@ @include ('layouts/crumbs') @extends ('layouts/main') + +

{!! __($p->formTitle) !!}

+ +
@yield ('crumbs')
+ @if ($form = $p->form) +
+
@include ('layouts/form')
+
+ @endif + diff --git a/app/templates/_default/passphrase_reset.forkbb.php b/app/templates/_default/passphrase_reset.forkbb.php index 4241abea..db6b0213 100644 --- a/app/templates/_default/passphrase_reset.forkbb.php +++ b/app/templates/_default/passphrase_reset.forkbb.php @@ -1,9 +1,15 @@ @extends ('layouts/main') + @if ($form = $p->form) +
+

{!! __('Passphrase reset') !!}

@include ('layouts/form')
+
+ @endif + diff --git a/app/templates/_default/post.forkbb.php b/app/templates/_default/post.forkbb.php index e5ac6cb1..4682a744 100644 --- a/app/templates/_default/post.forkbb.php +++ b/app/templates/_default/post.forkbb.php @@ -1,12 +1,18 @@ @include ('layouts/crumbs') @extends ('layouts/main') + +

{!! __($p->formTitle) !!}

+ +
@yield ('crumbs')
+ @if ($p->previewHtml) +

{!! __('Post preview') !!}

@@ -18,16 +24,22 @@
+ @endif @if ($form = $p->form) +
+

{!! __($p->formTitle) !!}

@include ('layouts/form')
+
+ @endif @if ($p->posts) +

{!! __($p->postsTitle) !!}

@foreach ($p->posts as $post) @@ -58,4 +70,6 @@ @endif @endforeach
+ @endif + diff --git a/app/templates/_default/profile.forkbb.php b/app/templates/_default/profile.forkbb.php index 70702a77..213537d2 100644 --- a/app/templates/_default/profile.forkbb.php +++ b/app/templates/_default/profile.forkbb.php @@ -2,9 +2,13 @@ @section ('avatar'){{ $p->curUser->username }} @endsection @section ('signature') @if ($p->signatureSection){!! $p->curUser->htmlSign !!} @endif @endsection @extends ('layouts/main') + +

{!! __(['%s\'s profile', $p->curUser->username]) !!}

+ +
@yield ('crumbs') @if ($p->actionBtns) @@ -19,19 +23,29 @@
@endif + @if ($form = $p->form) +
+

@if ($p->profileHeader === $p->curUser->username){{ $p->profileHeader }} @else{!! __($p->profileHeader) !!} @endif

@include ('layouts/form')
+
+ @endif @if ($form = $p->formOAuth) +
+

{!! __('Add account') !!}

@include ('layouts/form')
+
+ @endif + diff --git a/app/templates/_default/register.forkbb.php b/app/templates/_default/register.forkbb.php index 7db229f1..a43e8a8a 100644 --- a/app/templates/_default/register.forkbb.php +++ b/app/templates/_default/register.forkbb.php @@ -1,16 +1,26 @@ @extends ('layouts/main') + @if ($form = $p->form) +
+

{!! __('Register') !!}

@include ('layouts/form')
+
+ @endif @if ($form = $p->formOAuth) +
+
@include ('layouts/form')
+
+ @endif + diff --git a/app/templates/_default/report.forkbb.php b/app/templates/_default/report.forkbb.php index 5a0eacaf..35ac6da3 100644 --- a/app/templates/_default/report.forkbb.php +++ b/app/templates/_default/report.forkbb.php @@ -1,15 +1,25 @@ @include ('layouts/crumbs') @extends ('layouts/main') + +

{!! __('Report post') !!}

+ +
@yield ('crumbs')
+ @if ($form = $p->form) +
+
@include ('layouts/form')
+
+ @endif + diff --git a/app/templates/_default/rules.forkbb.php b/app/templates/_default/rules.forkbb.php index 9fc37e02..d4373929 100644 --- a/app/templates/_default/rules.forkbb.php +++ b/app/templates/_default/rules.forkbb.php @@ -1,18 +1,30 @@ @include ('layouts/crumbs') @extends ('layouts/main') + +

{!! __('Forum rules') !!}

+ +
@yield ('crumbs')
+ +
{!! $p->rules !!}
+ @if ($form = $p->form) +
+
@include ('layouts/form')
+
+ @endif + diff --git a/app/templates/_default/search.forkbb.php b/app/templates/_default/search.forkbb.php index acf2c3b4..58f62667 100644 --- a/app/templates/_default/search.forkbb.php +++ b/app/templates/_default/search.forkbb.php @@ -1,15 +1,25 @@ @include ('layouts/crumbs') @extends ('layouts/main') + +

{!! __('Search') !!}

+ +
@yield ('crumbs')
+ @if ($form = $p->form) + + @endif + diff --git a/app/templates/_default/topic.forkbb.php b/app/templates/_default/topic.forkbb.php index bfbf21f7..938625ec 100644 --- a/app/templates/_default/topic.forkbb.php +++ b/app/templates/_default/topic.forkbb.php @@ -21,9 +21,13 @@ @endif @endsection @extends ('layouts/main') + +

{{ $p->model->name }}

+ +
@yield ('crumbs') @if ($p->model->canReply || $p->model->closed || $p->model->pagination) @@ -45,6 +49,8 @@
@endif + +

{!! __('Post list') !!}

@foreach ($p->posts as $id => $post) @@ -166,6 +172,8 @@ @endif @endforeach
+ +
@if ($p->model->canReply || $p->model->pagination || $p->model->canSubscription)
@@ -191,22 +199,30 @@ @endif @yield ('crumbs')
+ @if ($p->enableMod && $form = $p->formMod) + + @endif @if ($p->online) + @include ('layouts/stats') + @endif @if ($form = $p->form) +

{!! __('Quick post') !!}

@include ('layouts/form')
+ @endif + diff --git a/app/templates/_default/topic_in_search.forkbb.php b/app/templates/_default/topic_in_search.forkbb.php index 98281a53..782991c5 100644 --- a/app/templates/_default/topic_in_search.forkbb.php +++ b/app/templates/_default/topic_in_search.forkbb.php @@ -21,9 +21,13 @@ @endif @endsection @extends ('layouts/main') + +

{!! __($p->model->name) !!}

+ +
@yield ('crumbs') @if ($p->model->pagination) @@ -32,6 +36,8 @@
@endif
+ +

{!! __('Post list') !!}

@foreach ($p->posts as $id => $post) @@ -95,6 +101,8 @@ @endif @endforeach
+ +
@if ($p->model->pagination)
@@ -103,3 +111,5 @@ @endif @yield ('crumbs')
+ + diff --git a/app/templates/_default/userlist.forkbb.php b/app/templates/_default/userlist.forkbb.php index 989c39fe..670772ad 100644 --- a/app/templates/_default/userlist.forkbb.php +++ b/app/templates/_default/userlist.forkbb.php @@ -21,9 +21,13 @@ @endif @endsection @extends ('layouts/main') + +

{!! __('User list') !!}

+ +
@yield ('crumbs') @if ($p->pagination) @@ -32,8 +36,10 @@
@endif
+ @if ($form = $p->form) -
+ +

{!! __($p->userRules->searchUsers ? 'User search head' : 'User sort head') !!}

{!! __($p->userRules->searchUsers ? 'User search head' : 'User sort head') !!} @@ -42,8 +48,10 @@
+ @endif @if ($p->userList) +

{!! __('User_list') !!}

@@ -96,11 +104,15 @@
+ @if ($p->pagination) +
@yield ('pagination')
+ @endif @endif +