Bug 2037 - Metadata on Social Media

Signed-off-by: Christopher Guindon <chris.guindon@eclipse.org>

20 files changed, 73 insertions, 231 deletions

diff --git a/eclipse_newsletter/2016/july/_variables.php b/eclipse_newsletter/2016/july/_variables.php
deleted file mode 100644
index 03f906c25..000000000
--- a/eclipse_newsletter/2016/july/_variables.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*******************************************************************************
- * Copyright (c) 2016 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
- *******************************************************************************/
-// This file must be included
-if(basename(__FILE__) == basename($_SERVER['PHP_SELF'])){exit();}
-
-  // Begin: page-specific settings. Change these.
-  $pageTitle = "Neon Lights Everywhere";
-  $pageKeywords = "eclipse, newsletter, neon";
-  $pageAuthor = "Christopher Guindon";
-
diff --git a/eclipse_newsletter/2016/july/article1.php b/eclipse_newsletter/2016/july/article1.php
index 916b863f1..70e19a105 100644
--- a/eclipse_newsletter/2016/july/article1.php
+++ b/eclipse_newsletter/2016/july/article1.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "Cloud Foundry Tools for Neon";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/july/article2.php b/eclipse_newsletter/2016/july/article2.php
index 8ef5966b7..c844e7a82 100644
--- a/eclipse_newsletter/2016/july/article2.php
+++ b/eclipse_newsletter/2016/july/article2.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "Eclipse Docker Tooling for Neon";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/july/article3.php b/eclipse_newsletter/2016/july/article3.php
index a4f30cdf1..dfd7e2cfd 100644
--- a/eclipse_newsletter/2016/july/article3.php
+++ b/eclipse_newsletter/2016/july/article3.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "One Year of Automated Error Reporting";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/july/article4.php b/eclipse_newsletter/2016/july/article4.php
index 8e9823df5..411c01006 100644
--- a/eclipse_newsletter/2016/july/article4.php
+++ b/eclipse_newsletter/2016/july/article4.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "Buildship into the Future";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/july/article5.php b/eclipse_newsletter/2016/july/article5.php
index 41228015e..d14e619d2 100644
--- a/eclipse_newsletter/2016/july/article5.php
+++ b/eclipse_newsletter/2016/july/article5.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "Article 4";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/july/index.php b/eclipse_newsletter/2016/july/index.php
index c63abe7c7..f8314c180 100644
--- a/eclipse_newsletter/2016/july/index.php
+++ b/eclipse_newsletter/2016/july/index.php
@@ -15,5 +15,10 @@
   $App = new App ();
   $Theme = $App->getThemeClass();
   $script_name = $App->getScriptName();
-  require_once '_variables.php';
+
+  // Begin: page-specific settings. Change these.
+  $pageTitle = "Neon Lights Everywhere";
+  $pageKeywords = "eclipse, newsletter, neon";
+  $pageAuthor = "Christopher Guindon";
+
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_index.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/june/_variables.php b/eclipse_newsletter/2016/june/_variables.php
deleted file mode 100644
index 8cedcccc8..000000000
--- a/eclipse_newsletter/2016/june/_variables.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*******************************************************************************
- * Copyright (c) 2016 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
- *******************************************************************************/
-// This file must be included
-if(basename(__FILE__) == basename($_SERVER['PHP_SELF'])){exit();}
-
-  // Begin: page-specific settings. Change these.
-  $pageTitle = "Eclipse Neon Shines Bright";
-  $pageKeywords = "eclipse, newsletter, neon, release,";
-  $pageAuthor = "Christopher Guindon";
-
diff --git a/eclipse_newsletter/2016/june/article1.php b/eclipse_newsletter/2016/june/article1.php
index 825071559..3e6e37846 100644
--- a/eclipse_newsletter/2016/june/article1.php
+++ b/eclipse_newsletter/2016/june/article1.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "Eclipse Neon Top Ten";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/june/article2.php b/eclipse_newsletter/2016/june/article2.php
index 11f9025b3..76630fe4b 100644
--- a/eclipse_newsletter/2016/june/article2.php
+++ b/eclipse_newsletter/2016/june/article2.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "What's Eclipse USS";
@@ -21,19 +20,9 @@
   $pageAuthor = "Christopher Guindon";
 
   // Uncomment and set $original_url if you know the original url of this article.
- $original_url = "http://blog.ttoine.net/en/2016/05/13/uss-and-the-marketplace-client/";
- $og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
+  $original_url = "http://blog.ttoine.net/en/2016/05/13/uss-and-the-marketplace-client/";
+  $og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/june/article3.php b/eclipse_newsletter/2016/june/article3.php
index 6e02d3842..b98437bb9 100644
--- a/eclipse_newsletter/2016/june/article3.php
+++ b/eclipse_newsletter/2016/june/article3.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "CDT 9.0 for Neon - Paying our Debt and Moving Forward";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/june/article4.php b/eclipse_newsletter/2016/june/article4.php
index b4111661f..a92361a2c 100644
--- a/eclipse_newsletter/2016/june/article4.php
+++ b/eclipse_newsletter/2016/june/article4.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "What's New in Eclipse PHP Development Tools";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/2016/june/index.php b/eclipse_newsletter/2016/june/index.php
index c63abe7c7..a2e9754cd 100644
--- a/eclipse_newsletter/2016/june/index.php
+++ b/eclipse_newsletter/2016/june/index.php
@@ -15,5 +15,10 @@
   $App = new App ();
   $Theme = $App->getThemeClass();
   $script_name = $App->getScriptName();
