Bug 416953 - Community News RSS Feeds needs love

Change-Id: I6bee2d84b1f86839722f330a39bb59cbd6739920 Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>
author: Christopher Guindon 2017-06-14 15:18:04 +0000
committer: Christopher Guindon 2017-06-14 15:23:11 +0000
commit: 9082b7f4bab091a674f6d02a2b38b3c3d6fc6d6f (patch)
tree: 0d245fc433f6563a6c738c86ff38982167103101
parent: fb4fdac51e74366c0623c9a66a17faa265da16d6 (diff)
download: community-9082b7f4bab091a674f6d02a2b38b3c3d6fc6d6f.tar.gz
community-9082b7f4bab091a674f6d02a2b38b3c3d6fc6d6f.tar.xz
community-9082b7f4bab091a674f6d02a2b38b3c3d6fc6d6f.zip
4 files changed, 124 insertions, 130 deletions
diff --git a/news/content/en_rssfeeds.php b/news/content/en_rssfeeds.php
new file mode 100644
index 000000000..83cdb2ccc
--- /dev/null
+++ b/news/content/en_rssfeeds.php
@@ -0,0 +1,79 @@
+<?php
+/*******************************************************************************
+ * Copyright (c) 2005, 2017 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:
+ *    Donald Smith (Eclipse Foundation) - Initial implementation
+ *    Christopher Guindon (Eclipse Foundation)
+ *******************************************************************************/
+?>
+
+<div id="midcolumn">
+
+  <h1><?php print$pageTitle; ?></h1>
+
+  <table class="table table-striped table-bordered table-hover">
+    <tr>
+      <th>Title</th>
+      <th>Description</th>
+      <th class="text-center">URL</th>
+    </tr>
+
+    <tr>
+      <td>Eclipse News</td>
+      <td>Press releases bulletins from the Eclipse Foundation</td>
+      <td class="text-center small">
+        <a href="//feeds.feedburner.com/eclipse/fnews"><i class="fa fa-rss-square fa-2x orange" aria-hidden="true"></i></a>
+      </td>
+    </tr>
+
+    <tr>
+      <td>Eclipse in the News</td>
+      <td>Press Releases about Eclipse</td>
+      <td class="text-center small">
+        <a href="//feeds.feedburner.com/eclipse/cnews"><i class="fa fa-rss-square fa-2x orange" aria-hidden="true"></i></a>
+      </td>
+    </tr>
+
+    <tr>
+      <td>Eclipse Downloads</td>
+      <td>See the latest Eclipse Project Releases.</td>
+      <td class="text-center small">
+        <a href="/downloads/rss.php"><i class="fa fa-rss-square fa-2x orange" aria-hidden="true"></i></a>
+      </td>
+    </tr>
+
+    <tr>
+      <td>Eclipse Marketplace</td>
+      <td>Eclipse Plugins, Bundles and Products Updates.</td>
+      <td class="text-center small">
+        <a href="https://marketplace.eclipse.org/rss.xml"><i class="fa fa-rss-square fa-2x orange" aria-hidden="true"></i></a>
+      </td>
+    </tr>
+
+    <tr>
+      <td>PlanetEclipse</td>
+      <td>Feeds from Planet Eclipse Blogs</td>
+      <td class="text-center small">
+        <a href="http://planeteclipse.org/planet/rss20.xml"><i class="fa fa-rss-square fa-2x orange" aria-hidden="true"></i></a>
+      </td>
+    </tr>
+
+    <tr>
+      <td>Eclipse Projects</td>
+      <td>Eclipse Proposals and Reviews</td>
+      <td class="text-center small">
+        <a href="/projects/reviews-rss.php"><i class="fa fa-rss-square fa-2x orange" aria-hidden="true"></i></a>
+      </td>
+    </tr>
+
+  </table>
+  <h3>New to RSS?</h3>
+  <p>By subscribing to RSS feeds with an RSS reader, you can easily stay up to date with all things Eclipse.<br/>
+  Here at Eclipse.org we have a series of RSS news feeds for you to stay updated with all the things happening in the Eclipse Ecosystem.</p>
+  <p>Looking for a quick way to subscribe to all the feeds? This <a href="/community/news/eclipsefeeds_opml.xml">OPML file</a> can be used to subscribe to all the feeds listed above.</p>
+</div>
diff --git a/news/eclipsefeeds_opml.xml b/news/eclipsefeeds_opml.xml
index 0944abe76..17215ebab 100644
--- a/news/eclipsefeeds_opml.xml
+++ b/news/eclipsefeeds_opml.xml
@@ -8,18 +8,14 @@
 	</head>
 	<body>
 		<outline text="Eclipse.org Feeds">
