Converting themes to views

1 files changed, 64 insertions, 4 deletions

diff --git a/resources/views/layouts/default.php b/resources/views/layouts/default.php
index 5c269ff801..d1f6d316b0 100644
--- a/resources/views/layouts/default.php
+++ b/resources/views/layouts/default.php
@@ -42,14 +42,64 @@
 		<header class="wt-header-wrapper d-print-none">
 			<div class="container wt-header-container">
 				<div class="row wt-header-content">
-					<?= Theme::theme()->headerContent() ?>
+					<div class="wt-accessibility-links">
+						<a class="sr-only sr-only-focusable btn btn-info btn-sm" href="#content">
+							<?= /* I18N: Skip over the headers and menus, to the main content of the page */ I18N::translate('Skip to content') ?>
+						</a>
+					</div>
+					<div class="col wt-site-logo"></div>
+
+					<?php if ($tree !== null): ?>
+						<h1 class="col wt-site-title"><?= e($tree->getTitle()) ?></h1>
+
+						<div class="col wt-header-search">
+							<form class="wt-header-search-form" role="search">
+								<input type="hidden" name="route" value="search-quick">
+								<input type="hidden" name="ged" value="<?= e($tree->getName()) ?>">
+								<div class="input-group">
+									<label class="sr-only" for="quick-search"><?= I18N::translate('Search') ?></label>
+									<input type="search" class="form-control wt-header-search-field" id="quick-search" name="query" size="15" placeholder="<?= I18N::translate('Search') ?>">
+									<span class="input-group-btn">
+										<button type="submit" class="btn btn-primary wt-header-search-button">
+											<i class="fas fa-search"></i>
+										</button>
+									</span>
+								</div>
+							</form>
+						</div>
+					<?php endif ?>
+
+					<div class="col wt-secondary-navigation">
+						<ul class="nav wt-secondary-menu">
+							<?php foreach (Theme::theme()->secondaryMenu() as $menu): ?>
+								<?= $menu->bootstrap4() ?>
+							<?php endforeach ?>
+						</ul>
+					</div>
+
+					<nav class="col wt-primary-navigation">
+						<ul class="nav wt-primary-menu">
+							<?php foreach (Theme::theme()->primaryMenu() as $menu): ?>
+								<?= $menu->bootstrap4() ?>
+							<?php endforeach ?>
+						</ul>
+					</nav>
 				</div>
 			</div>
 		</header>
 
 		<main id="content" class="wt-main-wrapper">
 			<div class="container wt-main-container">
-				<?= Theme::theme()->flashMessagesContainer(FlashMessages::getMessages()) ?>
+				<div class="flash-messages">
+					<?php foreach (FlashMessages::getMessages() as $message): ?>
+						<div class="alert alert-<?= e($message->status) ?> alert-dismissible" role="alert">
+							<button type="button" class="close" data-dismiss="alert" aria-label="<?= I18N::translate('close') ?>">
+								<span aria-hidden="true">&times;</span>
+							</button>
+							<?= $message->text ?>
+						</div>
+					<?php endforeach ?>
+				</div>
 
 				<?= $content ?>
 			</div>
@@ -67,9 +117,19 @@
 		<script src="<?= e(WT_ASSETS_URL . 'js/vendor.js') ?>"></script>
 		<script src="<?= e(WT_ASSETS_URL . 'js/webtrees.js') ?>"></script>
 
-		<?= View::stack('javascript') ?>
+		<script>
+      activate_colorbox();
+      jQuery.extend(jQuery.colorbox.settings, {
+       width: "85%",
+       height: "85%",
+       transition: "none",
+       slideshowStart: "<?= I18N::translate('Play') ?>"
+       slideshowStop: "<?= I18N::translate('Stop') ?>",
+       title: function() { return this.dataset.title; }
+      });
+    </script>
 
-		<?= Theme::theme()->hookFooterExtraJavascript() ?>
+		<?= View::stack('javascript') ?>
 
 		<?= DebugBar::render() ?>
 	</body>