UPDATED: new try with a new way to compose the page
diff --git a/functions/templating.php b/functions/templating.php
deleted file mode 100644
index 15d636c..0000000
--- a/functions/templating.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-function get_include_contents($filename) {
- if (is_file($filename)) {
- ob_start();
- include $filename;
- return ob_get_clean();
- }
- return false;
-}
-
-?>
\ No newline at end of file
diff --git a/index.php b/index.php
index 7845294..c19fd84 100755
--- a/index.php
+++ b/index.php
@@ -13,7 +13,6 @@
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("./functions/templating.php");
$App = new App();
$Nav = new Nav();
@@ -23,11 +22,14 @@
$localVersion = false;
// # Paste your HTML content between the EOHTML markers!
- $html = get_include_contents('pages/template.html');
- if ($html == false) {
- $html = "Error! Couldn't load file pages/template.html";
+ $banner = file_get_contents('pages/banner.html');
+ if ($_GET['section'] == "support") {
+ $body = file_get_contents('pages/support.html');
+ } else {
+ $body = file_get_contents('pages/_index.html');
}
-
+ $right = file_get_contents('pages/rightcolumn.html');
+ $html = $banner + $body + $right;
# Generate the web page
$App->generatePage($theme, $Menu, null, $pageAuthor, $pageKeywords, $pageTitle, $html);
diff --git a/pages/_index.html b/pages/_index.html
index 9ebad48..4c5d55b 100644
--- a/pages/_index.html
+++ b/pages/_index.html
@@ -1,3 +1,4 @@
+<div id="midcolumn">
<h3>EEF - The EMF presentation framework</h3>
<div id="introText">
@@ -52,4 +53,4 @@
<embed width="650" height="380" name="csSWF" src="http://www.eclipse.org/intent/pages/transcripts/2012_AgileALMConnect/demos/demo1_synchronization/sync1-final2_controller.swf" width="1280" height="738" bgcolor="#1a1a1a" quality="best" allowScriptAccess="always" allowFullScreen="true" scale="showall" flashVars="autostart=true&thumb=http://www.eclipse.org/intent/pages/transcripts/2012_AgileALMConnect/demos/demo1_synchronization/FirstFrame.png&thumbscale=45&color=0x000000,0x000000" pluginspage="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"></embed>
</object>
</div-->
-
+</div>
\ No newline at end of file
diff --git a/pages/banner.html b/pages/banner.html
new file mode 100644
index 0000000..b3caba7
--- /dev/null
+++ b/pages/banner.html
@@ -0,0 +1,13 @@
+<div id="bigbuttons">
+ <h3>Primary Links</h3>
+ <ul>
+ <li><a id="buttonDownload" href="downloads" title="Download">Eclipse
+ Distribution, Update Site, Dropins</a></li>
+ <li><a id="buttonDocumentation" href="http://wiki.eclipse.org/EEF"
+ title="Documentation">Tutorials, Examples, Videos, Reference Documentation</a></li>
+ <li><a id="buttonSupport" href="index.php?section=support" title="Download">Bug
+ Tracker, Newsgroup, Professional Support</a></li>
+ <li><a id="buttonInvolved" href="#" title="Getting Involved">CVS,
+ Workspace Setup, Wiki, Committers</a></li>
+ </ul>
+</div>
\ No newline at end of file
diff --git a/pages/rightcolumn.html b/pages/rightcolumn.html
new file mode 100644
index 0000000..dac3ad2
--- /dev/null
+++ b/pages/rightcolumn.html
@@ -0,0 +1,26 @@
+<div id="rightcolumn">
+ <div class="sideitem" id="obeo">
+ <a href="http://www.obeo.fr" title="Main Obeo website" rel="nofollow"><img src="images/logos/logo_obeo.png"/></a>
+ </div>
+
+ <div>
+ <h3>Project Summary</h3>
+ <p >
+ Read more
+ <a style="float: right;" href="http://www.eclipse.org/projects/project_summary.php?projectid=modeling.emft.eef" title="about">
+ about this project
+ </a>
+ and get all useful information and links about it in a nutshell.
+ </p>
+ </div>
+
+ <div id="headlines">
+ <h3>News and Noteworthy</h3>
+ <ul>
+ <li>08/07/2012 - This brand new website for EEF.</li>
+ <li>06/27/2012 - Like each year since the project creation, EEF takes part of the annual Eclipse release train.</li>
+ <li>05/10/2012 - EEF 1.1 is released!</li>
+ </ul>
+ </div>
+
+</div>
diff --git a/pages/support.html b/pages/support.html
index 0eb3d53..135bba9 100644
--- a/pages/support.html
+++ b/pages/support.html
@@ -1,5 +1,6 @@
+<div id="midcolumn">
<h3>EEF - Support</h3>
<div id="introText">
<p>Obeo provide a full support for EEF framework</p>
</div>
-
+</div>
diff --git a/pages/template.html b/pages/template.html
deleted file mode 100644
index 61f37d8..0000000
--- a/pages/template.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
- require_once("../functions/templating.php");
-?>
-
-<div id="bigbuttons">
- <h3>Primary Links</h3>
- <ul>
- <li><a id="buttonDownload" href="downloads" title="Download">Eclipse
- Distribution, Update Site, Dropins</a></li>
- <li><a id="buttonDocumentation" href="http://wiki.eclipse.org/EEF"
- title="Documentation">Tutorials, Examples, Videos, Reference Documentation</a></li>
- <li><a id="buttonSupport" href="index.php?section=support" title="Download">Bug
- Tracker, Newsgroup, Professional Support</a></li>
- <li><a id="buttonInvolved" href="#" title="Getting Involved">CVS,
- Workspace Setup, Wiki, Committers</a></li>
- </ul>
-</div>
-
-<div id="midcolumn">
-<?php
- if ($_GET['section'] == "support") {
- $html = get_include_contents('pages/support.html');
- if ($html == false) {
- $html = "Error! Couldn't load file support.html";
- }
- } else {
- $html = get_include_contents('page/_index.html');
- if ($html == false) {
- $html = "Error! Couldn't load file _index.html";
- }
- }
- echo $html;
-?>
-</div>
-
-<div id="rightcolumn">
- <div class="sideitem" id="obeo">
- <a href="http://www.obeo.fr" title="Main Obeo website" rel="nofollow"><img src="images/logos/logo_obeo.png"/></a>
- </div>
-
- <div>
- <h3>Project Summary</h3>
- <p >
- Read more
- <a style="float: right;" href="http://www.eclipse.org/projects/project_summary.php?projectid=modeling.emft.eef" title="about">
- about this project
- </a>
- and get all useful information and links about it in a nutshell.
- </p>
- </div>
-
- <div id="headlines">
- <h3>News and Noteworthy</h3>
- <ul>
- <li>08/07/2012 - This brand new website for EEF.</li>
- <li>06/27/2012 - Like each year since the project creation, EEF takes part of the annual Eclipse release train.</li>
- <li>05/10/2012 - EEF 1.1 is released!</li>
- </ul>
- </div>
-
-</div>
\ No newline at end of file
