From bc99ae32719f90606c0531b7203a9867afb56dd1 Mon Sep 17 00:00:00 2001
From: Nathan Kinkade <nath@nkinka.de>
Date: Tue, 13 Nov 2012 23:02:38 +0000
Subject: Removed Resources page and added a Contact page.

---
 contact.php             | 24 ++++++++++++++++++++++++
 resources.php           | 24 ------------------------
 templates/contact.tpl   | 32 ++++++++++++++++++++++++++++++++
 templates/header.tpl    |  4 ++--
 templates/resources.tpl | 49 -------------------------------------------------
 5 files changed, 58 insertions(+), 75 deletions(-)
 create mode 100644 contact.php
 delete mode 100644 resources.php
 create mode 100644 templates/contact.tpl
 delete mode 100644 templates/resources.tpl

diff --git a/contact.php b/contact.php
new file mode 100644
index 0000000..32cc00d
--- /dev/null
+++ b/contact.php
@@ -0,0 +1,24 @@
+<?php 
+
+/**
+ * Copyright (c) 2007 Nathan Kinkade
+ * 
+ * This code is offered under an MIT (X11) license.  For more information
+ * about the terms of this license see the file LICENSE included with this
+ * software or visit: http://www.opensource.org/licenses/mit-license.php
+ */
+
+# include the main site config where various global variables
+# and libraries are included
+include("config.php");
+
+# grab the various parts
+include("header.php");
+include("sidebar_left.php");
+include("sidebar_right.php");
+include("footer.php");
+
+# display the page
+$smarty->display("contact.tpl");
+
+?>
diff --git a/resources.php b/resources.php
deleted file mode 100644
index 2ce9ad5..0000000
--- a/resources.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php 
-
-/**
- * Copyright (c) 2007 Nathan Kinkade
- * 
- * This code is offered under an MIT (X11) license.  For more information
- * about the terms of this license see the file LICENSE included with this
- * software or visit: http://www.opensource.org/licenses/mit-license.php
- */
-
-# include the main site config where various global variables
-# and libraries are included
-include("config.php");
-
-# grab the various parts
-include("header.php");
-include("sidebar_left.php");
-include("sidebar_right.php");
-include("footer.php");
-
-# display the page
-$smarty->display("resources.tpl");
-
-?>
diff --git a/templates/contact.tpl b/templates/contact.tpl
new file mode 100644
index 0000000..356c8e6
--- /dev/null
+++ b/templates/contact.tpl
@@ -0,0 +1,32 @@
+{$header}
+<div id='columnContainer'>
+
+	<div id='middleColumn'>
+		<div id='middleData' style='text-align: justify;'>
+
+			<h2 style='text-align: center;'>CONTACT</h2>
+
+			<a name='nutritionsites' id='nutritionsites' style='position: absolute;'></a>
+			<div class='standardMargins'>
+				If you have any questions, comments or suggestions about NutriDB please contact
+				<a href="http://natha.nkinka.de">Nathan Kinkade</a> at <strong>nath@nkinka.de</strong.>
+			</div>
+
+		</div>
+	</div>
+
+	<div id='leftColumn'>
+		<div id='leftData'>
+			{$sidebar_left}
+		</div>
+	</div>
+
+	<div id='rightColumn'>
+		<div id='rightData'>
+			{$sidebar_right}
+		</div>
+	</div>
+
+</div>
+{$footer} 
+
diff --git a/templates/header.tpl b/templates/header.tpl
index 28e79bd..cd64c20 100644
--- a/templates/header.tpl
+++ b/templates/header.tpl
@@ -43,9 +43,9 @@
 			<a href='{$config->_rootUri}' title='Home/Search Page'>Search</a> &nbsp; | &nbsp;
 			<a href='about.php' title='About nutridb.org'>About</a> &nbsp; | &nbsp;
 			<a href='guide.php' title='A brief guide'>Guide</a> &nbsp; | &nbsp;
-			<a href='resources.php' title='Other useful information'>Resources</a> &nbsp; | &nbsp;
 			<a href='faq.php' title='FAQ'>FAQ</a> &nbsp; | &nbsp;
-			<a href='download.php' title='Download'>Download</a>
+			<a href='download.php' title='Download'>Download</a> &nbsp; | &nbsp;
+			<a href='contact.php' title='Contact'>Contact</a>
 		</div>
 		<div id='systemMsgs'>{$systemMsg}</div>
 	</div>
diff --git a/templates/resources.tpl b/templates/resources.tpl
deleted file mode 100644
index 62c6937..0000000
--- a/templates/resources.tpl
+++ /dev/null
@@ -1,49 +0,0 @@
-{$header}
-<div id='columnContainer'>
-
-	<div id='middleColumn'>
-		<div id='middleData' style='text-align: justify;'>
-
-			<h2 style='text-align: center;'>RESOURCES</h2>
-
-			<a name='nutritionsites' id='nutritionsites' style='position: absolute;'></a>
-			<div class='standardMargins'>
-				Here are a few other nutrition information sites that stand out to me.  They have a
-				very complete set of tools and information.  You may find them useful.
-					<ul>
-						<li><a href='http://www.nutritiondata.com'>http://www.nutritiondata.com</a></li>
-						<li><a href='http://www.thedailyplate.com'>http://www.thedailyplate.com</a></li>
-					</ul>
-			</div>
-
-			<a name='ndl' id='ndl' style='position: absolute;'></a>
-			<div class='standardMargins'>
-				The USDA Nutrient Data Laboratory is where the vast majority of reliable nutrient
-				data comes from, including for this site.
-					<ul>
-						<li>
-							<a href="http://www.ars.usda.gov/ba/bhnrc/ndl">
-								U.S. Department of Agriculture, Agricultural Research Service.
-							</a>
-						</li>
-					</ul>
-			</div>
-
-		</div>
-	</div>
-
-	<div id='leftColumn'>
-		<div id='leftData'>
-			{$sidebar_left}
-		</div>
-	</div>
-
-	<div id='rightColumn'>
-		<div id='rightData'>
-			{$sidebar_right}
-		</div>
-	</div>
-
-</div>
-{$footer} 
-
-- 
cgit v1.2.3