Bug 514416 - EF staff page should link to account site

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

2 files changed, 100 insertions, 62 deletions

diff --git a/foundation/staff.php b/foundation/staff.php
index fe7f301c..7f746b90 100644
--- a/foundation/staff.php
+++ b/foundation/staff.php
@@ -1,72 +1,80 @@
-<?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'
-/*******************************************************************************
-* Copyright (c) 2005, 2011 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://www.eclipse.org/legal/epl-v10.html
-*
-* Contributors:
-*    Wayne Beaton (Eclipse Foundation) - initial API and implementation
-*******************************************************************************/
-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");
+<?php
+/**
+ * *****************************************************************************
+ * Copyright (c) 2005, 2011, 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://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Wayne Beaton (Eclipse Foundation) - initial API and implementation
+ * Christopher Guindon (Eclipse Foundation) - Incremental improvements
+ * *****************************************************************************
+ */
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
 
 $App = new App();
 $Nav = new Nav();
-$Menu = new Menu();
-
-include($App->getProjectCommon());
-
-$pageTitle 		= "Eclipse Foundation Staff";
-$pageKeywords	= "foundation, staff";
-$pageAuthor		= "Wayne Beaton";
+include ($App->getProjectCommon());
 
-function dumpStaffInfo($App) {
+$pageTitle = "Eclipse Foundation Staff";
+$ThemeClass = $App->getThemeClass($theme);
 
-}
+$ThemeClass->setPageAuthor('Eclipse Foundation');
+$ThemeClass->setPageKeywords("Eclipse Foundation staff, Eclipse staff, Foundation staff");
+$ThemeClass->setPageTitle($pageTitle);
 
 ob_start();
 ?>
-	<style>.staffmember { clear:both }</style>
+<div id="midcolumn">
+  <h1><?php print $pageTitle; ?></h1>
+  <p>The Eclipse Foundation is fortunate to have some very talented
+    people working full-time on behalf of the Eclipse community. Below is
+    the list of our staff.</p>
+  <p>Eclipse email addresses all follow the firstname.lastname@eclipse.org convention.</p>
 
