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
This commit is contained in:
inghamn 2010-01-07 16:19:46 +00:00
parent 7dc3078e19
commit e34163a6f0
5 changed files with 52 additions and 39 deletions

View File

@ -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>

View File

@ -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();

View File

@ -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();

View File

@ -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');
}

View File

@ -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 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>