Merge pull request #45 from mreishman/0.2-Dev

0.2.1
mreishman · Nov 26, 2020 · aee4e01 · aee4e01
2 parents 2dea07f + 233f610
commit aee4e01
Show file tree

Hide file tree

Showing 22 changed files with 300 additions and 217 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,9 +5,9 @@ core/css/vars.css.map
 local/*
 Log-Hog/*
 status/*
-
+.sass-cache/
 
 media/*
 !media/img/about/filestructure.png
 !media/img/main/favicon.png
-!media/img/main/logo.png
+!media/img/main/logo.png
diff --git a/core/content/base/backToTopButton.php b/core/content/base/backToTopButton.php
@@ -0,0 +1 @@
+<button onclick="topFunction()" id="bttButton" title="Go to top">Top</button>
diff --git a/core/content/base/header.php b/core/content/base/header.php
@@ -1,6 +1,10 @@
 <header>
 	<nav class="navigationMain" >
-		<a href="<?php echo $core->getValue("baseUrl"); ?>" ><img src="/media/img/main/logo.png" height="42px" style="display: inline-block;" ></a>
+		<?php if (file_exists(BP . "media/img/main/logo.png")): ?>
+			<a href="<?php echo $core->getValue("baseUrl"); ?>" >
+				<img src="/media/img/main/logo.png" height="42px" style="display: inline-block;" >
+			</a>
+		<?php endif; ?>
 		<input type="checkbox" id="mainNavigationToggle" checked>
 		<label for="mainNavigationToggle" class="mobileNavButton">
 			<span class="navIconChecked">

diff --git a/core/content/templates/oneColumn.php b/core/content/templates/oneColumn.php
@@ -3,7 +3,9 @@
 	<head>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title><?php echo $baseXmlGen->title; ?></title>
-		<link rel="shortcut icon" type="image/png" href="/media/img/main/favicon.png"/>
+		<?php if(file_exists(BP . "/media/img/main/favicon.png")): ?>
+			<link rel="shortcut icon" type="image/png" href="/media/img/main/favicon.png"/>
+		<?php endif; ?>
 	</head>
 	<body>
 		<?php
@@ -33,8 +35,8 @@
 			?>
 		</div>
 		<?php
-			$headerModules = $core->getModules($layoutFileGen,"footer");
-			foreach ($headerModules as $module)
+			$footerModules = $core->getModules($layoutFileGen,"footer");
+			foreach ($footerModules as $module)
 			{
 				require_once($module["file"]);
 			}

diff --git a/core/content/templates/threeColumn.php b/core/content/templates/threeColumn.php
@@ -3,7 +3,9 @@
 	<head>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title><?php echo $baseXmlGen->title; ?></title>
-		<link rel="shortcut icon" type="image/png" href="/media/img/main/favicon.png"/>
+		<?php if(file_exists(BP . "/media/img/main/favicon.png")): ?>
+			<link rel="shortcut icon" type="image/png" href="/media/img/main/favicon.png"/>
+		<?php endif; ?>
 	</head>
 	<body>
 		<?php
@@ -53,11 +55,11 @@
 	  		<?php
 	  			$contentClass 	= $core->getSetting(
 					array($baseXmlGen, $layoutFileGen),
-					array("settings","body","mainContent","contentThree","columnWidth"),
+					array("settings","body","mainContent","contentTwo","columnWidth"),
 					"30");
 				$hideMobile 		= (string)$core->getSetting(
 					array($baseXmlGen, $layoutFileGen),
-					array("settings","body","mainContent","contentThree","hideMobile"),
+					array("settings","body","mainContent","contentTwo","hideMobile"),
 					"false");
 				if($hideMobile === "true")
 				{
@@ -70,8 +72,8 @@
 	  		</div>
 	  	</div>
 		<?php
-			$headerModules = $core->getModules($layoutFileGen,"footer");
-			foreach ($headerModules as $module)
+			$footerModules = $core->getModules($layoutFileGen,"footer");
+			foreach ($footerModules as $module)
 			{
 				require_once($module["file"]);
 			}

diff --git a/core/content/templates/twoColumn.php b/core/content/templates/twoColumn.php
@@ -3,7 +3,9 @@
 	<head>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<title><?php echo $baseXmlGen->title; ?></title>
-		<link rel="shortcut icon" type="image/png" href="/media/img/main/favicon.png"/>
+		<?php if(file_exists(BP . "/media/img/main/favicon.png")): ?>
+			<link rel="shortcut icon" type="image/png" href="/media/img/main/favicon.png"/>
+		<?php endif; ?>
 	</head>
 	<body>
 		<?php
@@ -66,8 +68,8 @@
 	  		</div>
 	  	</div>
 		<?php
-			$headerModules = $core->getModules($layoutFileGen,"footer");
-			foreach ($headerModules as $module)
+			$footerModules = $core->getModules($layoutFileGen,"footer");
+			foreach ($footerModules as $module)
 			{
 				require_once($module["file"]);
 			}

diff --git a/core/css/backToTopButton.css b/core/css/backToTopButton.css
diff --git a/core/css/backToTopButton.css.map b/core/css/backToTopButton.css.map
diff --git a/core/css/navigation.css b/core/css/navigation.css
diff --git a/core/css/navigation.css.map b/core/css/navigation.css.map