Update templates

Html5 semantics
This commit is contained in:
Visman 2021-01-05 22:57:37 +07:00
parent 5dd5924e65
commit 9baa10ef66
9 changed files with 70 additions and 54 deletions

View file

@ -4,7 +4,7 @@
@yield ('crumbs')
</div>
<div class="f-main f-main-admin{!! $p->mainSuffix or '' !!}">
<aside class="f-admin-menu">
<div class="f-admin-menu">
@if ($p->aNavigation)
<nav class="f-admin-nav f-menu">
<input id="id-an-checkbox" class="f-menu-checkbox" type="checkbox">
@ -16,7 +16,7 @@
</ul>
</nav>
@endif
</aside>
</div>
<div class="f-admin-wrap">
@yield ('content')
</div>

View file

@ -1,19 +1,21 @@
@section ('crumbs')
<ul class="f-crumbs">
<nav>
<ul class="f-crumbs">
@foreach ($p->crumbs as $cur)
@if (\is_object($cur[0]))
<li class="f-crumb @if ($cur[0]->is_subscribed) f-subscribed @endif"><!-- inline -->
<a href="{{ $cur[0]->link }}" @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</a>
</li><!-- endinline -->
<li class="f-crumb @if ($cur[0]->is_subscribed) f-subscribed @endif"><!-- inline -->
<a href="{{ $cur[0]->link }}" @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</a>
</li><!-- endinline -->
@else
<li class="f-crumb"><!-- inline -->
<li class="f-crumb"><!-- inline -->
@if ($cur[0])
<a href="{{ $cur[0] }}" @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</a>
<a href="{{ $cur[0] }}" @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</a>
@else
<span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
<span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
@endif
</li><!-- endinline -->
</li><!-- endinline -->
@endif
@endforeach
</ul>
</ul>
</nav>
@endsection

View file

@ -1,4 +1,4 @@
<section id="fork-debug">
<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>
@if ($p->queries)
@ -23,4 +23,4 @@
</tbody>
</table>
@endif
</section>
</aside>

View file

@ -20,6 +20,7 @@
<p id="id-fhtdesc">{!! __('Welcome') !!}</p>
</div>
</header>
<main>
@if ($iswev = $p->fIswev)
@include ('layouts/iswev')
@endif
@ -41,6 +42,7 @@
</section>
@endif
@endif
</main>
<!-- debuginfo -->
</div>
</body>

View file

@ -1,50 +1,52 @@
<aside>
@if ($iswev['i'])
<section class="f-iswev f-info">
<h2>Info message</h2>
<ul>
<section class="f-iswev f-info">
<h2>Info message</h2>
<ul>
@foreach ($iswev['i'] as $cur)
<li class="f-icontent">{!! $cur !!}</li>
<li class="f-icontent">{!! $cur !!}</li>
@endforeach
</ul>
</section>
</ul>
</section>
@endif
@if ($iswev['s'])
<section class="f-iswev f-success">
<h2>Successful operation message</h2>
<ul>
<section class="f-iswev f-success">
<h2>Successful operation message</h2>
<ul>
@foreach ($iswev['s'] as $cur)
<li class="f-scontent">{!! $cur !!}</li>
<li class="f-scontent">{!! $cur !!}</li>
@endforeach
</ul>
</section>
</ul>
</section>
@endif
@if ($iswev['w'])
<section class="f-iswev f-warning">
<h2>Warning message</h2>
<ul>
<section class="f-iswev f-warning">
<h2>Warning message</h2>
<ul>
@foreach ($iswev['w'] as $cur)
<li class="f-wcontent">{!! $cur !!}</li>
<li class="f-wcontent">{!! $cur !!}</li>
@endforeach
</ul>
</section>
</ul>
</section>
@endif
@if ($iswev['e'])
<section class="f-iswev f-error">
<h2>Error message</h2>
<ul>
<section class="f-iswev f-error">
<h2>Error message</h2>
<ul>
@foreach ($iswev['e'] as $cur)
<li class="f-econtent">{!! $cur !!}</li>
<li class="f-econtent">{!! $cur !!}</li>
@endforeach
</ul>
</section>
</ul>
</section>
@endif
@if ($iswev['v'])
<section class="f-iswev f-validation">
<h2>Validation message</h2>
<ul>
<section class="f-iswev f-validation">
<h2>Validation message</h2>
<ul>
@foreach ($iswev['v'] as $cur)
<li class="f-vcontent">{!! $cur !!}</li>
<li class="f-vcontent">{!! $cur !!}</li>
@endforeach
</ul>
</section>
</ul>
</section>
@endif
</aside>

View file

@ -78,16 +78,18 @@
</nav>
@endif
</header>
<main>
@if ($p->fAnnounce)
<section id="fork-announce">
<h2>{!! __('Announcement') !!}</h2>
<p id="id-facontent">{!! $p->fAnnounce !!}</p>
</section>
<aside id="fork-announce">
<h2>{!! __('Announcement') !!}</h2>
<p id="id-facontent">{!! $p->fAnnounce !!}</p>
</aside>
@endif
@if ($iswev = $p->fIswev)
@include ('layouts/iswev')
@endif
@yield ('content')
</main>
<footer id="fork-footer">
<h2>{!! __('Board footer') !!}</h2>
<div></div>

View file

@ -15,11 +15,13 @@
</head>
<body>
<div id="fork">
<section class="f-main f-redirect">
<h2>{!! __('Redirecting') !!}</h2>
<p>{!! $p->message !!}</p>
<p><a href="{{ $p->link }}">{!! __('Click redirect') !!}</a></p>
</section>
<main>
<section class="f-main f-redirect">
<h2>{!! __('Redirecting') !!}</h2>
<p>{!! $p->message !!}</p>
<p><a href="{{ $p->link }}">{!! __('Click redirect') !!}</a></p>
</section>
</main>
<!-- debuginfo -->
</div>
</body>

View file

@ -4,7 +4,7 @@
@yield ('crumbs')
</div>
@if ($form = $p->form)
<section class="f-moderate-form f-main">
<section class="f-main f-moderate-form">
<h2>{!! $p->formTitle !!}</h2>
<div class="f-fdiv">
@include ('layouts/form')

View file

@ -74,6 +74,7 @@ body,
#fork label,
#fork legend,
#fork li,
#fork main,
#fork mark,
#fork menu,
#fork nav,
@ -134,6 +135,10 @@ body,
position: relative;
}
#fork main {
display: block;
}
#fork code,
#fork pre {
font-family: "DejaVu Sans Mono", Consolas, "Droid Sans Mono", Monospace, Monaco, "Courier New", Courier;
@ -165,7 +170,8 @@ body,
background-color: #D3B58D;
}
#fork section > h2 {
#fork section > h2,
#fork aside > h2 {
display: none;
}