Improve the labels of all the pages.
diff --git a/_index.html b/_index.html
index 806c891..7eafa72 100644
--- a/_index.html
+++ b/_index.html
@@ -37,11 +37,10 @@
<div id="rightcolumn">
<div class="sideitem">
- <h6>The June 2012 Release is Available!</h6>
+ <h6>The Eclipse Luna Release is Available!</h6>
<ul>
- <li><a href="http://download.eclipse.org/e4/downloads/drops/R-0.12-201206131100/index.html">Download it</a></li>
+ <li><a href="http://www.eclipse.org/downloads">Download it</a></li>
</ul>
- Note that several e4 components graduated into the Eclipse Platform project to
- produce the <a href="http://www.eclipse.org/eclipse4">Eclipse 4</a> stream of releases.
+ The Eclipse Luna Modeling Package is the perfect package for modeling developers.
</div>
</div>
\ No newline at end of file
diff --git a/_projectCommon.php b/_projectCommon.php
index c86a7a2..5a70cdd 100644
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -16,9 +16,25 @@
$Menu->addMenuItem("Support", "/acceleo/support", "_self");
$Menu->addMenuItem("Developers", "/acceleo/developers", "_self");
+ $Nav->setLinkList(array());
+ $Nav->addNavSeparator("About this project", "https://projects.eclipse.org/projects/modeling.acceleo", "", 1 );
+ $Nav->addCustomNav("Wiki", "http://wiki.eclipse.org/Acceleo", "_self", 2);
+ $Nav->addCustomNav("Newsgroup", "http://www.eclipse.org/forums/index.php?t=thread&frm_id=24&", "_self", 2);
+ $Nav->addCustomNav("Project Plan", "https://projects.eclipse.org/projects/modeling.m2t.acceleo/documentation", "_self", 2);
+ $Nav->addCustomNav("Bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=VERIFIED&list_id=9161179&product=Acceleo&query_format=advanced", "_self", 2);
+ $Nav->addCustomNav("File a Bug", "https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Acceleo", "_self", 2);
+
+ $Nav->addNavSeparator("Developers", "https://projects.eclipse.org/projects/modeling.m2t.acceleo/developer", "", 1 );
+ $Nav->addCustomNav("Git", "http://git.eclipse.org/c/acceleo/org.eclipse.acceleo.git/", "_self", 2);
+ $Nav->addCustomNav("Gerrit", "https://git.eclipse.org/r/#/admin/projects/acceleo/org.eclipse.acceleo", "_self", 2);
+ $Nav->addCustomNav("Mailing List", "https://dev.eclipse.org/mailman/listinfo/m2t-dev", "_self", 2);
+
+ $Nav->addNavSeparator("Related Projects", "https://www.eclipse.org/modeling", "", 1 );
+ $Nav->addCustomNav("EMF", "https://www.eclipse.org/modeling/emf", "_self", 2);
+ $Nav->addCustomNav("Sirius", "https://www.eclipse.org/sirius", "_self", 2);
+
# $App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="/acceleo/style_acceleo.css"/>' . "\n\t");
$App->Promotion = TRUE;
-
$App->SetGoogleAnalyticsTrackingCode("UA-16777490-1");
?>
diff --git a/awards/_index.html b/awards/_index.html
index 85eb555..b45b6c6 100644
--- a/awards/_index.html
+++ b/awards/_index.html
@@ -1,56 +1,29 @@
-<div id="primaryLinks">
- <h3>Primary Links</h3>
+<div id="midcolumn">
+ <h2>Awards</h2>
<ul>
<li>
- <a id="buttonDownload" href="../downloads" title="Download">
- <strong>Download</strong> Eclipse Distribution, Update Site, Dropins
- </a>
+ <h4>Open Innovation Award 2010</h4>
</li>
- <li>
- <a id="buttonSupport" href="../support" title="Support">
- <strong>Support</strong> Documentation, Newsgroup, Videos
- </a>
- </li>
- <li class="toTheRight">
- <a id="buttonInvolved" href="../developers" title="Getting Involved">
- <strong>Getting Involved</strong> Git, Workspace Setup, Wiki, Committers
- </a>
- </li>
- </ul>
-</div>
+ <a href="http://www.obeo.fr/pages/news/en#041010"><img src="../images/openInnovationAward.png" width="155" height="101" /></a>
+ <br />
+ <p style="text-align:justify">Obeo wins the Open Innovation Award with the presentation of the Acceleo project at the Open
+ World Forum 2010. This award is given to recognize the most innovative and game-changer open source solution in its
+ marketplace.
+ </p>
+ <p>
+ Acceleo, selected from 13 top nominees, received one of five prestigious trophies at the closing ceremony
+ of the Open World Forum, awarded by a jury consisting of leading international experts in the world of open source.
+ More information about the Demo Cup: <a href="http://www.openworldforum.org/connect/awards">http://www.openworldforum.org/connect/awards</a>
+ </p>
+ <p>
+ After the Eclipse Community Award in 2009, this prize recognizes the constant efforts of the Acceleo team & community to provide a quality tool.
+ </p>
-<div id="midcolumn">
-
-<h2>Awards</h2>
-
-
-<h4></h4>
-<ul>
- <li>
-<h4>Open Innovation Award 2010</h4></li>
- <a href="http://www.obeo.fr/pages/news/en#041010"><img src="../images/openInnovationAward.png" width="155" height="101" /></a>
- <br />
- <p style="text-align:justify">Obeo wins the Open Innovation Award with the presentation of the Acceleo project at the Open
- World Forum 2010. This award is given to recognize the most innovative and game-changer open source solution in its
- marketplace.
- </p>
- <p>
- Acceleo, selected from 13 top nominees, received one of five prestigious trophies at the closing ceremony
- of the Open World Forum, awarded by a jury consisting of leading international experts in the world of open source.
- More information about the Demo Cup: <a href="http://www.openworldforum.org/connect/awards">http://www.openworldforum.org/connect/awards</a>
- </p>
- <p>
- After the Eclipse Community Award in 2009, this prize recognizes the constant efforts of the Acceleo team & community to provide a quality tool.
-
- </p>
-
-<li><h4>Best Open Source Eclipse-Based Developer Tool 2009</h4></li>
- <a href="http://www.eclipse.org/org/press-release/20090323_AwardsWinners.php"><img src="http://www.eclipse.org/images/awards/winner09.jpg" /></a>
+ <li><h4>Best Open Source Eclipse-Based Developer Tool 2009</h4></li>
+ <a href="http://www.eclipse.org/org/press-release/20090323_AwardsWinners.php"><img src="http://www.eclipse.org/images/awards/winner09.jpg" /></a>
<br />
<p>
- This award recognizes Top Technologies in the Eclipse Community. <a href="http://www.eclipse.org/org/press-release/20090323_AwardsWinners.php">More information about this award.</a>
+ This award recognizes Top Technologies in the Eclipse Community. <a href="http://www.eclipse.org/org/press-release/20090323_AwardsWinners.php">More information about this award.</a>
</p>
-
-</ul>
-
+ </ul>
</div>
\ No newline at end of file
diff --git a/awards/index.php b/awards/index.php
index e2b60a5..bda377f 100644
--- a/awards/index.php
+++ b/awards/index.php
@@ -1,5 +1,15 @@
-<?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'
- $pageTitle = "Acceleo - Documentation";
+<?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 = "Awards";
$html = file_get_contents('_index.html');
diff --git a/developers/index.php b/developers/index.php
index f6a1e23..0e6bc77 100644
--- a/developers/index.php
+++ b/developers/index.php
@@ -1,5 +1,15 @@
-<?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'
- $pageTitle = "Acceleo - Developers";
+<?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 = "Developers";
$html = file_get_contents('_index.html');
diff --git a/developers/style2.css b/developers/style2.css
deleted file mode 100644
index e69de29..0000000
--- a/developers/style2.css
+++ /dev/null
diff --git a/index.php b/index.php
index b7d8255..74df610 100644
--- a/index.php
+++ b/index.php
@@ -13,23 +13,6 @@
$pageAuthor = "Obeo";
$pageTitle = "Acceleo";
- $Nav->setLinkList(array());
- $Nav->addNavSeparator("About this project", "https://projects.eclipse.org/projects/modeling.acceleo", "", 1 );
- $Nav->addCustomNav("Wiki", "http://wiki.eclipse.org/Acceleo", "_self", 2);
- $Nav->addCustomNav("Newsgroup", "http://www.eclipse.org/forums/index.php?t=thread&frm_id=24&", "_self", 2);
- $Nav->addCustomNav("Project Plan", "https://projects.eclipse.org/projects/modeling.m2t.acceleo/documentation", "_self", 2);
- $Nav->addCustomNav("Bugs", "https://bugs.eclipse.org/bugs/buglist.cgi?bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&bug_status=VERIFIED&list_id=9161179&product=Acceleo&query_format=advanced", "_self", 2);
- $Nav->addCustomNav("File a Bug", "https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Acceleo", "_self", 2);
-
- $Nav->addNavSeparator("Developers", "https://projects.eclipse.org/projects/modeling.m2t.acceleo/developer", "", 1 );
- $Nav->addCustomNav("Git", "http://git.eclipse.org/c/acceleo/org.eclipse.acceleo.git/", "_self", 2);
- $Nav->addCustomNav("Gerrit", "https://git.eclipse.org/r/#/admin/projects/acceleo/org.eclipse.acceleo", "_self", 2);
- $Nav->addCustomNav("Mailing List", "https://dev.eclipse.org/mailman/listinfo/m2t-dev", "_self", 2);
-
- $Nav->addNavSeparator("Related Projects", "https://www.eclipse.org/modeling", "", 1 );
- $Nav->addCustomNav("EMF", "https://www.eclipse.org/modeling/emf", "_self", 2);
- $Nav->addCustomNav("Sirius", "https://www.eclipse.org/sirius", "_self", 2);
-
$html = file_get_contents('_index.html');
# Generate the web page
diff --git a/support/index.php b/support/index.php
index 5092153..2b07910 100644
--- a/support/index.php
+++ b/support/index.php
@@ -1,5 +1,15 @@
-<?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'
- $pageTitle = "Acceleo - Support";
+<?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 = "Support";
$html = file_get_contents('_index.html');
