Bug 2641 - Press Release descriptions eclipse.org

Change-Id: I6217744cb89942a4b26494326ee62da040aeb9f0
Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>

2 files changed, 62 insertions, 60 deletions

diff --git a/press-release/_projectCommon.php b/press-release/_projectCommon.php
index 4c2f8214..7cff2ca6 100644
--- a/press-release/_projectCommon.php
+++ b/press-release/_projectCommon.php
@@ -1,19 +1,19 @@
 <?php
+  if (!isset($Theme)) {
+    $Theme = $App->getThemeClass();
+  }
+  $Theme->setThemeVariables(array('sharethis' => TRUE));
 
-$Theme = $App->getThemeClass();
-$Theme->setThemeVariables(array('sharethis' => TRUE));
+  # Set the theme for your project's web pages.
+  # See the Committer Tools "How Do I" for list of themes
+  # https://dev.eclipse.org/committers/
+  $theme = "solstice";
 
-	# Set the theme for your project's web pages.
-	# See the Committer Tools "How Do I" for list of themes
-	# https://dev.eclipse.org/committers/ 
-	$theme = "solstice";
-
-	# Define your project-wide Nav bars here.
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank)
-	$Nav->addNavSeparator("About Us", 	"../");
-	$Nav->addCustomNav("Foundation", "../foundation/", "_self", 1);	
-	$Nav->addCustomNav("Governance", "../documents/", "_self", 1);
-	$Nav->addCustomNav("Legal Resources", "../../legal/", "_self", 1);
-	$Nav->addCustomNav("Contact Us", "../foundation/contact.php", "_self", 1);
-
-?>
+  # Define your project-wide Nav bars here.
+  # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank)
+  $Nav->addNavSeparator("About Us",   "../");
+  $Nav->addCustomNav("Foundation", "../foundation/", "_self", 1);
+  $Nav->addCustomNav("Governance", "../documents/", "_self", 1);
+  $Nav->addCustomNav("Legal Resources", "../../legal/", "_self", 1);
+  $Nav->addCustomNav("Contact Us", "../foundation/contact.php", "_self", 1);
+  $Theme->setNav($Nav);
\ No newline at end of file
diff --git a/press-release/iotdevsurvey2018.php b/press-release/iotdevsurvey2018.php
index aadd14e7..c42b79bb 100644
--- a/press-release/iotdevsurvey2018.php
+++ b/press-release/iotdevsurvey2018.php
@@ -1,61 +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("_projectCommon.php");    # All on the same line to unclutter the user's desktop'
+<?php
+/**
+ * ************************************************************************
+ * Copyright (c) 2018 Eclipse Foundation.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License 2.0 which accompanies
+ * this distribution, and is available at http://eclipse.org/legal/epl-2.0
+ * ************************************************************************
+ */
 
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
 
-	#
-	# Begin: page-specific settings.  Change these.
-	$pageTitle 		= "Participate in the IoT Developer Survey 2018";
-	$pageKeywords	= "eclipse, iot, developer, survey, internet of things,";
-	$pageAuthor		= "Roxanne Joncas";
+$App = new App();
+$Theme = $App->getThemeClass();
 
-	# Add page-specific Nav bars here
-	# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank)
-	# $Nav->addCustomNav("My Link", "mypage.php", "_self");
-	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank");
+// Begin: page-specific settings. Change these.
+$pageTitle = "Participate in the IoT Developer Survey 2018";
+$Theme->setPageTitle($pageTitle);
+$Theme->setPageAuthor("Roxanne Joncas");
+$Theme->setPageKeywords("eclipse, iot, developer, survey, internet of things,");
 
-	# End: page-specific settings
-	#
+// Custom Metatags
+$Theme->setMetaDescription("Eclipse IoT, in partnership with the IEEE IoT Initiative, the Open Mobile Alliance, and the AGILE-IoT is pleased to launch the fourth annual IoT Developer Survey.");
+$Theme->setMetaImage("https://www.eclipse.org/org/workinggroups/assets/images/wg_iot.png");
+$Theme->setMetaImageHeight('122');
+$Theme->setMetaImageWidth('140');
 
