Bug 451808 - Add Solstice "thin" theme to download pages

cleanup and preparation

15 files changed, 1637 insertions, 381 deletions

diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/dlconfig2.txt b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/dlconfig2.txt
deleted file mode 100644
index c597be537..000000000
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/dlconfig2.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-R, Latest Release
-S, @eclipseStreamMajor@.@eclipseStreamMinor@ Stream Stable Build
-I, @eclipseStreamMajor@.@eclipseStreamMinor@ Stream Integration Build
-N, @eclipseStreamMajor@.@eclipseStreamMinor@ Stream Nightly Build
-M, 3.7.x Stream Maintenance Build
-L, Language Pack
-X, Test Build
\ No newline at end of file
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
index 384bf916a..2a31f1c18 100644
--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/templateFiles/index.php.template
@@ -185,7 +185,7 @@ else {
 <!-- end of midcolumn div
 </div> -->
 
-<div class="homeitem3col">
+<div class="homeitem">
 <h3>Logs and Test Links</h3>
 
 <?php
@@ -281,7 +281,7 @@ else {
 
   echo "</ul>\n";
 
-//  echo "<div class=\"homeitem3col\">";
+//  echo "<div class=\"homeitem\">";
   echo "<h3>Summary of Unit Tests Results</h3>";
   echo "<table class=\"testTable\">\n";
   echo "<caption>".$boxesDisplay." of ".count($expectedTestConfigs)." integration and unit test configurations are complete.</caption> \n";
@@ -334,7 +334,7 @@ else {
 
 ?>
 
-<!-- <div class="homeitem3col"> -->
+<!-- <div class="homeitem"> -->
   <h3>Related Links</h3>
   <ul class="midlist">
     <li><a href="https://www.eclipse.org/eclipse/development/plans/eclipse_project_plan_4_4.xml#target_environments">Target Platforms and Environments</a></li>
@@ -413,7 +413,7 @@ else {
 ?>
 
 
-<!-- <div class="homeitem3col"> -->
+<!-- <div class="homeitem"> -->
 <table align="left" border="0" cellspacing="5" cellpadding="2" width="100%">
 <tr><td>
 
@@ -737,7 +737,7 @@ else {
 </tr>
 
 </table>
-</div>  <!-- end homeitem3col -->
+</div>  <!-- end homeitem -->
 <?php } ?>
 </div> <!-- end midcolumn -->
 </body>
diff --git a/production/downloadsites/eclipse/downloads/DL.footer.php.htmlORIG b/production/downloadsites/eclipse/downloads/DL.footer.php.htmlORIG
new file mode 100644
index 000000000..78395765b
--- /dev/null
+++ b/production/downloadsites/eclipse/downloads/DL.footer.php.htmlORIG
@@ -0,0 +1,80 @@
+
+</div>
+</main>
+<!-- /#main-content-container-row -->
+<p id="back-to-top">
+  <a class="visible-xs" href="#top">Back to the top</a>
+</p>
+<footer role="contentinfo">
+
+  <div class="container">
+
+    <div class="row">
+      <section id="footer-eclipse-foundation" class="col-xs-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print">
+        <h2 class="section-title">Eclipse Foundation</h2>
+        <ul class="nav">
+          <li><a href="http://eclipse.org/org/">About us</a></li>
+          <li><a href="http://eclipse.org/org/foundation/contact.php">Contact Us</a></li>
+          <li><a href="http://eclipse.org/donate">Donate</a></li>
+          <li><a href="http://eclipse.org/org/documents/">Governance</a></li>
+          <li><a href="http://eclipse.org/artwork/">Logo and Artwork</a></li>
+          <li><a href="http://eclipse.org/org/foundation/directors.php">Board of Directors</a></li>
+        </ul>
+      </section>
+      <section id="footer-legal" class="col-xs-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print ">
+        <h2 class="section-title">Legal</h2>
+        <ul class="nav">
+          <li><a href="http://eclipse.org/legal/privacy.php">Privacy Policy</a></li>
+          <li><a href="http://eclipse.org/legal/termsofuse.php">Terms of Use</a></li>
+          <li><a href="http://eclipse.org/legal/copyright.php">Copyright Agent</a></li>
+          <li><a href="http://eclipse.org/org/documents/epl-v10.php">Eclipse Public License </a></li>
+          <li><a href="http://eclipse.org/legal/">Legal Resources </a></li>
+
+        </ul>
+      </section>
+
+      <section id="footer-useful-links" class="col-xs-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print">
+        <h2 class="section-title">Useful Links</h2>
+        <ul class="nav">
+          <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
+          <li><a href="//help.eclipse.org/">Documentation</a></li>
+          <li><a href="http://eclipse.org/contribute/">How to Contribute</a></li>
+          <li><a href="http://eclipse.org/mail/">Mailing Lists</a></li>
+          <li><a href="http://eclipse.org/forums/">Forums</a></li>
+          <li><a href="//marketplace.eclipse.org">Marketplace</a></li>
+        </ul>
+      </section>
+
+      <section id="footer-other" class="col-xs-offset-1 col-xs-11 col-sm-7 col-md-6 col-md-offset-0 hidden-print">
+
+        <h2 class="section-title">Other</h2>
+        <ul class="nav">
+          <li><a href="http://eclipse.org/ide/">IDE and Tools</a></li>
+          <li><a href="http://eclipse.org/projects">Community of Projects</a></li>
+          <li><a href="http://eclipse.org/org/workinggroups/">Working Groups</a></li>
+        </ul>
+
+        <ul class="list-inline social-media">
+          <li><a href="https://twitter.com/EclipseFdn"><i class="fa fa-twitter-square"></i></a></li>
+          <li><a href="https://plus.google.com/+Eclipse"><i class="fa fa-google-plus-square"></i></a></li>
+          <li><a href="https://www.facebook.com/eclipse.org"><i class="fa fa-facebook-square"></i> </a></li>
+          <li><a href="https://www.youtube.com/user/EclipseFdn"><i class="fa fa-youtube-square"></i></a></li>
+        </ul>
+
+      </section>
+      <div id="copyright" class="col-xs-offset-1 col-sm-14 col-md-24 col-md-offset-0">
+        <div>
+          <span class="hidden-print"><img src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-logo-bw-800x188.png" alt="Eclipse.org black and white logo" width="166" height="39"
+            id="logo-eclipse-white" /></span>
+          <p id="copyright-text">Copyright &copy; 2014 The Eclipse Foundation. All Rights Reserved.</p>
+        </div>
+      </div>
+      <a href="#" class="scrollup">Back to the top</a>
+    </div>
+  </div>
+</footer>
+
+<!-- Placed at the end of the document so the pages load faster -->
+<script src="/eclipse.org-common/themes/solstice/public/javascript/main.min.js"></script>
+</body>
+</html>
diff --git a/production/downloadsites/eclipse/downloads/DL.header.php.html b/production/downloadsites/eclipse/downloads/DL.header.php.html
index a360d56a9..dd21c4449 100644
--- a/production/downloadsites/eclipse/downloads/DL.header.php.html
+++ b/production/downloadsites/eclipse/downloads/DL.header.php.html
@@ -1,70 +1,75 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-<meta charset="utf-8">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="author" content="Christopher Guindon" />
-<meta name="keywords" content="eclipse.org, Eclipse Foundation" />
-<link href="//fonts.googleapis.com/css?family=Open+Sans:400,700,300,600,100" rel="stylesheet" type="text/css">
-<link rel="shortcut icon" href="/eclipse.org-common/themes/solstice/public/images/favicon.ico" />
-<title><?php echo $pageTitle;?></title>
-<meta property="og:title" content="" />
-<meta property="og:description"
-  content="Eclipse is probably best known as a Java IDE, but it is more: it is an IDE framework, a tools framework, an open source project, a community, an eco-system, and a foundation." />
-<meta property="og:image" content="https://www.eclipse.org/eclipse.org-common/themes/Nova/images/eclipse.png" />
-
-<link rel="stylesheet" href="/eclipse.org-common/themes/solstice/public/stylesheets/styles.min.css">
-
-<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-<!--[if lt IE 9]>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="author" content="Christopher Guindon" />
+    <meta name="keywords" content="eclipse.org, Eclipse Foundation" />
+    <link href="//fonts.googleapis.com/css?family=Open+Sans:400,700,300,600,100" rel="stylesheet" type="text/css">
+    <link rel="shortcut icon" href="/eclipse.org-common/themes/solstice/public/images/favicon.ico" />
+    <title><?php echo $pageTitle;?></title>
+    <meta property="og:title" content="" />
+    <meta property="og:description"
+    content="Eclipse is probably best known as a Java IDE, but it is more: it is an IDE framework, a tools framework, an open source project, a community, an eco-system, and a foundation." />
+    <meta property="og:image" content="https://www.eclipse.org/eclipse.org-common/themes/Nova/images/eclipse.png" />
+
+    <link rel="stylesheet" href="/eclipse.org-common/themes/solstice/public/stylesheets/styles.min.css">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
     <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
 
-<style>
-td, th {
-  padding: 5px;
-  text-align: left;
-  vertical-align: top;
-}
-
-table.downloads {
-  /* font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; */
-  width: 100%;
-  border-collapse: separate;
-  *border-collapse: expression('separate', cellSpacing = '1px');
-}
-
-td.latest {
-  width: 100%;
-  background-color: #3b335a;
-  color: #FFFFFF;
-}
-
-td.main {
-  width: 100%;
-  background-color: #76708C;
-  color: #FFFFFF;
-}
-
-td.name, th.name {
-  width: 15%;
-}
-
-td.status, th.status {
-  width: 25%;
-}
-
-td.date, th.date {
-  width: 40%;
-}
-</style>
-
-</head>
-<body class="" id="body_solstice">
-  <a class="sr-only" href="#content">Skip to main content</a>
-  <header role="banner">
+    <style>
+      td, th 
+      {
+        padding: 5px;
+        text-align: left;
+        vertical-align: top;
+      }
+      table.downloads
+      {
+        /* font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; */
+        width: 100%;
+        border-collapse: separate;
+        *border-collapse: expression('separate', cellSpacing = '1px');
+      }
+
+      td.latest
+      {
+        width: 100%;
+        background-color: #3b335a;
+        color: #FFFFFF;
+      }
+      td.main
+      {
+        width: 100%;
+        background-color: #76708C;
+        color: #FFFFFF;
+      }
+      td.name, th.name 
+      {
+        width:15%;
+      }
+
+      td.status, th.status 
+      {
+        width:25%;
+      }
+
+      td.date, th.date 
+      {
+        width:40%;
+      }
+
+    </style>
+
+  </head>
+  <body class="" id="body_solstice">
+    <a class="sr-only" href="#content">Skip to main content</a>
+    <header role="banner">
     <div class="container">
 
       <div id="row-toolbar" class="text-right hidden-print">
@@ -83,9 +88,7 @@ td.date, th.date {
         <div id="header-left" class="col-sm-14 col-md-16 col-lg-19">
           <div class="row">
             <div class="hidden-xs">
-              <a href="http://eclipse.org/"><img
-                src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png" alt="Eclipse.org logo"
-                class="logo-eclipse-default img-responsive" /></a>
+              <a href="http://eclipse.org/"><img src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png" alt="Eclipse.org logo" class="logo-eclipse-default img-responsive" /></a>
             </div>
             <div id="main-menu" class="navbar row yamm">
               <div id="navbar-collapse-1" class="navbar-collapse collapse">
@@ -93,88 +96,82 @@ td.date, th.date {
                   <li><a href="http://eclipse.org/users/" target="_self">Getting Started </a></li>
                   <li><a href="http://eclipse.org/membership/" target="_self">Members</a></li>
                   <li><a href="http://eclipse.org/projects/" target="_self">Projects</a></li>
-                  <li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Community <b
-                      class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                      <li><a href="http://marketplace.eclipse.org">Marketplace</a></li>
-                      <li><a href="http://events.eclipse.org">Events</a></li>
-                      <li><a href="//www.planeteclipse.org/">Planet Eclipse</a></li>
-                      <li><a href="http://eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
-                      <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
-                    </ul></li>
-                  <li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Participate <b
-                      class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                      <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
-                      <li><a href="http://eclipse.org/forums/">Forums</a></li>
-                      <li><a href="http://eclipse.org/mail/">Mailing Lists</a></li>
-                      <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
-                      <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                      <li><a href="http://eclipse.org/contribute/">How to Contribute</a></li>
-                    </ul></li>
-                  <li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Working Groups
-                      <b class="caret"></b>
-                  </a>
-                    <ul class="dropdown-menu">
-                      <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                      <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                      <li><a href="http://locationtech.org">LocationTech</a></li>
-                      <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                      <li><a href="http://polarsys.org">PolarSys</a></li>
-                      <li><a href="http://science.eclipse.org">Science</a></li>
-                    </ul></li>
+                  <li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Community <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="http://marketplace.eclipse.org">Marketplace</a></li>
+                    <li><a href="http://events.eclipse.org">Events</a></li>
+                    <li><a href="//www.planeteclipse.org/">Planet Eclipse</a></li>
+                    <li><a href="http://eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
+                    <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                  </ul></li>
+                  <li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Participate <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
+                    <li><a href="http://eclipse.org/forums/">Forums</a></li>
+                    <li><a href="http://eclipse.org/mail/">Mailing Lists</a></li>
+                    <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
+                    <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
+                    <li><a href="http://eclipse.org/contribute/">How to Contribute</a></li>
+                  </ul></li>
+                  <li class="dropdown visible-xs"><a href="#" data-toggle="dropdown" class="dropdown-toggle">Working Groups <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
+                    <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
+                    <li><a href="http://locationtech.org">LocationTech</a></li>
+                    <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
+                    <li><a href="http://polarsys.org">PolarSys</a></li>
+                    <li><a href="http://science.eclipse.org">Science</a></li>
+                  </ul></li>
                   <!-- More -->
                   <li class="dropdown hidden-xs"><a data-toggle="dropdown" class="dropdown-toggle">More<b class="caret"></b></a>
-                    <ul class="dropdown-menu">
-                      <li>
-                        <!-- Content container to add padding -->
-                        <div class="yamm-content">
-                          <div class="row">
-                            <ul class="col-sm-8 list-unstyled">
-                              <li><p>
-                                  <strong>Community</strong>
-                                </p></li>
-                              <li><a href="http://marketplace.eclipse.org">Marketplace</a></li>
-                              <li><a href="http://events.eclipse.org">Events</a></li>
-                              <li><a href="//www.planeteclipse.org/">Planet Eclipse</a></li>
-                              <li><a href="http://eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
-                              <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
-                            </ul>
-                            <ul class="col-sm-8 list-unstyled">
-                              <li><p>
-                                  <strong>Participate</strong>
-                                </p></li>
-                              <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
-                              <li><a href="http://eclipse.org/forums/">Forums</a></li>
-                              <li><a href="http://eclipse.org/mail/">Mailing Lists</a></li>
-                              <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
-                              <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
-                              <li><a href="http://eclipse.org/contribute/">How to Contribute</a></li>
-                            </ul>
-                            <ul class="col-sm-8 list-unstyled">
-                              <li><p>
-                                  <strong>Working Groups</strong>
-                                </p></li>
-                              <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
-                              <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
-                              <li><a href="http://locationtech.org">LocationTech</a></li>
-                              <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
-                              <li><a href="http://polarsys.org">PolarSys</a></li>
-                              <li><a href="http://science.eclipse.org">Science</a></li>
-                            </ul>
-                          </div>
-                        </div>
-                      </li>
-                    </ul></li>
+                  <ul class="dropdown-menu">
+                    <li>
+                    <!-- Content container to add padding -->
+                    <div class="yamm-content">
+                      <div class="row">
+                        <ul class="col-sm-8 list-unstyled">
+                          <li><p>
+                          <strong>Community</strong>
+                          </p></li>
+                          <li><a href="http://marketplace.eclipse.org">Marketplace</a></li>
+                          <li><a href="http://events.eclipse.org">Events</a></li>
+                          <li><a href="//www.planeteclipse.org/">Planet Eclipse</a></li>
+                          <li><a href="http://eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
+                          <li><a href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                        </ul>
+                        <ul class="col-sm-8 list-unstyled">
+                          <li><p>
+                          <strong>Participate</strong>
+                          </p></li>
+                          <li><a href="https://bugs.eclipse.org/bugs/">Report a Bug</a></li>
+                          <li><a href="http://eclipse.org/forums/">Forums</a></li>
+                          <li><a href="http://eclipse.org/mail/">Mailing Lists</a></li>
+                          <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
+                          <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
+                          <li><a href="http://eclipse.org/contribute/">How to Contribute</a></li>
+                        </ul>
+                        <ul class="col-sm-8 list-unstyled">
+                          <li><p>
+                          <strong>Working Groups</strong>
+                          </p></li>
+                          <li><a href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
+                          <li><a href="http://iot.eclipse.org">Internet of Things</a></li>
+                          <li><a href="http://locationtech.org">LocationTech</a></li>
+                          <li><a href="http://lts.eclipse.org">Long-Term Support</a></li>
+                          <li><a href="http://polarsys.org">PolarSys</a></li>
+                          <li><a href="http://science.eclipse.org">Science</a></li>
+                        </ul>
+                      </div>
+                    </div>
+                    </li>
+                  </ul></li>
                 </ul>
               </div>
               <div class="navbar-header">
                 <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
-                  <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span
-                    class="icon-bar"></span> <span class="icon-bar"></span>
+                  <span class="sr-only">Toggle navigation</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span>
                 </button>
-                <a href="http://eclipse.org/" class="navbar-brand visible-xs"><img
-                  src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png" alt="Eclipse.org logo"
+                <a href="http://eclipse.org/" class="navbar-brand visible-xs"><img src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png" alt="Eclipse.org logo"
                   width="174" class="logo-eclipse-default" /></a>
               </div>
             </div>
@@ -184,9 +181,8 @@ td.date, th.date {
           <div id="header-right-container">
             <div id="custom-search-form">
               <form action="//www.google.com/cse" id="form-eclipse-search" role="form" class="input-group">
-                <input type="hidden" name="cx" value="017941334893793413703:sqfrdtd112s" /> <input id="search-box"
-                  placeholder="Search eclipse.org" type="text" name="q" size="25" class="form-control" /> <span
-                  class="input-group-btn">
+                <input type="hidden" name="cx" value="017941334893793413703:sqfrdtd112s" /> <input id="search-box" placeholder="Search eclipse.org" type="text" name="q" size="25" class="form-control" />
+                <span class="input-group-btn">
                   <button class="btn btn-default" type="submit">
                     <i class="fa fa-search"></i>
                   </button>
@@ -195,18 +191,16 @@ td.date, th.date {
             </div>
             <!-- /input-group -->
 
-            <script type="text/javascript"
-              src="//www.google.com/coop/cse/brand?form=searchbox_017941334893793413703%3Asqfrdtd112s&amp;lang=en"></script>
-            <a id="btn-call-for-action" href="http://eclipse.org/downloads/" class="btn btn-huge btn-warning"><i
-              class="fa fa-download"></i> Packages</a>
+            <script type="text/javascript" src="//www.google.com/coop/cse/brand?form=searchbox_017941334893793413703%3Asqfrdtd112s&amp;lang=en"></script>
+            <a id="btn-call-for-action" href="http://eclipse.org/downloads/" class="btn btn-huge btn-warning"><i class="fa fa-download"></i> Packages</a>
           </div>
         </div>
 
       </div>
 
     </div>
-  </header>
-  <section id="breadcrumb" class="defaut-breadcrumbs hidden-print">
+    </header>
+    <section id="breadcrumb" class="defaut-breadcrumbs hidden-print">
     <div class="container">
       <ol class="breadcrumb">
         <li><a href="http://www.eclipse.org/">Home</a></li>
@@ -215,6 +209,6 @@ td.date, th.date {
         <li class="active">Download</li>
       </ol>
     </div>
-  </section>
-  <main role="main">
-  <div class="container background-image-none" id="novaContent">
\ No newline at end of file
+    </section>
+    <main role="main">
+    <div class="container background-image-none" id="novaContent" >
diff --git a/production/downloadsites/eclipse/downloads/DL.thin.header.php.html b/production/downloadsites/eclipse/downloads/DL.thin.header.php.html
new file mode 100644
index 000000000..b32ddc67a
--- /dev/null
+++ b/production/downloadsites/eclipse/downloads/DL.thin.header.php.html
@@ -0,0 +1,251 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="author" content="$pageAuthor" />
+    <meta name="keywords" content="$pageKeywords" />
+    <link
+    href="//fonts.googleapis.com/css?family=Open+Sans:400,700,300,600,100"
+    rel="stylesheet" type="text/css">
+    <link rel="shortcut icon"
+    href="/eclipse.org-common/themes/solstice/public/images/favicon.ico" />
+    <title><?= $pageTitle;?></title>
+    <meta property="og:title" content="<?= $pageTitle;?>" />
+    <meta property="og:description"
+    content="Eclipse is probably best known as a Java IDE, but it is more: it is an IDE framework, a tools framework, an open source project, a community, an eco-system, and a foundation." />
+    <meta property="og:image"
+    content="https://www.eclipse.org/eclipse.org-common/themes/Nova/images/eclipse.png" />
+
+    <link rel="stylesheet"
+    href="/eclipse.org-common/themes/solstice/public/stylesheets/styles.min.css">
+
+    <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+    <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
+    <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <style>
+      td, th {
+        line-height: 0.8;
+        padding: 5px;
+        text-align: left;
+        vertical-align: middle;
+      }
+
+      table.downloads {
+        /* font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; */
+        width: 100%;
+        border-collapse: separate;
+        border-spacing: 1px;
+        *border-collapse: expression('separate', cellSpacing = '1px');
+      }
+
+      td.latest {
+        width: 100%;
+        background-color: #3b335a;
+        color: #FFFFFF;
+      }
+
+      td.main {
+        width: 100%;
+        background-color: #76708C;
+        color: #FFFFFF;
+      }
+
+      td.name, th.name {
+        width: 15%;
+        vertical-align: middle;
+      }
+
+      td.status, th.status {
+        width: 25%;
+        vertical-align: middle;
+      }
+
+      td.date, th.date {
+        width: 40%;
+        vertical-align: middle;
+      }
+    </style>
+
+  </head>
+  <body class="" id="body_solstice">
+    <a class="sr-only" href="#content">Skip to main content</a>
+    <div class="thin-header">
+      <header role="banner">
+      <div class="container">
+        <div id="row-logo-search">
+          <div id="header-left">
+            <div class="row">
+              <div class="hidden-xs col-sm-6">
+                <a href="https://eclipse.org/"><img
+                  src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png"
+                  alt="Eclipse.org logo" class="logo-eclipse-default" /></a>
+              </div>
+              <div id="main-menu" class="navbar col-sm-18 yamm">
+                <div id="navbar-collapse-1"
+                  class="navbar-collapse collapse">
+                  <ul class="nav navbar-nav">
+                    <li class="visible-thin"><a
+                      href="https://eclipse.org/downloads/"
+                      target="_self">Packages</a></li>
+                    <li><a href="https://eclipse.org/users/"
+                      target="_self">Getting Started </a></li>
+                    <li><a href="https://eclipse.org/membership/"
+                      target="_self">Members</a></li>
+                    <li><a href="https://eclipse.org/projects/"
+                      target="_self">Projects</a></li>
+                    <li class="dropdown visible-xs"><a href="#"
+                      data-toggle="dropdown" class="dropdown-toggle">Community
+                      <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                      <li><a
+                        href="http://marketplace.eclipse.org">Marketplace</a></li>
+                      <li><a href="http://events.eclipse.org">Events</a></li>
+                      <li><a href="http://www.planeteclipse.org/">Planet
+                        Eclipse</a></li>
+                      <li><a
+                        href="https://eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
+                      <li><a
+                        href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                    </ul></li>
+                    <li class="dropdown visible-xs"><a href="#"
+                      data-toggle="dropdown" class="dropdown-toggle">Participate
+                      <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                      <li><a
+                        href="https://bugs.eclipse.org/bugs/">Report
+                        a Bug</a></li>
+                      <li><a href="https://eclipse.org/forums/">Forums</a></li>
+                      <li><a href="https://eclipse.org/mail/">Mailing
+                        Lists</a></li>
+                      <li><a href="https://wiki.eclipse.org/">Wiki</a></li>
+                      <li><a href="https://wiki.eclipse.org/IRC">IRC</a></li>
+                      <li><a
+                        href="https://eclipse.org/contribute/">How
+                        to Contribute</a></li>
+                    </ul></li>
+                    <li class="dropdown visible-xs"><a href="#"
+                      data-toggle="dropdown" class="dropdown-toggle">Working
+                      Groups <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu">
+                      <li><a
+                        href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
+                      <li><a href="http://iot.eclipse.org">Internet
+                        of Things</a></li>
+                      <li><a href="http://locationtech.org">LocationTech</a></li>
+                      <li><a href="http://lts.eclipse.org">Long-Term
+                        Support</a></li>
+                      <li><a href="http://polarsys.org">PolarSys</a></li>
+                      <li><a href="http://science.eclipse.org">Science</a></li>
+                    </ul></li>
+                    <!-- More -->
+                    <li class="dropdown hidden-xs"><a
+                      data-toggle="dropdown" class="dropdown-toggle">More<b
+                        class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                      <li>
+                      <!-- Content container to add padding -->
+                      <div class="yamm-content">
+                        <div class="row">
+                          <ul class="col-sm-8 list-unstyled">
+                            <li><p>
+                            <strong>Community</strong>
+                            </p></li>
+                            <li><a
+                              href="http://marketplace.eclipse.org">Marketplace</a></li>
+                            <li><a
+                              href="http://events.eclipse.org">Events</a></li>
+                            <li><a
+                              href="http://www.planeteclipse.org/">Planet
+                              Eclipse</a></li>
+                            <li><a
+                              href="https://eclipse.org/community/eclipse_newsletter/">Newsletter</a></li>
+                            <li><a
+                              href="https://www.youtube.com/user/EclipseFdn">Videos</a></li>
+                          </ul>
+                          <ul class="col-sm-8 list-unstyled">
+                            <li><p>
+                            <strong>Participate</strong>
+                            </p></li>
+                            <li><a
+                              href="https://bugs.eclipse.org/bugs/">Report
+                              a Bug</a></li>
+                            <li><a
+                              href="https://eclipse.org/forums/">Forums</a></li>
+                            <li><a
+                              href="https://eclipse.org/mail/">Mailing
+                              Lists</a></li>
+                            <li><a
+                              href="https://wiki.eclipse.org/">Wiki</a></li>
+                            <li><a
+                              href="https://wiki.eclipse.org/IRC">IRC</a></li>
+                            <li><a
+                              href="https://eclipse.org/contribute/">How
+                              to Contribute</a></li>
+                          </ul>
+                          <ul class="col-sm-8 list-unstyled">
+                            <li><p>
+                            <strong>Working Groups</strong>
+                            </p></li>
+                            <li><a
+                              href="http://wiki.eclipse.org/Auto_IWG">Automotive</a></li>
+                            <li><a
+                              href="http://iot.eclipse.org">Internet
+                              of Things</a></li>
+                            <li><a
+                              href="http://locationtech.org">LocationTech</a></li>
+                            <li><a
+                              href="http://lts.eclipse.org">Long-Term
+                              Support</a></li>
+                            <li><a href="http://polarsys.org">PolarSys</a></li>
+                            <li><a
+                              href="http://science.eclipse.org">Science</a></li>
+                          </ul>
+                        </div>
+                      </div>
+                      </li>
+                    </ul>
+                    </li>
+                  </ul>
+                </div>
+                <div class="navbar-header">
+                  <button type="button" class="navbar-toggle"
+                    data-toggle="collapse"
+                    data-target="#navbar-collapse-1">
+                    <span class="sr-only">Toggle navigation</span> <span
+                      class="icon-bar"></span> <span class="icon-bar"></span>
+                    <span class="icon-bar"></span> <span
+                      class="icon-bar"></span>
+                  </button>
+                  <a href="https://eclipse.org/"
+                    class="navbar-brand visible-xs"><img
+                    src="/eclipse.org-common/themes/solstice/public/images/logo/eclipse-800x188.png"
+                    alt="Eclipse.org logo" width="174"
+                    class="logo-eclipse-default" /></a>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      </header>
+      <section id="breadcrumb" class="defaut-breadcrumbs hidden-print">
+      <div class="container">
+        <ol class="breadcrumb">
+          <li><a href="https://www.eclipse.org/">Home</a></li>
+          <li><a href="https://eclipse.org/projects/">Projects</a></li>
+          <li><a href="http://eclipse.org/eclipse/">Eclipse</a></li>
+          <li class="active">Downloads</li>
+        </ol>
+      </div>
+      </section>
+    </div>
+    <main role="main">
+    <div class="container background-image-none" id="novaContent">
diff --git a/production/downloadsites/eclipse/downloads/build_types.html b/production/downloadsites/eclipse/downloads/build_types.html
index ce45b9d92..932874717 100644
--- a/production/downloadsites/eclipse/downloads/build_types.html
+++ b/production/downloadsites/eclipse/downloads/build_types.html
@@ -8,74 +8,118 @@
 <meta name="description" content="Eclipse Project Build Types">
 <meta name="author" content="David Williams">
 </head>
-<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b" alink="#ff0000">
-  <table border=0 cellspacing=5 cellpadding=2 width="100%">
+<body text="#000000" bgcolor="#ffffff" link="#0000ee" vlink="#551a8b"
+  alink="#ff0000">
+  <table border="0" cellspacing="5" cellpadding="2" width="100%">
     <tr>
-      <td align=left valign=top colspan="2" bgcolor="#0080c0"><b><font face="Arial,Helvetica" color="#ffffff">Eclipse
-            Project Build Types</font></b></td>
+      <td align="left" valign="top" colspan="2" bgcolor="#0080c0"><b><font
+          face="Arial,Helvetica" color="#ffffff">Eclipse Project
+            Build Types</font></b></td>
     </tr>
     <tr>
-      <td align=right valign=top><img src="../images/Adarrow.gif" border=0 height=16 width=16></td>
+      <td align="right" valign="top"><img
+        src="../images/Adarrow.gif" border="0" height="16" width="16"
+        alt=""></td>
       <td>
         <p>
-          <b><font face="arial,helvetica,geneva" size="-1">Releases</font></b> <br> <font size="-1"
-            face="arial,helvetica,geneva"> </font>Releases are builds that have been declared major releases by the development team
-          - for example &quot;R1.0&quot;. Releases are the right builds for people who want to be on a stable, tested release, and
-          don't need the latest greatest features and improvements. Release builds always have an &quot;R&quot; at the beginning of
-          the name i.e. R1.0, R2.0 etc. Non-release <font size="-1" face="arial,helvetica,geneva"> builds are named according
-            to the date of the build - for example 20011027 is the build from Oct 27, 2001.</font><br>
+          <b><font face="arial,helvetica,geneva" size="-1">Releases</font></b>
+          <br><font size="-1" face="arial,helvetica,geneva">
+          </font>Releases are builds that have been declared major releases by
+          the development team - for example &quot;R1.0&quot;. Releases
+          are the right builds for people who want to be on a stable,
+          tested release, and don't need the latest greatest features
+          and improvements. Release builds always have an &quot;R&quot;
+          at the beginning of the name i.e. R1.0, R2.0 etc. Non-release
+          <font size="-1" face="arial,helvetica,geneva"> builds
+            are named according to the date of the build - for example
+            20011027 is the build from Oct 27, 2001.</font><br>
         </p>
       </td>
     </tr>
     <tr>
-      <td align=right valign=top><img src="../images/Adarrow.gif" border=0 height=16 width=16></td>
-      <td><b><font face="arial,helvetica,geneva" size="-1">Stable Builds</font></b> <br> <font size="-1"
-        face="arial,helvetica,geneva"> Stable builds are integration builds that have been found to be stable enough for most
-          people to use. They are promoted from integration build to stable build by the architecture team after they have been used
-          for a few days and deemed reasonably stable. The latest stable build is the right build for people who want to stay up to
-          date with what is going on in the latest development stream, and don't mind putting up with a few problems n in order to
-          get the latest greatest features and bug fixes. The latest stable build is the one the development team likes people to be
-          using, because of the valuable and timely feedback. </font></td>
+      <td align="right" valign="top"><img
+        src="../images/Adarrow.gif" border="0" height="16" width="16"
+        alt=""></td>
+      <td><b><font face="arial,helvetica,geneva" size="-1">Stable
+            Builds</font></b> <br> <font size="-1"
+        face="arial,helvetica,geneva"> Stable builds are
+          integration builds that have been found to be stable enough
+          for most people to use. They are promoted from integration
+          build to stable build by the architecture team after they have
+          been used for a few days and deemed reasonably stable. The
+          latest stable build is the right build for people who want to
+          stay up to date with what is going on in the latest
+          development stream, and don't mind putting up with a few
+          problems n in order to get the latest greatest features and
+          bug fixes. The latest stable build is the one the development
+          team likes people to be using, because of the valuable and
+          timely feedback. </font></td>
     </tr>
     <tr>
-      <td align=right valign=top><img src="../images/Adarrow.gif" border=0 height=16 width=16></td>
+      <td align="right" valign="top"><img
+        src="../images/Adarrow.gif" border="0" height="16" width="16"
+        alt=""></td>
       <td>
         <p>
-          <b><font face="arial,helvetica,geneva" size="-1">Integration Builds</font></b> <br> <font size="-1"
-            face="arial,helvetica,geneva"> Periodically, component teams version off their work in what they believe is a
-            stable, consistent state, and they update the build configuration to indicate that the next integration build should
-            take this version of the component. Integration builds are built from these stable component versions that have been
-            specified by each component team as the best version available. Integration builds may be promoted to stable builds
-            after a few days of testing. Integration builds are built whenever new stable component versions are released into the
-            build.</font>
+          <b><font face="arial,helvetica,geneva" size="-1">Integration
+              Builds</font></b> <br> <font size="-1"
+            face="arial,helvetica,geneva"> Periodically,
+            component teams version off their work in what they believe
+            is a stable, consistent state, and they update the build
+            configuration to indicate that the next integration build
+            should take this version of the component. Integration
+            builds are built from these stable component versions that
+            have been specified by each component team as the best
+            version available. Integration builds may be promoted to
+            stable builds after a few days of testing. Integration
+            builds are built whenever new stable component versions are
+            released into the build.</font>
         </p>
       </td>
     </tr>
-    <TR>
-      <TD ALIGN=right VALIGN=top><IMG SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD>
-      <TD><B><FONT FACE="arial,helvetica,geneva" SIZE="-1">Nightly Builds</FONT></B><BR> <FONT SIZE="-1"
-        FACE="arial,helvetica,geneva"> Nightly builds are produced every night from whatever has been released into the
-          master branch of the Git repository. They are completely untested and will almost always have major problems. Many will
-          not work at all. These drops are normally only useful to developers actually working on the Eclipse Project. Because
-          nightly builds are produced in a different way from integration builds, bundles from nightly builds should not be mixed
-          with bundles from other types of builds. </FONT></TD>
-    </TR>
-    <TR>
-      <TD ALIGN=right VALIGN=top><IMG SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD>
-      <TD><B><FONT FACE="arial,helvetica,geneva" SIZE="-1">Maintenance Builds</FONT></B><BR> <FONT SIZE="-1"
-        FACE="arial,helvetica,geneva"> Maintenance builds are produced periodically to incorporate fixes into an existing
-          release. They are typically built from tagged plug-in and feature pojects in a maintenance branch of the Git repository
-          (i.e. R3_7_maintenance). Maintenance builds are promoted to a minor or service release (i.e. R3.7 or R3.7.1) after
-          development teams have deemed one to be stable following one or more test-fix pass cycles. </FONT></TD>
-    </TR>
-    <TR>
-      <TD ALIGN=right VALIGN=top><IMG SRC="../images/Adarrow.gif" BORDER=0 HEIGHT=16 WIDTH=16></TD>
-      <TD><B><FONT FACE="arial,helvetica,geneva" SIZE="-1">Patch Builds</FONT></B><BR> <FONT SIZE="-1"
-        FACE="arial,helvetica,geneva"> Patch builds are produced rarely, but occasionally, to incorporate important fixes
-          into an existing release, or perhaps even new features. They are intended to apply to only one specific release with the
-          fixes or features being included in the next release. </FONT></TD>
-    </TR>
+    <tr>
+      <td align="right" valign="top"><img
+        src="../images/Adarrow.gif" border="0" height="16" width="16"
+        alt=""></td>
+      <td><b><font face="arial,helvetica,geneva" size="-1">Nightly
+            Builds</font></b><br> <font size="-1"
+        face="arial,helvetica,geneva"> Nightly builds are
+          produced every night from whatever has been released into the
+          master branch of the Git repository. They are completely
+          untested and will almost always have major problems. Many will
+          not work at all. These drops are normally only useful to
+          developers actually working on the Eclipse Project. Because
+          nightly builds are produced in a different way from
+          integration builds, bundles from nightly builds should not be
+          mixed with bundles from other types of builds. </font></td>
+    </tr>
+    <tr>
+      <td align="right" valign="top"><img
+        src="../images/Adarrow.gif" border="0" height="16" width="16"
+        alt=""></td>
+      <td><b><font face="arial,helvetica,geneva" size="-1">Maintenance
+            Builds</font></b><br> <font size="-1"
+        face="arial,helvetica,geneva"> Maintenance builds are
+          produced periodically to incorporate fixes into an existing
+          release. They are typically built from tagged plug-in and
+          feature pojects in a maintenance branch of the Git repository
+          (i.e. R3_7_maintenance). Maintenance builds are promoted to a
+          minor or service release (i.e. R3.7 or R3.7.1) after
+          development teams have deemed one to be stable following one
+          or more test-fix pass cycles. </font></td>
+    </tr>
+    <tr>
+      <td align="right" valign="top"><img
+        src="../images/Adarrow.gif" border="0" height="16" width="16"
+        alt=""></td>
+      <td><b><font face="arial,helvetica,geneva" size="-1">Patch
+            Builds</font></b><br> <font size="-1"
+        face="arial,helvetica,geneva"> Patch builds are produced
+          rarely, but occasionally, to incorporate important fixes into
+          an existing release, or perhaps even new features. They are
+          intended to apply to only one specific release with the fixes
+          or features being included in the next release. </font></td>
+    </tr>
   </table>
-  <h3>&nbsp;</h3>
 </body>
 </html>
diff --git a/production/downloadsites/eclipse/downloads/createIndex3x.php b/production/downloadsites/eclipse/downloads/createIndex3x.php
deleted file mode 100644
index 1c38fce89..000000000
--- a/production/downloadsites/eclipse/downloads/createIndex3x.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-# Begin: page-specific settings.  Change these.
-$pageTitle    = "Eclipse Project Downloads";
-$pageKeywords = "";
-$pageAuthor   = "";
-
-//ini_set("display_errors", "true");
-//error_reporting (E_ALL);
-$eclipseStream="3";
-$otherIndexFile="index.html";
-$otherStream="4";
-include('dlconfig3.php');
-$subdirDrops="drops";
-
-# Use the basic white layout if the file is not hosted on download.eclipse.org
-$layout = (array_key_exists("SERVER_NAME", $_SERVER) && ($_SERVER['SERVER_NAME'] == "download.eclipse.org")) ? "default" : "html";
-
-ob_start();
-
-switch($layout){
-case 'html':
-  #If this file is not on download.eclipse.org print the legacy headers.?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="stylesheet" href="../default_style.css" />
-<title><?php echo $pageTitle;?></title>
-<!--
-note, for Nova (default) secion below, this 'refresh'
-header is hadded 'by hand' after nova version is created ...
-since it generates its own 'header section'
--->
-<meta http-equiv="refresh" content="10; URL=index.html">
-</head>
-<body><?php
-    break;
-default:
-  #Otherwise use the default layout (content printed inside the nova theme).
-  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();
-  break;
-}?>
-<div class="container_<?php echo $layout;?>">
-<table border="0" cellspacing="5" cellpadding="2" width="100%" >
-
-<tr>
-
-<td align="left">
-<font class="indextop"><br /> Eclipse Project <?php echo $eclipseStream;?>.x Stream Downloads</font> <br />
-<br />
-</td>
-
-</tr>
-
-</table>
-
-<table border="0" cellspacing="5" cellpadding="2" width="100%" >
-<tr>
-<td align="left" valign="top" colspan="2" bgcolor="#0080C0"><font color="#FFFFFF" face="Arial,Helvetica">3.8.x
-Downloads</font></td></tr> <!-- The Eclipse Projects --> <tr> <td>
-
-<p>The build that used to be here has been moved to
-<a href="http://archive.eclipse.org/eclipse/downloads/">archived builds</a>.
-Specifically, for the last 3.8.x build see the <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/">3.8.2 build</a> there.</p>
-
-<p>You should be re-directed within 10 seconds to the page for
-<a href="http://download.eclipse.org/eclipse/downloads/">the most recent Eclipse builds</a>. If not,
-simply click on the link. Please update your bookmarks.</p>
-
-<p>This page
-has been left in place for now, in case some have it bookmarked, but soon this
-page itself will be removed (so update your bookmarks, as well as your build scripts, if needed).</p>
-
-</td></tr>
-</table>
-
-<?php
-
-  echo '</div>';
-$html = ob_get_clean();
-
-switch($layout){
-case 'html':
-  #echo the computed content with the body and html closing tag. This is for the old layout.
-  echo $html;
-  echo '</body>';
-  echo '</html>';
-  break;
-
-default:
-  #For the default view we use $App->generatePage to generate the page inside nova.
-  $App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />');
-  $App->Promotion = FALSE;
-  $App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html);
-  break;
-}
-
diff --git a/production/downloadsites/eclipse/downloads/createIndex4x.php b/production/downloadsites/eclipse/downloads/createIndex4x.php
index 845a8f825..37f6bde50 100644
--- a/production/downloadsites/eclipse/downloads/createIndex4x.php
+++ b/production/downloadsites/eclipse/downloads/createIndex4x.php
@@ -2,7 +2,7 @@
 # Begin: page-specific settings.  Change these.
 $pageTitle    = "Eclipse Project Downloads";
 $pageKeywords = "eclipse platform sdk pde jdt downloads";
-$pageAuthor   = "David Williams";
+$pageAuthor   = "David Williams and Christopher Guindon";
 
 //ini_set("display_errors", "true");
 //error_reporting (E_ALL);
@@ -15,19 +15,19 @@ $testConfigs = array();
 ob_start();
 
 /*
- DL.header.php.html and DL.footer.php.html were original obtained from
+ DL.thin.header.php.html was original obtained from
 
-wget http://eclipse.org/eclipse.org-common/themes/solstice/html_template/header.php;
-wget http://eclipse.org/eclipse.org-common/themes/solstice/html_template/footer.php;
+wget https://eclipse.org/eclipse.org-common/themes/solstice/html_template/thin/header.php
 
-and then those files modified to suit our needs. The header required a fair amount of customization,
-the footer almost none.
+and then that file modified to suit our needs.
+Occasionally, our version should be compared to the "standard" to see if anything has
+changed, in the interest of staying consistent.
+
+See https://eclipse.org/eclipse.org-common/themes/solstice/docs/
 
-See bug 437494 for a few details.
-https://bugs.eclipse.org/bugs/show_bug.cgi?id=437494
  */
 
-require("DL.header.php.html");
+require("DL.thin.header.php.html");
 
 ?>
 
@@ -182,12 +182,13 @@ function printBuildColumns($fileName, $parts) {
     // test results location changed. 'testresults' is new standard
     // but we check for 'results' for older stuff.
     // https://bugs.eclipse.org/bugs/show_bug.cgi?id=379408
+    $testResultsDirName="";
     if (file_exists("$dropDir/testresults")) {
       $testResultsDirName="testresults";
-    } elseif (file_exists("$dropDir/results")) {
-        $testResultsDirName="results";
     } else {
-      $testResultsDirName="";
+      if (file_exists("$dropDir/results")) {
+        $testResultsDirName="results";
+      }
     }
 
     $boxes=calcTestConfigsRan($fileName, $testResultsDirName);
@@ -224,12 +225,12 @@ function printBuildColumns($fileName, $parts) {
       if ($boxes == -1) {
         $testimage="caution.gif";
         $testalt="Integration tests did not run due to failed build";
-      } elseif (($boxes == 0 || $boxes == -3) && $diff > 600) {
-        // assume if no results at all, after 10 hours, assume they didn't run for unknown reasosn
+      } elseif ($boxes == 0 && $diff > 720) {
+        // assume if no results at all, after 12 hours, assume they didn't run for unknown reasons
         $testimage="caution.gif";
         $testalt="Integration tests did not run, due to unknown reasons.";
       } elseif ($boxes > 0 && $boxes < $expectedtestConfigs) {
-        if ($diff > 720) {
+        if ($diff > 1440) {
           $testimage="junit.gif";
           $testalt="Tests results are available but did not finish on all machines";
         } else {
@@ -238,23 +239,20 @@ function printBuildColumns($fileName, $parts) {
         }
       } elseif ($boxes == $expectedtestConfigs) {
         $testimage="junit.gif";
-        $testalt="All Tests results are available";
+        $testalt="Tests results are available";
       } else {
         $testimage="runtests.gif";
         $testalt="Integration tests are running ...";
       }
-      echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" />";
+      echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" /></a>\n";
       if ($boxes > -1) {
-        echo "&nbsp;(".$boxes." of ".$expectedtestConfigs." platforms)";
-      } elseif ($boxes == -3) {
-        echo "&nbsp;("0 of ".$expectedtestConfigs." platforms)";
+        echo "&nbsp;(".$boxes." of ".$expectedtestConfigs." platforms)\n";
       }
-      echo "</a>\n";
     } else {
       echo "<a href=\"$dropDir/testResults.php\" title=\"$boxesTitle\" style=\"text-decoration: none\">";
       $testimage="results.gif";
       $testalt="Logs from build";
-      echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" />";
+      echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" /></a>";
       if ($buildType == "P") {
         echo "&nbsp;(No automated tests)";
       } elseif ($boxes == -2) {
@@ -262,8 +260,9 @@ function printBuildColumns($fileName, $parts) {
       } else {
         echo "&nbsp;(unexpected test boxes)";
       }
-       echo "</a>\n";
+        
     }
+  //echo "</a>\n";
   }
   echo "</td>\n";
   return $buildName;
@@ -344,7 +343,7 @@ while ($anEntry = $aDirectory->read()) {
 
 <!-- This is the summary section, showing latest of each -->
 
-<table class="downloads">
+<table class="downloads table-striped table-condensed">
 <tr>
 <th class="name">Build Name</th>
 <th class="status">Build Status</th>
@@ -371,7 +370,7 @@ foreach($dropType as $value) {
       $buildName=$parts[1];
     }
     if (!file_exists($subdirDrops."/".$fileName."/buildHidden")) {
-      echo "<tr>\n";
+      echo "<tr style=\"line-hieght:0.8;\">\n";
       if ($fileName == "") {
         echo "<td class=\"name\">&nbsp;</td>\n";
       } else {
@@ -408,7 +407,7 @@ foreach($dropType as $value) {
     echo "</tr>\n";
     echo "</table>\n";
 
-    echo "<table class=\"downloads\">\n";
+    echo "<table class=\"downloads table-striped table-condensed\">\n";
     echo "<tr>\n";
 
     echo "<th class=\"name\">Build Name</th>\n";
@@ -445,8 +444,6 @@ foreach($dropType as $value) {
     echo "</table>\n";
   }
 }
-echo "<hr>";
-echo "<p style=\"text-align:center;font-style:italic;\">All downloads are provided under the terms and conditions of the <a href=\"https://www.eclipse.org/legal/epl/notice.php\">Eclipse Foundation Software User Agreement</a> unless otherwise specified.</p>";
 require("DL.footer.php.html");
 $html = ob_get_clean();
 
diff --git a/production/downloadsites/eclipse/downloads/createIndex4x.phpORIG b/production/downloadsites/eclipse/downloads/createIndex4x.phpORIG
new file mode 100644
index 000000000..67b223db8
--- /dev/null
+++ b/production/downloadsites/eclipse/downloads/createIndex4x.phpORIG
@@ -0,0 +1,564 @@
+<?php
+# Begin: page-specific settings.  Change these.
+$pageTitle    = "Eclipse Project Downloads";
+$pageKeywords = "eclipse platform sdk pde jdt downloads";
+$pageAuthor   = "David Williams";
+
+#ini_set("display_errors", "true");
+#error_reporting (E_ALL);
+$eclipseStream="4";
+include('dlconfig4.php');
+$subdirDrops="drops4";
+
+# Use the basic white layout if the file is not hosted on download.eclipse.org
+$layout = (array_key_exists("SERVER_NAME", $_SERVER) && ($_SERVER['SERVER_NAME'] == "download.eclipse.org")) ? "default" : "html";
+
+ob_start();
+
+switch($layout){
+case 'html':
+  #If this file is not on download.eclipse.org print the legacy headers.
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="stylesheet" href="../default_style.css" />
+<title><?php echo $pageTitle;?></title>
+<style>
+table {
+    border-collapse: separate;
+    border-spacing: 1px;
+    *border-collapse: expression('separate', cellSpacing = '1px');
+    width:100%;
+}
+td {
+ text-align:left;
+ padding: 1px;
+ vertical-align:top;
+}
+
+</style>
+
+</head>
+<body>
+
+<?php
+  break;
+default:
+  #Otherwise use the default layout (content printed inside the nova theme).
+  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();
+  break;
+}?>
+<div class="container_<?php echo $layout;?>">
+<table width="100%" style="border-spacing:2px;">
+
+<tr>
+
+<!--
+<td align="left" width="72%">
+-->
+<td align="left" width="100%" style="padding:2px;">
+<font class="indextop"><br />The Eclipse Project Downloads</font> <br />
+<!--
+<font class="indexsub">
+Latest downloads from the Eclipse project
+</font><br />
+-->
+</td>
+<!--
+<td width="28%">
+-->
+<!-- not sure, might need this "rowspan 2" then eclipsecon logo included?
+<td width="19%" rowspan="2"></td>
+-->
+<!--
+<img src="../images/friendslogo.jpg" alt="Friends of Eclipse Logo" /><br />Support Eclipse! Become a <a href="http://www.eclipse.org/donate/">friend</a>.<br />
+</td>
+-->
+<!--  <td width="19%" rowspan="2"><a href="http://www.eclipsecon.org/" target="_blank"><img src="../images/prom-eclipsecon1.gif" width="125" height="125" border="0" /></a></td> -->
+
+</tr>
+
+</table>
+<p>On this
+page you can find the latest builds produced by
+the <a href="http://www.eclipse.org/eclipse" target="_top">Eclipse
+Project</a>. To get started run the program and go through the user and developer
+documentation provided in the on-line help system. If you have problems downloading
+the drops, contact the <font size="-1" face="arial,helvetica,geneva"><a href="mailto:webmaster@eclipse.org">webmaster</a></font>.
+If you have problems installing or getting the workbench to run, <a href="http://wiki.eclipse.org/index.php/The_Official_Eclipse_FAQs" target="_top">check
+out the Eclipse Project FAQ,</a> or try posting a question to the <a href="http://www.eclipse.org/newsgroups" target="_top">newsgroup</a>.
+<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=415540
+If prefered, downloads are available with <a href="http://build.eclipse.org/technology/phoenix/torrents/SDK/">SDK Torrents</a>.
+-->
+<!-- https://bugs.eclipse.org/bugs/show_bug.cgi?id=415509
+Please consider helping with Eclipse translations; see the <a href="http://babel.eclipse.org/babel/">Babel project</a>.
+-->
+</p>
+
+<p>See the <a href="http://www.eclipse.org/downloads/">main Eclipse Foundation download site</a> for convenient all-in-one packages.
+The <a href="http://archive.eclipse.org/eclipse/downloads/">archive site</a> contains older releases (including the last 3.x version, <a href="http://archive.eclipse.org/eclipse/downloads/drops/R-3.8.2-201301310800/">3.8.2</a>).
+For reference, see also
+<a href="http://wiki.eclipse.org/Eclipse_Project_Update_Sites">the p2 repositories provided</a>,
+<a href="build_types.html">meaning of kinds of builds</a> (P,M,N,I,S, and R), and the
+<a href="http://www.eclipse.org/eclipse/platform-releng/buildSchedule.html">build schedule</a>.
+</p>
+<p><img src="new.gif" alt="News Item 1" /> Eclipse support for Java&trade; 8: Starting with <a href="drops4/I20140318-0830/">I20140318-0830</a> all our Luna
+(4.4) builds contain the Eclipse support for <a href="http://www.oracle.com/technetwork/java/javase/overview/index.html">Java&trade; 8</a>.
+For Kepler SR2 (4.3.2) a <a href="https://wiki.eclipse.org/JDT/Eclipse_Java_8_Support_For_Kepler">feature patch</a> is available (<a href="drops4/P20140317-1600">P20140317-1600</a>).
+</p>
+<table width="100%">
+<tr>
+<td width="100%" bgcolor="#0080C0"><font color="#FFFFFF" face="Arial,Helvetica">Latest
+Downloads</font>
+</td>
+</tr>
+</table>
+
+<?php
+
+  function startsWithDropPrefix($dirName, $dropPrefix)
+  {
+
+    $result = false;
+    // sanity check "setup" is as we expect
+    if (isset($dropPrefix) && is_array($dropPrefix)) {
+      // sanity check input
+      if (isset($dirName) && strlen($dirName) > 0) {
+        $firstChar = substr($dirName, 0, 1);
+        //echo "first char: ".$firstChar;
+        foreach($dropPrefix as $type) {
+          if ($firstChar == "$type") {
+            $result = true;
+            break;
+          }
+        }
+      }
+    }
+    else {
+      echo "dropPrefix not defined as expected\n";
+    }
+    return $result;
+  }
+function runTestBoxes($buildName, $testResultsDirName) {
+  // hard code for now the tests ran on one box (or, zero, if no testResultsDirName yet)
+  // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706
+  //if ($testResultsDirName === "" ) {
+  //   return 0;
+  //} else {
+  //   return 1;
+  //}
+  global $subdirDrops;
+  $testBoxes=array("linux", "macosx", "win32");
+  $length=count($testBoxes);
+  $boxes=0;
+  if (file_exists("$subdirDrops/$buildName/buildproperties.php")) {
+    // be sure any previous are reset
+    unset ($BUILD_FAILED);
+    include "$subdirDrops/$buildName/buildproperties.php";
+    if (isset ($BUILD_FAILED) && strlen($BUILD_FAILED) > 0) {
+      $boxes=-1;
+      unset ($BUILD_FAILED);
+    }
+  }
+  if ($boxes != -1)  {
+
+    // TEMP? appears "old style" builds had directories named "results", but now "testresults"
+    // and we want to look in $testResultsDirName/consolelogs
+    if (file_exists("$subdirDrops/$buildName/$testResultsDirName/consolelogs")) {
+      $buildDir = dir("$subdirDrops/$buildName/$testResultsDirName/consolelogs");
+      while ($file = $buildDir->read()) {
+        for ($i = 0 ; $i < $length ; $i++) {
+          if (strncmp($file, $testBoxes[$i], count($testBoxes[$i])) == 0) {
+            $boxes++;
+            break;
+          }
+        }
+      }
+    }
+  }
+  //echo "boxes: $boxes";
+  return $boxes;
+}
+function printBuildColumns($fileName, $parts) {
+  global $subdirDrops;
+  // no file name, write empty column
+  if ($fileName == "") {
+    echo "<td align=\"left\" width=\"25%\">&nbsp;</td>\n";
+    return;
+  }
+  // get build name, date and time
+  $dropDir="$subdirDrops/$fileName";
+  if (count($parts)==3) {
+    $buildName=$parts[1];
+    $buildDay=intval(substr($parts[2], 0, 8));
+    $buildTime=intval(substr($parts[2], 8, 4));
+    $buildType=$parts[0];
+  }
+  if (count($parts)==2) {
+    $buildName=$fileName;
+    $buildDay=intval(substr($buildName, 1, 8));
+    $buildTime=intval(substr($buildName, 10, 2))*60+intval(substr($buildName, 12, 2));
+    $buildType=substr($buildName, 0, 1);
+  }
+  // compute minutes elapsed since build started
+  $day=intval(date("Ymd"));
+  $time=intval(date("H"))*60+intval(date("i"));
+  $diff=($day-$buildDay)*24*60+$time-$buildTime;
+  // Add icons
+  echo "<td align=\"left\" width=\"25%\">\n";
+  // hard code for now the build is done
+  // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706
+  // but later, changed ...
+  // compute build done based on "buildPending" file, but if not
+  // present, assume build is done
+  // https://bugs.eclipse.org/bugs/show_bug.cgi?id=382196
+  $build_done=true;
+  if (file_exists("$dropDir/buildPending")) {
+    $build_done=false;
+  }
+  if ($build_done) {
+    // test results location changed. 'testresults' is new standard
+    // but we check for 'results' for older stuff.
+    // https://bugs.eclipse.org/bugs/show_bug.cgi?id=379408
+    $testResultsDirName="";
+    if (file_exists("$dropDir/testresults")) {
+      $testResultsDirName="testresults";
+    } else {
+      if (file_exists("$dropDir/results")) {
+        $testResultsDirName="results";
+      }
+    }
+
+    $boxes=runTestBoxes($fileName, $testResultsDirName);
+    // boses == -1 is code that "bulid failed" and no tests are expected.
+    if ($boxes == -1) {
+      $buildimage="build_failed.gif";
+      $buildalt="Build failed";
+    } else {
+      $buildimage="build_done.gif";
+      $buildalt="Build is available";
+    }
+    echo "<a href=\"$dropDir/\"><img style=\"border:0px\" src=\"../images/$buildimage\" title=\"$buildalt\" alt=\"$buildalt\" /></a>\n";
+
+    // hard code here, for now, but make come from property file, later
+    $expectedTestBoxes=3;
+
+    // We skip the main "tests" part for patch builds, since don't expect any (for now).
+    if ($buildType !== "P") {
+
+      // always put in links, since someone may want to look at logs, even if not tests results, per se
+      // don't forget to end link, after images decided.
+      $boxesTitle="";
+      if ($boxes > -1) {
+        $boxesTitle=$boxes." of ".$expectedTestBoxes." test platforms finished.";
+      }
+      if ($testResultsDirName === "results") {
+        echo "<a href=\"$dropDir/results/testResults.html\" title=\"$boxesTitle\" style=\"text-decoration: none\">";
+      } else {
+        echo "<a href=\"$dropDir/testResults.php\" title=\"$boxesTitle\" style=\"text-decoration: none\">";
+      }
+
+      if ($boxes == -1) {
+        $testimage="caution.gif";
+        $testalt="Integration tests did not run due to failed build";
+      } elseif ($boxes == 0 && $diff > 720) {
+        // assume if no results at all, after 12 hours, assume they didn't run for unknown reasosn
+        $testimage="caution.gif";
+        $testalt="Integration tests did not run, due to unknown reasons.";
+      } elseif ($boxes > 0 && $boxes < $expectedTestBoxes) {
+        if ($diff > 1440) {
+          $testimage="junit.gif";
+          $testalt="Tests results are available but did not finish on all machines";
+        } else {
+          $testimage="runtests.gif";
+          $testalt="Integration tests are running ...";
+        }
+      } elseif ($boxes == $expectedTestBoxes) {
+        $testimage="junit.gif";
+        $testalt="Tests results are available";
+      } else {
+        $testimage="runtests.gif";
+        $testalt="Integration tests are running ...";
+      }
+      echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" />";
+      if ($boxes > -1) {
+        echo "&nbsp;(".$boxes." of ".$expectedTestBoxes." platforms)";
+      }
+      echo "</a>\n";
+    } else {
+      echo "<a href=\"$dropDir/testResults.php\" title=\"$boxesTitle\" style=\"text-decoration: none\">";
+      $testimage="results.gif";
+      $testalt="Logs from build";
+      echo "<img style=\"border:0px\" src=\"../images/$testimage\" title=\"$testalt\" alt=\"$testalt\" />";
+      echo "&nbsp;(No automated tests)";
+      echo "</a>\n";
+    }
+  }
+  echo "</td>\n";
+  return $buildName;
+}
+?>
+<?php
+//}
+//    $perfsDir="$dropDir/performance";
+//  if (file_exists("$perfsDir")) {
+//    $perfsFile="$perfsDir/performance.php";
+//  if (file_exists("$perfsFile")) {
+//     if (file_exists("$perfsDir/global.php")) {
+// echo "<a href=\"$perfsFile\"><img border=\"0\" src=\"../images/perfs.gif\" title=\"Performance tests are available\" alt=\"Performance tests are available\"/></a>\n";
+//    } else {
+//        echo "<img src=\"../images/caution.gif\" title=\"Performance tests ran and results should have been generated but unfortunately they are not available!\" alt=\"No Performance tests\"/>\n";
+///   }
+// } else {
+//            if (file_exists("$perfsDir/consolelogs")) {
+// if more than one day then consider that perf tests did not finish
+//              if ($diff > 1440) {
+//                if (substr($buildName, 0, 1) == "I") {
+//                  $reason="see bug 259350";
+//            } else {
+//              $reason="either they were not stored in DB or not generated";
+//        }
+//  echo "<img src=\"../images/caution.gif\" title=\"Performance tests ran but no results are available: $reason!\" alt=\"No Performance Tests\" />\n";
+//} else {
+//   echo "<img src=\"../images/runperfs.gif\" title=\"Performance tests are running...\" alt=\"Performance tests are running\" />\n";
+// }
+// }
+// }
+//}
+//}
+//else {
+// if more than 5 hours then consider that the build did not finish
+//    if ($diff > 300) {
+//        echo "<img src=\"../images/build_failed.gif\" title=\"Build failed!\" alt=\"Build failed!\" />\n";
+//    } else {
+//        echo "<img src=\"../images/build_progress.gif\" title=\"Build is in progress...\" alt=\"Build is in progress.\"/>\n";
+//    }
+//}
+?>
+<?php
+// this is the main data computation part
+$aDirectory = dir($subdirDrops);
+while ($anEntry = $aDirectory->read()) {
+
+  // Short cut because we know aDirectory only contains other directories.
+
+  if ($anEntry != "." && $anEntry!=".." && $anEntry!="TIME" && startsWithDropPrefix($anEntry,$dropPrefix)) {
+    $parts = explode("-", $anEntry);
+    // echo "<p>an entry: $anEntry\n";
+    // do not count hidden directories in computation
+    // allows non-hidden ones to still show up as "most recent" else will be blank.
+    if (!file_exists($subdirDrops."/".$anEntry."/buildHidden")) {
+      if (count($parts) == 3) {
+
+        //$buckets[$parts[0]][] = $anEntry;
+
+        $timePart = $parts[2];
+        $year = substr($timePart, 0, 4);
+        $month = substr($timePart, 4, 2);
+        $day = substr($timePart, 6, 2);
+        $hour = substr($timePart,8,2);
+        $minute = substr($timePart,10,2);
+        // special logic adds 1 second if build id contains "RC" ... this was
+        // added for the M build case, where there is an M build and and RC version that
+        // have same time stamp. One second should not effect desplayed values.
+        $isRC = strpos($anEntry, "RC");
+        if ($isRC === false) {
+          $timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
+        } else {
+          $timeStamp = mktime($hour, $minute, 1, $month, $day, $year);
+        }
+        $buckets[$parts[0]][$timeStamp] = $anEntry;
+        $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
+        // latestTimeStamp will not be defined, first time through
+        if (!isset($latestTimeStamp) || !array_key_exists($parts[0],$latestTimeStamp)  || $timeStamp > $latestTimeStamp[$parts[0]]) {
+          $latestTimeStamp[$parts[0]] = $timeStamp;
+          $latestFile[$parts[0]] = $anEntry;
+        }
+      }
+
+      if (count($parts) == 2) {
+
+        $buildType=substr($parts[0],0,1);
+        //$buckets[$buildType][] = $anEntry;
+        $datePart = substr($parts[0],1);
+        $timePart = $parts[1];
+        $year = substr($datePart, 0, 4);
+        $month = substr($datePart, 4, 2);
+        $day = substr($datePart, 6, 2);
+        $hour = substr($timePart,0,2);
+        $minute = substr($timePart,2,2);
+        $isRC = strpos($anEntry, "RC");
+        if ($isRC === false) {
+          $timeStamp = mktime($hour, $minute, 0, $month, $day, $year);
+        } else {
+          $timeStamp = mktime($hour, $minute, 1, $month, $day, $year);
+        }
+        $buckets[$buildType[0]][$timeStamp] = $anEntry;
+
+        $timeStamps[$anEntry] = date("D, j M Y -- H:i (O)", $timeStamp);
+
+        if (!isset($latestTimeStamp) || !array_key_exists($buildType,$latestTimeStamp) || $timeStamp > $latestTimeStamp[$buildType]) {
+          $latestTimeStamp[$buildType] = $timeStamp;
+          $latestFile[$buildType] = $anEntry;
+        }
+      }
+    }
+  }
+}
+?>
+
+<!-- This is the summary section, showing latest of each -->
+<!--
+<table width="100%">
+<tr>
+<td>
+-->
+
+<table width="100%">
+<tr>
+<!-- <th align="left" width="20%">Build Type</th> -->
+<th align="left"  width="15%">Build Name</th>
+<th align="left"  width="25%">Build Status</th>
+<th align="left"  width-"40%">Build Date</th>
+</tr>
+<?php
+foreach($dropType as $value) {
+
+  $prefix=$typeToPrefix[$value];
+  // if empty bucket, do not print this row
+  if (array_key_exists($prefix,$buckets)) {
+
+
+    if (array_key_exists($prefix,$latestFile)) {
+      $fileName = $latestFile[$prefix];
+    }
+    $parts = explode("-", $fileName);
+
+    // Uncomment the line below if we need click through licenses.
+    // echo "<td><a href=license.php?license=$subdirDrops/$fileName>$parts[1]</a></td>\n";
+
+    // Comment the line below if we need click through licenses.
+
+    $buildName=$fileName;
+    if (count($parts)==3) {
+      $buildName=$parts[1];
+    }
+    if (!file_exists($subdirDrops."/".$fileName."/buildHidden")) {
+      echo "<tr>\n";
+      //            echo "<td align=\"left\" width=\"20%\">$value</td>\n";
+      if ($fileName == "") {
+        echo "<td align=\"left\" width=\"15%\">&nbsp;</td>\n";
+      } else {
+        // Note: '$value' basically comes from dlconfig4.php and serves two purposes:
+        // 1) the "tool tip" when hovering over the "Latest" build.
+        // 2) the "title bar" of remaining sections.
+        // In other words dlconfig4.php would have to be expanded if we ever wanted
+        // "tool tip" and "section title" to be (slightly) different from each other.
+        echo "<td align=\"left\"  width=\"15%\"><a href=\"$subdirDrops/$fileName/\" title=\"$value\">$buildName</a></td>\n";
+      }
+      $buildName = printBuildColumns($fileName, $parts);
+      echo "<td  align=\"left\" width=\"40%\">$timeStamps[$fileName]</td>\n";
+      echo "</tr>\n";
+    }
+  }
+}
+?>
+</td>
+</tr>
+    </table>
+<!-- </td></tr></table>
+<table  width="100%" >
+-->
+
+<?php
+foreach($dropType as $value) {
+  $prefix=$typeToPrefix[$value];
+  // skip whole section, if bucket is empty
+  if (array_key_exists($prefix,$buckets)) {
+
+    echo "<table width=\"100%\">\n";
+    // header, colored row
+    echo "<tr bgcolor=\"#999999\">\n";
+    // name attribute can have no spaces, so we tranlate them to underscores
+    // (could effect targeted links)
+    $valueName=strtr($value,' ','_');
+    echo "<td align=\"left\" width=\"100%\"><a name=\"$valueName\">\n";
+    echo "<font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value\n";
+    echo "</font></a></td>\n";
+    echo "</tr>\n";
+    echo "</table>";
+
+    // echo "<tr>\n";
+    // echo "<td>\n";
+    //echo "<br/>\n";
+    echo "<table width=\"100%\">\n";
+    echo "<tr>\n";
+
+    // first cell blank, for alignment with top block
+    //echo "<th align=\"left\" width=\"20%\"></th>";
+    echo "<th align=\"left\" width=\"15%\">Build Name</th>\n";
+    echo "<th align=\"left\" width=\"25%\">Build Status</th>\n";
+    echo "<th align=\"left\" width=\"40%\">Build Date</th>\n";
+
+    echo "</tr>\n";
+    $aBucket = $buckets[$prefix];
+    if (isset($aBucket)) {
+      krsort($aBucket);
+      foreach($aBucket as $innerValue) {
+
+        if (!file_exists($subdirDrops."/".$innerValue."/buildHidden")) {
+
+          $parts = explode("-", $innerValue);
+
+          echo "<tr>\n";
+          //echo "<td align=\"left\" width=\"20%\">&nbsp;</td>\n";
+          // Uncomment the line below if we need click through licenses.
+          // echo "<td><a href=\"license.php?license=$subdirDrops/$innerValue\">$parts[1]</a></td>\n";
+
+          // Comment the line below if we need click through licenses.
+          $buildName=$innerValue;
+          if (count ($parts)==3) {
+            echo "<td align=\"left\" width=\"15%\"><a href=\"$subdirDrops/$innerValue/\">$parts[1]</a></td>\n";
+          } else if (count ($parts)==2) {
+            echo "<td align=\"left\" width=\"15%\"><a href=\"$subdirDrops/$innerValue/\">$innerValue</a></td>\n";
+          } else {
+            echo "<td align=\"left\" width=\"15%\">Unexpected numberof parts?</td>\n";
+          }
+
+          $buildName = printBuildColumns($innerValue, $parts);
+          echo "<td align=\"left\" width=\"40%\">$timeStamps[$innerValue]</td>\n";
+          echo "</tr>\n";
+        }
+      }
+    }
+    echo "</table>\n";
+  }
+}
+echo "<hr>";
+echo "<p style=\"text-align:center;font-style:italic;\">All downloads are provided under the terms and conditions of the <a href=\"http://www.eclipse.org/legal/epl/notice.php\" target=\"_top\">Eclipse Foundation Software User Agreement</a> unless otherwise specified.</p>";
+
+echo '</div>';
+$html = ob_get_clean();
+
+switch($layout){
+case 'html':
+  #echo the computed content with the body and html closing tag. This is for the old layout.
+  echo $html;
+  echo '</body>';
+  echo '</html>';
+  break;
+
+default:
+  #For the default view we use $App->generatePage to generate the page inside theme.
+  $App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />');
+  $App->Promotion = FALSE;
+  $App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html);
+  break;
+}
diff --git a/production/downloadsites/eclipse/downloads/dlconfig2.txt b/production/downloadsites/eclipse/downloads/dlconfig2.txt
deleted file mode 100644
index 83bc9c9e3..000000000
--- a/production/downloadsites/eclipse/downloads/dlconfig2.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-R, Latest Release
-S, 3.8 Stream Stable Build
-I, 3.8 Stream Integration Build
-N, 3.8 Stream Nightly Build
-M, 3.7.x Stream Maintenance Build
-L, Language Pack
-X, Test Build
diff --git a/production/downloadsites/eclipse/downloads/dlconfig3.php b/production/downloadsites/eclipse/downloads/dlconfig3.php
deleted file mode 100644
index 97bccc30b..000000000
--- a/production/downloadsites/eclipse/downloads/dlconfig3.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$dropPrefix = array();
-$dropPrefix[]="R";
-$dropPrefix[]="S";
-$dropPrefix[]="I";
-$dropPrefix[]="M";
-$dropPrefix[]="N";
-$dropType = array();
-$dropType[]="Latest Release";
-$dropType[]="3.8 Stable Build";
-$dropType[]="3.8 Integration Build";
-$dropType[]="3.8 Maintenance Build";
-$dropType[]="3.8 Nightly Build";
-// the "prefix" array and dropType array must be of same size, defined in right order
-for ($i = 0; $i < count($dropType); $i++) {
-  $typeToPrefix[$dropType[$i]] = $dropPrefix[$i];
-}
-
-?>
diff --git a/production/downloadsites/eclipse/downloads/dlconfig4.php b/production/downloadsites/eclipse/downloads/dlconfig4.php
index 3244d333a..ae7faf3f7 100644
--- a/production/downloadsites/eclipse/downloads/dlconfig4.php
+++ b/production/downloadsites/eclipse/downloads/dlconfig4.php
@@ -8,14 +8,13 @@ $dropPrefix[]="N";
 $dropPrefix[]="P";
 $dropType = array();
 $dropType[]="Latest Release";
-$dropType[]="4.4 Stable Build";
-$dropType[]="4.4 Integration Build";
-$dropType[]="4.3 Maintenance Build";
-$dropType[]="4.4 Nightly Build";
+$dropType[]="4.5 Stable Build";
+$dropType[]="4.5 Integration Build";
+$dropType[]="4.4 Maintenance Build";
+$dropType[]="4.5 Nightly Build";
 $dropType[]="Patch Builds";
 // the "prefix" array and dropType array must be of same size, defined in right order
 for ($i = 0; $i < count($dropType); $i++) {
-  $typeToPrefix[$dropType[$i]] = $dropPrefix[$i];
+    $typeToPrefix[$dropType[$i]] = $dropPrefix[$i];
 }
 
-?>
diff --git a/production/sdk/miscTools/cptestConfigs.sh b/production/sdk/miscTools/cptestConfigs.sh
new file mode 100644
index 000000000..39e5bb6e5
--- /dev/null
+++ b/production/sdk/miscTools/cptestConfigs.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+for file in drops4/* 
+do
+  if [[ -d $file ]] 
+  then
+    echo "copying testConfigs.php to $file/"
+    cp testConfigs.php $file/
+  fi
+done
diff --git a/production/sdk/miscTools/mainDLCheck.html b/production/sdk/miscTools/mainDLCheck.html
new file mode 100644
index 000000000..5248881bf
--- /dev/null
+++ b/production/sdk/miscTools/mainDLCheck.html
@@ -0,0 +1,452 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    <title>
+            [Valid]
+            Markup Validation of http://davidw.com/eclipse/downloads/createIndex4x.php - W3C Markup Validator</title>
+        <link rel="icon" href="data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%10%00%00%00%10%08%02%00%00%00%90%91h6%00%00%00%19IDAT(%91c%0C%DD%10%C5%40%0A%60%22I%F5%A8%86Q%0DCJ%03%00dy%01%7F%0C%9F0%7D%00%00%00%00IEND%AEB%60%82" type="image/png" />
+    <link rev="made" href="mailto:www-validator@w3.org" />
+    <link rev="start" href="./" title="Home Page" />
+    <style type="text/css" media="all">@import "./style/base";
+            @import "./style/results";</style>
+    <meta name="keywords" content="HTML, HyperText Markup Language, Validation,
+      W3C Markup Validation Service" />
+    <meta name="description" content="W3C's easy-to-use
+      markup validation service, based on SGML and XML parsers." />
+  </head>
+  <body>
+    
+    <div id="banner">
+     <h1 id="title">
+       <a href="http://www.w3.org/"><img alt="W3C" width="110" height="61" id="logo" src="./images/w3c.png" /></a>
+ 			<a href="./"><span>Markup Validation Service</span></a>
+       </h1>
+       <p id="tagline">Check the markup (HTML, XHTML, …) of Web documents</p>
+    </div>
+
+
+<div id="results_container">
+
+
+
+        <ul class="navbar" id="jumpbar">
+                <li><strong>Jump To:</strong></li>
+                
+                        <li><a href="#preparse_warnings">Notes and Potential Issues</a></li>
+                
+                
+          <li><a title="Result of Validation" href="#result">Validation Output</a></li>
+          
+          
+                  <li><a title="Information on validation, Icons" href="#congrats">Congratulations &middot; Icons</a></li>
+
+
+  
+  
+  
+        </ul>
+
+<!-- valid/invalid header and revalidation table -->
+
+  
+    <h2 class="valid">This document was successfully checked as 
+     HTML5!</h2>
+  
+  
+
+
+
+
+  
+    <form id="form" method="get" action="check">
+  
+
+  <table class="header">
+    <tr>
+    <th>Result:</th>
+    
+    <td colspan="2" class="valid">
+      
+        Passed, <strong class="has_warnings">2 warning(s)</strong>
+      
+    
+    </td>
+    </tr>
+    <tr>
+
+    
+      <th><label title="Address of Page to Validate" for="uri">Address</label>:</th>
+      <td colspan="2"><input type="text" id="uri" name="uri" value="http://davidw.com/eclipse/downloads/createIndex4x.php" size="50" /></td>
+      
+
+    </tr>
+
+  
+
+  <tr>
+    <th><label title="Character Encoding" for="charset">Encoding</label>:</th>
+    <td>utf-8</td><td><select name="charset" id="charset">
+  <option value="(detect automatically)">(detect automatically)</option>
+  <option value="utf-8" >utf-8 (Unicode, worldwide)</option>
+  <option value="utf-16" >utf-16 (Unicode, worldwide)</option>
+  <option value="iso-8859-1" >iso-8859-1 (Western Europe)</option>
+  <option value="iso-8859-2" >iso-8859-2 (Central Europe)</option>
+  <option value="iso-8859-3" >iso-8859-3 (Southern Europe)</option>
+  <option value="iso-8859-4" >iso-8859-4 (North European)</option>
+  <option value="iso-8859-5" >iso-8859-5 (Cyrillic)</option>
+  <option value="iso-8859-6-i" >iso-8859-6-i (Arabic)</option>
+  <option value="iso-8859-7" >iso-8859-7 (Greek)</option>
+  <option value="iso-8859-8" >iso-8859-8 (Hebrew, visual)</option>
+  <option value="iso-8859-8-i" >iso-8859-8-i (Hebrew, logical)</option>
+  <option value="iso-8859-9" >iso-8859-9 (Turkish)</option>
+  <option value="iso-8859-10" >iso-8859-10 (Latin 6)</option>
+  <option value="iso-8859-11" >iso-8859-11 (Latin/Thai)</option>
+  <option value="iso-8859-13" >iso-8859-13 (Latin 7, Baltic Rim)</option>
+  <option value="iso-8859-14" >iso-8859-14 (Latin 8, Celtic)</option>
+  <option value="iso-8859-15" >iso-8859-15 (Latin 9)</option>
+  <option value="iso-8859-16" >iso-8859-16 (Latin 10)</option>
+  <option value="us-ascii" >us-ascii (basic English)</option>
+  <option value="euc-jp" >euc-jp (Japanese, Unix)</option>
+  <option value="shift_jis" >shift_jis (Japanese, Win/Mac)</option>
+  <option value="iso-2022-jp" >iso-2022-jp (Japanese, email)</option>
+  <option value="euc-kr" >euc-kr (Korean)</option>
+  <option value="gb2312" >gb2312 (Chinese, simplified)</option>
+  <option value="gb18030" >gb18030 (Chinese, simplified)</option>
+  <option value="big5" >big5 (Chinese, traditional)</option>
+  <option value="big5-HKSCS" >Big5-HKSCS (Chinese, Hong Kong)</option>
+  <option value="tis-620" >tis-620 (Thai)</option>
+  <option value="koi8-r" >koi8-r (Russian)</option>
+  <option value="koi8-u" >koi8-u (Ukrainian)</option>
+  <option value="iso-ir-111" >iso-ir-111 (Cyrillic KOI-8)</option>  
+  <option value="macintosh" >macintosh (MacRoman)</option>
+  <option value="windows-1250" >windows-1250 (Central Europe)</option>
+  <option value="windows-1251" >windows-1251 (Cyrillic)</option>
+  <option value="windows-1252" >windows-1252 (Western Europe)</option>
+  <option value="windows-1253" >windows-1253 (Greek)</option>
+  <option value="windows-1254" >windows-1254 (Turkish)</option>
+  <option value="windows-1255" >windows-1255 (Hebrew)</option>
+  <option value="windows-1256" >windows-1256 (Arabic)</option>
+  <option value="windows-1257" >windows-1257 (Baltic Rim)</option>
+</select>
+</td>
+  </tr>
+
+
+  <tr>
+    <th><label for="doctype" title="Document Type">Doctype</label>:</th>
+    <td>HTML5</td><td><select id="doctype" name="doctype">
+  <option value="Inline">(detect automatically)</option>
+  <option value="HTML5">HTML5 (experimental)</option>
+  <option value="XHTML 1.0 Strict">XHTML 1.0 Strict</option>
+  <option value="XHTML 1.0 Transitional" >XHTML 1.0 Transitional</option>
+  <option value="XHTML 1.0 Frameset" >XHTML 1.0 Frameset</option>
+  <option value="HTML 4.01 Strict" >HTML 4.01 Strict</option>
+  <option value="HTML 4.01 Transitional" >HTML 4.01 Transitional</option>
+  <option value="HTML 4.01 Frameset" >HTML 4.01 Frameset</option>
+  <option value="HTML 4.01 + RDFa 1.1" >HTML 4.01 + RDFa 1.1</option>
+  <option value="HTML 3.2" >HTML 3.2</option>
+  <option value="HTML 2.0" >HTML 2.0</option>
+  <option value="ISO/IEC 15445:2000 (&quot;ISO HTML&quot;)" >ISO/IEC 15445:2000 ("ISO HTML")</option>
+  <option value="XHTML 1.1" >XHTML 1.1</option>
+  <option value="XHTML + RDFa" >XHTML + RDFa</option>
+  <option value="XHTML Basic 1.0" >XHTML Basic 1.0</option>
+  <option value="XHTML Basic 1.1" >XHTML Basic 1.1</option>
+  <option value="XHTML Mobile Profile 1.2" >XHTML Mobile Profile 1.2</option>
+  <option value="XHTML-Print 1.0" >XHTML-Print 1.0</option>
+  <option value="XHTML 1.1 plus MathML 2.0" >XHTML 1.1 plus MathML 2.0</option> 
+  <option value="XHTML 1.1 plus MathML 2.0 plus SVG 1.1" >XHTML 1.1 plus MathML 2.0 plus SVG 1.1</option> 
+  <option value="MathML 2.0" >MathML 2.0</option>
+  <option value="SVG 1.0" >SVG 1.0</option>
+  <option value="SVG 1.1" >SVG 1.1</option>
+  <option value="SVG 1.1 Tiny" >SVG 1.1 Tiny</option>
+  <option value="SVG 1.1 Basic" >SVG 1.1 Basic</option>
+  <option value="SMIL 1.0" >SMIL 1.0</option>
+  <option value="SMIL 2.0" >SMIL 2.0</option>
+</select>
+</td>
+  </tr>
+
+
+  <tr>
+    <th>Root Element:</th>
+    <td colspan="2">html</td>
+  </tr>
+
+
+
+  </table>
+
+<div id="w3c-include">
+    <script type="text/javascript" src="http://www.w3.org/QA/Tools/w3c-include.js"></script>
+</div>
+
+        <fieldset id="revalidate_opts">
+                 <legend>Options</legend>
+
+    <table class="header">
+      <tr>
+        <td><input type="checkbox" value="1" id="ss" name="ss" 
+
+		/><label title="Show Page Source" for="ss">Show&nbsp;Source</label></td>
+              <td><input type="checkbox" value="1" id="outline" name="outline" 
+
+		/><label title="Show an Outline of the document" for="outline">Show&nbsp;Outline</label></td>
+                <td><input type="radio" name="group" id="group_no" value="0" 
+                        
+                        	checked="checked"
+                        
+                        /><label for="group_no">List Messages Sequentially</label> 
+                        <input type="radio" name="group" id="group_yes" value="1"
+                                
+                                 /><label for="group_yes">Group Error Messages by Type</label></td>
+            </tr>
+            <tr>
+              <td><input type="checkbox" value="1" id="No200" name="No200"
+
+		/><label title="Validate also pages for which the HTTP status code indicates an error" for="No200">Validate&nbsp;error&nbsp;pages</label></td>
+              <td><input type="checkbox" value="1" id="verbose" name="verbose"
+
+		/><label title="Show Verbose Output" for="verbose">Verbose&nbsp;Output</label></td>
+    		<td><input id="st" name="st" type="checkbox" value="1"
+                        
+    		         /><label for="st">Clean up Markup with HTML-Tidy</label></td>
+            </tr>
+
+    </table>
+        <p class="moreinfo">
+          <a href="docs/users.html#Options">Help</a> on the options is available.
+        </p>
+    <div id="revalidate_button" class="submit_button">
+ <input type="hidden" value="W3C_Validator/1.3 http://validator.w3.org/services" id="user-agent" name="user-agent" />
+      <input type="submit" value="Revalidate" title="Validate this document again" />
+    </div>
+  </fieldset>
+</form>
+
+
+
+                
+                  <div id="result">
+
+        
+          <h3 id="preparse_warnings">Notes and Potential Issues</h3>
+<p>The following notes and warnings highlight missing or conflicting information which caused the validator to perform some guesswork prior to validation, or other things affecting the output below. If the guess or fallback is incorrect, it could make validation results entirely incoherent. It is <em>highly recommended</em> 
+to check these potential issues, and, if necessary, fix them and re-validate the document.</p>
+<ol id="warnings">
+
+
+  <li class="msg_warn" id="W00">
+      <p><span class="err_type"><img src="images/info_icons/info.png" alt="Info" title="Info" /></span> <span class="msg"> Using experimental feature:
+          <em>HTML5 Conformance Checker</em>.</span></p>
+    <p>The validator checked your document with an experimental feature:
+        <em>HTML5 Conformance Checker</em>. This feature has been 
+        made available for your convenience, but be aware that it may be unreliable, or not perfectly
+        up to date with the latest development of some cutting-edge technologies. If you find any issues
+        with this feature, please <a href="feedback.html">report them</a>. Thank you.
+    </p>
+  </li>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</ol><!-- End of "warnings". -->
+
+        
+
+
+<h3 id="warning_loop">Validation Output: 2 Warnings
+        </h3>
+    <p>
+      Below is a list of the warning message(s) produced when checking your document.
+    </p>
+    
+        <ol id="error_loop">
+
+  <li class="msg_warn">
+    <span class="err_type"><img src="images/info_icons/warning.png" alt="Warning" title="Warning" /></span>
+    
+    <em>Line 235,
+        Column 69</em>:
+    <span class="msg">Section lacks heading. Consider using h2-h6 elements to add identifying headings to all sections.</span>
+    <pre><code class="input">    &#60;section id=&#34;breadcrumb&#34; class=&#34;defaut-breadcrumbs hidden-print&#34;<strong title="Position where error was detected.">&#62;</strong></code></pre>
+        <p class="helpwanted">
+      <a
+        href="feedback.html?uri=http%3A%2F%2Fdavidw.com%2Feclipse%2Fdownloads%2FcreateIndex4x.php;errmsg_id=html5#errormsg"
+	title="Suggest improvements on this error message through our feedback channels" 
+      >&#x2709;</a>
+    </p>
+
+  </li>
+
+</ol>
+
+<p class="backtop"><a href="#jumpbar">&uarr; Top</a></p>
+
+    
+
+
+<h3 id="congrats">Congratulations</h3>
+  <p>
+
+  
+    The document located at
+    &lt;<a href="http://davidw.com/eclipse/downloads/createIndex4x.php">http://davidw.com/eclipse/downloads/createIndex4x.php</a>&gt;
+    
+
+
+    was successfully checked as 
+    
+    HTML5.  
+    
+    This means that the resource in question identified itself as
+    "HTML5" and that we successfully
+    performed a formal validation of it.
+    
+
+    The parser implementations we used for this check are based on
+    
+    
+    <a href="http://validator.nu/">validator.nu</a> (HTML5).
+    
+  </p>
+
+
+  
+<h4>Linking to this result</h4>
+  <p>
+    If you would like to create a link to <em>this</em> page (i.e., this
+    validation result) to make it easier to revalidate this page in the
+    future or to allow others to validate your page, the URI is
+    &lt;<a href="http://validator.w3.org/check?uri=http%3A%2F%2Fdavidw.com%2Feclipse%2Fdownloads%2FcreateIndex4x.php">http://validator.w3.org/check?uri=http%3A%2F%2Fdavidw.com%2Feclipse%2Fdownloads%2FcreateIndex4x.php</a>&gt;
+    (or you can just add the current page to your bookmarks or hotlist).
+  </p>
+  
+
+<h4>Validating CSS Style Sheets</h4>
+  <p>
+    If you use <a href="http://www.w3.org/Style/CSS/">CSS</a> in your document,
+    you can 
+
+  
+    <a title="Validate CSS at the W3C CSS Validator"
+    href="http://jigsaw.w3.org/css-validator/validator?uri=http%3A%2F%2Fdavidw.com%2Feclipse%2Fdownloads%2FcreateIndex4x.php">check
+    it</a>
+  
+
+    using the W3C
+    <a href="http://jigsaw.w3.org/css-validator/">CSS Validation Service</a>.
+  </p>
+
+
+<p class="backtop"><a href="#jumpbar">&uarr; Top</a></p>
+
+</div><!-- end of "result" -->
+
+                
+
+      
+
+      
+
+      
+
+</div><!-- results_container-->
+
+<ul class="navbar" id="menu">
+    <li><a href="./" accesskey="1" title="Go to the Home Page for The W3C Markup Validation Service">Home</a><span> | </span></li>
+    <li><a href="./about.html" title="Information About this Service">About...</a><span> | </span></li>
+
+    <li><a href="./whatsnew.html" title="The changes made to this service recently">News</a><span> | </span></li>
+    <li><a href="./docs/" accesskey="3" title="Documentation for this Service">Docs</a><span> | </span></li>
+	<li><a href="./docs/help.html" title="Help and answers to frequently asked questions">Help&nbsp;&amp;&nbsp;<acronym title="Frequently Asked Questions">FAQ</acronym></a><span> | </span></li>
+    <li><a href="./feedback.html" accesskey="4" title="How to provide feedback on this service">Feedback</a><span> | </span></li>
+    <li><a href="./contribute.html" title="How to contribute to the validator project">Contribute</a><span> | </span></li>
+</ul>
+<div id="footer">
+
+	<p id="activity_logos">
+		<a href="http://www.w3.org/Status" title="W3C's Open Source, bringing you free Web quality tools and more"><img src="http://www.w3.org/Icons/WWW/w3c_home_nb" alt="W3C" width="72" height="47" /><img src="./images/opensource-55x48.png" alt="Open-Source" title="We are building certified Open Source/Free Software. - see www.opensource.org" width="55" height="48" /></a>
+	</p>
+
+		<p id="support_logo">
+			<a href="http://www.w3.org/QA/Tools/Donate">
+			<img src="http://www.w3.org/QA/Tools/I_heart_validator" alt="I heart Validator logo" title=" Validators Donation Program" width="80" height="15" />
+			</a>
+		</p>
+    <p id="version_info">
+      This service runs the W3C Markup Validator, <a href="whatsnew.html#v13"><abbr title="version">v</abbr>1.3</a>.
+    </p>
+
+		<p class="copyright">
+			<a rel="Copyright" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> &copy; 1994-2012
+			<a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a>&reg;
+
+			(<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>,
+			<a href="http://www.ercim.eu/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
+			<a href="http://www.keio.ac.jp/">Keio</a>),
+			All Rights Reserved.
+			W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
+			<a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>,
+			<a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a>
+
+			and <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-software">software licensing</a>
+
+			rules apply. Your interactions with this site are in accordance
+			with our <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Public">public</a> and
+			<a href="http://www.w3.org/Consortium/Legal/privacy-statement#Members">Member</a> privacy
+			statements.
+		</p>
+</div><!-- footer -->
+	</body>
+
+</html>
+
+
+
diff --git a/production/testScripts/configuration/sdk.tests/testScripts/test.xml b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
index 49878af81..401a486a7 100644
--- a/production/testScripts/configuration/sdk.tests/testScripts/test.xml
+++ b/production/testScripts/configuration/sdk.tests/testScripts/test.xml
@@ -1374,12 +1374,12 @@
     <!-- TODO: Do we need "buildID" coded somewhere, to know WHICH build to match with?
                Or, else will take large number of "baselines" averaged? -->
     <condition property="eclipse.perf.config"
-              value="build=${baselinePerfAltVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
+              value="build=config=${testedPlatformConfig};${baselinePerfAltVersion};jvm=${javaMajorVersion}">
          <istrue value="${baselinePerfAlt}"/>
     </condition>
     <condition property="eclipse.perf.config"
-              value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion}"
-              else="build=${buildId};config=${testedPlatformConfig};jvm=${javaMajorVersion}">
+              value="config=${testedPlatformConfig};build=${baselinePerfVersion};jvm=${javaMajorVersion}"
+              else="config=${testedPlatformConfig};build=${buildId};jvm=${javaMajorVersion}">
             <istrue value="${baselinePerf}"/>
     </condition>
     <!--
@@ -1389,7 +1389,7 @@
          Note: Note, docs say order does not matter, and could specify "just build" and reset filled in with what's in 'config', but some experiences makes me doubt that?
          TODO: design problem: how to distinguish assert against baseline vs. baseline alt.
     -->
-    <condition property="eclipse.perf.assertAgainst" value="build=${baselinePerfVersion};config=${testedPlatformConfig};jvm=${javaMajorVersion};">
+    <condition property="eclipse.perf.assertAgainst" value="config=${testedPlatformConfig};build=${baselinePerfVersion};jvm=${javaMajorVersion};">
         <equals arg1="${buildIdToUse}" arg2="${buildId}" />
     </condition>
     <!-- frameworkperfargs is used by library.xml ... probably an easier way? -->