-	<div id="midcolumn">
-		<h1><?php echo $pageTitle ?></h1>
-		<p>The Eclipse Foundation is fortunate to have some very talented people working
-		full-time on behalf of the Eclipse community. Below is the list of our staff.</p>
-		<p>Eclipse email addresses all follow the firstname.lastname@eclipse.org convention.</p>
-
-		<?php
-		  $staff = simplexml_load_file(dirname(__FILE__) . '/staff.xml');
-			foreach ($staff as $member) {
-				print '<div class="media clearfix">';
-				print '<div class="col-xs-5 col-sm-4">';
-				if ($member->image) {
-          print '<a name="' . $member->id . '"></a><img class="img-thumbnail img-responsive" src="' . $member->image . '" alt="' . $member->name . '">';
-				}
-				print '</div>';
-				print '<div class="col-xs-19 col-sm-20">';
-				print '<div class="media-body">';
-                print '<h4 class="media-heading">' . $member->name . '</h4>';
-				if ($member->title) {
-          print '<h5 class="media-heading">' . $member->title . '</h5>';
+    <?php
+    // @todo: Create a JS widjet to display staff bio from api.eclipse.org
+    $staff = simplexml_load_file(dirname(__FILE__) . '/staff.xml');
+    foreach ($staff as $member) {
+      print '<div class="media clearfix">';
+      print '<div class="col-xs-5 col-sm-4">';
+      if ($member->image) {
+        print '<a name="' . $member->id . '"';
+        if (!empty($member->username)) {
+          print ' href="https://www.eclipse.org/user/' . $member->username . '"';
         }
-        print $member->description;
-        if ($member->twitter) {
-					print $App->getTwitterFollowWidget($member->twitter);
-				}
-        print '</div></div></div><hr/>';
-
-			}
-		?>
-	</div>
+        print '><img class="img-thumbnail img-responsive" src="' . $member->image . '" alt="' . $member->name . '"></a>';
+      }
+      print '</div>';
+      print '<div class="col-xs-19 col-sm-20">';
+      print '<div class="media-body">';
+      print '<h4>';
+      if (!empty($member->username)) {
+        print '<a href="https://www.eclipse.org/user/' . $member->username . '">' . $member->name . ' <i class="fa fa-link" aria-hidden="true"></i></a>';
+      }
+      else {
+        print $member->name;
+      }
+      print '</h4>';
+      if ($member->title) {
+        print '<h5 class="media-heading">' . $member->title . '</h5>';
+      }
+      print $member->description;
+      if ($member->twitter) {
+        print $App->getTwitterFollowWidget($member->twitter);
+      }
+      print '</div></div></div><hr/>';
+    }
+    ?>
+  </div>
 
 <?php
-	# Paste your HTML content between the EOHTML markers!
-	$html = ob_get_contents();
-	ob_end_clean();
+$html = ob_get_contents();
+ob_end_clean();
 
-	# Generate the web page
-	$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
+$ThemeClass->setNav($Nav);
+$ThemeClass->setHtml($html);
+$ThemeClass->generatePage();
\ No newline at end of file
diff --git a/foundation/staff.xml b/foundation/staff.xml
index e3265ff7..ce7f3347 100644
--- a/foundation/staff.xml
+++ b/foundation/staff.xml
@@ -3,6 +3,7 @@
 
   <staffmember id="mike">
     <name>Mike Milinkovich</name>
+    <username>mmilinkovich</username>
     <title>Executive Director</title>
     <twitter>mmilinkov</twitter>
     <image>images_staff/mike.jpg</image>
@@ -19,6 +20,7 @@
 
   <staffmember id="thea">
     <name>Thea Aldrich</name>
+    <username>taldrich</username>
     <title>LocationTech Developer Advocate</title>
     <twitter>TheaClay</twitter>
     <image>images_staff/thea.jpg</image>
@@ -30,6 +32,7 @@
 
 <staffmember id="darrell">
     <name>Darrell Armstrong</name>
+    <username>darmstrong</username>
     <title>Web Developer</title>
     <image>images_staff/darrella.jpg</image>
     <description><![CDATA[
@@ -43,6 +46,7 @@
   
 	<staffmember id="mikael">
     <name>Mikaël Barbero</name>
+    <username>mbarbero</username>
     <title>Senior Platform Developer</title>
     <twitter>mikbarbero</twitter>
     <image>images_staff/mikael.jpg</image>
@@ -58,6 +62,7 @@
   
   <staffmember id="wayne">
     <name>Wayne Beaton</name>
+    <username>wbeaton</username>
     <title>Director of Open Source Projects</title>
     <twitter>waynebeaton</twitter>
     <image>images_staff/wayne.jpg</image>
@@ -77,6 +82,7 @@
 
   <staffmember id="gael">
     <name>Gaël Blondelle</name>
+    <username>gblondelle</username>
     <title>Director, European Ecosystem Development</title>
     <twitter>gblondelle</twitter>
     <image>images_staff/gael.jpg</image>
@@ -89,6 +95,7 @@
 
   <staffmember id="ben">
     <name>Benjamin Cabé</name>
+    <username>bcabe</username>
     <title>Community Evangelist</title>
     <twitter>kartben</twitter>
     <image>images_staff/ben.jpg</image>
@@ -101,6 +108,7 @@
 
   <staffmember id="sharonc">
     <name>Sharon Corbett</name>
+    <username>scorbett</username>
     <image>images_staff/sharonc.jpg</image>
     <title><![CDATA[Manager, Intellectual Property]]></title>
     <twitter>mysharona_lc</twitter>
@@ -112,6 +120,7 @@
 
   <staffmember id="chrisguindon">
     <name>Christopher Guindon</name>
+    <username>cguindon</username>
     <image>images_staff/chris.jpg</image>
     <title>Lead Web Developer</title>
     <twitter>chrisguindon</twitter>
@@ -123,6 +132,7 @@
   
     <staffmember id="fredgurr">
     <name>Frederic Gurr</name>
+    <username>fgurr</username>
     <image>images_staff/fred.jpg</image>
     <title>Release Engineer</title>
     <twitter>fr3dg</twitter>
@@ -134,6 +144,7 @@
   
    <staffmember id="kathirsch">
     <name>Kat Hirsch</name>
+    <username>khirsch</username>
     <image>images_staff/kat.png</image>
     <title>Marketing and Events</title>
     <twitter>katvcb</twitter>
@@ -146,6 +157,7 @@
   
     <staffmember id="susan">
     <name>Susan Iwai</name>
+    <username>siwai</username>
     <image>images_staff/susan.jpg</image>
     <title>European Ecosystem</title>
     <description>
@@ -157,6 +169,7 @@
 
   <staffmember id="anne">
     <name>Anne Jacko</name>
+    <username>ajacko</username>
     <image>images_staff/Anne.jpg</image>
     <title>Conference Queen</title>
     <twitter>annejacko</twitter>
@@ -171,6 +184,7 @@
 
   <staffmember id="roxanne">
     <name>Roxanne Joncas</name>
+    <username>rjoncas</username>
     <image>images_staff/roxanne.jpg</image>
     <title>Marketing Specialist</title>
     <twitter>roxannejoncas</twitter>
@@ -185,6 +199,7 @@
   
   <staffmember id="philippe">
     <name>Philippe Krief</name>
+    <username>pkriefrvi</username>
     <image>images_staff/philippe.jpeg</image>
     <title>Director, Research Relations</title>
     <twitter>phkrief</twitter>
@@ -198,6 +213,7 @@
 
   <staffmember id="larocque">
     <name>Chris Larocque</name>
+    <username>clarocque</username>
     <title><![CDATA[Director, Operations<br/>Treasurer]]></title>
     <image>images_staff/chrisl.jpg</image>
     <description> <![CDATA[
@@ -209,6 +225,7 @@
 
   <staffmember id="perri">
     <name>Perri Lavergne</name>
+    <username>pmisingnameu8g</username>
     <title>Membership Coordinator and Global Inside Sales</title>
     <twitter>perrieclipse</twitter>
     <image>images_staff/perri.jpg</image>
@@ -220,8 +237,9 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
     </description>
   </staffmember>
   
-      <staffmember id="sharonm">
+  <staffmember id="sharonm">
     <name>Sharon Macdonald</name>
+    <username>scorbett</username>
     <title>Intellectual Property Analyst</title>
     <image>images_staff/sharonm.jpg</image>
     <description>
@@ -232,8 +250,9 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
     </description>
   </staffmember>
   
-     <staffmember id="jenn">
+  <staffmember id="jenn">
     <name>Jenn Martel</name>
+    <username>jmartelb0n</username>
     <title>Manager of Finance and Administration</title>
      <twitter>jennmartel4</twitter>
     <image>images_staff/Jenn.jpg</image>
@@ -247,6 +266,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
 
   <staffmember id="ralph">
     <name>Ralph Mueller</name>
+    <username>rmueller</username>
     <title>Managing Director, Eclipse Foundation Europe GmbH</title>
     <twitter>ralph_mueller</twitter>
     <image>images_staff/ralph.jpg </image>
@@ -262,8 +282,9 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
     </description>
   </staffmember>
   
-    <staffmember id="eric">
+  <staffmember id="eric">
     <name>Eric Poirier</name>
+    <username>epoirier</username>
     <title>Web Developer</title>
     <twitter>ericpoir</twitter>
     <image>images_staff/eric.jpg</image>
@@ -278,6 +299,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
 
   <staffmember id="denis">
     <name>Denis Roy</name>
+    <username>droy</username>
     <title>Director, IT Services</title>
     <image>images_staff/denis.jpg</image>
     <twitter>droy_eclipse</twitter>
@@ -288,6 +310,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
   
   <staffmember id="heather">
     <name>Heather Shahan</name>
+    <username>hshahan</username>
     <title>Bookkeeper</title>
     <image>images_staff/heather.jpg</image>
     <description>
@@ -301,6 +324,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
   
   <staffmember id="ian">
     <name>Ian Skerrett</name>
+    <username>iskerrett</username>
     <title>VP, Marketing</title>
     <image>images_staff/ian.jpg </image>
     <twitter>ianskerrett</twitter>
@@ -315,6 +339,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
   
     <staffmember id="stephanie">
     <name>Stephanie Swart</name>
+    <username>sswart</username>
     <title>Program Coordinator</title>
     <image>images_staff/stephanie.png </image>
     <twitter>stephaniejswart</twitter>
@@ -327,6 +352,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
   
 <staffmember id="antoine">
     <name>Antoine Thomas</name>
+    <username>ttoine</username>
     <title>Product Manager</title>
     <image>images_staff/antoine.jpg</image>
     <twitter>ttoine </twitter>
@@ -340,6 +366,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
   
 	<staffmember id="derek">
     <name>Derek Toolan</name>
+    <username>dtoolan</username>
     <title>Systems Administrator</title>
     <image>images_staff/derek.jpg</image>
     <description><![CDATA[
@@ -353,6 +380,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
 
   <staffmember id="marc">
     <name>Marc Vloemans</name>
+    <username>mvloemans</username>
     <title>Director, Ecosystem Development</title>
     <image>images_staff/marc.jpg </image>
     <twitter>marcvloemans</twitter>
@@ -365,6 +393,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
 
   <staffmember id="matt">
     <name>Matt Ward</name>
+    <username>mward</username>
     <title>Systems Administrator</title>
     <image>images_staff/matt.jpg </image>
     <description><![CDATA[
@@ -376,6 +405,7 @@ Perri hopes to one day accomplish her long time dream of a unique day program fo
   
   <staffmember id="paul">
     <name>Paul White</name>
+    <username>pwhited3w</username>
     <title>Vice President, Member Services</title>
     <image>images_staff/Paul.jpg </image>
     <description><![CDATA[