Bug 438206 - Convert tools (main) web page to solstice theme
diff --git a/EclipseToolsLogos/README.md b/EclipseToolsLogos/README.md
index 9825c7d..2a00174 100644
--- a/EclipseToolsLogos/README.md
+++ b/EclipseToolsLogos/README.md
@@ -1,11 +1,11 @@
 Eclipse Tools Logo Icons and Images
 ==============================
 
-This directory contains a collection of "Tools Logo" images and icons. 
+This directory contains a collection of "Tools Logo" images and icons.
 
-Contributed in bug 370021 [1] they are primarly intended for those that would like to use a common "Tools Logo" icon, for various purposes such as their "branding icon" for features represented in the Eclpse "About Box". It is thought this is one way to reduce clutter in the "About Box", especially for "low level" libraries (such as GEF, and others) that casual end-users would seldome seek out to install, but are installed automatically along with many other higher level tools. Read the bug [1] for history and discussion and to provide feedback or improvements.  
+Contributed in bug 370021 [1] they are primarly intended for those that would like to use a common "Tools Logo" icon, for various purposes such as their "branding icon" for features represented in the Eclpse "About Box". It is thought this is one way to reduce clutter in the "About Box", especially for "low level" libraries (such as GEF, and others) that casual end-users would seldome seek out to install, but are installed automatically along with many other higher level tools. Read the bug [1] for history and discussion and to provide feedback or improvements.
 
-See Eclipse Help [2] and the Eclipse wiki [3] for more information about "branding" and the use of icons. 
+See Eclipse Help [2] and the Eclipse wiki [3] for more information about "branding" and the use of icons.
 
 
 [1] https://bugs.eclipse.org/bugs/show_bug.cgi?id=370021
diff --git a/_projectCommon.php b/_projectCommon.php
index 23e8629..bc9e888 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -2,7 +2,7 @@
 
 # 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/ 
+# https://dev.eclipse.org/committers/
 $theme = "solstice";
 
 require_once($_SERVER['DOCUMENT_ROOT'] . "/projects/common/project-info.class.php");
@@ -21,4 +21,4 @@
 #$Nav->addNavSeparator("Tools",   "/tools/");
 #$Nav->addCustomNav( "About This Project", "/projects/project_summary.php?projectid=tools", "_self", 1);
 #$Nav->addCustomNav("    Charter", "/tools/eclipsetools-charter.php",   "_self", 1);
-
+$Nav = NULL;
diff --git a/downloads.php b/downloads.php
index 7bfb020..6b1a9ef 100644
--- a/downloads.php
+++ b/downloads.php
@@ -11,13 +11,13 @@
 	#
 	#
 	#****************************************************************************
-	
+
 	#
-	# Begin: page-specific settings.  Change these. 
+	# Begin: page-specific settings.  Change these.
 	$pageTitle 		= "Eclipse Tools Project";
 	$pageKeywords	= "Eclipse Tools Project";
 	$pageAuthor		= "Tools PMC";
-	
+
 	# 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");
@@ -25,8 +25,8 @@
 	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
 
 	# End: page-specific settings
-		
-	# Paste your HTML content between the EOHTML markers!	
+
+	# Paste your HTML content between the EOHTML markers!
 	$html = <<<EOHTML
 
 <div class='leftnav'>
@@ -38,10 +38,10 @@
 
 	<div class="homeitem" style="width: 75%">
 		<h3>About the Eclipse Tools Project Downloads</h3>
-      <p>The "Top Level" Tools Project itself has no "downloads", but you can see the 
-      <a href="http://projects.eclipse.org/projects/tools">individual tools projects</a> 
+      <p>The "Top Level" Tools Project itself has no "downloads", but you can see the
+      <a href="http://projects.eclipse.org/projects/tools">individual tools projects</a>
       for what downloads they provide.</p>
-            <p>If this is your first time visiting eclipse.org, you probably want to 
+            <p>If this is your first time visiting eclipse.org, you probably want to
         download a convenient "all in one" package from <a href="http://www.eclipse.org/downloads/">Eclipse Downloads</a>.
       </p>
 	</div>
