Removed some old junk directories and files

6 files changed, 0 insertions, 646 deletions

diff --git a/css/site.css.orig b/css/site.css.orig
deleted file mode 100644
index 29620ea..0000000
--- a/css/site.css.orig
+++ /dev/null
@@ -1,161 +0,0 @@
-body {
-  color: black;
-  background-color: white;
-  padding: 1%;
-}
-
-table.smalltext td {
-  font-size: small;
-}
-
-.indent {
-  padding-left: 1em;
-}
-
-a img {
-  border: none;
-}
-
-em {
-  font-weight: 600;
-}
-
-p.nowrap {
-  white-space: nowrap;
-}
-
-.bold-ital {
-  font-weight: bold;
-  font-style: italic;
-}
-
-.small {
-  font-size: small;
-}
-
-.x-small {
-  font-size: x-small;
-}
-
-.limit-width {
-  max-width: 60%;
-}
-
-.bold2 {
-  font-weight: bold;
-  font-size: large;
-}
-
-.logout {
-  position: absolute;
-  right: 3%;
-}
-
-.login-error {
-  font-weight: bold;
-  color: red;
-  background-color: #999966;
-}
-
-.errors {
-  font-weight: bold;
-  color: red;
-  background-color: white;
-}
-
-.blue {
-  color: blue;
-}
-
-.header {
-  position: relative;
-  top: 0;
-  height: 4em;
-}
-
-.hdr-link-left {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 8%;
-  text-align: left;
-
-}
-.hdr-img-center {
-  position: absolute;
-  top: 0;
-  left: 8%;
-  width: 84%;
-  text-align: center;
-}
-.hdr-link-right {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 8%;
-  text-align: right;
-}
-
-.search-box {
-  float: left;
-  padding: 1%;
-  height: 18em;
-  width: 47%;
-  margin-bottom: 1em;
-  border: medium gray ridge;
-  background-color: #FFCC66;
-}
-
-.mystuff-box {
-  float: right;
-  padding: 1%;
-  min-height: 18em;
-  width: 47%;
-  margin-bottom: 1em;
-  border: medium gray ridge;
-  background-color: #999966;
-}
-
-.footer {
-  clear: both;
-  width: 98%;
-  margin-top: 1em;
-  text-align: center;
-  font-size: x-small;
-  border-top: medium black double;
-}
-
-.bsd-logo {
-  position: absolute;
-  margin-top: 0;
-  left: 0;
-  width: 25%;
-}
-
-.apache-logo {
-  position: absolute;
-  margin-top: 1em;
-  right: 0;
-  width: 25%;
-}
-
-.xhtml-logo {
-  position: absolute;
-  margin-top: 2em; 
-  left: 25%;
-  width: 25%;
-}
-
-.css-logo {
-  position: absolute;
-  margin-top: 2em;
-  right: 25%;
-  width: 25%;
-}
-
-.border-med-ridge {
-  width: auto;
-  padding: 1%;
-  border: medium gray ridge;
-}
-
diff --git a/css/trash/2column.css b/css/trash/2column.css
deleted file mode 100644
index fafa314..0000000
--- a/css/trash/2column.css
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-http://www.positioniseverything.net/articles/onetruelayout/example/equalheightopera8fix
-2 COLUMN LIQUID LAYOUT
-*/
-
-#middleColumn {
-	float: left;
-	width: 85%;
-}
-
-* html #middleColumn {
-	display: inline;
-}
-
-#rightColumn {
-	float: left;
-	width: 15%;
-	background-color: #cccccc;
-}
-
-/* Start Mac IE5 filter \*/
-#middleColumn, #rightColumn {
-	padding-bottom: 32767px;
-	margin-bottom: -32767px; 
-}
-
-@media all and (min-width: 0px) {
-	#middleColumn, #rightColumn {
-		padding-bottom: 0;
-		margin-bottom: 0; 
-	}
-	#middleColumn:before, #rightColumn:before {
-		display: block;
-		background: inherit;
-		padding-top: 32767px;
-		margin-bottom: -32767px;
-		height: 0;
-	}
-}
-/* End Mac IE5 filter */
-
-#columnContainer {
-	/* This hides the excess padding in non-IE browsers */
-	overflow: hidden;
-	margin-bottom: 3px;
-}
-
-/* we need this for IE 5.01 - otherwise the columnContainer does not expand to the
-necessary height (unless fixed, this problem becomes even more acute 
-weirdness as the method is enhanced */
-#columnContainer {
-	/* Normally a Holly-style hack height: 1% would suffice but that causes 
-	IE 5.01 to completely collapse the columnContainer - instead we float it */
-	float: left;
-	/* NB. possibly only IE 5.01 needs to get this float value - otherwise 5.5 sometimes 
-	(I saw it happen many moons ago) makes the width of columnContainer too small 
-	the float: none with the comment is ignored by 5.01,
-	5.5 and above see it and carry on about their business
-	It's probably fine to just remove it, but it's left here 
-	just in case that many moons ago problem rears its head again */
-	float/**/: none;
-}
-
-/* begin easy clearing */
-#columnContainer:after {
-	display: block; 
-	height: 0; 
-	clear: both; 
-	visibility: hidden;
-}
-
-#columnContainer {
-	display: inline-block;
-}
-
-/*\*/
-#columnContainer {
-	display: block;
-}
-/* end easy clearing */
-
-#footer {
-	clear: both;
-}
-
-/* Safari needs this - otherwise the ghost overflow, though painted 
-correctly obscures links and form elements that by rights should be above it.
-An unintended side-effect is that it cause such elements to vanish in IE 5.01
-and 5.5, hence the child selector hack */
-* > #footer, * > form, * > #notes, * > .output {
-	position: relative;
-	z-index: 1000;
-}
diff --git a/css/trash/3column.css b/css/trash/3column.css
deleted file mode 100644
index 57b1abb..0000000
--- a/css/trash/3column.css
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-http://www.positioniseverything.net/articles/onetruelayout/example/equalheightopera8fix
-3 COLUMN LIQUID LAYOUT
-*/
-
-#middleColumn {
-	float: left;
-	width: 64%;
-	margin-left: 20%;
-	margin-right: 1%;
-}
-
-* html #middleColumn {
-	display: inline;
-}
-
-#leftColumn {
-	float: left;
-	width: 19%;
-	margin-left: -85%;
-	background-color: #009999;
-	/*background-color: #568fc4;*/
-}
-
-#rightColumn {
-	float: left;
-	width: 15%;
-	background-color: #cccccc;
-}
-
-/* Start Mac IE5 filter \*/
-#middleColumn, #leftColumn, #rightColumn {
-	padding-bottom: 32767px;
-	margin-bottom: -32767px; 
-}
-
-@media all and (min-width: 0px) {
-	#middleColumn, #leftColumn, #rightColumn {
-		padding-bottom: 0;
-		margin-bottom: 0; 
-	}
-	#middleColumn:before, #leftColumn:before, #rightColumn:before {
-		display: block;
-		background: inherit;
-		padding-top: 32767px;
-		margin-bottom: -32767px;
-		height: 0;
-	}
-}
-/* End Mac IE5 filter */
-
-#columnContainer {
-	/* This hides the excess padding in non-IE browsers */
-	overflow: hidden;
-	margin-bottom: 3px;
-}
-
-/* we need this for IE 5.01 - otherwise the columnContainer does not expand to the
-necessary height (unless fixed, this problem becomes even more acute 
-weirdness as the method is enhanced */
-#columnContainer {
-	/* Normally a Holly-style hack height: 1% would suffice but that causes 
-	IE 5.01 to completely collapse the columnContainer - instead we float it */
-	float: left;
-	/* NB. possibly only IE 5.01 needs to get this float value - otherwise 5.5 sometimes 
-	(I saw it happen many moons ago) makes the width of columnContainer too small 
-	the float: none with the comment is ignored by 5.01,
-	5.5 and above see it and carry on about their business
-	It's probably fine to just remove it, but it's left here 
-	just in case that many moons ago problem rears its head again */
-	float/**/: none;
-}
-
-/* begin easy clearing */
-#columnContainer:after {
-	display: block; 
-	height: 0; 
-	clear: both; 
-	visibility: hidden;
-}
-
-#columnContainer {
-	display: inline-block;
-}
-
-/*\*/
-#columnContainer {
-	display: block;
-}
-/* end easy clearing */
-
-#footer {
-	clear: both;
-}
-
-/* Safari needs this - otherwise the ghost overflow, though painted 
-correctly obscures links and form elements that by rights should be above it.
-An unintended side-effect is that it cause such elements to vanish in IE 5.01
-and 5.5, hence the child selector hack */
-* > #footer, * > form, * > #notes, * > .output {
-	position: relative;
-	z-index: 1000;
-}
diff --git a/css/trash/site.css.orig b/css/trash/site.css.orig
deleted file mode 100644
index 29620ea..0000000
--- a/css/trash/site.css.orig
+++ /dev/null
@@ -1,161 +0,0 @@
-body {
-  color: black;
-  background-color: white;
-  padding: 1%;
-}
-
-table.smalltext td {
-  font-size: small;
-}
-
-.indent {
-  padding-left: 1em;
-}
-
-a img {
-  border: none;
-}
-
-em {
-  font-weight: 600;
-}
-
-p.nowrap {
-  white-space: nowrap;
-}
-
-.bold-ital {
-  font-weight: bold;
-  font-style: italic;
-}
-
-.small {
-  font-size: small;
-}
-
-.x-small {
-  font-size: x-small;
-}
-
-.limit-width {
-  max-width: 60%;
-}
-
-.bold2 {
-  font-weight: bold;
-  font-size: large;
-}
-
-.logout {
-  position: absolute;
-  right: 3%;
-}
-
-.login-error {
-  font-weight: bold;
-  color: red;
-  background-color: #999966;
-}
-
-.errors {
-  font-weight: bold;
-  color: red;
-  background-color: white;
-}
-
-.blue {
-  color: blue;
-}
-
-.header {
-  position: relative;
-  top: 0;
-  height: 4em;
-}
-
-.hdr-link-left {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 8%;
-  text-align: left;
-
-}
-.hdr-img-center {
-  position: absolute;
-  top: 0;
-  left: 8%;
-  width: 84%;
-  text-align: center;
-}
-.hdr-link-right {
-  position: absolute;
-  top: 0;
-  right: 0;
-  width: 8%;
-  text-align: right;
-}
-
-.search-box {
-  float: left;
-  padding: 1%;
-  height: 18em;
-  width: 47%;
-  margin-bottom: 1em;
-  border: medium gray ridge;
-  background-color: #FFCC66;
-}
-
-.mystuff-box {
-  float: right;
-  padding: 1%;
-  min-height: 18em;
-  width: 47%;
-  margin-bottom: 1em;
-  border: medium gray ridge;
-  background-color: #999966;
-}
-
-.footer {
-  clear: both;
-  width: 98%;
-  margin-top: 1em;
-  text-align: center;
-  font-size: x-small;
-  border-top: medium black double;
-}
-
-.bsd-logo {
-  position: absolute;
-  margin-top: 0;
-  left: 0;
-  width: 25%;
-}
-
-.apache-logo {
-  position: absolute;
-  margin-top: 1em;
-  right: 0;
-  width: 25%;
-}
-
-.xhtml-logo {
-  position: absolute;
-  margin-top: 2em; 
-  left: 25%;
-  width: 25%;
-}
-
-.css-logo {
-  position: absolute;
-  margin-top: 2em;
-  right: 25%;
-  width: 25%;
-}
-
-.border-med-ridge {
-  width: auto;
-  padding: 1%;
-  border: medium gray ridge;
-}
-
diff --git a/templates/sidebar_left.tpl.orig b/templates/sidebar_left.tpl.orig
deleted file mode 100644
index dbd7881..0000000
--- a/templates/sidebar_left.tpl.orig
+++ /dev/null
@@ -1,64 +0,0 @@
-		<div><strong>Current meal</strong>:</div>
-{if isset($currentMealItems)}
-			<form action='view_meal.php' method='post'>
-{foreach from=$currentMealItems key=key item=currentMealItem}
-				<span class='indent'> =&gt; {$currentMealItem.description|escape:'html'} (<a href='edit_new_meal.php?rm_item={$key}' title='Remove meal item'>Del</a>)</span>
-				<br />
-{/foreach}
-				<input type='hidden' name='source' value='new' />
-				<input type='submit' name='view_new_meal' value='View Meal' />
-				<a href='edit_new_meal.php?clear_meal=yes' title='Remove all meal items'>Clear Meal</a>
-			</form>
-{else}
-			(No items in meal.)
-{/if}
-{if $isLoggedIn}
-			<div style='margin-top: 2ex;'><strong>Saved items</strong>:</div>
-{if $myFoods}
-			<form action='view_food.php' method='post' id='frmMyFoods' style='margin: .5ex;'>
-				<select name='queryString' style='width: 70%; margin-bottom: .5ex;' onchange='return submitForm("frmMyFoods");'>
-					<option value=''> -- Select -- </option>
-{foreach from=$myFoods item=myFood}
-					<option value='ndb_no={$myFood.ndb_no}&weight={$myFood.id_weight}&quantity={$myFood.my_qty}&foodDesc={$myFood.my_desc}&action=viewFood'>{$myFood.my_desc}</option>
-{/foreach}
-				</select>
-				Foods
-				<input type='hidden' name='viewFood' value='viewFood' />
-			</form>
-{else}
-			No saved foods.<br />
-{/if}
-
-{if $myMeals}
-			<form action='view_meal.php' method='post' id='frmMyMeals' style='margin: .5ex;'>
-				<select name='mealId' style='width: 70%; margin-bottom: .5ex;' onchange='return submitForm("frmMyMeals");'>
-					<option value=''> -- Select -- </option>
-{foreach from=$myMeals item=myMeal}
-					<option value='{$myMeal.id_my_meals}'>{$myMeal.meal_desc}</option>
-{/foreach}
-				</select>
-				Meals
-				<input type='hidden' name='action' value='viewMeal' />
-			</form>
-{else}
-			No saved meals.<br />
-{/if}
-  
-{if $myDiaries}
-			<form action='view_diary.php' method='post' id='frmMyDiaries' style='margin: .5ex;'>
-				<select name='id_my_diaries' style='width: 70%; margin-bottom: .5ex;' onchange='return submitForm("frmMyDiaries");'>
-					<option value=''> -- Select -- </option>
-{foreach from=$myDiaries item=myDiary}
-					<option value='{$myDiary.id_my_diaries}'>{$myDiary.diary_desc}</option>
-{/foreach}
-				</select>
-				Meals
-			</form>
-			Diaries
-{else}
-			No saved diaries.
-{/if}
-			<p>
-				<a href='my_stuff.php'>Manage my account</a>.
-			</p>
-{/if}
diff --git a/templates/trash/sidebar_left.tpl.orig b/templates/trash/sidebar_left.tpl.orig
deleted file mode 100644
index dbd7881..0000000
--- a/templates/trash/sidebar_left.tpl.orig
+++ /dev/null
@@ -1,64 +0,0 @@
-		<div><strong>Current meal</strong>:</div>
-{if isset($currentMealItems)}
-			<form action='view_meal.php' method='post'>
-{foreach from=$currentMealItems key=key item=currentMealItem}
-				<span class='indent'> =&gt; {$currentMealItem.description|escape:'html'} (<a href='edit_new_meal.php?rm_item={$key}' title='Remove meal item'>Del</a>)</span>
-				<br />
-{/foreach}
-				<input type='hidden' name='source' value='new' />
-				<input type='submit' name='view_new_meal' value='View Meal' />
-				<a href='edit_new_meal.php?clear_meal=yes' title='Remove all meal items'>Clear Meal</a>
-			</form>
-{else}
-			(No items in meal.)
-{/if}
-{if $isLoggedIn}
-			<div style='margin-top: 2ex;'><strong>Saved items</strong>:</div>
-{if $myFoods}
-			<form action='view_food.php' method='post' id='frmMyFoods' style='margin: .5ex;'>
-				<select name='queryString' style='width: 70%; margin-bottom: .5ex;' onchange='return submitForm("frmMyFoods");'>
-					<option value=''> -- Select -- </option>
-{foreach from=$myFoods item=myFood}
-					<option value='ndb_no={$myFood.ndb_no}&weight={$myFood.id_weight}&quantity={$myFood.my_qty}&foodDesc={$myFood.my_desc}&action=viewFood'>{$myFood.my_desc}</option>
-{/foreach}
-				</select>
-				Foods
-				<input type='hidden' name='viewFood' value='viewFood' />
-			</form>
-{else}
-			No saved foods.<br />
-{/if}
-
-{if $myMeals}
-			<form action='view_meal.php' method='post' id='frmMyMeals' style='margin: .5ex;'>
-				<select name='mealId' style='width: 70%; margin-bottom: .5ex;' onchange='return submitForm("frmMyMeals");'>
-					<option value=''> -- Select -- </option>
-{foreach from=$myMeals item=myMeal}
-					<option value='{$myMeal.id_my_meals}'>{$myMeal.meal_desc}</option>
-{/foreach}
-				</select>
-				Meals
-				<input type='hidden' name='action' value='viewMeal' />
-			</form>
-{else}
-			No saved meals.<br />
-{/if}
-  
-{if $myDiaries}
-			<form action='view_diary.php' method='post' id='frmMyDiaries' style='margin: .5ex;'>
-				<select name='id_my_diaries' style='width: 70%; margin-bottom: .5ex;' onchange='return submitForm("frmMyDiaries");'>
-					<option value=''> -- Select -- </option>
-{foreach from=$myDiaries item=myDiary}
-					<option value='{$myDiary.id_my_diaries}'>{$myDiary.diary_desc}</option>
-{/foreach}
-				</select>
-				Meals
-			</form>
-			Diaries
-{else}
-			No saved diaries.
-{/if}
-			<p>
-				<a href='my_stuff.php'>Manage my account</a>.
-			</p>
-{/if}