Release 2.5: demote OT/J & Java 8 page
diff --git a/index_java8.php b/index_java8.php
deleted file mode 100755
index 026299d..0000000
--- a/index_java8.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*******************************************************************************
- * Copyright (c) 2009 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
- *
- * Contributors:
- * Stephan Herrmann
- *******************************************************************************/
-
- 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());
- $App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/objectteams/css/frontstyle.css"/>');
-
- $App->Promotion = FALSE;
-
- $localVersion = false;
-
- # Define these here, or in _projectCommon.php for site-wide values
- $pageKeywords = "ObjectTeams";
- $pageAuthor = "Stephan Herrmann";
- $pageTitle = "Object Teams home";
-
-// Custom theme variables
- $variables = array();
- $variables['main_container_classes'] = 'container-full';
- $App->setThemeVariables($variables);
-
- // # Paste your HTML content between the EOHTML markers!
- $html = file_get_contents('pages/otj_java8.html');
-
- # Generate the web page
- $App->generatePage($theme, $Menu, null, $pageAuthor, $pageKeywords, $pageTitle, $html);
-
-?>
\ No newline at end of file
diff --git a/index_neon.php b/index_neon.php
deleted file mode 100755
index cb79579..0000000
--- a/index_neon.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/*******************************************************************************
- * Copyright (c) 2009 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
- *
- * Contributors:
- * Stephan Herrmann
- *******************************************************************************/
-
- 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());
- $App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/objectteams/css/frontstyle.css"/>');
-
- $App->Promotion = FALSE;
-
- $localVersion = false;
-
- # Define these here, or in _projectCommon.php for site-wide values
- $pageKeywords = "ObjectTeams";
- $pageAuthor = "Stephan Herrmann";
- $pageTitle = "Object Teams home";
-
-// Custom theme variables
- $variables = array();
- $variables['main_container_classes'] = 'container-full';
- $App->setThemeVariables($variables);
-
- // # Paste your HTML content between the EOHTML markers!
- $html = file_get_contents('pages/_index.html');
-
- # Generate the web page
- $App->generatePage($theme, $Menu, null, $pageAuthor, $pageKeywords, $pageTitle, $html);
-
-?>
\ No newline at end of file
diff --git a/pages/_index.html b/pages/_index.html
index 3551cf6..340b6b2 100644
--- a/pages/_index.html
+++ b/pages/_index.html
@@ -62,7 +62,7 @@
<div id="feature_3">
<h4>Mature and fresh</h4>
<p style="margin-bottom:10px;">OT/J looks back on a long history,
- but is is also well <a href="/objectteams/index_java8.php">integrated with Java 8</a>,
+ but is is also well <a href="/objectteams/pages/otj_java8.php">integrated with Java 8</a>,
and sports a leading-edge mechanisms for <a href="https://www.youtube.com/watch?v=0ugRIx0vu_g">runtime specialization</a>.</p>
<ul class="novaArrow">
<li><a href="https://wiki.eclipse.org/OTJ">OT/J in the Wiki</a></li>
diff --git a/pages/otj_java8.html b/pages/otj_java8.html
deleted file mode 100644
index 4a50a78..0000000
--- a/pages/otj_java8.html
+++ /dev/null
@@ -1,81 +0,0 @@
-<!--div id="bigbuttons">
-<h3>Primary Links</h3>
-<ul>
- <li><a id="buttonDownload" href="download.php" title="Download">Eclipse
- Distribution, Update Site, Dropins</a></li>
- <li><a id="buttonDocumentation" href="documentation.php"
- title="Documentation">Tutorials, Examples, Videos, Reference Documentation</a></li>
- <li><a id="buttonSupport" href="support.php" title="Support">Bug
- Tracker, Newsgroup</a></li>
- <li><a id="buttonInvolved" href="getting_involved.php" title="Getting Involved">CVS,
- Workspace Setup, Wiki, Committers</a></li>
-</ul>
-</div-->
-
-<div class="container"
- style="height:220px;width:100%;
- background-image:url(/luna/assets/public/images/background.jpg);">
- <div class="col-md-15" style="margin-bottom:-40px;">
- <h1 style="color:#fff;">Mars is here:<br/>Object Teams Consolidation Release<br/>for Java™ 8</h1>
- </div>
- <div class="col-md-8 col-md-offset-1">
- <span style="display:inline-block; width:180px;font-size:22px;margin-top:40px;">
- <a href="/objectteams/documentation.php" style="color:#aaa;"
- onMouseOver="this.style.color='#F7941E'"
- onMouseOut="this.style.color='#aaa'">Documentation</a></span>
- <span style="display:inline-block; width:180px;font-size:22px;">
- <a href="/objectteams/download.php" style="color:#aaa;"
- onMouseOver="this.style.color='#F7941E'"
- onMouseOut="this.style.color='#aaa'">Download</a></span>
- <span style="display:inline-block; width:180px;font-size:22px;">
- <a href="/objectteams/support.php" style="color:#aaa;"
- onMouseOver="this.style.color='#F7941E'"
- onMouseOut="this.style.color='#aaa'">Support</a></span>
- <span style="display:inline-block; width:180px;font-size:22px;">
- <a href="/objectteams/getting_involved.php" style="color:#aaa;"
- onMouseOver="this.style.color='#F7941E'"
- onMouseOut="this.style.color='#aaa'">Getting Involved</a></span>
- </div>
-</div>
-
-<div id="container" style="margin-top:50px;margin-left: auto; margin-right: auto;
- background-image:url(images/OTJ8-concepts.png);background-repeat:no-repeat;
- background-position:15px 20px;width:790px;height:695px;">
- <h1 style="position:relative; top:0px;height:36px; text-align:center;">OT/J on Java 8 is …</h1>
- <h2 style="position:relative; left:170px; top:0px;height:24px;">Composition:</h2>
- <div style="position:relative; left:30px; top:22px; width:380px;height:300px;font-size:16px;">
- The essence of object-oriented programming is to compose a system from a possibly large number of interacting classes and objects.
- <p>
- Since version 1.1, <b class="orange">Java</b> has not seen any enhancements for this task.
- </p>
- <p style="margin:-5px 0px 0px;">
- <a class="orange" href="http://wiki.eclipse.org/OTJ">OT/J</a> adds three closely related concepts:
- </p>
- <ul style="margin:0px;">
- <li style="margin:3px;"><a href="http://wiki.eclipse.org/OTJ_Primer/Role_Playing">Roles</a> can be attached to a base object for <b>dynamic specialization</b>.</li>
- <li style="margin:-5px 0px 0px;">Roles are grouped into a <a href="http://wiki.eclipse.org/OTJ_Primer/Role_Containment">Team</a> to yield <b>cohesive modules</b> for use-cases & features.</li>
- <li style="margin:-5px 0px 0px;">Teams support nested inheritance for <b>large-scale specialization</b>.</li></ul>
- </div>
- <h2 style="position:relative; left:80px; top:-420px;
- display:block;transform:rotate(-90deg);
- -ms-transform:rotate(-90deg);
- -webkit-transform:rotate(-90deg);">Algorithms:</h2>
- <div style="position:relative; left:520px; top:-195px; width:245px;font-size:16px;">
- <a class="orange" href="http://wiki.eclipse.org/OTJ">OT/J</a> is agnostic to how algorithms are encoded (programming in the small),<br/>
- but you may leverage lambda expressions from <b class="orange">Java 8</b> in your OT/J programs for that touch
- of <b>functional programming</b>.
- </div>
- <h2 style="position:relative; left:156px; top:-140px;"> Types:</h2>
- <div style="position:relative; left:270px; top:-185px; width:480px;font-size:16px;">
- A rich type system is key for attaching <b>semantics</b> to the elements of your program.
- <ul>
- <li style="margin-left:-12px;"><b class="orange">Java 8</b> features …<br/>
- <b>type annotations</b> for expressing more properties of types,</li>
- <li style="margin-left:-12px;"><a class="orange" href="http://help.eclipse.org/luna/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2FwhatsNew%2Fjdt_whatsnew.html&cp=1_6_2&anchor=null-types-annotations">JDT</a> leverages …<br/>
- type annotations for detecting <b>null</b> related errors,</li>
- <li style="margin-left:-12px;"><a class="orange" href="http://wiki.eclipse.org/OTJ">OT/J</a> introduces …<br/>
- dependent types to express object <b>ownership</b>.</li>
- </ul>
- </div>
-</div>
-
diff --git a/pages/otj_java8.php b/pages/otj_java8.php
new file mode 100644
index 0000000..ff915d5
--- /dev/null
+++ b/pages/otj_java8.php
@@ -0,0 +1,90 @@
+<?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) 2009, 2013
+ * 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
+ * https://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Stephan Herrmann
+ *******************************************************************************/
+
+ $pageTitle = "Object Teams - Download";
+ $App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/objectteams/css/style.css"/>');
+ $App->AddExtraHtmlHeader('<style type="text/css">.col-md-4 { width: 20%; !important; }</style>');
+
+
+ # add a complete nav definition:
+ # $Nav->addCustomNav( "About This Project", "/projects/project_summary.php?projectid=tools.objectteams", "", 1 );
+ # $Nav->addNavSeparator("Object Teams", "/objectteams");
+ # $Nav->addCustomNav("Download", "/objectteams/download.php", "_self", 2);
+ # $Nav->addCustomNav("Releases 2.2.x", "#R22", "_self", 3);
+ # $Nav->addCustomNav("How To Install", "#howto", 3);
+ # $Nav->addCustomNav("Previous Releases", "#previous", 3);
+ # $Nav->addCustomNav("Retention Policy", "#retention", 3);
+ # "#R22" Milestone releases towards 2.2 Eclipse 4.3Mx)
+
+ # $Nav->addCustomNav("Documentation", "/objectteams/documentation.php", "_self", 2);
+ # $Nav->addCustomNav("Support", "/objectteams/support.php", "_self", 2);
+ # $Nav->addCustomNav("Getting Involved", "/objectteams/getting_involved.php", "_self", 2);
+ # $Nav->addCustomNav("Project Plan", "https://www.eclipse.org/projects/project-plan.php?projectid=tools.objectteams", "_self", 2);
+
+ $Nav->addNavSeparator("On this page", "/objectteams/download.php", "_self");
+ $Nav->addCustomNav("Releases 2.5.x", "#R25", "_self", 3);
+ $Nav->addCustomNav("How To Install", "#howto", 3);
+ $Nav->addCustomNav("Previous Releases", "#previous", 3);
+ $Nav->addCustomNav("Retention Policy", "#retention", 3);
+
+ $Nav->addNavSeparator("Documentation Quicklinks", "");
+ $Nav->addCustomNav("Quick-Start", "https://wiki.eclipse.org/Object_Teams_Quick-Start", "_blank", 2);
+ $Nav->addCustomNav("User Guide", "https://help.eclipse.org/topic/org.eclipse.objectteams.otdt.doc/guide/develop.html", "_blank", 2);
+ $Nav->addCustomNav("Language Definition", "https://help.eclipse.org/topic/org.eclipse.objectteams.otdt.doc/guide/otjld/def/index.html", "_blank", 2);
+
+ $html = <<<EOHTML
+<div id="midcolumn" style="width:80%; !important;">
+ <h1>$pageTitle</h1>
+
+
+ <h1 style="position:relative; top:0px;height:36px; text-align:center;">OT/J on Java 8 is …</h1>
+ <h2 style="position:relative; left:170px; top:0px;height:24px;">Composition:</h2>
+ <div style="position:relative; left:30px; top:22px; width:380px;height:300px;font-size:16px;">
+ The essence of object-oriented programming is to compose a system from a possibly large number of interacting classes and objects.
+ <p>
+ Since version 1.1, <b class="orange">Java</b> has not seen any enhancements for this task.
+ </p>
+ <p style="margin:-5px 0px 0px;">
+ <a class="orange" href="http://wiki.eclipse.org/OTJ">OT/J</a> adds three closely related concepts:
+ </p>
+ <ul style="margin:0px;">
+ <li style="margin:3px;"><a href="http://wiki.eclipse.org/OTJ_Primer/Role_Playing">Roles</a> can be attached to a base object for <b>dynamic specialization</b>.</li>
+ <li style="margin:-5px 0px 0px;">Roles are grouped into a <a href="http://wiki.eclipse.org/OTJ_Primer/Role_Containment">Team</a> to yield <b>cohesive modules</b> for use-cases & features.</li>
+ <li style="margin:-5px 0px 0px;">Teams support nested inheritance for <b>large-scale specialization</b>.</li></ul>
+ </div>
+ <h2 style="position:relative; left:80px; top:-420px;
+ display:block;transform:rotate(-90deg);
+ -ms-transform:rotate(-90deg);
+ -webkit-transform:rotate(-90deg);">Algorithms:</h2>
+ <div style="position:relative; left:520px; top:-195px; width:245px;font-size:16px;">
+ <a class="orange" href="http://wiki.eclipse.org/OTJ">OT/J</a> is agnostic to how algorithms are encoded (programming in the small),<br/>
+ but you may leverage lambda expressions from <b class="orange">Java 8</b> in your OT/J programs for that touch
+ of <b>functional programming</b>.
+ </div>
+ <h2 style="position:relative; left:156px; top:-140px;"> Types:</h2>
+ <div style="position:relative; left:270px; top:-185px; width:480px;font-size:16px;">
+ A rich type system is key for attaching <b>semantics</b> to the elements of your program.
+ <ul>
+ <li style="margin-left:-12px;"><b class="orange">Java 8</b> features …<br/>
+ <b>type annotations</b> for expressing more properties of types,</li>
+ <li style="margin-left:-12px;"><a class="orange" href="http://help.eclipse.org/luna/index.jsp?topic=%2Forg.eclipse.jdt.doc.user%2FwhatsNew%2Fjdt_whatsnew.html&cp=1_6_2&anchor=null-types-annotations">JDT</a> leverages …<br/>
+ type annotations for detecting <b>null</b> related errors,</li>
+ <li style="margin-left:-12px;"><a class="orange" href="http://wiki.eclipse.org/OTJ">OT/J</a> introduces …<br/>
+ dependent types to express object <b>ownership</b>.</li>
+ </ul>
+ </div>
+</div>
+
+EOHTML;
+ # Generate the web page
+ $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
\ No newline at end of file
