Pages in /projects should use the default theme
Change-Id: I865ffcc775791d65a2b942db030eba8f0228e910
Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>
diff --git a/_projectCommon.php b/_projectCommon.php
index 84a67d2..859e994 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -1,4 +1,4 @@
<?php
-$theme = "solstice";
+$theme = NULL;
$App->Promotion = TRUE;
?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 37a3c85..a54cc51 100644
--- a/index.php
+++ b/index.php
@@ -1,41 +1,40 @@
<?php
-/*******************************************************************************
- * Copyright (c) 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
+/**
+ * Copyright (c) 2010, 2018 Eclipse Foundation and others.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
*
* Contributors:
* Wayne Beaton (Eclipse Foundation)- initial API and implementation
* Christopher Guindon (Eclipse Foundation) - Re-implementation for the new solstice theme
- *******************************************************************************/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
- 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");
+require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
- $App = new App();
- $Nav = new Nav();
- $Menu = new Menu();
- include($App->getProjectCommon());
+$App = new App();
+$App->PageRSS = "/projects/reviews-rss.php";
+$Theme = $App->getThemeClass();
+//$Theme->removeAttributes('breadcrumbs', 'breadcrumbs-default-margin');
- $pageTitle = "Projects Gateway";
- $pageAuthor = "";
- $pageKeywords = "Eclipse, projects, plugin, plugins, download, plan";
+$pageTitle = "Projects Gateway";
+$Theme->setPageTitle($pageTitle);
+$Theme->setPageKeywords("Eclipse, projects, plugin, plugins, download, plan");
+$Theme->setPageAuthor("Christopher Guindon");
- // Custom theme variables
- $variables = array();
- $variables['main_container_classes'] = 'container-project';
+// Custom theme variables
+$variables = array();
+$variables['main_container_classes'] = 'container-project';
+$Theme->setThemeVariables($variables);
- // Place your html content in a file called content/en_pagename.php
- ob_start();
- include("content/en_" . $App->getScriptName());
- $html = ob_get_clean();
+// Place your html content in a file called content/en_pagename.php
+ob_start();
+include("content/en_" . $App->getScriptName());
+$html = ob_get_clean();
+$Theme->setHtml($html);
- $App->setThemeVariables($variables);
-
- // $App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/default/style.css"/>');
- # Generate the web page
- $App->PageRSS = "/projects/reviews-rss.php";
- $App->generatePage('solstice', $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
+# Generate the web page
+$Theme->generatePage();
\ No newline at end of file
diff --git a/project_activity.php b/project_activity.php
index 18f266a..841291e 100644
--- a/project_activity.php
+++ b/project_activity.php
@@ -36,4 +36,4 @@
// $App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/default/style.css"/>');
# Generate the web page
$App->PageRSS = "/projects/reviews-rss.php";
- $App->generatePage('solstice', $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
+ $App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
diff --git a/tools/_projectCommon.php b/tools/_projectCommon.php
index 02d25cf..f3b9979 100755
--- a/tools/_projectCommon.php
+++ b/tools/_projectCommon.php
@@ -37,7 +37,7 @@
$separator = '&';
}
-$theme = "solstice";
+$theme = NULL;
$App->Promotion = TRUE;
$Nav->addNavSeparator("Project Tools", "index.php$parameters");
diff --git a/tools/hierarchy.php b/tools/hierarchy.php
index 468d1a5..8a1e4b5 100644
--- a/tools/hierarchy.php
+++ b/tools/hierarchy.php
@@ -57,5 +57,5 @@
<?php
$html = ob_get_contents();
ob_end_clean();
-$App->generatePage('solstice', $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$App->generatePage(NULL, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>
\ No newline at end of file
diff --git a/tools/status.php b/tools/status.php
index 1da4d2d..35b351e 100644
--- a/tools/status.php
+++ b/tools/status.php
@@ -444,5 +444,5 @@
<?php
$html = ob_get_contents();
ob_end_clean();
- $App->generatePage('solstice', $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+ $App->generatePage(NULL, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>
\ No newline at end of file
