Attachment 217376 Details for Bug 208422 – Latest nova patch

[patch] Latest nova patch

nova+theme.patch (text/plain), 18.30 KB, created by Christopher Guindon

on 2012-06-14 14:28:52 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Christopher Guindon

Created: 2012-06-14 14:28:52 EDT

Size: 18.30 KB

patch

obsolete

>From 9d28263b0a7d4f2e63b9556e97bdb57ec463352e Thu, 14 Jun 2012 14:27:01 -0400
>From: Christopher Guindon <chris.guindon@eclipse.org>
>Date: Thu, 14 Jun 2012 14:19:54 -0400
>Subject: [PATCH] nova theme
>
>diff --git a/downloadsites/eclipse/downloads/createIndex4x.php b/downloadsites/eclipse/downloads/createIndex4x.php
>index fd9066e..a8e4913 100644
>--- a/downloadsites/eclipse/downloads/createIndex4x.php
>+++ b/downloadsites/eclipse/downloads/createIndex4x.php
>@@ -1,26 +1,97 @@
>-<!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">
>-<?php
>-//ini_set("display_errors", "true");
>-//error_reporting (E_ALL);
>-$eclipseStream="4";
>-$otherIndexFile="eclipse3x.html";
>-$otherStream="3";
>-include('dlconfig4.php');
>-$subdirDrops="drops4";
>+<?php 
>+require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	
>+require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	
>+require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	
>+$App 	= new App();	
>+$Nav	= new Nav();	
>+$Menu 	= new Menu();		
>+include($App->getProjectCommon());    
> 
>-?>
>-<head>
>-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
>-<link rel="stylesheet" href="../default_style.css" />
>-<title>Eclipse Project Downloads</title></head>
>-<body>
>+# All on the same line to unclutter the user's desktop'
>+/*******************************************************************************
>+ * Copyright (c) 2009-2010 Eclipse Foundation and others.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *    
>+ *******************************************************************************/
>+
>+		#
>+	# Begin: page-specific settings.  Change these. 
>+	$pageTitle 		= "Eclipse Project Downloads";
>+	$pageKeywords	= "";
>+	$pageAuthor		= "";
>+	
>+	ini_set("display_errors", "true");
>+	error_reporting (E_ALL);
>+	$eclipseStream="4";
>+	$otherIndexFile="eclipse3x.html";
>+	$otherStream="3";
>+	include('dlconfig4.php');
>+	$subdirDrops="drops4";
>+
>+	
>+	$op = '<' . '?php' ;
>+	$cl = ' ?' . '>';
>+	
>+	# Paste your HTML content between the EOHTML markers!	
>+	ob_start();	
>+	
>+	
>+	//options: php, html. If not define default
>+	$layout = (!isset($_GET['layout']) || ($_GET['layout'] != "php" && $_GET['layout'] != "html")) ? 'default' : $_GET['layout'];
>+	
>+
>+	switch($layout){
>+		case 'html':
>+	?> 
>+      <!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 print $pageTitle;?></title></head>
>+      <body>
>+<?php 
>+			break;
>+		case 'php':
>+			print $op;?>
>+      
>+            $pageTitle    = "<?php print $pageTitle;?>";
>+            $pageKeywords = "";
>+            $pageAuthor   = "";
>+		    require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");	
>+		    require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php"); 	
>+		    require_once($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/menu.class.php"); 	
>+		    $App 	= new App();	
>+		    $Nav	= new Nav();	
>+		    $Menu 	= new Menu();		
>+		    include($App->getProjectCommon()); 
>+            $App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />');
>+            ob_start();
>+              
>+           <?php  
>+   			print $cl;   		
>+   			break;	
>+		default:
>+			$App->AddExtraHtmlHeader('<link rel="stylesheet" href="../default_style.css" />');
>+			break;			
>+	}?>
>+<style type="text/css">
>+  .container_php, .container_default{
>+    padding:0 20px;
>+  }
>+</style>
>+<div class="container_<?php print $layout;?>">
> <table border="0" cellspacing="5" cellpadding="2" width="100%" > 
> 
> <tr> 
> 
> <td align="left" width="72%"> 
>-<font class="indextop"> Eclipse Project <?php echo $eclipseStream;?>.x Stream Downloads</font> <br /> 
>+<font class="indextop"> Eclipse Project <?php print $eclipseStream;?>.x Stream Downloads</font> <br /> 
> <font class="indexsub">
> Latest downloads from the Eclipse project
> </font><br />
>@@ -55,7 +126,7 @@
> Software User Agreement</a> unless otherwise specified. </p>
> 
> 
>-<p><a href="http://download.eclipse.org/eclipse/downloads/<?php echo $otherIndexFile;?>">Eclipse <?php echo $otherStream;?>.x downloads</a> are available.</p>
>+<p><a href="http://download.eclipse.org/eclipse/downloads/<?php print $otherIndexFile;?>">Eclipse <?php print $otherStream;?>.x downloads</a> are available.</p>
> <p>See the <a href="http://www.eclipse.org/downloads/"> main Eclispe download site for other packages and projects</a>.</p>
> <p>Help out with Eclipse translations - check out the <a href="http://babel.eclipse.org/babel/">Babel project</a>.</p>
> <p>If you prefer, try downloading with the <a href="http://build.eclipse.org/technology/phoenix/torrents/SDK/">SDK Torrents</a> </p>
>@@ -79,7 +150,7 @@
>         // sanity check input
>         if (isset($dirName) && strlen($dirName) > 0) {
>             $firstChar = substr($dirName, 0, 1);
>-            //echo "first char: ".$firstChar;
>+            //print "first char: ".$firstChar;
>             foreach($dropPrefix as $type) {  
>                 if ($firstChar == "$type") {
>                     $result = true;
>@@ -89,7 +160,7 @@
>         }
>     }
>     else {
>-        echo "dropPrefix not defined as expected\n";
>+        print "dropPrefix not defined as expected\n";
>     }
>     return $result;
> }
>@@ -97,7 +168,6 @@
>     // hard code for now the tests ran on one box
>     // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706
>     return 1;
>-
>     global $subdirDrops;
>     $testBoxes=array("linux", "macosx", "win32");
>     $length=count($testBoxes);
>@@ -120,7 +190,7 @@
>     global $subdirDrops;
>     // no file name, write empty column
>     if ($fileName == "") {
>-        echo "<td></td>\n";
>+        print "<td></td>\n";
>         return;
>     }
>     // get build name, date and time
>@@ -145,13 +215,13 @@
>     // presumably this particular md5 was choosen since last one made, I'd guess? 
>     //$build_done=file_exists("$dropDir/checksum/swt-$buildName-win32-wce_ppc-arm-j2me.zip.md5");
>     $build_done=file_exists("$dropDir/eclipse-SDK-$buildName-linux-gtk.tar.gz");
>-    echo "<td valign=\"baseline\">\n";
>+    print "<td valign=\"baseline\">\n";
>     // hard code for now the build is done
>     // https://bugs.eclipse.org/bugs/show_bug.cgi?id=378706
>     // if ($build_done) {
>     if (true) {
>         $boxes=runTestBoxes($fileName);
>-        echo "<a href=\"$dropDir/\"><img border=\"0\" src=\"../images/build_done.gif\" title=\"Build is available\" alt=\"Build is available\" /></a>\n";
>+        print "<a href=\"$dropDir/\"><img border=\"0\" src=\"../images/build_done.gif\" title=\"Build is available\" alt=\"Build is available\" /></a>\n";
>         //$testResults="$dropDir/testresults/xml";
>         //if (file_exists("$testResults")) {
>         switch ($boxes) {
>@@ -160,21 +230,21 @@
>             //if ($diff > 480) {
>             // for now, hard code to "0" since we are not reunning tests
>             if ($diff > 0) { 
>-                echo "<img src=\"../images/caution.gif\" title=\"Regression tests did not run!\" alt=\"Regression tests did not run!\" />\n";
>+                print "<img src=\"../images/caution.gif\" title=\"Regression tests did not run!\" alt=\"Regression tests did not run!\" />\n";
>             } else {
>-                echo "<img src=\"../images/runtests.gif\" title=\"Regression tests are running...\" alt=\"Regression tests are running...\" />\n";
>+                print "<img src=\"../images/runtests.gif\" title=\"Regression tests are running...\" alt=\"Regression tests are running...\" />\n";
>             }
>             break;
> 
>         case 5:
>-            echo "<a href=\"$dropDir/results/testResults.html\"><img border=\"0\" src=\"../images/junit.gif\" title=\"Tests results are available\" alt=\"Tests results are available\" /></a>\n";
>+            print "<a href=\"$dropDir/results/testResults.html\"><img border=\"0\" src=\"../images/junit.gif\" title=\"Tests results are available\" alt=\"Tests results are available\" /></a>\n";
>             break;
>         default:
>             // if more than 12 hours then consider that the regression tests did not finish
>             if ($diff > 720) {
>-                echo "<a href=\"$dropDir/results/testResults.html\"><img border=\"0\" src=\"../images/junit.gif\" title=\"Tests results are available but did not finish on all machines\" alt=\"Tests results are available but did not finish on all machines\" /></a>\n";
>+                print "<a href=\"$dropDir/results/testResults.html\"><img border=\"0\" src=\"../images/junit.gif\" title=\"Tests results are available but did not finish on all machines\" alt=\"Tests results are available but did not finish on all machines\" /></a>\n";
>             } else {
>-                echo "<img border=\"0\" src=\"../images/runtests.gif\" title=\"Tests are still running on some machines...\" alt=\"Tests are still running on some machines...\" />\n";
>+                print "<img border=\"0\" src=\"../images/runtests.gif\" title=\"Tests are still running on some machines...\" alt=\"Tests are still running on some machines...\" />\n";
>             }
>         }
>         //break;
>@@ -184,9 +254,9 @@
>     //    $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";
>+    //print "<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";
>+    //        print "<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")) {
>@@ -197,9 +267,9 @@
>     //            } 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";
>+    //  print "<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";
>+    //   print "<img src=\"../images/runperfs.gif\" title=\"Performance tests are running...\" alt=\"Performance tests are running\" />\n";
>     // }
>     // }
>     // }
>@@ -208,12 +278,12 @@
>     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";
>+            print "<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";
>+            print "<img src=\"../images/build_progress.gif\" title=\"Build is in progress...\" alt=\"Build failed!\"/>\n";
>         }
>     }
>-    echo "</td>\n";
>+    print "</td>\n";
>     return $buildName;
> }
> ?> 
>@@ -226,7 +296,7 @@
> 
>     if ($anEntry != "." && $anEntry!=".." && $anEntry!="TIME" && startsWithDropPrefix($anEntry,$dropPrefix)) {
>         $parts = explode("-", $anEntry);
>-        // echo "<p>an entry: $anEntry\n";
>+        // print "<p>an entry: $anEntry\n";
>         if (count($parts) == 3) {
> 
>             $buckets[$parts[0]][] = $anEntry;
>@@ -289,8 +359,8 @@
>     $prefix=$typeToPrefix[$value];
>     // if empty bucket, do not print this row
>     if (array_key_exists($prefix,$buckets)) {
>-        echo "<tr>\n";
>-        echo "<td width=\"30%\">$value</td>\n";
>+        print "<tr>\n";
>+        print "<td width=\"30%\">$value</td>\n";
> 
> 
>         if (array_key_exists($prefix,$latestFile)) {
>@@ -299,7 +369,7 @@
>         $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";
>+        // print "<td><a href=license.php?license=$subdirDrops/$fileName>$parts[1]</a></td>\n";
> 
>         // Comment the line below if we need click through licenses.
> 
>@@ -308,13 +378,13 @@
>             $buildName=$parts[1];
>         }
>         if ($fileName == "") {
>-            echo "<td></td>\n";
>+            print "<td></td>\n";
>         } else {
>-            echo "<td><a href=\"$subdirDrops/$fileName/\">$buildName</a></td>\n";
>+            print "<td><a href=\"$subdirDrops/$fileName/\">$buildName</a></td>\n";
>         }
>         $buildName = printBuildColumns($fileName, $parts);
>-        echo "<td>$timeStamps[$fileName]</td>\n";
>-        echo "</tr>\n";
>+        print "<td>$timeStamps[$fileName]</td>\n";
>+        print "</tr>\n";
>     }
> }
> ?> 
>@@ -327,31 +397,31 @@
>     // skip whole section, if bucket is empty
>     if (array_key_exists($prefix,$buckets)) {
> 
>-        echo " <table width=\"100%\" cellspacing=\"0\" cellpadding=\"3\" align=\"center\" >\n";
>+        print " <table width=\"100%\" cellspacing=\"0\" cellpadding=\"3\" align=\"center\" >\n";
>         // header, colored row
>-        echo "<tr bgcolor=\"#999999\">\n";
>+        print "<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=\"30%\"><a name=\"$valueName\">\n";
>-        echo "<font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value\n";
>-        echo "</font></a></td>\n";
>-        echo "</tr>\n";
>+        print "<td align=\"left\" width=\"30%\"><a name=\"$valueName\">\n";
>+        print "<font color=\"#FFFFFF\" face=\"Arial,Helvetica\">$value\n";
>+        print "</font></a></td>\n";
>+        print "</tr>\n";
> 
>-        echo "<tr>\n";
>-        echo "<td align=\"left\" >\n";
>-        echo "\n";
>-        echo "\n";
>-        echo "\n";
>-        echo "\n";
>-        echo "<table  width=\"100%\" cellspacing=\"0\" cellpadding=\"4\" >\n";
>-        echo "<tr>\n";
>+        print "<tr>\n";
>+        print "<td align=\"left\" >\n";
>+        print "\n";
>+        print "\n";
>+        print "\n";
>+        print "\n";
>+        print "<table  width=\"100%\" cellspacing=\"0\" cellpadding=\"4\" >\n";
>+        print "<tr>\n";
> 
>-        echo "<th width=\"15%\">Build Name</th>\n";
>-        echo "<th width=\"15%\">Build Status</th>\n";
>-        echo "<th>Build Date</th>\n";
>+        print "<th width=\"15%\">Build Name</th>\n";
>+        print "<th width=\"15%\">Build Status</th>\n";
>+        print "<th>Build Date</th>\n";
> 
>-        echo "</tr>\n";
>+        print "</tr>\n";
> 
>         $aBucket = $buckets[$prefix];
>         if (isset($aBucket)) {
>@@ -359,34 +429,57 @@
>             foreach($aBucket as $innerValue) {
>                 $parts = explode("-", $innerValue);
> 
>-                echo "<tr>\n";
>+                print "<tr>\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";
>+                // print "<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><a href=\"$subdirDrops/$innerValue/\">$parts[1]</a></td>\n";
>+                    print "<td><a href=\"$subdirDrops/$innerValue/\">$parts[1]</a></td>\n";
>                 } else if (count ($parts)==2) {
>-                    echo "<td><a href=\"$subdirDrops/$innerValue/\">$innerValue</a></td>\n";
>+                    print "<td><a href=\"$subdirDrops/$innerValue/\">$innerValue</a></td>\n";
>                 } else {
>-                    echo "<td>Unexpected numberof parts?</td>\n";
>+                    print "<td>Unexpected numberof parts?</td>\n";
>                 }
> 
>                 $buildName = printBuildColumns($innerValue, $parts);
>-                echo "<td>$timeStamps[$innerValue]</td>\n";
>-                echo "</tr>\n";
>+                print "<td>$timeStamps[$innerValue]</td>\n";
>+                print "</tr>\n";
>             }
>         }
>-        echo "</table>\n";
>-        echo "</td></tr>\n";
>-        echo "</table>\n";
>+        print "</table>\n";
>+        print "</td></tr>\n";
>+        print "</table>\n";
> 
>     }
> }
>-
>-?>  
>-</body>
>-</html>
>+	print '</div>';
>+	$html = ob_get_clean();
>+	
>+	switch($layout){
>+		case 'html':
>+			print $html;
>+			print '</body>';
>+			print '</html>';
>+			break;
>+		
>+		case 'php':            
>+            print $html;
>+            print $op; ?>
>+            
>+            $html = ob_get_clean();
>+            $App->Promotion = FALSE;
>+            $App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html);            
>+			
>+			<?php 		
>+			//print $cl;
>+			break;
>+		
>+		default:
>+			$App->Promotion = FALSE;
>+			$App->generatePage('Nova', $Menu, NULL , $pageAuthor, $pageKeywords, $pageTitle, $html);
>+			break;	
>+	}

Actions: View | Diff

Attachments on bug 208422: 217373 | 217375 | 217376 | 217377 | 217429 | 217495 | 217496