Alan Lam 8 лет назад
Родитель
Сommit
ab414f4b48
5 измененных файлов с 166 добавлено и 185 удалено
  1. 0 0
      public/css/bootstrap.min.css
  2. 5 14
      scss/_main.scss
  3. 56 58
      views/footer.php
  4. 104 112
      views/header.php
  5. 1 1
      views/performance.php

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
public/css/bootstrap.min.css


+ 5 - 14
scss/_main.scss

@@ -1,17 +1,5 @@
-html, body {
-	height: 100%;
-}
-
-.flex-container {
-	display: flex;
-	flex-direction: column;
-	height: 100%;
-
-	.page-content {
-		flex: 1;
-		overflow: auto;
-	}
-
+body {
+	padding-top: 56px;
 }
 
 .text-monospace {
@@ -92,6 +80,9 @@ html, body {
 }
 
 .breadcrumb-nav {
+	position: sticky;
+	top: 56px;
+	z-index: 100;
 }
 
 ol.breadcrumb {

+ 56 - 58
views/footer.php

@@ -1,68 +1,66 @@
-				<?php
-				if(Core::$show_footer_content) {
-				?>
+		<?php
+		if(Core::$show_footer_content) {
+		?>
 
-				<footer class="my-3">
-					<div class="container">
+		<footer class="my-3">
+			<div class="container">
 
-						<hr />
+				<hr />
 
-						<div class="row">
-							<div class="col-md mb-3">
-								<h5>Navigation</h5>
-								<ul class="nav flex-column">
-									<li><a href="/home">Home</a></li>
+				<div class="row">
+					<div class="col-md mb-3">
+						<h5>Navigation</h5>
+						<ul class="nav flex-column">
+							<li><a href="/home">Home</a></li>
 
-									<?php
-									if(!Core::$user) {
-										?>
-										<li><a href="/services">Services</a></li>
-										<li><a href="/become-a-tester">Become a tester</a></li>
-										<li><a href="/contact">Contact</a></li>
-										<li><a href="/jobs">Jobs</a></li>
-										<?php
-									}
-									else {
-										?>
-										<li><a href="/contact">Contact</a></li>
-										<li><a href="/account">Account</a></li>
-										<?php
-									}
-									?>
-								</ul>
-							</div>
-							<div class="col-md mb-3">
-								<h5>Follow Us</h5>
-								<ul class="nav flex-column">
-									<li><i class="fab fa-fw fa-facebook"></i> <a href="https://www.facebook.com/checkpolicy" target="_blank">Facebook</a></li>
-									<li><i class="fab fa-fw fa-whatsapp"></i> <a href="https://api.whatsapp.com/send?phone=447841353775" target="_blank">WhatsApp</a></li>
-								</ul>
-							</div>
-							<div class="col-md mb-3">
-								<h5>Our Location</h5>
-								<ul class="nav flex-column">
-									<li><i class="fal fa-fw fa-map-marker"></i> 8 Market Street, Liskeard, Cornwall, PL14 3JJ</li>
-									<li><i class="fal fa-fw fa-phone"></i> <a href="tel:07841+353775">07841 353775</a></li>
-									<li><i class="fal fa-fw fa-envelope"></i> <a href="mailto:admin@<?=DOMAIN?>">admin@<?=DOMAIN?></a></li>
-								</ul>
-							</div>
-						</div>
+							<?php
+							if(!Core::$user) {
+								?>
+								<li><a href="/services">Services</a></li>
+								<li><a href="/become-a-tester">Become a tester</a></li>
+								<li><a href="/contact">Contact</a></li>
+								<li><a href="/jobs">Jobs</a></li>
+								<?php
+							}
+							else {
+								?>
+								<li><a href="/contact">Contact</a></li>
+								<li><a href="/account">Account</a></li>
+								<?php
+							}
+							?>
+						</ul>
+					</div>
+					<div class="col-md mb-3">
+						<h5>Follow Us</h5>
+						<ul class="nav flex-column">
+							<li><i class="fab fa-fw fa-facebook"></i> <a href="https://www.facebook.com/checkpolicy" target="_blank">Facebook</a></li>
+							<li><i class="fab fa-fw fa-whatsapp"></i> <a href="https://api.whatsapp.com/send?phone=447841353775" target="_blank">WhatsApp</a></li>
+						</ul>
+					</div>
+					<div class="col-md mb-3">
+						<h5>Our Location</h5>
+						<ul class="nav flex-column">
+							<li><i class="fal fa-fw fa-map-marker"></i> 8 Market Street, Liskeard, Cornwall, PL14 3JJ</li>
+							<li><i class="fal fa-fw fa-phone"></i> <a href="tel:07841+353775">07841 353775</a></li>
+							<li><i class="fal fa-fw fa-envelope"></i> <a href="mailto:admin@<?=DOMAIN?>">admin@<?=DOMAIN?></a></li>
+						</ul>
+					</div>
+				</div>
 
 
-						<div class="text-center">
-							&copy; <?=date("Y")?> <?=APP_NAME?><br />
-							<small>
-								<a href="/privacy-policy">Privacy Policy</a>
-							</small>
-						</div>
-					</div>
+				<div class="text-center">
+					&copy; <?=date("Y")?> <?=APP_NAME?><br />
+					<small>
+						<a href="/privacy-policy">Privacy Policy</a>
+					</small>
+				</div>
+			</div>
 
-				</footer>
-				<?php
-				}
-				?>
-			</div> <!-- .page-content -->
-		</div> <!-- .flex-container -->
+		</footer>
+		<?php
+		}
+		?>
 
 		<?php
 		$scripts = Core::getScripts();

+ 104 - 112
views/header.php

@@ -48,135 +48,127 @@ if(!PRODUCTION) {
 	</head>
 	<body>
 
-		<div class="flex-container">
-
-
-			<div class="page-header">
-
-				<nav class="navbar navbar-expand-lg navbar-light bg-light">
-					<div class="navbar-brand p-0">
-						<a href="/">
-							<img src="<?=$logo?>?<?=filemtime("public" . $logo)?>" style="height: 40px;" />
-						</a>
-					</div>
-					<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-content" aria-controls="navbar-content" aria-expanded="false" aria-label="Toggle navigation">
-						<span class="navbar-toggler-icon"></span>
-					</button>
-
-					<div class="collapse navbar-collapse" id="navbar-content">
-						<ul class="navbar-nav ml-auto">
+		<div class="fixed-top" style="overflow-y: auto; max-height: 100%;">
+			<nav class="navbar navbar-expand-lg navbar-light bg-light">
+				<div class="navbar-brand p-0">
+					<a href="/">
+						<img src="<?=$logo?>?<?=filemtime("public" . $logo)?>" style="height: 40px;" />
+					</a>
+				</div>
+				<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-content" aria-controls="navbar-content" aria-expanded="false" aria-label="Toggle navigation">
+					<span class="navbar-toggler-icon"></span>
+				</button>
+
+				<div class="collapse navbar-collapse" id="navbar-content">
+					<ul class="navbar-nav ml-auto">
+						<?php
+						if(!Core::isLoggedIn()) {
+							?>
+							<li class="nav-item">
+								<a class="nav-link" href="/services">Services</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link" href="/become-a-tester">Become A Tester</a>
+							</li>
 							<?php
-							if(!Core::isLoggedIn()) {
-								?>
-								<li class="nav-item">
-									<a class="nav-link" href="/services">Services</a>
-								</li>
-								<li class="nav-item">
-									<a class="nav-link" href="/become-a-tester">Become A Tester</a>
-								</li>
-								<?php
-							}
+						}
+						?>
+						<li class="nav-item">
+							<a class="nav-link" href="/contact">Contact</a>
+						</li>
+						<?php
+						if(Core::isLoggedIn()) {
 							?>
 							<li class="nav-item">
-								<a class="nav-link" href="/contact">Contact</a>
+								<a class="nav-link" href="/account">Account</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link" href="/log-out">Log Out</a>
 							</li>
 							<?php
-							if(Core::isLoggedIn()) {
-								?>
-								<li class="nav-item">
-									<a class="nav-link" href="/account">Account</a>
-								</li>
-								<li class="nav-item">
-									<a class="nav-link" href="/log-out">Log Out</a>
-								</li>
-								<?php
-							}
-							else {
-								?>
-								<li class="nav-item">
-									<a class="nav-link" href="/jobs">Jobs</a>
-								</li>
-								<li class="nav-item">
-									<a class="nav-link" href="/register">Register</a>
-								</li>
-								<li class="nav-item">
-									<a class="nav-link" href="/log-in">Log In</a>
-								</li>
-								<?php
-							}
+						}
+						else {
 							?>
-						</ul>
-					</div>
+							<li class="nav-item">
+								<a class="nav-link" href="/jobs">Jobs</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link" href="/register">Register</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link" href="/log-in">Log In</a>
+							</li>
+							<?php
+						}
+						?>
+					</ul>
+				</div>
+
+			</nav>
+		</div>
 
-				</nav>
+		<?php
+		if(count(Core::$breadcrumbs) > 1) {
+			View::include("breadcrumbs");
+		}
 
+		if(!PRODUCTION) {
+			$style = (count(Core::$breadcrumbs) > 1) ? "margin-top: -1rem;" : "";
+			?>
+			<div class="p-2 mb-3 bg-danger text-white text-center" style="<?=$style?>">
+				<strong>PLEASE NOTE:</strong> This is a development version of the site.
+			</div>
+			<?php
+		}
+
+		if(Core::$show_alerts) {
+			$alerts = Core::getAlerts();
+			if($alerts) {
+				?>
+				<div class="container">
 				<?php
-				if(count(Core::$breadcrumbs) > 1) {
-					View::include("breadcrumbs");
-				}
+				foreach($alerts as $alert) {
+					list($class, $message) = $alert;
+
+					$icon = "info-circle";
+					if($class == "success") $icon = "check";
+					if($class == "warning") $icon = "exclamation-triangle";
+					if($class == "error") $icon = "exclamation-circle";
 
-				if(!PRODUCTION) {
-					$style = (count(Core::$breadcrumbs) > 1) ? "margin-top: -1rem;" : "";
 					?>
-					<div class="p-2 mb-3 bg-danger text-white text-center" style="<?=$style?>">
-						<strong>PLEASE NOTE:</strong> This is a development version of the site.
+					<div class="alert alert-<?=$class?> alert-dismissable fade show">
+						<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+							<span aria-hidden="true">&times;</span>
+						</button>
+						<i class="fal fa-fw fa-<?=$icon?>"></i> <?=htmlspecialchars($message)?>
 					</div>
 					<?php
 				}
-
-			?>
-			</div>
-			<div class="page-content">
+				?>
+				</div>
 				<?php
+			}
+		}
 
-				if(Core::$show_alerts) {
-					$alerts = Core::getAlerts();
-					if($alerts) {
-						?>
-						<div class="container">
-						<?php
-						foreach($alerts as $alert) {
-							list($class, $message) = $alert;
-
-							$icon = "info-circle";
-							if($class == "success") $icon = "check";
-							if($class == "warning") $icon = "exclamation-triangle";
-							if($class == "error") $icon = "exclamation-circle";
-
-							?>
-							<div class="alert alert-<?=$class?> alert-dismissable fade show">
-								<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-									<span aria-hidden="true">&times;</span>
-								</button>
-								<i class="fal fa-fw fa-<?=$icon?>"></i> <?=htmlspecialchars($message)?>
-							</div>
-							<?php
-						}
-						?>
+		if(!Core::$cookie_alert_shown) {
+			?>
+			<div class="container mt-3">
+				<div class="alert alert-info alert-dismissable fade show">
+					<button type="button" class="close" data-dismiss="alert" aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+					<div class="row">
+						<div class="col-auto pr-0">
+							<i class="fal fa-fw fa-info-circle"></i>
 						</div>
-						<?php
-					}
-				}
-
-				if(!Core::$cookie_alert_shown) {
-					?>
-					<div class="container mt-3">
-						<div class="alert alert-info alert-dismissable fade show">
-							<button type="button" class="close" data-dismiss="alert" aria-label="Close">
-								<span aria-hidden="true">&times;</span>
-							</button>
-							<div class="row">
-								<div class="col-auto pr-0">
-									<i class="fal fa-fw fa-info-circle"></i>
-								</div>
-								<div class="col">
-									<strong>This site uses cookies to improve functionality and personalisation.</strong><br />
-									By continuing to use the site, you consent to our use of cookies and our privacy policy.
-								</div>
-							</div>
+						<div class="col">
+							<strong>This site uses cookies to improve functionality and personalisation.</strong><br />
+							By continuing to use the site, you consent to our use of cookies and our privacy policy.
 						</div>
 					</div>
-					<?php
-				}
+				</div>
+			</div>
+			<?php
+		}
 
-				?>
+		?>

+ 1 - 1
views/performance.php

@@ -152,7 +152,7 @@ $date_ranges = [
 	<div class="row">
 		<div class="col-md-4" style="position: relative;">
 			<h3>Chart List</h3>
-			<div class="list-group" style="position: sticky; top: 1rem;">
+			<div class="list-group" style="position: sticky; top: 7rem;">
 			<?php
 			foreach($charts as $index => $chart) {
 				?>

Некоторые файлы не были показаны из-за большого количества измененных файлов