/ide should always use default theme
Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>
diff --git a/_projectCommon.php b/_projectCommon.php
deleted file mode 100644
index 6bbb079..0000000
--- a/_projectCommon.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
- // Default theme
- $theme = "solstice";
-
diff --git a/content/en_index.php b/content/en_index.php
index 900ee36..9335bf6 100644
--- a/content/en_index.php
+++ b/content/en_index.php
@@ -1,47 +1,60 @@
+<?php
+/**
+ * Copyright (c) 2014, 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:
+ * Christopher Guindon (Eclipse Foundation) - initial API and implementation
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+?>
<div class="container-fluid">
- <section class="row highlight background-grey breadcrumbs-offset" id="sec_wg">
- <div class="container" style="padding-top:4em;">
- <div>
- <div class="col-md-14 highlight-content">
- <h1>Desktop IDEs</h1>
- <p>Eclipse is famous for our Java Integrated Development Environment (IDE), but
- our C/C++ IDE and PHP IDE are pretty cool too. You can easily combine language
- support and other features into any of our default packages, and the Eclipse
- Marketplace allows for virtually unlimited customization and extension.</p>
- <ul class="list-inline">
- <li><a href="<?php print $java['url']?>"><img width="42" height="42" alt="<?php print $java['name']?>" src="<?php print $java['icon']?>"> Java IDE</a></li>
- <li><a href="<?php print $jee['url']?>"><img width="42" height="42" alt="<?php print $jee['name']?>" src="<?php print $jee['icon']?>"> Java EE</a></li>
- <li><a href="<?php print $cpp['url']?>"><img width="42" height="42" alt="<?php print $cpp['name']?>" src="<?php print $cpp['icon']?>"> C/C++</a></li>
- <li><a href="<?php print $php['url']?>"><img width="42" height="42" alt="<?php print $php['name']?>" src="<?php print $php['icon']?>"> PHP</a></li>
- </ul>
- </div>
- <div class="col-md-9 right highlight-img hidden-xs hidden-sm col-sm-offset-1">
- <img src="images/desktop-ide-screenshot.jpg" class="img-responsive" alt="Eclipse Desktop IDE"/>
- </div>
- </div>
- </div>
- </section>
-
- <section class="row highlight highlight-left background-white" id="sec_ide">
- <div class="container">
- <div>
- <div class="triangle hidden-sm hidden-xs"></div>
- <div class="col-sm-8 col-md-12 center highlight-img hidden-xs">
- <img src="images/web-ide-screenshot-2.jpg" alt="Eclipse Web IDE" class="img-responsive"/>
- </div>
- <div class="col-sm-16 col-md-12 highlight-content">
- <h1>Cloud IDEs</h1>
- <p>Develop your software wherever you go. It'll be there, in the cloud, right where you left it. Use your browser to develop with hosted workspaces or install desktop packaging to experience a modern development environment for Java, JavaScript, CSS, and HTML.</p>
- <ul class="list-inline">
- <li><a href="/orion/"><img src="images/orion-logo78x48.jpg" alt="Open Source Platform For Cloud Based Development"/></a></li>
- <li><a href="/che/"><img src="images/EclipseCheLogo.png" alt="Open Source Platform For Cloud Based Development"/></a></li>
- <li><a href="/dirigible/"><img src="images/dirigible_logo.png" alt="Open Source Cloud Development Toolkit"/></a></li>
- </ul>
- </div>
- </div>
- </div>
- </section>
-
+ <section class="row highlight background-grey breadcrumbs-offset" id="sec_wg">
+ <div class="container" style="padding-top:4em;">
+ <div>
+ <div class="col-md-14 highlight-content">
+ <h1>Desktop IDEs</h1>
+ <p>Eclipse is famous for our Java Integrated Development Environment (IDE), but
+ our C/C++ IDE and PHP IDE are pretty cool too. You can easily combine language
+ support and other features into any of our default packages, and the Eclipse
+ Marketplace allows for virtually unlimited customization and extension.
+ </p>
+ <ul class="list-inline">
+ <li><a href="<?php print $java['url']?>"><img width="42" height="42" alt="<?php print $java['name']?>" src="<?php print $java['icon']?>"> Java IDE</a></li>
+ <li><a href="<?php print $jee['url']?>"><img width="42" height="42" alt="<?php print $jee['name']?>" src="<?php print $jee['icon']?>"> Java EE</a></li>
+ <li><a href="<?php print $cpp['url']?>"><img width="42" height="42" alt="<?php print $cpp['name']?>" src="<?php print $cpp['icon']?>"> C/C++</a></li>
+ <li><a href="<?php print $php['url']?>"><img width="42" height="42" alt="<?php print $php['name']?>" src="<?php print $php['icon']?>"> PHP</a></li>
+ </ul>
+ </div>
+ <div class="col-md-9 right highlight-img hidden-xs hidden-sm col-sm-offset-1">
+ <img src="images/desktop-ide-screenshot.jpg" class="img-responsive" alt="Eclipse Desktop IDE"/>
+ </div>
+ </div>
+ </div>
+ </section>
+ <section class="row highlight highlight-left background-white" id="sec_ide">
+ <div class="container">
+ <div>
+ <div class="triangle hidden-sm hidden-xs"></div>
+ <div class="col-sm-8 col-md-12 center highlight-img hidden-xs">
+ <img src="images/web-ide-screenshot-2.jpg" alt="Eclipse Web IDE" class="img-responsive"/>
+ </div>
+ <div class="col-sm-16 col-md-12 highlight-content">
+ <h1>Cloud IDEs</h1>
+ <p>Develop your software wherever you go. It'll be there, in the cloud, right where you left it. Use your browser to develop with hosted workspaces or install desktop packaging to experience a modern development environment for Java, JavaScript, CSS, and HTML.</p>
+ <ul class="list-inline">
+ <li><a href="/orion/"><img src="images/orion-logo78x48.jpg" alt="Open Source Platform For Cloud Based Development"/></a></li>
+ <li><a href="/che/"><img src="images/EclipseCheLogo.png" alt="Open Source Platform For Cloud Based Development"/></a></li>
+ <li><a href="/dirigible/"><img src="images/dirigible_logo.png" alt="Open Source Cloud Development Toolkit"/></a></li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </section>
<section class="row highlight background-grey breadcrumbs-offset" id="sec_ide_p">
<div class="container">
<div>
@@ -49,10 +62,11 @@
<div class="col-md-14 highlight-content">
<h1>IDE Platforms</h1>
<p>Create the next generation of developer tooling with our extensible platforms.
- Use your imagination to build services and tools that can be assembled into new IDEs
- or packages tailored to your identity. We provide multiple platforms to build plug-ins
- for desktop tools, distributed services used by cloud IDEs, and browser interfaces.
- You can then publish plug-ins to our Eclipse Marketplace of 1000s.</p>
+ Use your imagination to build services and tools that can be assembled into new IDEs
+ or packages tailored to your identity. We provide multiple platforms to build plug-ins
+ for desktop tools, distributed services used by cloud IDEs, and browser interfaces.
+ You can then publish plug-ins to our Eclipse Marketplace of 1000s.
+ </p>
<ul class="list-inline">
<li><a href="http://wiki.eclipse.org/Platform"><img width="42" height="42" alt="<?php print $java['name']?>" src="<?php print $java['icon']?>"> Eclipse Platform</a></li>
<li><a href="/orion/"><img src="images/orion-logo-grey78x48.jpg" alt="Open Source Platform For Cloud Based Development"/></a></li>
@@ -65,60 +79,59 @@
</div>
</div>
</section>
-
- <section class="row highlight highlight-left background-white footer-offset">
- <div class="container">
- <div>
- <div class="triangle hidden-sm hidden-xs"></div>
- <div class="col-md-13">
- <div class="media">
- <div class="pull-left orange">
- <i class="fa fa-wrench font-size-large"></i>
- </div>
- <div class="media-body">
- <h4 class="media-heading">Tools</h4>
- <p class="emphasis">Extend the extensible platform.</p>
- <p>An impressive collection of tools can be easily installed into your Eclipse desktop IDE, including GUI builders and tools for modeling, charting and reporting, testing, and more.</p>
- </div>
- </div>
- <div class="media">
- <div class="pull-left orange">
- <i class="fa fa-shopping-cart font-size-large"></i>
- </div>
- <div class="media-body">
- <h4 class="media-heading">Marketplace</h4>
- <p class="emphasis">Customize and extend Eclipse and make it your own.</p>
- <p>Use the <a href="/mpc">Eclipse Marketplace Client</a> to find, install, and vote for new plug-ins from our vast ecosystem of providers.</p>
- </div>
- </div>
- <div class="media">
- <div class="pull-left orange">
- <i class="fa fa-gears font-size-large"></i>
- </div>
- <div class="media-body">
- <h4 class="media-heading">Extend</h4>
- <p class="emphasis">Join the Community.</p>
- <p>Extend the desktop and web-based IDEs by writing your own plug-ins using the Plug-in Development Environment (PDE), or mash up features to build the web IDE of your dreams.</p>
- </div>
- </div>
- </div>
- <div class="col-md-8 right highlight-img text-left hidden-xs hidden-sm col-sm-offset-3">
- <div>
- <h2>Discover</h2>
- <p class="orange"><strong>Find an Eclipse open source project.</strong></p>
- <form id="form-discover-search" class="form-inline form-search-projects input-group custom-search-form" role="form" action="https://projects.eclipse.org/projects/all">
- <input id="discover-search-box" class="form-control" type="text" size="25" name="keys" placeholder="Search">
- <span class="input-group-btn">
- <button class="btn btn-default" type="submit">
- <i class="fa fa-search"></i>
- </button>
- </span>
- </form>
- <br/>
- <p><a class="btn btn-info uppercase fw-700" href="//projects.eclipse.org/list-of-projects">List of projects</a></p>
- </div>
- </div>
- </div>
- </div>
- </section>
-</div>
+ <section class="row highlight highlight-left background-white footer-offset">
+ <div class="container">
+ <div>
+ <div class="triangle hidden-sm hidden-xs"></div>
+ <div class="col-md-13">
+ <div class="media">
+ <div class="pull-left orange">
+ <i class="fa fa-wrench font-size-large"></i>
+ </div>
+ <div class="media-body">
+ <h4 class="media-heading">Tools</h4>
+ <p class="emphasis">Extend the extensible platform.</p>
+ <p>An impressive collection of tools can be easily installed into your Eclipse desktop IDE, including GUI builders and tools for modeling, charting and reporting, testing, and more.</p>
+ </div>
+ </div>
+ <div class="media">
+ <div class="pull-left orange">
+ <i class="fa fa-shopping-cart font-size-large"></i>
+ </div>
+ <div class="media-body">
+ <h4 class="media-heading">Marketplace</h4>
+ <p class="emphasis">Customize and extend Eclipse and make it your own.</p>
+ <p>Use the <a href="/mpc">Eclipse Marketplace Client</a> to find, install, and vote for new plug-ins from our vast ecosystem of providers.</p>
+ </div>
+ </div>
+ <div class="media">
+ <div class="pull-left orange">
+ <i class="fa fa-gears font-size-large"></i>
+ </div>
+ <div class="media-body">
+ <h4 class="media-heading">Extend</h4>
+ <p class="emphasis">Join the Community.</p>
+ <p>Extend the desktop and web-based IDEs by writing your own plug-ins using the Plug-in Development Environment (PDE), or mash up features to build the web IDE of your dreams.</p>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-8 right highlight-img text-left hidden-xs hidden-sm col-sm-offset-3">
+ <div>
+ <h2>Discover</h2>
+ <p class="orange"><strong>Find an Eclipse open source project.</strong></p>
+ <form id="form-discover-search" class="form-inline form-search-projects input-group custom-search-form" role="form" action="https://projects.eclipse.org/projects/all">
+ <input id="discover-search-box" class="form-control" type="text" size="25" name="keys" placeholder="Search">
+ <span class="input-group-btn">
+ <button class="btn btn-default" type="submit">
+ <i class="fa fa-search"></i>
+ </button>
+ </span>
+ </form>
+ <br/>
+ <p><a class="btn btn-info uppercase fw-700" href="//projects.eclipse.org/list-of-projects">List of projects</a></p>
+ </div>
+ </div>
+ </div>
+ </div>
+ </section>
+</div>
\ No newline at end of file
diff --git a/index.php b/index.php
index 1e90140..ae516ca 100644
--- a/index.php
+++ b/index.php
@@ -1,49 +1,46 @@
<?php
-/*******************************************************************************
- * Copyright (c) 2014 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) 2014, 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:
- * Christopher Guindon (Eclipse Foundation) - Initial implementation
- *******************************************************************************/
+ * Christopher Guindon (Eclipse Foundation) - initial API and implementation
+ *
+ * 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");
+require_once($_SERVER['DOCUMENT_ROOT'] . "/downloads/downloads/controller.compare.php");
- require_once($_SERVER['DOCUMENT_ROOT'] . "/downloads/downloads/controller.compare.php");
+$App = new App();
+$Theme = $App->getThemeClass();
- $App = new App();
- $Nav = new Nav();
- $Menu = new Menu();
- include("_projectCommon.php"); # All on the same line to unclutter the user's desktop.
+// Begin: page-specific settings. Change these.
+$pageTitle = "Eclipse desktop & web IDE<span style=\"text-transform:lowercase;\">s</span>";
+$Theme->setPageTitle($pageTitle);
+$Theme->setPageKeywords("eclipse,project,plug-ins,plugins,java,ide,swt,refactoring,free java ide,tools,platform,open source,development environment,development,ide");
+$Theme->setPageAuthor("Christopher Guindon");
- // Begin: page-specific settings. Change these.
- $pageTitle = "Eclipse desktop & web IDE<span style=\"text-transform:lowercase;\">s</span>";
- $pageKeywords = "eclipse,project,plug-ins,plugins,java,ide,swt,refactoring,free java ide,tools,platform,open source,development environment,development,ide";
- $pageAuthor = "Christopher Guindon";
+$Packages = new CompareController($App);
+$Packages->setPrefixPackage('release');
- $Packages = new CompareController($App);
- $Packages->setPrefixPackage('release');
+$jee = $Packages->getPackages('jee-package');
+$java = $Packages->getPackages('java-package');
+$php = $Packages->getPackages('php-package');
+$cpp = $Packages->getPackages('cpp-package');
- $jee = $Packages->getPackages('jee-package');
- $java = $Packages->getPackages('java-package');
- $php = $Packages->getPackages('php-package');
- $cpp = $Packages->getPackages('cpp-package');
+// 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);
+// Custom theme variables
+$variables = array();
+$variables['main_container_classes'] = 'container-full';
+$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();
-
- // Custom theme variables
- $variables = array();
- $variables['main_container_classes'] = 'container-full';
- $App->setThemeVariables($variables);
-
- //$html = mb_convert_encoding($html, "HTML-ENTITIES", 'auto');
- $App->generatePage($theme, $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
+$Theme->generatePage();
\ No newline at end of file
