From e34163a6f0af509bb274842310f21e7a23b503dc Mon Sep 17 00:00:00 2001
From: inghamn <inghamn@100bd78a-fc82-11de-b5bc-ffd2847a4b57>
Date: Thu, 7 Jan 2010 16:19:46 +0000
Subject: [PATCH] The about information is now part of panel-one.  It is
 displayed unless you specifically add other content to panel-one

git-svn-id: https://rosehill.googlecode.com/svn/branches/php@38 100bd78a-fc82-11de-b5bc-ffd2847a4b57
---
 blocks/html/about.inc                 | 26 --------------
 html/cemeteries/home.php              |  5 ++-
 html/cemeteries/viewCemetery.php      | 10 ++----
 html/interments/home.php              |  1 -
 templates/html/partials/panel-one.inc | 49 +++++++++++++++++++++++++--
 5 files changed, 52 insertions(+), 39 deletions(-)
 delete mode 100644 blocks/html/about.inc

diff --git a/blocks/html/about.inc b/blocks/html/about.inc
deleted file mode 100644
index 7ecb364..0000000
--- a/blocks/html/about.inc
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @copyright Copyright (C) 2008-2009 City of Bloomington, Indiana. All rights reserved.
- * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
- */
-?>
-<div id="aboutCemeteries">
-	<h2>About the Cemeteries</h2>
-	<ul>
-		<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=1745">Rose Hill Cemetery</a></li>
-		<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=1747">White Oak Cemetery</a></li>
-		<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=1745">Notable Persons</a></li>
-		<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=1745">Rose Hill Historic Walking Tour</a></li>
-	</ul>
-	<h2>Website Support</h2>
-	<ul>
-		<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=4578">Help</a></li>
-		<li><a href="https://bloomington.in.gov/documents/viewDocument.php?document_id=4577">Cemetery Data Download and Service</a></li>
-		<li><a href="http://bloomington.in.gov">City of Bloomington</a></li>
-	</ul>
-
-</div>
-<div id="cemeteryImages">
-	<div><img alt="Rose Hill Cemetery" src="<?php echo BASE_URL."/images/rosehill.png"; ?>" /></div>
-	<div><img alt="White Oak Cemetery" src="<?php echo BASE_URL."/images/whiteoakweb.jpg"; ?>" /></div>
-</div>
diff --git a/html/cemeteries/home.php b/html/cemeteries/home.php
index d415a8b..ef939b2 100644
--- a/html/cemeteries/home.php
+++ b/html/cemeteries/home.php
@@ -1,13 +1,12 @@
 <?php
 /**
- * @copyright 2009 City of Bloomington, Indiana
+ * @copyright 2009-2010 City of Bloomington, Indiana
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL, see LICENSE.txt
  * @author Cliff Ingham <inghamn@bloomington.in.gov>
  */
-
 $cemeteryList = new CemeteryList();
 $cemeteryList->find();
 
-$template = new Template();
+$template = isset($_GET['format']) ? new Template('default',$_GET['format']) : new Template();
 $template->blocks[] = new Block('cemeteries/cemeteryList.inc',array('cemeteryList'=>$cemeteryList));
 echo $template->render();
\ No newline at end of file
diff --git a/html/cemeteries/viewCemetery.php b/html/cemeteries/viewCemetery.php
index e91f34e..fa1078b 100644
--- a/html/cemeteries/viewCemetery.php
+++ b/html/cemeteries/viewCemetery.php
@@ -19,12 +19,8 @@ catch (Exception $e) {
 }
 
 
-
-if (isset($_GET['format'])) {
-	$template = new Template('default',$_GET['format']);
-}
-else {
-	$template = new Template();
-}
+$template = isset($_GET['format'])
+		? new Template('default',$_GET['format'])
+		: $template = new Template();
 $template->blocks[] = new Block('cemeteries/cemeteryInfo.inc',array('cemetery'=>$cemetery));
 echo $template->render();
diff --git a/html/interments/home.php b/html/interments/home.php
index a7b29fa..f2147f5 100644
--- a/html/interments/home.php
+++ b/html/interments/home.php
@@ -32,7 +32,6 @@ if ($template->outputFormat=='html') {
 		$template->blocks[] = new Block('interments/addIntermentForm.inc',
 										array('return_url'=>$return_url));
 	}
-	$template->blocks['panel-one'][] = new Block('about.inc');
 }
 
 
diff --git a/templates/html/partials/panel-one.inc b/templates/html/partials/panel-one.inc
index ed6c9b1..3887980 100644
--- a/templates/html/partials/panel-one.inc
+++ b/templates/html/partials/panel-one.inc
@@ -1,5 +1,50 @@
 <div id="panel-one">
 <?php
-	echo $this->includeBlocks('panel-one');
+	if (array_key_exists('panel-one',$this->blocks) && count($this->blocks['panel-one'])) {
+		echo $this->includeBlocks('panel-one');
+	}
+	else {
 ?>
-</div>
+	<div id="aboutCemeteries">
+		<h2>About the Cemeteries</h2>
+		<ul>
+			<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=1745">
+					Rose Hill Cemetery
+				</a>
+			</li>
+			<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=1747">
+					White Oak Cemetery
+				</a>
+			</li>
+			<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=1745">
+					Notable Persons
+				</a>
+			</li>
+			<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=1745">
+					Rose Hill Historic Walking Tour
+				</a>
+			</li>
+		</ul>
+		<h2>Website Support</h2>
+		<ul>
+			<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=4578">
+					Help
+				</a>
+			</li>
+			<li><a href="http://bloomington.in.gov/documents/viewDocument.php?document_id=4577">
+					Cemetery Data Download and Service
+				</a>
+			</li>
+			<li><a href="<?php echo BASE_URL; ?>/services">Web Services</a></li>
+			<li><a href="http://bloomington.in.gov">City of Bloomington</a></li>
+		</ul>
+
+	</div>
+	<div id="cemeteryImages">
+		<div><img alt="Rose Hill Cemetery" src="<?php echo BASE_URL."/images/rosehill.png"; ?>" /></div>
+		<div><img alt="White Oak Cemetery" src="<?php echo BASE_URL."/images/whiteoakweb.jpg"; ?>" /></div>
+	</div>
+<?php
+}
+?>
+</div>
\ No newline at end of file