-	# Paste your HTML content between the EOHTML markers!
-	$html = <<<EOHTML
+$Nav = new Nav();
+include ("_projectCommon.php");
 
+// Paste your HTML content between the EOHTML markers!
+$html = <<<EOHTML
 <div id="maincontent">
-	<div id="midcolumn">
-		<h1>$pageTitle</h1>
-		<p>
+  <div id="midcolumn">
+    <h1>$pageTitle</h1>
+    <p>
 <p>The <a target="_blank" href="http://iot.eclipse.org/">Eclipse IoT</a> Working Group, in partnership with the <a target="_blank" href="http://iot.ieee.org/">IEEE IoT Initiative</a>, the <a target="_blank" href="http://openmobilealliance.org/iot">Open Mobile Alliance</a>, and the <a target="_blank" href="http://agile-iot.eu/">AGILE-IoT</a> H2020 Research Project is pleased to launch the fourth annual <a target="_blank" href="https://www.surveymonkey.de/r/eclipseorg">IoT Developer Survey</a>. The purpose of the survey is to gain a better understanding and insight into how developers are building IoT solutions. The survey will run until February 26, 2018, and the results will be published in early April 2018.</p>
 
 <p>This is the fourth year for the IoT Developer Survey. The results from the previous years (<a target="_blank" href="https://www.slideshare.net/IanSkerrett/iot-developer-survey-2017">2017</a>, <a target="_blank" href="https://www.slideshare.net/IanSkerrett/iot-developer-survey-2016">2016</a>, <a target="_blank" href="https://www.slideshare.net/IanSkerrett/iot-developer-survey-2015">2015</a>) have provided some interesting insights and trends about the IoT industry.</p>
-<p>Please take the time to complete this 5-8 minute survey. It allows us to analyze the latest trends in the industry and we want to make sure it reflects everyone's point of view, including yours!</p> 
+<p>Please take the time to complete this 5-8 minute survey. It allows us to analyze the latest trends in the industry and we want to make sure it reflects everyone's point of view, including yours!</p>
 <p>&rarr; <a target="_blank" href="https://www.surveymonkey.de/r/eclipseorg">Complete the survey</a> &larr;</p><br/>
 
-<p><a target="_blank" href="https://www.surveymonkey.de/r/eclipseorg"><img class="img-responsive" src="/org/images/iot_survey_2018.png" alt="iot survey partners 2018"/></a></p>		
+<p><a target="_blank" href="https://www.surveymonkey.de/r/eclipseorg"><img class="img-responsive" src="/org/images/iot_survey_2018.png" alt="iot survey partners 2018"/></a></p>
 
-				</div>
+        </div>
 
-	<!-- remove the entire <div> tag to omit the right column!  -->
-	<div id="rightcolumn">
-		<div class="sideitem">
-			<h6>Related Links</h6>
-			<ul>
-				<li><a target="_blank" href="https://www.surveymonkey.de/r/eclipseorg">IoT Developer Survey</a></li>
-				<li><a target="_blank" href="https://ianskerrett.wordpress.com/2017/04/19/iot-developer-trends-2017-edition/">Survey Results 2017</a></li>
-			</ul>
-		</div>
-	</div>
+  <!-- remove the entire <div> tag to omit the right column!  -->
+  <div id="rightcolumn">
+    <div class="sideitem">
+      <h6>Related Links</h6>
+      <ul>
+        <li><a target="_blank" href="https://www.surveymonkey.de/r/eclipseorg">IoT Developer Survey</a></li>
+        <li><a target="_blank" href="https://ianskerrett.wordpress.com/2017/04/19/iot-developer-trends-2017-edition/">Survey Results 2017</a></li>
+      </ul>
+    </div>
+  </div>
 </div>
-
 EOHTML;
 
-
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
-<?php
-/*
- * Created on 20-Jan-2006
- *
- * To change the template for this generated file go to
- * Window - Preferences - PHPeclipse - PHP - Code Templates
- */
-?>
-
+$Theme->setHtml($html);
+$Theme->generatePage();