-  require_once '_variables.php';
+
+  // Begin: page-specific settings. Change these.
+  $pageTitle = "Eclipse Neon Shines Bright";
+  $pageKeywords = "eclipse, newsletter, neon, release,";
+  $pageAuthor = "Christopher Guindon";
+
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_index.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/_includes/_generate_page_article.php b/eclipse_newsletter/_includes/_generate_page_article.php
new file mode 100644
index 000000000..9bf32a3ac
--- /dev/null
+++ b/eclipse_newsletter/_includes/_generate_page_article.php
@@ -0,0 +1,27 @@
+<?php
+/*******************************************************************************
+ * Copyright (c) 2016 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
+ ********************************************************************************/
+
+  ob_start();
+  include ("content/en_" . $script_name);
+  $html = ob_get_clean ();
+
+  if (isset ( $original_url )) {
+    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
+  }
+  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
+
+  $Theme = $App->getThemeClass();
+  $Theme->setHTML($html);
+  $Theme->setPageTitle($pageTitle);
+  $Theme->getPageKeywords($pageKeywords);
+  $Theme->setPageAuthor($pageAuthor);
+  $Theme->generatePage();
\ No newline at end of file
diff --git a/eclipse_newsletter/starterkit/_variables.php b/eclipse_newsletter/starterkit/_variables.php
deleted file mode 100644
index 8cad19a77..000000000
--- a/eclipse_newsletter/starterkit/_variables.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*******************************************************************************
- * Copyright (c) 2016 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
- *******************************************************************************/
-// This file must be included
-if(basename(__FILE__) == basename($_SERVER['PHP_SELF'])){exit();}
-
-  // Begin: page-specific settings. Change these.
-  $pageTitle = "Newsletter Title";
-  $pageKeywords = "eclipse, newsletter";
-  $pageAuthor = "Christopher Guindon";
-
diff --git a/eclipse_newsletter/starterkit/article1.php b/eclipse_newsletter/starterkit/article1.php
index bb0743e60..4b3a02095 100644
--- a/eclipse_newsletter/starterkit/article1.php
+++ b/eclipse_newsletter/starterkit/article1.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "Article 1";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/starterkit/article2.php b/eclipse_newsletter/starterkit/article2.php
index e1fe0e7d9..bf09738f5 100644
--- a/eclipse_newsletter/starterkit/article2.php
+++ b/eclipse_newsletter/starterkit/article2.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "Article 2";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/starterkit/article3.php b/eclipse_newsletter/starterkit/article3.php
index d534b8644..ce03caaa9 100644
--- a/eclipse_newsletter/starterkit/article3.php
+++ b/eclipse_newsletter/starterkit/article3.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "Article 3";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/starterkit/article4.php b/eclipse_newsletter/starterkit/article4.php
index 41228015e..d14e619d2 100644
--- a/eclipse_newsletter/starterkit/article4.php
+++ b/eclipse_newsletter/starterkit/article4.php
@@ -13,7 +13,6 @@
 
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
   $App = new App ();
-  require_once ('_variables.php');
 
   // Begin: page-specific settings. Change these.
   $pageTitle = "Article 4";
@@ -25,15 +24,5 @@
   //$og = (isset ( $original_url )) ? '<li><a href="' . $original_url . '" target="_blank">Original Article</a></li>' : '';
 
   // Place your html content in a file called content/en_article1.php
-  ob_start ();
-  include ("content/en_" . $App->getScriptName());
-  $html = ob_get_clean ();
-
-  if (isset ( $original_url )) {
-    $App->AddExtraHtmlHeader ( '<link rel="canonical" href="' . $original_url . '" />' );
-  }
-  $App->AddExtraHtmlHeader ( '<link rel="stylesheet" type="text/css" href="/community/eclipse_newsletter/assets/articles.css" media="screen" />' );
-
-  $Theme = $App->getThemeClass();
-  $Theme->setHTML($html);
-  $Theme->generatePage();
\ No newline at end of file
+  $script_name = $App->getScriptName();
+  require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_generate_page_article.php");
\ No newline at end of file
diff --git a/eclipse_newsletter/starterkit/index.php b/eclipse_newsletter/starterkit/index.php
index c63abe7c7..925f56a6f 100644
--- a/eclipse_newsletter/starterkit/index.php
+++ b/eclipse_newsletter/starterkit/index.php
@@ -15,5 +15,10 @@
   $App = new App ();
   $Theme = $App->getThemeClass();
   $script_name = $App->getScriptName();
-  require_once '_variables.php';
+
+  // Begin: page-specific settings. Change these.
+  $pageTitle = "Newsletter Title";
+  $pageKeywords = "eclipse, newsletter";
+  $pageAuthor = "Christopher Guindon";
+
   require_once ($_SERVER ['DOCUMENT_ROOT'] . "/community/eclipse_newsletter/_includes/_index.php");
\ No newline at end of file