diff --git a/eclipsetools-charter.php b/eclipsetools-charter.php
index 49f017b..a335dd6 100644
--- a/eclipsetools-charter.php
+++ b/eclipsetools-charter.php
@@ -1,4 +1,8 @@
-<?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  																														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();
+$Nav = NULL;
+$Menu 	= new Menu();
+include($App->getProjectCommon());
 
 	#*****************************************************************************
 	#
@@ -11,13 +15,13 @@
 	#
 	#
 	#****************************************************************************
-	
+
 	#
-	# Begin: page-specific settings.  Change these. 
+	# Begin: page-specific settings.  Change these.
 	$pageTitle 		= "Eclipse Tools Project";
 	$pageKeywords	= "Eclipse Tools Project";
 	$pageAuthor		= "Tools PMC";
-	
+
 	# 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");
@@ -25,8 +29,8 @@
 	# $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
 
 	# End: page-specific settings
-		
-	# Paste your HTML content between the EOHTML markers!	
+
+	# Paste your HTML content between the EOHTML markers!
 	$html = <<<EOHTML
 
 
@@ -73,17 +77,17 @@
   Management Committee (the &#8220;PMC&#8221;).</p>
   <p>PMCs are expected to ensure that:</p>
   <ul>
-  
+
   <li>All Projects operate effectively by providing
   leadership to guide the Project&#8217;s overall direction and by removing
   obstacles, solving problems, and resolving conflicts.</li>
-  
+
   <li>All Project plans, technical documents and reports
   are publicly available</li>
-  
+
   <li>All Projects operate using open source rules of
-  engagement: meritocracy, transparency, and open participation. 
-  These principles work together. 
+  engagement: meritocracy, transparency, and open participation.
+  These principles work together.
   Anyone can participate in a
   Project.
   This open interaction,
@@ -134,7 +138,7 @@
   members.</p>
   <p>In the unlikely event that a member of the PMC becomes disruptive to the
   process or ceases to contribute for an extended period, the member may be
-  removed by unanimous vote of remaining PMC members. 
+  removed by unanimous vote of remaining PMC members.
   PMC members may resign at any time by delivering notice of
   their resignation to the PMC Lead.</p>
   <p>The PMC is responsible for producing and maintaining the Project Charter.
diff --git a/index.php b/index.php
index f042fa9..5bf1ffc 100644
--- a/index.php
+++ b/index.php
@@ -13,7 +13,7 @@
 #****************************************************************************
 
 #
-# Begin: page-specific settings.  Change these. 
+# Begin: page-specific settings.  Change these.
 $pageTitle 		= "Eclipse Tools Project";
 $pageKeywords	= "Eclipse Tools Project";
 $pageAuthor		= "Tools PMC";
@@ -26,19 +26,19 @@
 
 # End: page-specific settings
 
-# Paste your HTML content between the EOHTML markers!	
+# Paste your HTML content between the EOHTML markers!
 $html = <<<EOHTML
 
 
 <div id="midcolumn">
   <div class='homeitem'>
      <h3>About the Eclipse Tools Project</h3>
-        <p>The Eclipse Tools Project is an open source project of the Eclipse Foundation. 
-          It is overseen 
-          by a <a href="http://projects.eclipse.org/projects/tools/developers">Project Management Committee</a> (PMC) 
-          but each project is ran relatively independently and overseen by the project's leaders. 
-          The <a href="eclipsetools-charter.php">Eclipse Tools Project Charter</a> 
-          describes the organization of the project, roles and responsibilities 
+        <p>The Eclipse Tools Project is an open source project of the Eclipse Foundation.
+          It is overseen
+          by a <a href="http://projects.eclipse.org/projects/tools/developers">Project Management Committee</a> (PMC)
+          but each project is ran relatively independently and overseen by the project's leaders.
+          The <a href="eclipsetools-charter.php">Eclipse Tools Project Charter</a>
+          describes the organization of the project, roles and responsibilities
           of the participants, and top level development process for the project.
         </p>