Fix /org/press-release home page
Signed-off-by: Eric Poirier <eric.poirier@eclipse-foundation.org>
diff --git a/press-release/_projectCommon.php b/press-release/_projectCommon.php
index 1c568b9..f5e4b5f 100644
--- a/press-release/_projectCommon.php
+++ b/press-release/_projectCommon.php
@@ -33,6 +33,12 @@
require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
$Nav = new Nav();
}
+
+$Nav->addNavSeparator("Related Links", "");
+$Nav->addCustomNav("2001-2005 Archives", "main.html", "_self", 1);
+$Nav->addCustomNav("2006 Archive", "2006archive.php", "_self", 1);
+$Nav->addCustomNav("Press Release Guidelines", "pressrelease_guidelines.php", "_self", 1);
+
$Nav->addNavSeparator("About Us", "../");
$Nav->addCustomNav("Foundation", "../foundation/", "_self", 1);
$Nav->addCustomNav("Governance", "../documents/", "_self", 1);
diff --git a/press-release/index.php b/press-release/index.php
index 4ba5469..54e0c99 100644
--- a/press-release/index.php
+++ b/press-release/index.php
@@ -12,21 +12,19 @@
require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
-require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php");
$App = new App();
$Nav = new Nav();
-$Menu = new Menu();
-include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
+$Theme = $App->getThemeClass();
+include($App->getProjectCommon());
require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/parser/feedparser.class.php");
# Begin: page-specific settings. Change these.
$pageTitle = "Eclipse Foundation Press Releases";
-$pageKeywords = "eclipse, foundation , press, release, news about eclipse, Eclipse Announcements";
-$pageAuthor = "Christopher Guindon";
-
-ob_start();
+$Theme->setPageTitle($pageTitle);
+$Theme->setPageKeywords("eclipse, foundation , press, release, news about eclipse, Eclipse Announcements");
+$Theme->setPageAuthor("Christopher Guindon");
$news = new FeedParser();
$news->addPath($_SERVER['DOCUMENT_ROOT'] . "/community/news/2005newsarchive.rss");
@@ -40,30 +38,17 @@
$pageTitle .= " (Archive)";
$news->setCount(5000);
}
+
+ob_start();
?>
- <div class="col-md-17">
- <h1><?php print $pageTitle; ?></h1>
- <?php
- print $news->output();
- ?>
- </div>
-
- <div class="col-md-6 col-md-offset-1">
- <div class="sideitem">
- <h6>Related Links</h6>
- <ul>
- <li><a href="main.html">2001-2005 Archives</a></li>
- <li><a href="2006archive.php">2006 Archive</a></li>
- <li><a href="pressrelease_guidelines.php">Press Release Guidelines</a></li>
-
- </ul>
- </div>
- </div>
+<h1><?php print $pageTitle; ?></h1>
+<?php print $news->output();?>
<?php
- $html = ob_get_contents();
- ob_end_clean();
+$html = ob_get_clean();
- # Generate the web page
- $App->generatePage($theme, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
+
+$Theme->setNav($Nav);
+$Theme->setHtml($html);
+$Theme->generatePage();