Rework website to match latest style
diff --git a/_projectCommon.php b/_projectCommon.php
index 2edd955..82ce485 100755
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -1,105 +1,66 @@
<?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://www.eclipse.org/legal/epl-v10.html
+require_once ($_SERVER['DOCUMENT_ROOT'] . '/eclipse.org-common/system/app.class.php');
+require_once ($_SERVER['DOCUMENT_ROOT'] . '/eclipse.org-common/system/nav.class.php');
+
+/**
+ * Copyright (c) 2015-present Eclipse Foundation.
+ *
+ * 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:
- * Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
- *******************************************************************************/
+ * Stuart McCulloch - Custom content for Sisu
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
-require_once($_SERVER['DOCUMENT_ROOT'] . "/projects/classes/Project.class.php");
+$currentRelease = '0.3.4';
-$projectId = "technology.sisu";
-$project = getProject($projectId);
-$projectName = $project->getName();
-$projectShortName = $project->getShortName();
-$projectDescription = $project->getDescription();
-$projectUrl = "http://www.eclipse.org/sisu/";
-$issueTracker = normalizeHttpUrl($project->getBugzillaUrl());
-$wiki = normalizeHttpUrl($project->getWikiUrl());
-$sources = "http://git.eclipse.org/c/sisu/";
-$ci = "https://hudson.eclipse.org/sisu/";
-$about = "/projects/project.php?id=$projectId";
-$iplog = "/projects/ip_log.php?projectid=$projectId";
-$release = "0.3.4";
+$projectInfo = 'https://projects.eclipse.org/projects/technology.sisu/';
+$projectSource = 'https://git.eclipse.org/c/sisu/';
+$projectCi = 'https://ci.eclipse.org/sisu/';
+$projectBugs = 'https://bugs.eclipse.org/bugs/describecomponents.cgi?product=Sisu';
+$projectWiki = 'http://wiki.eclipse.org/Sisu';
-# Set the theme for your project's web pages.
-# See the Committer Tools "Phoenix" secion in the How Do I? for list of themes
-# https://dev.eclipse.org/committers/
-$theme = "solstice";
+$pageKeywords = 'sisu, dependency injection, inject, ioc, jsr330';
+$pageAuthor = 'Stuart McCulloch';
-# Define keywords, author and title here, or in each PHP page specifically
-$pageKeywords = "sisu, dependency injection, inject, ioc, jsr330";
-$pageAuthor = "Stuart McCulloch";
-$pageTitle = $projectName;
+$App = new App();
+$Nav = new Nav();
-# Define your project-wide Navigation here
-# This appears on the left of the page if you define a left nav
-# Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
-# these are optional
+$Nav->addNavSeparator('Sisu', '/sisu/');
+$Nav->addCustomNav('Javadoc', '/sisu/docs/api/org.eclipse.sisu.inject/reference/packages.html', '_self', NULL);
+$Nav->addCustomNav('Source code', $projectSource, '_self', NULL);
+$Nav->addCustomNav('Project info', $projectInfo, '_self', NULL);
-# If you want to override the eclipse.org navigation, uncomment below.
-# $Nav->setLinkList(array());
+$incubation = '<div style="text-align:center"><a href="/projects/what-is-incubation.php"><img class="img-responsive"
+ align="center" src="https://projects.eclipse.org/sites/all/modules/custom/pmi/project_state/images/incubating.png"
+ border="0" alt="Incubation" /></a></div>';
-# Break the navigation into sections
-$Nav->addNavSeparator("$projectName", $projectUrl);
-$Nav->addCustomNav("Documentation", $projectUrl . "docs/", "_self", 3);
-$Nav->addCustomNav("Downloads", $projectUrl . "download/", "_self", 3);
-$Nav->addCustomNav("Get Involved", $projectUrl . "developers/", "_self", 3);
-$Nav->addCustomNav("Support", $projectUrl . "support/", "_self", 3);
-$Nav->addCustomNav("Changelog", "http://wiki.eclipse.org/Sisu/Changelog", "_self", 3);
-$Nav->addCustomNav("About Sisu", "/projects/project.php?id=$projectId", "_self", 3);
+$Nav->setHTMLBlock($incubation);
-# top navigation bar
-# To override and replace the navigation with your own, uncomment the line below.
-# $Menu->setMenuItemList(array());
-# $Menu->addMenuItem("Home", $projectUrl, "_self");
-# $Menu->addMenuItem("Documentation", $projectUrl . "docs/", "_self");
-# $Menu->addMenuItem("Downloads", $projectUrl . "download/", "_self");
-# $Menu->addMenuItem("Get Involved", $projectUrl . "developers/", "_self");
-# $Menu->addMenuItem("Support", $projectUrl . "support/", "_self");
+$Theme = $App->getThemeClass();
+$Theme->setPageAuthor($pageAuthor);
+$Theme->setPageKeywords($pageKeywords);
+$Theme->setPageTitle($pageTitle);
+$Theme->setBreadcrumb($pageTitle);
+$Theme->setNav($Nav);
-# incubation side item
-$incubation = "<div class=\"sideitem\">
- <h6><img src=\"/projects/images/egg.gif\" align=\"right\"/>Incubation</h6>
- <div style=\"text-align:center\"><a href=\"/projects/what-is-incubation.php\"><img
- align=\"center\" src=\"/images/egg-incubation.png\"
- border=\"0\" alt=\"Incubation\" /></a></div>
- </div>";
-
-# To define additional CSS or other pre-body headers
-
-ob_start();
-require_once("banner.php");
-$banner = ob_get_clean();
-
-# Initialize custom solstice $variables.
$variables = array();
-# Add classes to <body>. (String)
$variables['body_classes'] = '';
-# Insert custom HTML in the breadcrumb region. (String)
$variables['breadcrumbs_html'] = '';
-# Hide the breadcrumbs. (Bool)
$variables['hide_breadcrumbs'] = FALSE;
-# Insert HTML before the left nav. (String)
-$variables['leftnav_html'] = "$banner";
-# Update the main container class (String)
+$variables['leftnav_html'] = '';
$variables['main_container_classes'] = 'container';
-# Insert HTML after opening the main content container, before the left sidebar. (String)
$variables['main_container_html'] = '';
-# Set Solstice theme variables. (Array)
+// disable big button in header
+$variables['btn_cfa'] = array(
+ 'hide' => TRUE,
+ 'text' => ' '
+);
+
$App->setThemeVariables($variables);
-# Insert extra html before closing </head> tag.
-$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/sisu/assets/css/banner.css"/>');
-
-# To enable occasional Eclipse Foundation Promotion banners on your pages (EclipseCon, etc)
-$App->Promotion = FALSE;
-
-# If you have Google Analytics code, use it here
-# $App->SetGoogleAnalyticsTrackingCode("YOUR_CODE");
?>
diff --git a/assets/css/banner.css b/assets/css/banner.css
index 6ed9755..f9a1577 100644
--- a/assets/css/banner.css
+++ b/assets/css/banner.css
@@ -1,22 +1,20 @@
@CHARSET "UTF-8";
.sisu div{position:absolute;}
-.sisu-0{width:136px;height:46px;border:2px solid #000;}
-.sisu-1{left:12px;top:12px;background:#000;}
-.sisu-2{width:30px;height:2px;left:15px;top:15px;background:#000;}
-.sisu-3{width:30px;height:2px;top:30px;background:#000;}
-.sisu-4{left:27px;top:27px;background:#000;}
-.sisu-5{width:2px;height:44px;left:45px;background:#000;}
-.sisu-6{width:2px;height:44px;left:60px;background:#000;}
-.sisu-7{width:2px;height:30px;left:60px;background:#000;}
-.sisu-8{left:57px;top:27px;background:#000;}
-.sisu-dot{width:8px;height:8px;-moz-border-radius:4px;-webkit-border-radius:4px;border-radius:4px}
+.sisu-0{width:272px;height:92px;border:4px solid #000;}
+.sisu-1{left:24px;top:24px;background:#000;}
+.sisu-2{width:60px;height:4px;left:30px;top:30px;background:#000;}
+.sisu-3{width:60px;height:4px;top:60px;background:#000;}
+.sisu-4{left:54px;top:54px;background:#000;}
+.sisu-5{width:4px;height:88px;left:90px;background:#000;}
+.sisu-6{width:4px;height:88px;left:120px;background:#000;}
+.sisu-7{width:4px;height:60px;left:120px;background:#000;}
+.sisu-8{left:114px;top:54px;background:#000;}
+.sisu-dot{width:16px;height:16px;-moz-border-radius:8px;-webkit-border-radius:8px;border-radius:8px}
-@media (min-width:768px){
-div.sisu{position:relative;top:-192px;left:220px;}}
+@media (min-width:992px){
+div.sisu{position:relative;top:-160px;left:20px;}}
-@media (min-width:438px) and (max-width:767px){
-div.sisu{position:relative;top:-147px;left:220px;}}
+@media (min-width:0px) and (max-width:991px){
+div.sisu{position:relative;top:-465px;left:20px;}}
-@media (min-width:0px) and (max-width:437px){
-div.sisu{display:none;}}
diff --git a/assets/img/blank.png b/assets/img/blank.png
new file mode 100644
index 0000000..60721d2
--- /dev/null
+++ b/assets/img/blank.png
Binary files differ
diff --git a/developers/index.php b/developers/index.php
index 364b927..ab2e1e0 100644
--- a/developers/index.php
+++ b/developers/index.php
@@ -1,17 +1,16 @@
-<?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()); # All on the same line to unclutter the user's desktop'
-/*******************************************************************************
- * 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://www.eclipse.org/legal/epl-v10.html
+<?php $pageTitle = "Get Involved"; require_once ('../_projectCommon.php');
+/**
+ * Copyright (c) 2015-present Eclipse Foundation.
+ *
+ * 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:
- * Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
- *******************************************************************************/
-
-$pageTitle = "Get Involved";
-
+ * Stuart McCulloch - Custom content for Sisu
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
ob_start();
?>
@@ -19,12 +18,12 @@
<h3 id="wiki">Wiki</h3>
<p>
- Information about building, testing and debugging <?php print $projectName;?> can be found in our <a href="<?php print $wiki;?>">wiki space</a>.
+ Information about building, testing and debugging Sisu can be found in our <a href="<?php print $projectWiki;?>">wiki space</a>.
</p>
<h3 id="sources">Source Code</h3>
<p>
- The source files of the project are stored in <a href="<?php print $sources;?>">Git repositories</a>. Please
+ The source files of the project are stored in <a href="<?php print $projectSource;?>">Git repositories</a>. Please
see the summary tab of a repository for details about the URL required to clone a repository to your local machine.
</p>
<p>
@@ -55,13 +54,12 @@
</p>
<p>
We use the <a href="http://wiki.eclipse.org/Development_Resources/Automatic_IP_Log">automatic IP log tool</a>
- to track code contributions and third-party dependencies. See <a href="<?php print $iplog;?>"><?php print $projectName;?>'s tentative IP log</a>
- for the list of currently approved dependencies.
+ to track code contributions and third-party dependencies.
</p>
<h3 id="issues">Bug Tracker</h3>
<p>
- The project uses Bugzilla to manage <a href="<?php print $issueTracker;?>">bugs and feature requests</a>.
+ The project uses Bugzilla to manage <a href="<?php print $projectBugs;?>">bugs and feature requests</a>.
</p>
<h3 id="mail">Mailing Lists</h3>
@@ -72,9 +70,9 @@
<h3 id="ci">Continuous Integration</h3>
<p>
- We use <a href="<?php print $ci;?>">Hudson</a> for our continuous integration
- builds. Hudson is configured to periodically poll our Git repositories for changes and automatically starts a new
- build when required. We also have a daily <a href="https://hudson.eclipse.org/sisu/job/sisu-sonar/">Sonar job</a>
+ We use <a href="<?php print $projectCi;?>">Jenkins</a> for our continuous integration
+ builds. Jenkins is configured to periodically poll our Git repositories for changes and automatically starts a new
+ build when required. We also have a daily <a href="https://ci.eclipse.org/sisu/job/sisu-sonar/">Sonar job</a>
to track <a href="https://dev.eclipse.org/sonar/dashboard/index/org.eclipse.sisu:sisu-inject">code quality</a>.
</p>
<p>
@@ -91,7 +89,7 @@
</repository>
</pre>
<p>
- Note: This repository contains snapshots of many projects, not just those produced by <?php print $projectName;?>.
+ Note: This repository contains snapshots of many projects, not just those produced by Sisu.
</p>
<h3 id="website">Website</h3>
@@ -104,14 +102,11 @@
<li><a href="http://wiki.eclipse.org/Using_Phoenix">Using Phoenix</a></li>
<li><a href="http://wiki.eclipse.org/Configuring_Eclipse_to_Edit_your_eclipse.org_Website">Configuring Eclipse to Edit your eclipse.org Website</a></li>
</ul>
-</div>
-<div id="rightcolumn">
-<?php print $incubation;?>
</div>
<?php
$html = ob_get_clean();
-# Generate the web page
-$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$Theme->setHtml($html);
+$Theme->generatePage();
?>
diff --git a/docs/index.php b/docs/index.php
index c55f6f5..cb1d9ee 100644
--- a/docs/index.php
+++ b/docs/index.php
@@ -1,17 +1,16 @@
-<?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()); # All on the same line to unclutter the user's desktop'
-/*******************************************************************************
- * 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://www.eclipse.org/legal/epl-v10.html
+<?php $pageTitle = "Documentation"; require_once ('../_projectCommon.php');
+/**
+ * Copyright (c) 2015-present Eclipse Foundation.
+ *
+ * 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:
- * Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
- *******************************************************************************/
-
-$pageTitle = "Documentation";
-
+ * Stuart McCulloch - Custom content for Sisu
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
ob_start();
?>
@@ -22,8 +21,8 @@
<h3 id="api">API</h3>
<ul>
-<li><a href="api/org.eclipse.sisu.inject/">Sisu-Inject <?php print $release;?> javadoc</a></li>
-<li><a href="api/org.eclipse.sisu.plexus/">Sisu-Plexus <?php print $release;?> javadoc</a></li>
+<li><a href="api/org.eclipse.sisu.inject/">Sisu-Inject <?php print $currentRelease;?> javadoc</a></li>
+<li><a href="api/org.eclipse.sisu.plexus/">Sisu-Plexus <?php print $currentRelease;?> javadoc</a></li>
<li><a href="api/org.eclipse.sisu.mojos/">sisu-maven-plugin site</a></li>
</ul>
<p><i>also available from the Central Repository for IDEs with Maven integration.</i></p>
@@ -33,12 +32,8 @@
</div>
-<div id="rightcolumn">
-<?php print $incubation;?>
-</div>
-
<?php
$html = ob_get_clean();
-# Generate the web page
-$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$Theme->setHtml($html);
+$Theme->generatePage();
?>
diff --git a/download/index.php b/download/index.php
index 603468b..7337bb4 100644
--- a/download/index.php
+++ b/download/index.php
@@ -1,17 +1,16 @@
-<?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()); # All on the same line to unclutter the user's desktop'
-/*******************************************************************************
- * 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://www.eclipse.org/legal/epl-v10.html
+<?php $pageTitle = "Downloads"; require_once ('../_projectCommon.php');
+/**
+ * Copyright (c) 2015-present Eclipse Foundation.
+ *
+ * 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:
- * Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
- *******************************************************************************/
-
-$pageTitle = "Downloads";
-
+ * Stuart McCulloch - Custom content for Sisu
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
ob_start();
?>
@@ -23,11 +22,11 @@
<h3 id="dist">Distribution</h3>
<ul>
-<li><a href="https://repo1.maven.org/maven2/org/eclipse/sisu/org.eclipse.sisu.inject.site/<?php print $release;?>/org.eclipse.sisu.inject.site-<?php print $release;?>.zip">Sisu-Inject <?php print $release;?> bundles</a></li>
-<li><a href="https://repo1.maven.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus.site/<?php print $release;?>/org.eclipse.sisu.plexus.site-<?php print $release;?>.zip">Sisu-Plexus <?php print $release;?> bundles</a></li>
+<li><a href="https://repo1.maven.org/maven2/org/eclipse/sisu/org.eclipse.sisu.inject.site/<?php print $currentRelease;?>/org.eclipse.sisu.inject.site-<?php print $currentRelease;?>.zip">Sisu-Inject <?php print $currentRelease;?> bundles</a></li>
+<li><a href="https://repo1.maven.org/maven2/org/eclipse/sisu/org.eclipse.sisu.plexus.site/<?php print $currentRelease;?>/org.eclipse.sisu.plexus.site-<?php print $currentRelease;?>.zip">Sisu-Plexus <?php print $currentRelease;?> bundles</a></li>
<!--
-<li><a href="http://www.eclipse.org/downloads/download.php?file=/sisu/releases/org.eclipse.sisu.inject.site-<?php print $release;?>.zip">Sisu-Inject <?php print $release;?> bundles</a></li>
-<li><a href="http://www.eclipse.org/downloads/download.php?file=/sisu/releases/org.eclipse.sisu.plexus.site-<?php print $release;?>.zip">Sisu-Plexus <?php print $release;?> bundles</a></li>
+<li><a href="http://www.eclipse.org/downloads/download.php?file=/sisu/releases/org.eclipse.sisu.inject.site-<?php print $currentRelease;?>.zip">Sisu-Inject <?php print $currentRelease;?> bundles</a></li>
+<li><a href="http://www.eclipse.org/downloads/download.php?file=/sisu/releases/org.eclipse.sisu.plexus.site-<?php print $currentRelease;?>.zip">Sisu-Plexus <?php print $currentRelease;?> bundles</a></li>
-->
</ul>
@@ -35,19 +34,19 @@
<p>To install a bundle distribution download the zip and point your P2 installer at it.</p>
<h3 id="maven">Maven Artifacts</h3>
-<p>The following artifacts are also available from the <a href="http://search.maven.org/#search|ga|1|g%3A%22org.eclipse.sisu%22%20AND%20v:%22<?php print $release;?>%22">Central Repository</a>:</p>
+<p>The following artifacts are also available from the <a href="http://search.maven.org/#search|ga|1|g%3A%22org.eclipse.sisu%22%20AND%20v:%22<?php print $currentRelease;?>%22">Central Repository</a>:</p>
<pre>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject</artifactId>
- <version><?php print $release;?></version>
+ <version><?php print $currentRelease;?></version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.inject.extender</artifactId>
- <version><?php print $release;?></version>
+ <version><?php print $currentRelease;?></version>
</dependency>
</pre>
@@ -55,7 +54,7 @@
<plugin>
<groupId>org.eclipse.sisu</groupId>
<artifactId>sisu-maven-plugin</artifactId>
- <version><?php print $release;?></version>
+ <version><?php print $currentRelease;?></version>
</plugin>
</pre>
@@ -63,24 +62,20 @@
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus</artifactId>
- <version><?php print $release;?></version>
+ <version><?php print $currentRelease;?></version>
</dependency>
<dependency>
<groupId>org.eclipse.sisu</groupId>
<artifactId>org.eclipse.sisu.plexus.extender</artifactId>
- <version><?php print $release;?></version>
+ <version><?php print $currentRelease;?></version>
</dependency>
</pre>
</div>
-<div id="rightcolumn">
-<?php print $incubation;?>
-</div>
-
<?php
$html = ob_get_clean();
-# Generate the web page
-$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$Theme->setHtml($html);
+$Theme->generatePage();
?>
diff --git a/index.php b/index.php
index e316bf1..84b2bc1 100755
--- a/index.php
+++ b/index.php
@@ -1,14 +1,62 @@
-<?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()); # All on the same line to unclutter the user's desktop'
-/*******************************************************************************
- * 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://www.eclipse.org/legal/epl-v10.html
+<?php $pageTitle = "Sisu"; require_once ('_projectCommon.php');
+/**
+ * Copyright (c) 2015-present Eclipse Foundation.
+ *
+ * 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:
- * Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
- *******************************************************************************/
+ * Stuart McCulloch - Custom content for Sisu
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+
+$links = array();
+$links[] = array(
+ 'icon' => 'fa-download',
+ 'url' => 'download/',
+ 'title' => 'Downloads',
+ 'text' => 'Maven, Distributions'
+);
+$links[] = array(
+ 'icon' => 'fa-users',
+ 'url' => 'developers/',
+ 'title' => 'Get Involved',
+ 'text' => 'Source code, Wiki'
+);
+$links[] = array(
+ 'icon' => 'fa-book',
+ 'url' => 'docs/',
+ 'title' => 'Documentation',
+ 'text' => 'Javadoc, Tutorials'
+);
+$links[] = array(
+ 'icon' => 'fa-support',
+ 'url' => 'support/',
+ 'title' => 'Support',
+ 'text' => 'Mailing lists, Bug tracker'
+);
+
+// add blank logo and main icons
+$variables['header_nav'] = array(
+ 'links' => $links,
+ 'logo' => array(
+ 'src' => 'assets/img/blank.png',
+ 'alt' => 'Sisu',
+ 'url' => '/sisu/'
+ )
+);
+
+ob_start();
+require_once('banner.php');
+$banner = ob_get_clean();
+
+// add real logo banner, which will go over the blank logo
+$variables['main_container_html'] = "<a href='/sisu/'>$banner</a>";
+$App->setThemeVariables($variables);
+
+$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="assets/css/banner.css"/>');
ob_start();
?>
@@ -16,22 +64,21 @@
<div id="midcolumn">
<center><h3><a class="btn btn-huge btn-primary" href="docs/tutorials/index.html">Sisu in 5 minutes</a></h3></center>
<hr/>
- <?php print $projectDescription;?>
+ <p>
+ Sisu is a modular JSR330-based container that supports classpath scanning, auto-binding, and dynamic auto-wiring. Sisu uses Google-Guice to perform dependency injection and provide the core JSR330 support, but removes the need to write explicit bindings in Guice modules. Integration with other containers via the Eclipse Extension Registry and the OSGi Service Registry is a goal of this project.
+ </p>
</div>
-
-<div id="rightcolumn">
- <div class="sideitem">
- <h6>New and Noteworthy</h6>
- <h7>2019-11-05</h7><p><a href="download/">0.3.4</a> Reproducible builds</p>
- <h7>2016-02-17</h7><p>0.3.3 Lifecycle maintenance</p>
- <h7>2015-09-14</h7><p>0.3.2 Java9+Jigsaw support</p>
- <h7>2015-02-20</h7><p>Sisu 0.3.0 has been released!</p>
- </div>
- <?php print $incubation;?>
+<p class="margin-bottom-50"/>
+<div class="sideitem pull-left">
+ <h6>New and Noteworthy</h6>
+ <h7>2019-11-05</h7><p><a href="download/">0.3.4</a> Reproducible builds</p>
+ <h7>2016-02-17</h7><p>0.3.3 Lifecycle maintenance</p>
+ <h7>2015-09-14</h7><p>0.3.2 Java9+Jigsaw support</p>
+ <h7>2015-02-20</h7><p>Sisu 0.3.0 has been released!</p>
</div>
<?php
$html = ob_get_clean();
-# Generate the web page
-$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$Theme->setHtml($html);
+$Theme->generatePage();
?>
diff --git a/support/index.php b/support/index.php
index a7d7777..97f4106 100644
--- a/support/index.php
+++ b/support/index.php
@@ -1,17 +1,16 @@
-<?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()); # All on the same line to unclutter the user's desktop'
-/*******************************************************************************
- * 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://www.eclipse.org/legal/epl-v10.html
+<?php $pageTitle = "Support"; require_once ('../_projectCommon.php');
+/**
+ * Copyright (c) 2015-present Eclipse Foundation.
+ *
+ * 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:
- * Stuart McCulloch (Sonatype, Inc.) - Custom content for Sisu
- *******************************************************************************/
-
-$pageTitle = "Support";
-
+ * Stuart McCulloch - Custom content for Sisu
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
ob_start();
?>
@@ -20,7 +19,7 @@
<h3 id="bugs">Bug Tracker</h3>
<p>
If you encounter a bug or have a feature request, please enter a sufficiently detailed issue in our
- <a href="<?php print $issueTracker;?>">bug tracker</a>.
+ <a href="<?php print $projectBugs;?>">bug tracker</a>.
We especially appreciate issues that come with suggested patches or enough information to be recreated locally.
</p>
<p>
@@ -44,12 +43,8 @@
</div>
-<div id="rightcolumn">
-<?php print $incubation;?>
-</div>
-
<?php
$html = ob_get_clean();
-# Generate the web page
-$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$Theme->setHtml($html);
+$Theme->generatePage();
?>
