Update News pages
Bug 432362 - Update Eclipse Foundation News
Bug 432361 - Update Eclipse in the News (Community news)
Signed-off-by: Christopher Guindon <chris.guindon@eclipse.org>
diff --git a/news/2005inthenewsarchive.rss b/news/2005inthenewsarchive.rss
index 5739572..1239f6a 100644
--- a/news/2005inthenewsarchive.rss
+++ b/news/2005inthenewsarchive.rss
@@ -4321,7 +4321,7 @@
<link><![CDATA[http://dev2dev.bea.com/blog/phumphrey/archive/2008/02/the_fastest_wor.html]]></link>
<description><![CDATA[<p>BEA Workshop 10.2 is here and it’s faster than ever. Developers will experience noticeable speed improvements in server start, deployment, incremental & clean build, and the stability of 885+ resolved software defects.</p>
<p>This release updates BEA Workshop for WebLogic, BEA Workshop Studio with Adobe Flex Builder 2, and BEA Workshop for JSP.</p>
- <p>Download your free trial or free copy and give it a try!</p ]]></description>
+ <p>Download your free trial or free copy and give it a try!</p> ]]></description>
<pubDate>Mon, 03 Mar 2008 08:45:00 EST</pubDate>
<category>news</category>
</item>
diff --git a/news/eclipseinthenews.php b/news/eclipseinthenews.php
index 24f112b..7f87f77 100644
--- a/news/eclipseinthenews.php
+++ b/news/eclipseinthenews.php
@@ -1,68 +1,63 @@
-<?php 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'
+<?php
+/*******************************************************************************
+ * Copyright (c) 2014 Eclipse Foundation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Christopher Guindon (Eclipse Foundation) - Initial implementation
+ *******************************************************************************/
- #*****************************************************************************
- #
- # template.php
- #
- # Author: Denis Roy
- # Date: 2005-06-16
- #
- # Description: Type your page comments here - these are not sent to the browser
- #
- #
- #****************************************************************************
+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");
- #
- # Begin: page-specific settings. Change these.
- $pageTitle = "Eclipse in the News";
- $pageKeywords = "Type, page, keywords, here";
- $pageAuthor = "Type your name here";
- $App->PageRSS = "/home/eclipseinthenews.rss";
- $App->PageRSSTitle = "Eclipse In The News";
- # Add page-specific Nav bars here
- # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
- # $Nav->addNavSeparator("My Page Links", "downloads.php");
- # $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
- # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
- # End: page-specific settings
- #
-
- # The next two lines load the $news variable with the HTML equivalent to the contents of the eclipsenews.rss file.
- # Reference the $news variable to drop the HTML into your content...
- include('scripts/news.php');
- $eclipseinthenews = get_eclipseinthenews_verbose();
-
- # Paste your HTML content between the EOHTML markers!
- $html = <<<EOHTML
- <style>
- blockquote {
- font-size:12px;
- line-height:15px;
- }
- </style>
- <div id="midcolumn">
-
- <h1>$pageTitle</h1>
-
- <div class="homeitem3col">
- $eclipseinthenews
- </div>
- </div>
-
- <div id="rightcolumn">
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/parser/feedparser.class.php");
+
+$pageTitle = "Eclipse Community News";
+$pageKeywords = "eclipse community news";
+$pageAuthor = "Christopher Guindon";
+
+$App->PageRSS = "/home/eclipseinthenews.rss";
+$App->PageRSSTitle = "Eclipse In The News";
+
+ob_start();
+?>
+
+<div class="col-md-17">
+ <h1><?php print $pageTitle; ?></h1>
+ <?php
+ $news = new FeedParser();
+ $news->setUrl($_SERVER['DOCUMENT_ROOT'] . "/community/news/2005inthenewsarchive.rss");
+ $news->setRssLink('/home/eclipseinthenews.rss');
+ $news->setLimit(500);
+ $news->setCount(5000);
+ $news->output();
+ ?>
+</div>
+
+<div class="col-md-6 col-md-offset-1">
<div class="sideitem">
<h6>Related Links</h6>
<ul>
+ <li><a href="eclipsenews.php">Eclipse Foundation News</a></li>
+ <li><a href="whatsnewhistory.html">Eclipse News Archive</a> (What's New)</li>
<li><a href="InTheNews.html">In the News Archive 2004-2005</a></li>
- <li><a href="InTheNews2002-2003.html">In the News Archive 2002-2003</a></li>
- </ul>
+ <li><a href="InTheNews2002-2003.html">In the News Archive 2002-2003</a></li>
+ </ul>
</div>
</div>
-EOHTML;
-
+<?php
+ $html = ob_get_clean();
$html = mb_convert_encoding($html, "HTML-ENTITIES", "auto");
# Generate the web page
- $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+ $App->generatePage($theme, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>
diff --git a/news/eclipsenews.php b/news/eclipsenews.php
index c7962a2..3f22591 100644
--- a/news/eclipsenews.php
+++ b/news/eclipsenews.php
@@ -1,72 +1,65 @@
-<?php 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'
+<?php
+/*******************************************************************************
+ * Copyright (c) 2014 Eclipse Foundation and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Christopher Guindon (Eclipse Foundation) - Initial implementation
+ *******************************************************************************/
- #*****************************************************************************
- #
- # template.php
- #
- # Author: Denis Roy
- # Date: 2005-06-16
- #
- # Description: Type your page comments here - these are not sent to the browser
- #
- #
- #****************************************************************************
+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");
- #
- # Begin: page-specific settings. Change these.
- $pageTitle = "Eclipse Foundation News";
- $pageKeywords = "Type, page, keywords, here";
- $pageAuthor = "Type your name here";
- $App->PageRSS = "/home/eclipsenews.rss";
- $App->PageRSSTitle = "Eclipse Foundation News";
- # Add page-specific Nav bars here
- # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
- # $Nav->addNavSeparator("My Page Links", "downloads.php");
- # $Nav->addCustomNav("My Link", "mypage.php", "_self", 1);
- # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 1);
+$App = new App();
+$Nav = new Nav();
+$Menu = new Menu();
+include($App->getProjectCommon()); # All on the same line to unclutter the user's desktop'
- # End: page-specific settings
- #
-
- # The next two lines load the $news variable with the HTML equivalent to the contents of the eclipsenews.rss file.
- # Reference the $news variable to drop the HTML into your content...
- include('scripts/news.php');
- $eclipsenews = get_eclipsenews_verbose();
-
- # Paste your HTML content between the EOHTML markers!
- $html = <<<EOHTML
- <style>
- blockquote {
- font-size:12px;
- line-height:15px;
- }
- </style>
- <div id="midcolumn">
-
- <h1>$pageTitle</h1>
-
- <div class="homeitem3col">
- $eclipsenews
- </div>
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/classes/parser/feedparser.class.php");
+
+# Begin: page-specific settings. Change these.
+$pageTitle = "Eclipse Foundation News";
+$pageKeywords = "Eclipse Announcements, eclipse foundation news";
+$pageAuthor = "Christopher Guindon";
+$App->PageRSS = "/home/eclipsenews.rss";
+$App->PageRSSTitle = "Eclipse Foundation News";
+
+ob_start();
+?>
+
+ <div class="col-md-17">
+ <h1><?php print $pageTitle; ?></h1>
+ <?php
+ $news = new FeedParser();
+ $news->setUrl($_SERVER['DOCUMENT_ROOT'] . "/community/news/2005newsarchive.rss");
+ $news->setRssLink('http://feeds.feedburner.com/eclipse/fnews');
+ $news->setLimit(500);
+ $news->setCount(5000);
+ $news->output();
+ ?>
</div>
-
- <div id="rightcolumn">
- <div class="sideitem">
- <h6>Related Links</h6>
- <ul>
- <li><a href="eclipseinthenews.php">Eclipse Community News</a></li>
- <li><a href="whatsnewhistory.html">Eclipse News Archive</a> (What's New)</li>
- <li><a href="../../org/press-release/">Press Release Archive</a></li>
- <li><a href="../../org/press-release/pressrelease_guidelines.php">Press Release Guidelines</a></li>
-
- </ul>
+
+ <div class="col-md-6 col-md-offset-1">
+ <div class="sideitem">
+ <h6>Related Links</h6>
+ <ul>
+ <li><a href="eclipseinthenews.php">Eclipse Community News</a></li>
+ <li><a href="whatsnewhistory.html">Eclipse News Archive</a> (What's New)</li>
+ <li><a href="../../org/press-release/">Press Release Archive</a></li>
+ <li><a href="../../org/press-release/pressrelease_guidelines.php">Press Release Guidelines</a></li>
+ </ul>
</div>
</div>
-EOHTML;
+<?php
+ $html = ob_get_clean();
$App->PageRSS = "http://feeds.feedburner.com/eclipse/fnews";
$App->PageRSSTitle = "Eclipse Foundation News";
$html = mb_convert_encoding($html, "HTML-ENTITIES", "auto");
# Generate the web page
- $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+ $App->generatePage($theme, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>
