Bug 438205 - Convert Orbit web pages to solstice theme
diff --git a/description.php b/description.php
index b659e57..7c4eaa6 100644
--- a/description.php
+++ b/description.php
@@ -1,5 +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'
+//$Nav  = new Nav();  
+$Nav  = NULL;  
+$Menu   = new Menu();    
+include($App->getProjectCommon());
 
   #*****************************************************************************
   #
@@ -23,12 +26,6 @@
   # Paste your HTML content between the markers!  
 ob_start();
 
-  $Nav->setLinkList( array() );
-  $Nav->addNavSeparator( "Orbit", "/orbit" );
-  $Nav->addCustomNav( "About This Project",
-    "/projects/project_summary.php?projectid=tools.orbit", "", 1  );
-
-
 ?>    
 
   <div id="midcolumn">
diff --git a/documents/index.php b/documents/index.php
index c814532..3625a49 100644
--- a/documents/index.php
+++ b/documents/index.php
@@ -44,8 +44,7 @@
   </div>
 
 <?php
-  include $_SERVER['DOCUMENT_ROOT'] . "/orbit/global-links.html";
-  include "dir-links.html";
+  include "../global-links.html";
 ?>
 
 <?php
diff --git a/documents/minutes-061024.php b/documents/minutes-061024.php
index 6b9b8cf..da2abe7 100644
--- a/documents/minutes-061024.php
+++ b/documents/minutes-061024.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();  
+$Menu   = new Menu();    
+include($App->getProjectCommon());   
 
   #*****************************************************************************
   #
diff --git a/index.php b/index.php
index 627420b..5a6d1ae 100644
--- a/index.php
+++ b/index.php
@@ -1,5 +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'
+//$Nav  = new Nav();  
+$Nav = NULL;
+$Menu   = new Menu();    
+include($App->getProjectCommon());   
 
   #*****************************************************************************
   #
@@ -23,13 +26,6 @@
   # Paste your HTML content between the markers!  
 ob_start();
 
-#  $Nav->setLinkList( array() );
-#  $Nav->addNavSeparator( "Orbit", "/orbit" );
-#  $Nav->addCustomNav( "About This Project",
-#    "/projects/project_summary.php?projectid=tools.orbit", "", 1  );
-
-$Nav=NULL;
-
 ?>    
 
   <div id="midcolumn">
diff --git a/overview.php b/overview.php
index bbf3c39..5b03bf8 100644
--- a/overview.php
+++ b/overview.php
@@ -17,16 +17,7 @@
   #
   # Begin: page-specific settings.  Change these. 
   $pageTitle = "Orbit overview";
-$pageKeywords = "orbit, bundles, third party, code, equinox, osgi, framework, runtime";
-
-// 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", 3);
-// $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
-
-// End: page-specific settings
-//
+  $pageKeywords = "orbit, bundles, third party, code, equinox, osgi, framework, runtime";
 
 // Paste your HTML content between the markers!
 ob_start ();
diff --git a/resources.php b/resources.php
index 6df9fa8..c8abf51 100644
--- a/resources.php
+++ b/resources.php
@@ -4,7 +4,8 @@
 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 = new Nav ();
+$Nav = NULL;
 $Menu = new Menu ();
 include ($App->getProjectCommon ()); # All on the same line to unclutter the user's desktop'
 
@@ -93,7 +94,7 @@
             appropriate for the work being done. Please not that in
             general the code for a particular version of a library is
             held in a <b>branch</b> of the related project. This is done
-            to accomodate multiple versions of the code library. You
+            to accommodate multiple versions of the code library. You
             should ensure that you check out the correct branch for your
             needs.
           </p></td>
@@ -122,8 +123,7 @@
 </div>
 
 <?php
-  include $_SERVER['DOCUMENT_ROOT'] . "/orbit/global-links.html";
-  include "dir-links.html";
+  include "global-links.html";
 ?>
 
 <?php