Clean up Juno for default theme Signed-off-by: Eric Poirier <eric.poirier@eclipse-foundation.org>
diff --git a/_projectCommon.php b/_projectCommon.php index 08242fa..0f8ae52 100644 --- a/_projectCommon.php +++ b/_projectCommon.php
@@ -1,23 +1,19 @@ <?php -/******************************************************************************* - * Copyright(c) 2015 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://eclipse.org/legal/epl-v10.html +/** + * Copyright (c) 2015, 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: - * Nathan Gervais (Eclipse Foundation) - Initial implementation - * Eric Poirier (Eclipse Foundation) - *******************************************************************************/ + * Nathan Gervais (Eclipse Foundation) - Initial implementation + * Eric Poirier (Eclipse Foundation) + * + * SPDX-License-Identifier: EPL-2.0 + */ - # Set the theme for your project's web pages. - # See the Committer Tools "How Do I" for list of themes - # https://dev.eclipse.org/committers/ - # Optional: defaults to system theme -$theme = "solstice"; +$theme = NULL; $App->Promotion = FALSE; -$App->setOutDated( '2011-11-11', '<a href="https://projects.eclipse.org/releases/juno">Juno</a> is a past version of Eclipse. Please visit our <a href="/downloads/">download</a> page for the latest version of Eclipse. ' ); - -?> \ No newline at end of file +$App->setOutDated('2011-11-11', '<a href="https://projects.eclipse.org/releases/juno">Juno</a> is a past version of Eclipse. Please visit our <a href="/downloads/">download</a> page for the latest version of Eclipse. ');
diff --git a/content/en_friends.php b/content/en_friends.php index 087d9e0..458db63 100644 --- a/content/en_friends.php +++ b/content/en_friends.php
@@ -1,15 +1,17 @@ <?php -/******************************************************************************* - * Copyright(c) 2015 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://eclipse.org/legal/epl-v10.html +/** + * Copyright (c) 2015, 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: - * Nathan Gervais (Eclipse Foundation) - Initial implementation - * Eric Poirier (Eclipse Foundation) - *******************************************************************************/ + * Nathan Gervais (Eclipse Foundation) - Initial implementation + * Eric Poirier (Eclipse Foundation) + * + * SPDX-License-Identifier: EPL-2.0 + */ ?> <div id="juno"> <div id="fullcolumn" class="juno friends">
diff --git a/content/en_index.php b/content/en_index.php index 4b1d2a3..5762a71 100644 --- a/content/en_index.php +++ b/content/en_index.php
@@ -1,15 +1,17 @@ <?php -/******************************************************************************* - * Copyright(c) 2015 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://eclipse.org/legal/epl-v10.html +/** + * Copyright (c) 2015, 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: - * Nathan Gervais (Eclipse Foundation) - Initial implementation - * Eric Poirier (Eclipse Foundation) - *******************************************************************************/ + * Nathan Gervais (Eclipse Foundation) - Initial implementation + * Eric Poirier (Eclipse Foundation) + * + * SPDX-License-Identifier: EPL-2.0 + */ ?> <div id="juno"> <div class="juno frontpage">
diff --git a/content/en_projects.php b/content/en_projects.php index 50e4e8b..eff613f 100644 --- a/content/en_projects.php +++ b/content/en_projects.php
@@ -1,15 +1,17 @@ <?php -/******************************************************************************* - * Copyright(c) 2015 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://eclipse.org/legal/epl-v10.html +/** + * Copyright (c) 2015, 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: - * Nathan Gervais (Eclipse Foundation) - Initial implementation - * Eric Poirier (Eclipse Foundation) - *******************************************************************************/ + * Nathan Gervais (Eclipse Foundation) - Initial implementation + * Eric Poirier (Eclipse Foundation) + * + * SPDX-License-Identifier: EPL-2.0 + */ ?> <div id="juno"> <div id="fullcolumn" class="juno projects">
diff --git a/friends.php b/friends.php index bdbb28b..17a4f6d 100644 --- a/friends.php +++ b/friends.php
@@ -1,35 +1,34 @@ <?php -/******************************************************************************* - * Copyright(c) 2015 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://eclipse.org/legal/epl-v10.html +/** + * Copyright (c) 2015, 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: - * Nathan Gervais (Eclipse Foundation) - Initial implementation - * Eric Poirier (Eclipse Foundation) - *******************************************************************************/ -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"); + * Nathan Gervais (Eclipse Foundation) - Initial implementation + * Eric Poirier (Eclipse Foundation) + * + * SPDX-License-Identifier: EPL-2.0 + */ +require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); $App = new App(); -$Nav = new Nav(); -$Menu = new Menu(); -include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop' +$Theme = $App->getThemeClass(); +include ($App->getProjectCommon()); -// Begin: page-specific settings. Change these. -$pageTitle = "Eclipse.org - Juno Simultaneous Release : Friends of Eclipse"; -$pageKeywords = "juno, release, simultaneous, release train, eclipse 4, e4"; -$pageAuthor = "Christopher Guindon"; +$pageTitle = "Eclipse.org - Juno Simultaneous Release : Friends of Eclipse"; +$Theme->setPageTitle($pageTitle); +$Theme->setPageKeywords("juno, release, simultaneous, release train, eclipse 4, e4"); +$Theme->setPageAuthor("Christopher Guindon"); // Place your html content in a file called content/en_pagename.php ob_start(); -include("content/en_" . $App->getScriptName()); +include ("content/en_" . $App->getScriptName()); $html = ob_get_clean(); -# Generate the web page $App->AddExtraHtmlHeader('<link type="text/css" href="/juno/style.css" rel="stylesheet"/>'); -$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html); \ No newline at end of file +$Theme->setHtml($html); +$Theme->generatePage(); \ No newline at end of file
diff --git a/index.php b/index.php index 6014464..a02336d 100644 --- a/index.php +++ b/index.php
@@ -1,35 +1,34 @@ <?php -/******************************************************************************* - * Copyright(c) 2015 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://eclipse.org/legal/epl-v10.html +/** + * Copyright (c) 2015, 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: - * Nathan Gervais (Eclipse Foundation) - Initial implementation - * Eric Poirier (Eclipse Foundation) - *******************************************************************************/ -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"); + * Nathan Gervais (Eclipse Foundation) - Initial implementation + * Eric Poirier (Eclipse Foundation) + * + * SPDX-License-Identifier: EPL-2.0 + */ +require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); $App = new App(); -$Nav = new Nav(); -$Menu = new Menu(); -include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop' +$Theme = $App->getThemeClass(); +include ($App->getProjectCommon()); -// Begin: page-specific settings. Change these. -$pageTitle = "Eclipse.org - Juno Simultaneous Release"; -$pageKeywords = "juno, release, simultaneous, release train, eclipse 4, e4"; -$pageAuthor = "Christopher Guindon"; +$pageTitle = "Eclipse.org - Juno Simultaneous Release"; +$Theme->setPageTitle($pageTitle); +$Theme->setPageKeywords("juno, release, simultaneous, release train, eclipse 4, e4"); +$Theme->setPageAuthor("Christopher Guindon"); // Place your html content in a file called content/en_pagename.php ob_start(); -include("content/en_" . $App->getScriptName()); +include ("content/en_" . $App->getScriptName()); $html = ob_get_clean(); -# Generate the web page $App->AddExtraHtmlHeader('<link type="text/css" href="/juno/style.css" rel="stylesheet"/>'); -$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html); \ No newline at end of file +$Theme->setHtml($html); +$Theme->generatePage(); \ No newline at end of file
diff --git a/projects.php b/projects.php index 571b49d..c98296e 100644 --- a/projects.php +++ b/projects.php
@@ -1,35 +1,34 @@ <?php -/******************************************************************************* - * Copyright(c) 2015 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://eclipse.org/legal/epl-v10.html +/** + * Copyright (c) 2015, 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: - * Nathan Gervais (Eclipse Foundation) - Initial implementation - * Eric Poirier (Eclipse Foundation) - *******************************************************************************/ -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"); + * Nathan Gervais (Eclipse Foundation) - Initial implementation + * Eric Poirier (Eclipse Foundation) + * + * SPDX-License-Identifier: EPL-2.0 + */ +require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php"); $App = new App(); -$Nav = new Nav(); -$Menu = new Menu(); -include($App->getProjectCommon()); // All on the same line to unclutter the user's desktop' +$Theme = $App->getThemeClass(); +include ($App->getProjectCommon()); -// Begin: page-specific settings. Change these. -$pageTitle = "Eclipse.org - Juno Simultaneous Release : Projects"; -$pageKeywords = "juno, release, simultaneous, release train, eclipse 4, e4"; -$pageAuthor = "Christopher Guindon"; +$pageTitle = "Eclipse.org - Juno Simultaneous Release : Projects"; +$Theme->setPageTitle($pageTitle); +$Theme->setPageKeywords("juno, release, simultaneous, release train, eclipse 4, e4"); +$Theme->setPageAuthor("Christopher Guindon"); // Place your html content in a file called content/en_pagename.php ob_start(); -include("content/en_" . $App->getScriptName()); +include ("content/en_" . $App->getScriptName()); $html = ob_get_clean(); -# Generate the web page $App->AddExtraHtmlHeader('<link type="text/css" href="/juno/style.css" rel="stylesheet"/>'); -$App->generatePage(NULL, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html); \ No newline at end of file +$Theme->setHtml($html); +$Theme->generatePage(); \ No newline at end of file
diff --git a/style.css b/style.css index 8267246..92efacc 100644 --- a/style.css +++ b/style.css
@@ -277,7 +277,7 @@ #friend_box p, #friend_box h3 { text-align: center; padding-left: 0px; - margin-top:0; + margin-top: 0; } #friend_box p { @@ -360,10 +360,10 @@ padding-top: 20px; } -#sidebar{ - padding-top: 0; - overflow: visible; - height: inherit; +#sidebar { + padding-top: 0; + overflow: visible; + height: inherit; } #main { @@ -441,8 +441,8 @@ width: 90%; margin-top: 23px; border: 1px solid #D4B6FE; - position:relative; - height:75px; + position: relative; + height: 75px; } #btn_continue {