*** empty log message ***
diff --git a/testweb/_projectCommon.php b/testweb/_projectCommon.php
index 6b503f3..886d05f 100755
--- a/testweb/_projectCommon.php
+++ b/testweb/_projectCommon.php
@@ -5,6 +5,8 @@
ini_set('display_errors', 1); ini_set('error_reporting', E_ALL);
+$rtProjects = array("rt.ecf", "rt.eclipselink", "rt.equinox", "rt.ercp", "rt.gemini", "rt.jetty", "rt.rap", "rt.riena", "rt.smila", "rt.virgo");
+
# $Nav->setLinkList( array() );
$Nav->addCustomNav("Wiki", "http://wiki.eclipse.org/RT", "_self", 1);
$Nav->addCustomNav("Team", "/rt/team-leaders.php", "_self", 1);
@@ -29,18 +31,24 @@
// $App->Promotion = TRUE; # set true to enable current eclipse.org site-wide promo
-$rtProjects = array("rt.ecf", "rt.eclipselink", "rt.equinox", "rt.ercp", "rt.gemini", "rt.jetty", "rt.rap", "rt.riena", "rt.smila", "rt.virgo");
$App->useProjectInfo();
function load_project_nav($projectList) {
foreach ($projectList as $project) {
$projectInfo = new ProjectInfoData($project);
- $projectName = $projectInfo->__get("projectshortname");
- $projectURL = $projectInfo->__get("projecturl");
+ $projectName = $projectInfo->projectshortname;
+ $projectURL = fixupURL($projectInfo->projecturl);
$Nav->addCustomNav($projectName, $projectURL, "_self", 1);
}
}
+function fixupURL($url) {
+ $result = $url;
+ if(!preg_match('/http:\/\//', $url))
+ $result = "http://www.eclipse.org/" . $url);
+ return trim($result);
+}
+
function createRapNavigation( $Nav ) {
$html = <<<EOHTML
<div id="rap-small-header">
diff --git a/testweb/index.php b/testweb/index.php
index 6df21ba..56ef025 100755
--- a/testweb/index.php
+++ b/testweb/index.php
@@ -21,17 +21,17 @@
$result = "\n<ul>";
foreach ($projectList as $project) {
$projectInfo = new ProjectInfoData($project);
- $projectName = $projectInfo->__get("projectname");
+ $projectName = $projectInfo->projectname;
if(!$projectName)
- $projectName = $projectInfo->__get("projectshortname");
+ $projectName = $projectInfo->projectshortname;
if ($projectName) {
- $projectHeading = $projectInfo->__get("projecturl");
+ $projectHeading = fixupURL($projectInfo->projecturl);
if ($projectHeading)
$projectHeading = '<a href="' . $projectHeading . '"><b>' . $projectName . "</b></a>";
else
$projectHeading = "<b>" . $projectName . "</b>";
$result .= "\n\t<li>" . $projectHeading;
- $paraURL = $projectInfo->__get("paragraphurl");
+ $paraURL = fixupURL($projectInfo->paragraphurl);
if ($paraURL)
$result .= "<br/>" . file_get_contents($paraURL);
$result .= "</li>\n";
