Updated OSEE web page structure
diff --git a/_index.html b/_index.html
new file mode 100644
index 0000000..1b497b3
--- /dev/null
+++ b/_index.html
@@ -0,0 +1,64 @@
+<div id="midcolumn">
+<h3>OSEE: The Open System Engineering Environment</h3>
+<div id="introText">
+
+<p>
+<a href="http://en.wikipedia.org/wiki/V_model" target="_self">
+ <img align="right" src="images/VDiagram_sm.png" style="padding-right:10px;width:320px;height:166px;" alt="V-Model"/>
+</a>
+The Open System Engineering Environment is an integrated, extensible tool environment for large engineering projects.
+
+It provides a tightly integrated environment supporting lean principles across a
+product's full life-cycle in the context of an overall systems engineering approach.
+
+OSEE's feature set includes configuration management, requirements management, testing, validation, and project management.
+</p>
+
+</div>
+<div id="screenshot">
+<a href="images/ss.png">
+<img src="images/ss_small.png" />
+</a>
+</div>
+
+<img src="images/buttonInvolved_sel.png" height="0" width="0" />
+<img src="images/buttonDownload_sel.png" height="0" width="0" />
+<img src="images/buttonDocumentation_sel.png" height="0" width="0" />
+<img src="images/buttonSupport_sel.png" height="0" width="0" />
+
+<div id="feature_1">
+
+<h4>Extensible Data Model</h4>
+<p>All project data is stored in OSEE's user-definable data model, which offers revision control, bidirectional traceability, project status reporting, and metrics.</p>
+</div>
+
+
+<div id="feature_2">
+<h4>Full Lifecycle Support</h4>
+<p>
+The data integration and traceability features OSEE offers enable a coherent view of a project across its full life-cycle.
+</p>
+</div>
+
+<div id="feature_3">
+<h4>A Potent Framework</h4>
+<p>
+In addition to excelling as a stand-alone application, OSEE offers a full-featured API, enabling
+developers to harness OSEE's powerful data management capabilities for their own applications.
+</p>
+</div>
+
+<div id="feature_4">
+<h4>Version and Variant Management</h4>
+<p>OSEE's advanced branch management capabilities, including change reports and automated merging,
+make it possible to control many variants of a project with ease. Since OSEE retains a full revision
+history of every resource in the system, engineers can make and review changes with greater confidence.</p>
+</div>
+
+<div id="feature_more">
+<h4>and much more...</h4>
+<p>Read the OSEE <a href="http://wiki.eclipse.org/OSEE">Wiki</a> and join the discussion at the <a href="http://www.eclipse.org/forums/index.php?t=thread&frm_id=68&S=03be8852279043e2fbe465ca71cbb7ac">forum</a> to get involved in using or developing OSEE.</p>
+<p>Our Eclipse project page can be found here: <a href="/projects/project_summary.php?projectid=technology.osee">About OSEE</a>
+</div>
+</div>
+
diff --git a/_pageHeader.html b/_pageHeader.html
new file mode 100644
index 0000000..6e3a3af
--- /dev/null
+++ b/_pageHeader.html
@@ -0,0 +1,11 @@
+<h3>Primary Links</h3>
+<ul>
+ <li><a id="buttonDownload" href="downloads.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="Download">Bug
+ Tracker, Newsgroup, Professional Support</a></li>
+ <li><a id="buttonInvolved" href="get_involved.php" title="Getting Involved">CVS,
+ Workspace Setup, Wiki, Committers</a></li>
+</ul>
\ No newline at end of file
diff --git a/_sidePanel.html b/_sidePanel.html
new file mode 100644
index 0000000..1808ab6
--- /dev/null
+++ b/_sidePanel.html
@@ -0,0 +1,39 @@
+<div>
+<h3>Project Status</h3>
+<center><a href="/projects/gazoo.php"><img align="center" src="/images/egg-incubation.png" border="0"/></a></center>
+</div>
+
+<div>
+<h3>Getting Started</h3>
+At EclipseCon 2008, the OSEE team presented a tutorial explaining the use of the Action
+Tracking System and other features. The slides from this tutorial can
+be found <a href="http://wiki.eclipse.org/OSEE/Tutorial">here</a>.
+</div>
+
+<div>
+<h3>Commit Activity</h3>
+<a href="http://dash.eclipse.org/dash/commits/web-app/summary.cgi?company=x&month=y&project=technology.osee">
+<img width="256" height="74" src="http://dash.eclipse.org/dash/commits/web-app/active-graph.cgi?project=technology.osee" />
+</a>
+</div>
+
+<div>
+<h3>What's new?</h3>
+<ul>
+ <li>OSEE 0.9.4 is <a href="http://www.eclipse.org/osee/downloads.php">available</a>.</li>
+ <li>The slides from the OSEE team's presentation at EclipseCon 2010,
+ entitled "Xtext and GEF deliver editors for the Open System Engineering Environment",
+ are available <a href="http://www.eclipse.org/osee/Xtext_and_GEF_deliver_editors_for_the_Open_System_Engineering_Environment.ppt">here</a>.</li>
+</ul>
+</div>
+
+<div>
+<h3>Quick Links</h3>
+<div class="modal">
+<ul>
+ <li><a href="http://osee.microdoc.com/node/2">OSEE add-ons page</a></li>
+ <li><a href="http://www.open-do.org/">Open DO-178</a></li>
+ <li><a href="http://www.eclipse.org/proposals/osee/">Project Proposal</a></li>
+</ul>
+</div>
+</div>
\ No newline at end of file
diff --git a/developers/_index.html b/developers/_index.html
new file mode 100644
index 0000000..827fa2d
--- /dev/null
+++ b/developers/_index.html
@@ -0,0 +1,9 @@
+<h2>Get Involved</h2>
+<ul>
+<li>Our <a href="http://git.eclipse.org/c/osee/org.eclipse.osee.git">Git repository</a> contains all the
+source code for OSEE.
+</li>
+<li>Our <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=OSEE&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED">Bugzilla page</a>
+lists all the open bugs users have submitted against OSEE and its components.
+</li>
+</ul>
diff --git a/developers/index.php b/developers/index.php
new file mode 100644
index 0000000..0793b37
--- /dev/null
+++ b/developers/index.php
@@ -0,0 +1,23 @@
+<?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());
+
+ #*****************************************************************************
+
+ $pageTitle = "OSEE - Developers";
+ $pageKeywords = "OSEE, source, community";
+
+ #*****************************************************************************
+
+ $html = '<div id="midcolumn">';
+ $html .= file_get_contents('_index.html');
+ $html .= '</div>';
+
+ # Generate the web page
+ $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/faq.php b/faq.php
index bf98e41..421797f 100644
--- a/faq.php
+++ b/faq.php
@@ -1,33 +1,5 @@
-<?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'
+<?php
- #*****************************************************************************
- # faq.php
- #****************************************************************************
-
- #
- # Begin: page-specific settings. Change these.
- $pageTitle = "OSEE FAQs";
- $pageKeywords = "OSEE, Open, System, Engineering, Environment, Eclipse, Define, ATS, OTE, Application Framework";
- $pageAuthor = "Ryan D. Brooks; Donald G. Dunne";
-
- # Add page-specific Nav bars here
- # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
- # $Nav->addNavSeparator("My Page Links", "downloads.php");
- # $Nav->addCustomNav("My Link", "mypage.php", "_self", 3);
- # $Nav->addCustomNav("Google", "http://www.google.com/", "_blank", 3);
+ header( 'Location: documentation/' ) ;
- # End: page-specific settings
- #
-
- # Paste your HTML content between the EOHTML markers!
- $html = <<<EOHTML
-
- <a href="http://wiki.eclipse.org/OSEE/Users_Guide#Frequently_Asked_Questions">FAQ moved here</a>
- </div>
-
-EOHTML;
-
-
- # Generate the web page
- $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>
diff --git a/get_involved.php b/get_involved.php
index 5ed2555..cb7c964 100644
--- a/get_involved.php
+++ b/get_involved.php
@@ -1,44 +1,5 @@
-<?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 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:
- *
- *******************************************************************************/
+<?php
- #
- # Begin: page-specific settings. Change these.
- $pageTitle = "Getting involved in OSEE";
- $pageKeywords = "OSEE, source, community";
- $pageAuthor = "Ryan Schmitt";
- $theme = "Nova";
-
- # Paste your HTML content between the EOHTML markers!
- ob_start();
- ?>
- <div class="homeitem">
- <h1>Get Involved</h1>
- <p>
- <ul>
- <li>
- Our <a href="http://git.eclipse.org/c/osee/org.eclipse.osee.git">Git repository</a> contains all the
- source code for OSEE.
- </li>
- <li>
- Our <a href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Technology&product=OSEE&long_desc_type=allwordssubstr&long_desc=&bug_file_loc_type=allwordssubstr&bug_file_loc=&status_whiteboard_type=allwordssubstr&status_whiteboard=&keywords_type=allwords&keywords=&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED">Bugzilla page</a>
- lists all the open bugs users have submitted against OSEE and its components.
- </li>
- </ul>
- </p>
- </div>
-
- <?
- $html = ob_get_clean();
+ header( 'Location: developers/' ) ;
- # Generate the web page
- $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 2ad02a9..288db21 100644
--- a/index.php
+++ b/index.php
@@ -1,30 +1,38 @@
-<?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:
- *
- *******************************************************************************/
-
- 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="/osee/style.css"/>');
-
- $localVersion = false;
-
- # Define these here, or in _projectCommon.php for site-wide values
- $pageKeywords = "eclipse, osee";
- $pageAuthor = "Ryan Schmitt";
+<?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());
+
+ #*****************************************************************************
+
$pageTitle = "Open System Engineering Environment";
+ $pageKeywords = "eclipse, osee";
+
+ #*****************************************************************************
+
+ #$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/osee/style.css"/>');
- // # Paste your HTML content between the EOHTML markers!
- $html = file_get_contents('pages/_index.html');
+ $html = '<div id="bigbuttons">';
+ $html .= file_get_contents('_pageHeader.html');
+ $html .= '</div>';
+
+ $html .= '<div id="midcolumn">';
+ $html .= file_get_contents('_index.html');
+ $html .= '</div>';
+
+ $html .= '<div id="rightcolumn">';
+ $html .= '<div class="sideitem">';
+ $html .= file_get_contents('_sidePanel.html');
+ $html .= '</div>';
+ $html .= '</div>';
# 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
deleted file mode 100644
index 500a043..0000000
--- a/pages/_index.html
+++ /dev/null
@@ -1,124 +0,0 @@
-<div id="bigbuttons">
-<h3>Primary Links</h3>
-<ul>
- <li><a id="buttonDownload" href="downloads.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="Download">Bug
- Tracker, Newsgroup, Professional Support</a></li>
- <li><a id="buttonInvolved" href="get_involved.php" title="Getting Involved">CVS,
- Workspace Setup, Wiki, Committers</a></li>
-</ul>
-</div>
-
-<div id="midcolumn">
-<h3>OSEE: The Open System Engineering Environment</h3>
-<div id="introText">
-
-<p>
-<a href="http://en.wikipedia.org/wiki/V_model" target="_self">
- <img align="right" src="images/VDiagram_sm.png" style="padding-right:10px;width:320px;height:166px;" alt="V-Model"/>
-</a>
-The Open System Engineering Environment is an integrated, extensible tool environment for large engineering projects.
-
-It provides a tightly integrated environment supporting lean principles across a
-product's full life-cycle in the context of an overall systems engineering approach.
-
-OSEE's feature set includes configuration management, requirements management, testing, validation, and project management.
-</p>
-
-</div>
-
-
-
-<div id="screenshot">
-<a href="images/ss.png">
-<img src="images/ss_small.png" />
-</a>
-</div>
-
-<img src="images/buttonInvolved_sel.png" height="0" width="0" />
-<img src="images/buttonDownload_sel.png" height="0" width="0" />
-<img src="images/buttonDocumentation_sel.png" height="0" width="0" />
-<img src="images/buttonSupport_sel.png" height="0" width="0" />
-
-<div id="feature_1">
-
-<h4>Extensible Data Model</h4>
-<p>All project data is stored in OSEE's user-definable data model, which offers revision control, bidirectional traceability, project status reporting, and metrics.</p>
-</div>
-
-
-<div id="feature_2">
-<h4>Full Lifecycle Support</h4>
-<p>
-The data integration and traceability features OSEE offers enable a coherent view of a project across its full life-cycle.
-</p>
-</div>
-
-<div id="feature_3">
-<h4>A Potent Framework</h4>
-<p>
-In addition to excelling as a stand-alone application, OSEE offers a full-featured API, enabling
-developers to harness OSEE's powerful data management capabilities for their own applications.
-</p>
-</div>
-
-<div id="feature_4">
-<h4>Version and Variant Management</h4>
-<p>OSEE's advanced branch management capabilities, including change reports and automated merging,
-make it possible to control many variants of a project with ease. Since OSEE retains a full revision
-history of every resource in the system, engineers can make and review changes with greater confidence.</p>
-</div>
-
-<div id="feature_more">
-<h4>and much more...</h4>
-<p>Read the OSEE <a href="http://wiki.eclipse.org/OSEE">Wiki</a> and join the discussion at the <a href="http://www.eclipse.org/forums/index.php?t=thread&frm_id=68&S=03be8852279043e2fbe465ca71cbb7ac">forum</a> to get involved in using or developing OSEE.</p>
-<p>Our Eclipse project page can be found here: <a href="/projects/project_summary.php?projectid=technology.osee">About OSEE</a>
-</div>
-
-</div>
-
-<div id="rightcolumn">
- <div>
- <h3>Project Status</h3>
- <center><a href="/projects/gazoo.php"><img align="center" src="/images/egg-incubation.png" border="0"/></a></center>
- </div>
-
- <div>
- <h3>Getting Started</h3>
- At EclipseCon 2008, the OSEE team presented a tutorial explaining the use of the Action
- Tracking System and other features. The slides from this tutorial can
- be found <a href="http://wiki.eclipse.org/OSEE/Tutorial">here</a>.
- </div>
-
- <div>
- <h3>Commit Activity</h3>
- <a href="http://dash.eclipse.org/dash/commits/web-app/summary.cgi?company=x&month=y&project=technology.osee">
- <img width="256" height="74" src="http://dash.eclipse.org/dash/commits/web-app/active-graph.cgi?project=technology.osee" />
- </a>
- </div>
-
- <div>
- <h3>What's new?</h3>
- <ul>
- <li>OSEE 0.9.4 is <a href="http://www.eclipse.org/osee/downloads.php">available</a>.</li>
- <li>The slides from the OSEE team's presentation at EclipseCon 2010,
- entitled "Xtext and GEF deliver editors for the Open System Engineering Environment",
- are available <a href="http://www.eclipse.org/osee/Xtext_and_GEF_deliver_editors_for_the_Open_System_Engineering_Environment.ppt">here</a>.</li>
- </ul>
- </div>
-
- <div>
- <h3>Quick Links</h3>
- <div class="modal">
- <ul>
- <li><a href="http://osee.microdoc.com/node/2">OSEE add-ons page</a></li>
- <li><a href="http://www.open-do.org/">Open DO-178</a></li>
- <li><a href="http://www.eclipse.org/proposals/osee/">Project Proposal</a></li>
- </ul>
- </div>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/midcolumn_example.php b/sandbox/midcolumn_example.php
similarity index 100%
rename from midcolumn_example.php
rename to sandbox/midcolumn_example.php
diff --git a/screencasts.php b/screencasts.php
index fd0d920..c622c72 100644
--- a/screencasts.php
+++ b/screencasts.php
@@ -1,20 +1,5 @@
-<?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'
+<?php
- # Begin: page-specific settings. Change these.
- $pageTitle = "OSEE Screencasts";
- $pageKeywords = "OSEE, Open, System, Engineering, Environment, Eclipse, Define, ATS, OTE, Application Framework";
- $pageAuthor = "Ryan D. Brooks; Donald G. Dunne";
-
- # Paste your HTML content between the EOHTML markers!
- $html = <<<EOHTML
+ header( 'Location: documentation/' ) ;
- <div id="midcolumn">
- <h1>$pageTitle</h1>
- <a href="http://wiki.eclipse.org/OSEE/Users_Guide#Screencasts">Screencasts moved here</a>
-</div>
-EOHTML;
-
-
- # Generate the web page
- $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
?>
\ No newline at end of file
diff --git a/sidebar.php b/sidebar.php
deleted file mode 100644
index 810e6b5..0000000
--- a/sidebar.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
- $sidebar = <<<EOHTML
-
- <div class="sideitem">
- <h6>Project Status: Incubation</h6>
- <div>
- <center><a href="/projects/gazoo.php"><img align="center" src="/images/egg-incubation.png" border="0"/></a></center></div>
- </div>
-
- <div class="sideitem">
- <h6>Commit Activity</h6>
- <a href="http://dash.eclipse.org/dash/commits/web-app/summary.cgi?company=x&month=y&project=technology.osee">
- <img src="http://dash.eclipse.org/dash/commits/web-app/active-graph.cgi?project=technology.osee" />
- </a>
- </div>
-
- <div class="sideitem">
- <h6>Quick Links</h6>
- <div class="modal">
- <ul>
- <li><a href="http://osee.microdoc.com/node/2">OSEE add-ons page</a></li>
- <li><a href="http://www.open-do.org/">Open DO-178</a></li>
- <li><a href="http://www.eclipse.org/proposals/osee/">Project Proposal</a></li>
- </ul>
- </div>
- </div>
-
-EOHTML
-?>
\ No newline at end of file
