2 tahun lalu · 7699db8f5d
--- a/app/templates/layouts/main.forkbb.php
+++ b/app/templates/layouts/main.forkbb.php
@@ -20,7 +20,19 @@
 
				       <p id="id-fhtdesc">{!! $p->fDescription !!}</p>
			
 
				 @endif
			
 
				     </header>
			
 
				- @if ($p->fNavigation)
			
 
				+    <main>
			
 
				+@if ($p->fAnnounce)
			
 
				+    <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')
			
 
				+@endif
			
 
				+@yield ('content')
			
 
				+    </main>
			
 
				+@if ($p->fNavigation)
			
 
				     <nav id="fork-nav" class="f-menu @if ($p->fNavigation['search']) f-main-nav-search @endif">
			
 
				       <div id="fork-navdir">
			
 
				         <input id="id-mn-checkbox" class="f-menu-checkbox" type="checkbox">
			
@@ -78,18 +90,6 @@
 
				       </div>
			
 
				     </nav>
			
 
				 @endif
			
 
				-    <main>
			
 
				-@if ($p->fAnnounce)
			
 
				-    <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')
			
 
				-@endif
			
 
				-@yield ('content')
			
 
				-    </main>
			
 
				     <footer id="fork-footer">
			
 
				       <p class="f-sim-header">{!! __('Board footer') !!}</p>
			
 
				       <div id="fork-footer-in">
			
--- a/app/templates/layouts/redirect.forkbb.php
+++ b/app/templates/layouts/redirect.forkbb.php
@@ -3,7 +3,7 @@
 
				 <head>
			
 
				   <meta charset="utf-8">
			
 
				   <meta name="viewport" content="width=device-width, initial-scale=1.0">
			
 
				-  <meta http-equiv="refresh" content="{{ $p->timeout }};URL={{ $p->link }}">
			
 
				+  <meta http-equiv="refresh" content="{{ $p->timeout }}; URL={{ $p->link }}">
			
 
				   <title>{!! \htmlspecialchars($p->pageTitle, \ENT_HTML5 | \ENT_QUOTES | \ENT_SUBSTITUTE, 'UTF-8', false) !!}</title>
			
 
				 @foreach ($p->pageHeaders as $pageHeader)
			
 
				     @if ('style' === $pageHeader['type'])
			
@@ -22,7 +22,9 @@
 
				         <p class="f-rdrct-p"><a href="{{ $p->link }}">{!! __('Click redirect') !!}</a></p>
			
 
				       </section>
			
 
				     </main>
			
 
				+    <footer id="fork-footer">
			
 
				 <!-- debuginfo -->
			
 
				+    </footer>
			
 
				   </div>
			
 
				 </body>
			
 
				 </html>
			
--- a/public/style/ForkBB/style.css
+++ b/public/style/ForkBB/style.css
@@ -145,6 +145,7 @@ body,
 
				 }
			
 
				 
			
 
				 #fork main {
			
 
				+  order: 2;
			
 
				   display: block;
			
 
				 }
			
 
				 
			
@@ -409,6 +410,7 @@ body,
 
				 /* Главное меню */
			
 
				 /****************/
			
 
				 #fork #fork-nav {
			
 
				+  order: 1;
			
 
				   border-bottom: 0.0625rem solid #AA7939;
			
 
				 }
			
 
				 
			
@@ -567,7 +569,7 @@ body,
 
				 /* Шапка */
			
 
				 /*********/
			
 
				 #fork #fork-header {
			
 
				-  /* background-color: #AA7939; */
			
 
				+  order: 0;
			
 
				   border-bottom: 0.0625rem solid #AA7939;
			
 
				 }
			
 
				 
			
@@ -830,6 +832,10 @@ body,
 
				 /**********/
			
 
				 /* Подвал */
			
 
				 /**********/
			
 
				+#fork #fork-footer {
			
 
				+  order: 3;
			
 
				+}
			
 
				+
			
 
				 #fork #fork-footer-in {
			
 
				   border-bottom: 0.0625rem solid #AA7939;
			
 
				   border-top: 0.0625rem solid #AA7939;
			
@@ -2736,7 +2742,6 @@ body,
 
				   }
			
 
				 
			
 
				   #fork.f-with-nav #fork-header {
			
 
				-    order: 0;
			
 
				     width: 100%;
			
 
				     border-bottom-width: 0.125rem;
			
 
				   }
			
@@ -2756,7 +2761,6 @@ body,
 
				   }
			
 
				 
			
 
				   #fork.f-with-nav #fork-footer {
			
 
				-    order: 3;
			
 
				     width: 100%;
			
 
				   }