-			<outline text="Eclipse Foundation News" description="Press releases bulletins from the Eclipse Foundation" type="rss" xmlUrl="http://www.eclipse.org/home/eclipsenews.rss"/>
-			<outline text="Eclipse In The News" description="Press Releases about Eclipse" type="rss" xmlUrl="http://www.eclipse.org/home/eclipseinthenews.rss"/>
-			<outline text="Eclipse Resources and Technical Articles" description="Eclipse related technical articles from Eclipse.org" type="rss" xmlUrl="http://www.eclipse.org/resources/resources.rss"/>
+			<outline text="Eclipse Foundation News" description="Press releases bulletins from the Eclipse Foundation" type="rss" xmlUrl="https://feeds.feedburner.com/eclipse/fnews"/>
+			<outline text="Eclipse In The News" description="Press Releases about Eclipse" type="rss" xmlUrl="https://feeds.feedburner.com/eclipse/cnews"/>
 			<outline text="Eclipse Projects" description="Eclipse Proposals and Reviews" type="rss" xmlUrl="http://www.eclipse.org/projects/reviews-rss.php"/>
 			<outline text="Eclipse Downloads" description="See the latest Eclipse Project Releases." type="rss" xmlUrl="http://www.eclipse.org/downloads/rss.php"/>
-			<outline text="Eclipse Member Bulletins" description="Eclipse Proposals and Reviews" type="rss" xmlUrl="http://eclipse.org/membership/news/membernews.rss"/>
 		</outline>
-		<outline text="EclipsePluginCentral.com Feeds">
-			<outline text="EPIC News" description="Eclipse Plug-in Central News" type="rss" xmlUrl="http://www.eclipseplugincentral.com/backend.php"/>
-			<outline text="EPIC Plugins" description="Eclipse Plug-in Central Plugin Updates" type="rss" xmlUrl="http://www.eclipseplugincentral.com/pluginfeed.rss"/>
+		<outline text="Marketplace.eclipse.org Feeds">
+			<outline text="Eclipse Marketplace" description="EEclipse Plugins, Bundles and Products Updates" type="rss" xmlUrl="https://marketplace.eclipse.org/rss.xml"/>
 		</outline>
-		<outline text="Eclipse Live" description="Eclipse Live New and Upcoming Resources" type="rss" xmlURL="http://feeds.feedburner.com/eclipselive?format=xml"/>
 		<outline text="PlanetEclipse" description="Feeds from Planet Eclipse Blogs" type="rss" xmlUrl="http://www.planeteclipse.org/planet/rss20.xml"/>
 	</body>
 </opml>
diff --git a/news/rssfeeds.php b/news/rssfeeds.php
index 10b17a5e4..b4a71c042 100644
--- a/news/rssfeeds.php
+++ b/news/rssfeeds.php
@@ -1,122 +1,41 @@
-<?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'
-
-	#*****************************************************************************
-	#
-	# template.php
-	#
-	# Author: 		Denis Roy
-	# Date:			2005-06-16
-	#
-	# Description: Type your page comments here - these are not sent to the browser
-	#
-	#
-	#****************************************************************************
-
-	#
-	# Begin: page-specific settings.  Change these. 
-	$pageTitle 		= "Eclipse RSS Feeds";
-	$pageKeywords	= "Eclipse, RSS, Feeds";
-	$pageAuthor		= "Donald Smith";
-	
-	# 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);
-
-	# End: page-specific settings
-	#
-		
-	
-	# Paste your HTML content between the EOHTML markers!	
-	$html = <<<EOHTML
-
-	<div id="midcolumn">
-	
-		<h1>$pageTitle</h1>
-		
-		
-		<div class="homeitem3col">
-		<h3>Eclipse RSS Feeds</h3>		
-		<table WIDTH="100%">
-			<tr>
-				<td>Eclipse News</td>
-				<td>Press releases bulletins from the Eclipse Foundation</td>
-				<td>
-					<a href="/home/eclipsenews.rss"><img src="/images/rss2.gif"></a>
-				</td>				
-			</tr>
-
-			<tr>
-				<td>Eclipse in the News</td>
-				<td>Press Releases about Eclipse</td>
-				<td>
-					<a href="/home/eclipseinthenews.rss"><img src="/images/rss2.gif"></a>
-				</td>				
-			</tr>
-			<tr>
-				<td>Eclipse Downloads</td>
-				<td>See the latest Eclipse Project Releases.</td>
-				<td>
-					<a href="/downloads/rss.php"><img src="/images/rss2.gif"></a>
-				</td>
-			</tr>
-			<tr>
-				<td>Eclipse Live</td>
-				<td>Eclipse Live New and Upcoming Resources</td>
-				<td>
-					<a href="http://feeds.feedburner.com/eclipselive?format=xml"><img src="/images/rss2.gif"></a>
-				</td>				
-			</tr>
-			<tr>
-				<td>EPIC News</td>
-				<td>Eclipse Plug-in Central News</td>
-				<td>
-					<a href="http://eclipseplugincentral.com/backend.php"><img src="/images/rss2.gif"></a>
-				</td>				
-			</tr>
-			<tr>
-				<td>EPIC Plugins</td>
-				<td>Eclipse Plug-in Central Plugin Updates</td>
-				<td>
-					<a href="http://eclipseplugincentral.com/pluginfeed.rss"><img src="/images/rss2.gif"></a>
-				</td>				
-			</tr>
-			<tr>
-				<td>PlanetEclipse</td>
-				<td>Feeds from Planet Eclipse Blogs</td>
-				<td>
-					<a href="http://planeteclipse.org/planet/rss20.xml"><img src="/images/rss2.gif"></a>
-				</td>				
-			</tr>
-			<tr>
-				<td>Eclipse Projects</td>
-				<td>Eclipse Proposals and Reviews</td>
-				<td>
-					<a href="/projects/reviews-rss.php"><img src="/images/rss2.gif"></a>
-				</td>				
-			</tr>
-	
-			<tr>
-				<td>Eclipse Member Bulletins</td>
-				<td>Membership specific information such as members meetings, surveys and other activities.</td>
-				<td>
-					<a href="/membership/news/membernews.rss"><img src="/images/rss2.gif"></a>
-				</td>				
-			</tr>
-		</table>		
-		</div>
-		<h3>New to RSS?</h3>
-		<p>By subscribing to RSS feeds with an RSS reader, you can easily stay up to date with all things Eclipse.<br/>
-		Here at Eclipse.org we have a series of RSS news feeds for you to stay updated with all the things happening in the Eclipse Ecosystem.</p>
-		<p>Looking for a quick way to subscribe to all the feeds? This <a href="/community/news/eclipsefeeds_opml.xml">OPML file</a> can be used to subscribe to all the feeds listed above.</p>
-	</div>
-	
-	
-
-EOHTML;
-
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+<?php
+/*******************************************************************************
+ * Copyright (c) 2005, 2017 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:
+ *    Donald Smith (Eclipse Foundation) - Initial implementation
+ *    Christopher Guindon (Eclipse Foundation)
+ *******************************************************************************/
+
+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());
+
+# Begin: page-specific settings
+$pageTitle     = "Eclipse RSS Feeds";
+$pageKeywords  = "Eclipse, RSS, Feeds";
+$pageAuthor    = "Christopher Guindon";
+
+$Theme = $App->getThemeClass();
+$Theme->setNav($Nav);
+$Theme->setPageAuthor($pageAuthor);
+$Theme->setPageKeywords($pageKeywords);
+$Theme->setPageTitle($pageTitle);
+
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
+
+$Theme->setHtml($html);
+$Theme->generatePage();
diff --git a/news/~$05inthenewsarchive.rss b/news/~$05inthenewsarchive.rss
deleted file mode 100644
index 69dad38f5..000000000
--- a/news/~$05inthenewsarchive.rss
+++ /dev/null
author	Christopher Guindon	2017-06-14 15:18:04 +0000
committer	Christopher Guindon	2017-06-14 15:23:11 +0000
commit	9082b7f4bab091a674f6d02a2b38b3c3d6fc6d6f (patch)
tree	0d245fc433f6563a6c738c86ff38982167103101
parent	fb4fdac51e74366c0623c9a66a17faa265da16d6 (diff)
download	community-9082b7f4bab091a674f6d02a2b38b3c3d6fc6d6f.tar.gz community-9082b7f4bab091a674f6d02a2b38b3c3d6fc6d6f.tar.xz community-9082b7f4bab091a674f6d02a2b38b3c3d6fc6d6f.zip