updating amalgam website
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..3167f92
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Thu May 27 15:44:42 CEST 2010
+eclipse.preferences.version=1
+encoding//doc/releases/amalgam_1.1.0_release_review.html=utf-8
diff --git a/_index.html b/_index.html
new file mode 100644
index 0000000..1889de7
--- /dev/null
+++ b/_index.html
@@ -0,0 +1,96 @@
+
+<div id="primaryLinks">
+<h3>Primary Links</h3>
+<ul>
+ <li>
+ <a id="buttonDownload" href="http://www.eclipse.org/downloads/packages/" title="Download">
+ <strong>Download</strong> Eclipse Distribution
+ </a>
+ </li>
+ <li>
+ <a id="buttonDocumentation" href="http://wiki.eclipse.org/ModelingAmalgam" title="Documentation">
+ <strong>Documentation</strong> Tutorials, Examples, Videos, Reference Documentation
+ </a>
+ </li>
+ <li>
+ <a id="buttonSupport" href="support" title="Support">
+ <strong>Support</strong> Bug Tracker, Newsgroup, Support
+ </a>
+ </li>
+ <li>
+ <a id="buttonInvolved" href="developers" title="Getting Involved">
+ <strong>Getting Involved</strong> CVS, Workspace Setup, Wiki, Committers
+ </a>
+ </li>
+</ul>
+</div>
+
+<div id="midcolumn">
+<h3>Modeling Amalgamation Project</h3>
+<div id="introText">
+<p class="left">
+The Amalgamation project provides improved packaging, integration, and usability of Modeling project components.
+ The project is focused on providing a consumable and integrated Eclipse Modeling Tools package and ease the discovery of the modeling technologies
+ through specific code and examples.
+</p>
+
+</div>
+
+<div id="screencast">
+ <a href="/modeling/amalgam/images/package.png"><img src="images/package.png" alt="Modeling Package" width="600" height="407" /></a>
+</div>
+
+<h3>Eclipse Modeling Project Book </h3>
+<div id="introText">
+
+ <p align="center">
+ The Amalgam project is also a support for the <b>Eclipse Modeling Project</b> book explaining how to leverage several modeling technologies. The book examples are based
+ on the Ganymede release though, you should download the <a href="http://download.eclipse.org/modeling/amalgam/dsltk/downloads/drops/S20090703-0844">corresponding packages.</a>
+ <a href="http://www.informit.com/store/product.aspx?isbn=0321580540"><img src="http://www.informit.com/ShowCover.aspx?isbn=0321580540&type=f"/></a>
+ </p>
+</div>
+
+<div id="feature">
+<h4>User Experience</h4>
+<p>
+
+</p>
+</div>
+
+<!--
+<div id="feature_discovery">
+<h4>Discovering features...</h4>
+<p>
+ Read the documentation, join the discussion at the
+ <a href="http://www.eclipse.org/forums/index.php?t=thread&frm_id=24&">newsgroup</a>, or get in touch with the team
+ on <a href="irc://irc.freenode.net/#eclipse-modeling">IRC</a>.</p>
+</div>
+-->
+</div>
+
+<div id="rightcolumn">
+
+<div class="sideitem">
+<h6>News</h6>
+<ul>
+ <li> <tt>03/2010</tt> a new media to <a href="http://model-driven-blogging.blogspot.com/2010/03/eclipse-amalgamation-20.html">discover and install modeling components </a></li>
+ <li> <tt>10/2009</tt> a new team is forged</li>
+</ul>
+</div>
+
+<br />
+<div class="sideitem">
+</div>
+
+<div class="sideitem">
+<h6>Headlines in the web</h6>
+<ul>
+ <li>
+
+ </li>
+</ul>
+</div>
+
+
+
+</div>
diff --git a/_projectCommon.php b/_projectCommon.php
index 1637e37..733a829 100755
--- a/_projectCommon.php
+++ b/_projectCommon.php
@@ -1,107 +1,36 @@
<?php
-$Nav->setLinkList(null);
-$PR = "modeling/amalgam";
-$projectName = "Amalgam";
-$defaultProj = "/amalgam";
-
-$isEMFserver = (preg_match("/^emf(?:\.torolab\.ibm\.com)$/", $_SERVER["SERVER_NAME"]));
-$isBuildServer = (preg_match("/^(emft|modeling|build)\.eclipse\.org$/", $_SERVER["SERVER_NAME"])) || $isEMFserver;
-$isBuildDotEclipseServer = $_SERVER["SERVER_NAME"] == "build.eclipse.org";
-$isWWWserver = (preg_match("/^(?:www.|)eclipse.org$/", $_SERVER["SERVER_NAME"]));
-$isEclipseCluster = (preg_match("/^(?:www.||download.|download1.|build.)eclipse.org$/", $_SERVER["SERVER_NAME"]));
-$debug = (isset ($_GET["debug"]) && preg_match("/^\d+$/", $_GET["debug"]) ? $_GET["debug"] : -1);
-$writableRoot = ($isBuildServer ? $_SERVER["DOCUMENT_ROOT"] . "/modeling/includes/" : "/home/data/httpd/writable/www.eclipse.org/");
-$writableBuildRoot = $isBuildDotEclipseServer ? "/opt/public/modeling" : "/home/www-data";
-
-$rooturl = "http://" . $_SERVER["HTTP_HOST"] . "/$PR";
-$downurl = ($isBuildServer ? "" : "http://www.eclipse.org");
-$bugurl = "https://bugs.eclipse.org";
-
-if (isset ($_GET["skin"]) && preg_match("/^(Blue|EclipseStandard|Industrial|Lazarus|Miasma|Modern|OldStyle|Phoenix|PhoenixTest|PlainText|Nova)$/", $_GET["skin"], $regs))
-{
- $theme = $regs[1];
-}
-else
-{
+ # Set the theme for your project's web pages.
+ # See the Committer Tools "How Do I" for list of themes
+ # https://dev.eclipse.org/committers/
+ # Optional: defaults to system theme
$theme = "Nova";
-}
+
-/* projects/components in cvs */
-/* "proj" => "cvsname" */
-$cvsprojs = array ("amalgam" => "org.eclipse.amalgam");
+ # Define your project-wide Nav bars here.
+ # Format is Link text, link URL (can be http://www.someothersite.com/), target (_self, _blank), level (1, 2 or 3)
+ # these are optional
+ $Nav->setLinkList(array());
+ $Nav->addNavSeparator("Amalgam", "/amalgam");
+ $Nav->addCustomNav("Download", "http://www.eclipse.org/downloads/packages/", "_self", 3);
+ $Nav->addCustomNav("Documentation", "http://wiki.eclipse.org/ModelingAmalgam", "_self", 3);
+ $Nav->addCustomNav("Support", "/modeling/amalgam/support", "_self", 3);
+ $Nav->addCustomNav("Getting Involved", "/modeling/amalgam/developers", "_self", 3);
+
+ $pageKeywords = "acceleo, dsl, modeling, domain specific language, textual, emf, package, diagram, modeler";
+ $pageAuthor = "Obeo";
+ $pageTitle = "Modeling Amalgamation";
-/* sub-projects/components in cvs for projects/components above (if any) */
-/* "cvsname" => array("shortname" => "cvsname") */
-$cvscoms = array (
-/* "org.eclipse.amalgam" => array (
- "amalgam" => "org.eclipse.amalgam",
- )*/
-);
+ $Menu->setMenuItemList(array());
+ $Menu->addMenuItem("Home", "/modeling/amalgam", "_self");
+ $Menu->addMenuItem("Download", "http://www.eclipse.org/downloads/packages/", "_self");
+ $Menu->addMenuItem("Documentation", "http://wiki.eclipse.org/ModelingAmalgam", "_self");
+ $Menu->addMenuItem("Support", "/modeling/amalgam/support", "_self");
+ $Menu->addMenuItem("Developers", "/modeling/amalgam/developers", "_self");
+
+ $App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="style_amalgam.css"/>' . "\n\t");
+
+ $App->Promotion = TRUE;
-$projects = array (
- "Amalgam" => "amalgam",
-);
-$bugcoms = array_flip($projects);
-$bugcoms = preg_replace("/ /", "%20", $bugcoms);
-
-$extraprojects = array(); //components with only downloads, no info yet, "prettyname" => "directory"
-$nodownloads = array(""); //components with only information, no downloads, or no builds available yet, "projectkey"
-$nonewsgroup = array(""); //components without newsgroup
-$nomailinglist = array(""); //components without mailinglist
-$incubating = array(""); // components which are still incubating
-$nomenclature = "Component"; //are we dealing with "components" or "projects"?
-include_once $_SERVER["DOCUMENT_ROOT"] . "/modeling/includes/scripts.php";
-$regs = null;
-$proj = (isset($_GET["project"]) && preg_match("/^(" . join("|", $projects) . ")$/", $_GET["project"], $regs) ? $regs[1] : getProjectFromPath($PR));
-$projct= preg_replace("#^/#", "", $proj);
-
-$buildtypes = array(
- "R" => "Release",
- "S" => "Stable",
- "I" => "Integration",
- "M" => "Maintenance",
- "N" => "Nightly"
-);
-
-$Nav->addCustomNav("About This Project", "/projects/project_summary.php?projectid=" . str_replace("/", ".", $PR), "", 1);
-$Nav->addNavSeparator($projectName, "$rooturl/");
-/*foreach (array_keys(array_diff($projects, $extraprojects)) as $z)
-{
- if (!isset($hasmoved[$projects[$z]]))
- {
- $Nav->addCustomNav($z, "$rooturl/?project=$projects[$z]", "_self", 2);
- }
- else
- {
- $Nav->addCustomNav($z, "http://www.eclipse.org/modeling/" . $hasmoved[$projects[$z]] . "/?project=" . $projects[$z], "_self", 2);
- }
-}*/
-
-$Nav->addCustomNav("Downloads", "$downurl/$PR/downloads/?project=$proj", "_self", 2);
-$Nav->addCustomNav("Update Manager", "$rooturl/updates/", "_self", 2);
-
-$Nav->addNavSeparator("Documentation", "http://wiki.eclipse.org/ModelingAmalgam");
-$Nav->addCustomNav("Getting Started", "http://wiki.eclipse.org/ModelingAmalgam", "_self", 2);
-$Nav->addCustomNav("FAQ", "$rooturl/faq.php?project=$proj", "_self", 2);
-$Nav->addCustomNav("Plan", "http://www.eclipse.org/projects/project-plan.php?projectid=modeling.amalgam", "_self", 2);
-$Nav->addCustomNav("Release Notes", "http://www.eclipse.org/$PR/news/relnotes.php?project=$proj&version=HEAD", "_self", 2);
-$Nav->addCustomNav("Search CVS", "http://www.eclipse.org/$PR/searchcvs.php?q=file%3A+org.eclipse.amalgam%2F" . (false && $proj?"org.eclipse.amalgam.".$proj."%2F":"") . "+days%3A+7", "_self", 2);
-
-$Nav->addNavSeparator("Community", "http://www.eclipse.org/$PR/development/");
-$Nav->addCustomNav("How To Contribute", "http://www.eclipse.org/$PR/development/", "_self", 2);
-$Nav->addCustomNav("Wiki", "http://wiki.eclipse.org/ModelingAmalgam", "_self", 2);
-$Nav->addCustomNav("Newsgroup", "http://dev.eclipse.org/newslists/news.eclipse.modeling.amalgam/maillist.html", "_self", 2);
-$Nav->addCustomNav("Mailing List", "https://dev.eclipse.org/mailman/listinfo/amalgam-releng", "_self", 2);
-
-$Nav->addCustomNav("Modeling Corner", "http://wiki.eclipse.org/Modeling_Corner", "_self", 2);
-$collist = "%26query_format%3Dadvanced&column_changeddate=on&column_bug_severity=on&column_priority=on&column_rep_platform=on&column_bug_status=on&column_product=on&column_component=on&column_version=on&column_target_milestone=on&column_short_short_desc=on&splitheader=0";
-$Nav->addCustomNav("Open Bugs", "$bugurl/bugs/colchange.cgi?rememberedquery=product%3D" . $projectName . (false && isset ($bugcoms[$proj]) ? "%26component=$bugcoms[$proj]" : "") . "%26bug_status%3DNEW%26bug_status%3DASSIGNED%26bug_status%3DREOPENED%26bug_status%3DRESOLVED%26resolution%3DFIXED%26resolution%3D---%26order%3Dbugs.bug_status%2Cbugs.target_milestone%2Cbugs.bug_id" . $collist, "_self", 2);
-$Nav->addCustomNav("Submit A Bug", "$bugurl/bugs/enter_bug.cgi?product=" . $projectName . (false && isset ($bugcoms[$proj]) ? "&component=$bugcoms[$proj]" : ""), "_self", 2);
-$Nav->addCustomNav("Contributors", "http://www.eclipse.org/$PR/project-info/team.php", "_self", 2);
-unset ($bugcoms);
-
-$App->AddExtraHtmlHeader("<link rel=\"stylesheet\" type=\"text/css\" href=\"/modeling/includes/common.css\"/>\n");
-addGoogleAnalyticsTrackingCodeToHeader();
-$App->Promotion = TRUE; # set true to enable current eclipse.org site-wide promo
+ $App->SetGoogleAnalyticsTrackingCode("UA-16777490-1");
?>
diff --git a/developers/_index.html b/developers/_index.html
new file mode 100644
index 0000000..637e9b1
--- /dev/null
+++ b/developers/_index.html
@@ -0,0 +1,18 @@
+<ul>
+ <li><b><a
+ href="http://www.eclipse.org/projects/project_summary.php?projectid=modeling.amalgam"
+ title="Project Summary">Project Summary</li>
+ <li><b><a
+ href="repositoryDetails.php"
+ title="Amalgam Repository Details">Source Code Access</a></b> - get the code
+ from CVS!</li>
+ <li><b><a
+ href="https://dev.eclipse.org/mailman/listinfo/amalgam-dev"
+ title="https://dev.eclipse.org/mailman/listinfo/amalgam-dev"
+ rel="nofollow">Developer Mailing List</a></b> - Subscribe to the developer
+ list.</li>
+ <li><b><a
+ href="http://www.eclipse.org/projects/project-plan.php?projectid=modeling.amalgam"
+ title="http://www.eclipse.org/projects/project-plan.php?projectid=modeling.amalgam"
+ rel="nofollow">Project Plan</a></b> - what's coming up?</li>
+</ul>
diff --git a/developers/_repositoryDetails.html b/developers/_repositoryDetails.html
new file mode 100644
index 0000000..e18a855
--- /dev/null
+++ b/developers/_repositoryDetails.html
@@ -0,0 +1,21 @@
+<p>The complete source code for Amalgam is publicly available from the
+Eclipse.org CVS repository.</p>
+<p>In order to use the following repository locations, copy the
+location URL, open the <i>CVS repository exploring</i> perspective and
+paste it in.</p>
+
+<h3>Browse Repository</h3>
+<p>If you just want to browse the source code without checking out
+all the projects, you can use this link: <a
+ href="http://dev.eclipse.org/viewcvs/index.cgi/org.eclipse.amalgam/?root=Modeling_Project">Browse
+Amalgam source code</a></p>
+
+<h3><span class="editsection">CVS Anonymous Access</span></h3>
+<table>
+<tr><td><i>Connection type:</i></td><td>pserver</td></tr>
+<tr><td><i>User:</i></td><td>anonymous</td></tr>
+<tr><td><i>Password:</i></td><td>[none]</td></tr>
+<tr><td><i>Host:</i></td><td>dev.eclipse.org</td></tr>
+<tr><td><i>Path:</i></td><td>/cvsroot/modeling</td></tr>
+<tr><td><i>Module:</i></td><td>org.eclipse.amalgam</td></tr>
+</table>
diff --git a/developers/index.php b/developers/index.php
new file mode 100644
index 0000000..2170dde
--- /dev/null
+++ b/developers/index.php
@@ -0,0 +1,10 @@
+<?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 = "Amalgam - Developers";
+
+ $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/developers/repositoryDetails.php b/developers/repositoryDetails.php
new file mode 100644
index 0000000..7e1cbde
--- /dev/null
+++ b/developers/repositoryDetails.php
@@ -0,0 +1,10 @@
+<?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 = "Amalgam - Developers - Repository Details";
+
+ $html = '<div id="midcolumn">';
+ $html .= file_get_contents('_repositoryDetails.html');
+ $html .= "</div>";
+
+ # Generate the web page
+ $App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+?>
diff --git a/developers/style2.css b/developers/style2.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/developers/style2.css
diff --git a/images/.directory b/images/.directory
new file mode 100644
index 0000000..abbf56f
--- /dev/null
+++ b/images/.directory
@@ -0,0 +1,6 @@
+[Dolphin]
+ShowPreview=true
+Timestamp=2010,6,4,14,28,55
+
+[Settings]
+ShowDotFiles=true
diff --git a/images/backgroundMainAmalgam.png b/images/backgroundMainAmalgam.png
new file mode 100644
index 0000000..22831e2
--- /dev/null
+++ b/images/backgroundMainAmalgam.png
Binary files differ
diff --git a/images/backgroundMainEmpty.png b/images/backgroundMainEmpty.png
new file mode 100644
index 0000000..9487b21
--- /dev/null
+++ b/images/backgroundMainEmpty.png
Binary files differ
diff --git a/images/buttonDocumentation_empty.png b/images/buttonDocumentation_empty.png
new file mode 100644
index 0000000..8e3877e
--- /dev/null
+++ b/images/buttonDocumentation_empty.png
Binary files differ
diff --git a/images/buttonDownload_empty.png b/images/buttonDownload_empty.png
new file mode 100644
index 0000000..693a98c
--- /dev/null
+++ b/images/buttonDownload_empty.png
Binary files differ
diff --git a/images/buttonInvolved_empty.png b/images/buttonInvolved_empty.png
new file mode 100644
index 0000000..8bbc845
--- /dev/null
+++ b/images/buttonInvolved_empty.png
Binary files differ
diff --git a/images/buttonSupport_empty.png b/images/buttonSupport_empty.png
new file mode 100644
index 0000000..b22fc84
--- /dev/null
+++ b/images/buttonSupport_empty.png
Binary files differ
diff --git a/images/discovery.png b/images/discovery.png
new file mode 100644
index 0000000..cffc421
--- /dev/null
+++ b/images/discovery.png
Binary files differ
diff --git a/images/downloadButton.png b/images/downloadButton.png
new file mode 100644
index 0000000..4cad191
--- /dev/null
+++ b/images/downloadButton.png
Binary files differ
diff --git a/images/downloadButtonUnderline.png b/images/downloadButtonUnderline.png
new file mode 100644
index 0000000..ae92474
--- /dev/null
+++ b/images/downloadButtonUnderline.png
Binary files differ
diff --git a/images/iconWebinar.gif b/images/iconWebinar.gif
new file mode 100644
index 0000000..5d9aa1c
--- /dev/null
+++ b/images/iconWebinar.gif
Binary files differ
diff --git a/images/modeling_logo.png b/images/modeling_logo.png
new file mode 100644
index 0000000..6dec083
--- /dev/null
+++ b/images/modeling_logo.png
Binary files differ
diff --git a/images/newAndNoteworthy.png b/images/newAndNoteworthy.png
new file mode 100644
index 0000000..e53729e
--- /dev/null
+++ b/images/newAndNoteworthy.png
Binary files differ
diff --git a/images/package.png b/images/package.png
new file mode 100644
index 0000000..32a7b94
--- /dev/null
+++ b/images/package.png
Binary files differ
diff --git a/images/packagescreenshot.png b/images/packagescreenshot.png
new file mode 100644
index 0000000..d316883
--- /dev/null
+++ b/images/packagescreenshot.png
Binary files differ
diff --git a/images/small_discovery.png b/images/small_discovery.png
new file mode 100644
index 0000000..d51d36d
--- /dev/null
+++ b/images/small_discovery.png
Binary files differ
diff --git a/index.php b/index.php
index cfe286a..1b5cf7e 100644
--- a/index.php
+++ b/index.php
@@ -1,97 +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());
-
-require($_SERVER["DOCUMENT_ROOT"] . "/modeling/includes/db.php");
-
-ob_start();
-?>
-
- <div id="midcolumn">
- <h1>Modeling Amalgamation Project</h1>
- <p>
- The Amalgamation project provides improved packaging, integration, and usability of Modeling project components.
- The project is focused on providing a consumable and integrated Eclipse Modeling Tools package and ease the discovery of the modeling technologies
- through specific code and examples.
- </p>
-
- <div class="homeitem" style="clear: both">
- <h3>Quick Links</h3>
- <ul class="midlist">
- <li>Amalgam <a href="http://wiki.eclipse.org/ModelingAmalgam">Wiki</a> is the main source of information about the project.</li>
- <li><a href="http://www.eclipse.org/epp/download.php">Downloads</a> page.</li>
- <li><a href="http://www.eclipse.org/projects/project-plan.php?projectid=modeling.amalgam">Project Plan</a> for the current release.</li>
- <li><a href="http://www.eclipse.org/proposals/amalgamation/">Project proposal</a></li>
- </div>
- <div class="homeitem" style="clear: both">
- <h3>Events</h3>
- <ul class="midlist">
- <li><b>2010</b>A new team is forged : Cedric Brun (lead), Peter Friese and Artem Tikhomirov</li>
- <li><a href="http://www.eclipsecon.org/2009/">EclipseCon 2009</a> tutorial <a href="http://www.eclipsecon.org/2009/sessions?id=443">Domain-Specific Language Development using Modeling Amalgam</a> accepted.</li>
- <li><a href="https://www.eclipsecon.org/summiteurope2008/">Eclipse Summit Europe</a> talk <a href="https://www.eclipsecon.org/submissions/ese2008/view_talk.php?id=25">Modeling Amalgam as a DSL Toolkit</a> accepted.</li>
- <li><a href="http://www.eclipseworld.net/programday3pm.html#704">Developing and Using Domain-Specific Languages</a> at <a href="http://www.eclipseworld.net/">Eclipse World 2008</a>.</li>
- <li><a href="http://www.eclipsecon.org/2008/index.php?page=sub/&id=51">Eclipse Modeling Project as a DSL Toolkit</a> at <a href="http://www.eclipsecon.org/2008/">EclipseCon 2008</a></li>
- </ul>
- </div>
- <div class="homeitem" style="clear: both">
- <h3>Packages</h3>
- <ul class="midlist">
- <li><a href="http://www.eclipse.org/epp/download.php">Eclipse Modeling Tools</a> package from the
- <a href="http://www.eclipse.org/epp">Eclipse Packaging Project</a> is maintained by Amalgam and represents the Eclipse Modeling Platform SDK. From this package you can easily discover and install all the modeling technologies.</li>
- <!--<li><a href="http://www.eclipse.org/modeling/amalgam/downloads/">DSL Toolkit</a> is a product definition that includes tooling required for a Toolsmith to produce MDSD applications. Currently, it includes
- EMF, GMF, QVTO, Xpand, MWE, OCL, UML2 Tools, and Teneo components.</li>
- <li><a href="http://www.eclipse.org/modeling/amalgam/downloads/">Modeler</a> is a product definition that includes the bare essentials for diagramming in UML and BPMN.</li>
- -->
- </ul>
- </div>
- <br/>
-
- <hr class="clearer" />
-
- </div>
+<?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'
- <div id="rightcolumn">
- <br />
- <div class="sideitem">
- <h6>Incubation</h6>
- <p>Amalgam is currently in the <a href="http://www.eclipse.org/projects/dev_process/validation-phase.php">Validation (Incubation) Phase</a>.</p>
- <div align="center"><a href="http://www.eclipse.org/projects/what-is-incubation.php"><img
- align="center" src="http://www.eclipse.org/images/egg-incubation.png" border="0"/></a>
- </div>
- </div>
-
- <div class="sideitem">
- <h6>DSL Toolkit Book</h6>
-
- <p align="center">
- <a href="http://www.informit.com/store/product.aspx?isbn=0321580540"><img src="http://www.informit.com/ShowCover.aspx?isbn=0321580540&type=f"/></a>
- </p>
- </div>
-
- <div class="sideitem">
- <h6>Getting started</h6>
- <ul>
- <li><a href="http://wiki.eclipse.org/ModelingAmalgam">Amalgam Wiki</a></li>
- </ul>
- </div>
-
- <div class="sideitem">
- <h6>What's New</h6>
- <ul>
- <li> <tt>03/2010</tt> a new media to <a href="http://model-driven-blogging.blogspot.com/2010/03/eclipse-amalgamation-20.html">discover and install modeling components </a></li>
- <li> <tt>10/2009</tt> a new team is forged</li>
- </ul>
- </div>
- </div>
+
+ # Paste your HTML content between the EOHTML markers!
+ $html = file_get_contents('_index.html');
-
-<?php
-$html = ob_get_contents();
-ob_end_clean();
-
-$pageTitle = "Modeling Amalgamation Project";
-$pageKeywords = "eclipse,project,graphical,modeling,model-driven";
-$pageAuthor = "Richard C. Gronback, Nick Boldt";
-
-$App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="http://www.eclipse.org/modeling/includes/index.css"/>' . "\n");
-$App->generatePage($theme, $Menu, $Nav, $pageAuthor, $pageKeywords, $pageTitle, $html);
+ # Generate the web page
+ $App->generatePage($theme, $Menu, null, $pageAuthor, $pageKeywords, $pageTitle, $html);
+ #echo $headlines;
?>
diff --git a/style_amalgam.css b/style_amalgam.css
new file mode 100644
index 0000000..4c190db
--- /dev/null
+++ b/style_amalgam.css
@@ -0,0 +1,219 @@
+#novaContent {
+ background: url("images/backgroundAmalgam.png") no-repeat white;
+}
+
+#introText p.left {
+ text-align: justify;
+ width: 48%;
+ float: left;
+}
+
+#introText p.right {
+ text-align: justify;
+ width: 48%;
+ float: right;
+}
+
+#feature {
+ text-align: justify;
+ clear: both;
+ float: left;
+ width: 63%;
+ margin-right: 3%;
+}
+
+#feature_discovery {
+ text-align: justify;
+ float: left;
+ width: 30%;
+}
+
+#primaryLinks {
+ position: relative;
+ padding-left: 420px;
+ width: 560px;
+}
+
+#primaryLinks h3{
+ visibility: hidden;
+ height: 0;
+}
+
+#primaryLinks ul li {
+ vertical-align: bottom;
+ display: inline-block;
+ list-style-type: none;
+ padding: 0;
+ margin: 0;
+}
+
+#primaryLinks a:hover {
+ text-decoration: underline;
+ color: black;
+}
+
+#primaryLinks a {
+ display: inline-block;
+ list-style-type: none;
+ width: 180px;
+ height: 77px;
+ padding-top: 10px;
+ padding-left: 70px;
+ margin: 0;
+ color: black;
+}
+
+#primaryLinks strong {
+ font-size: larger;
+ display: block;
+ text-decoration: none;
+}
+
+#buttonDownload {
+ background:transparent url("images/buttonDownload_empty.png") no-repeat 0 0;
+}
+
+#buttonDownload:hover {
+}
+
+
+#buttonDocumentation {
+ background:transparent url("images/buttonDocumentation_empty.png") no-repeat 0 0;
+}
+
+#buttonDocumentation:hover {
+}
+
+#buttonSupport {
+ background:transparent url("images/buttonSupport_empty.png") no-repeat 0 0;
+}
+
+#buttonSupport:hover {
+}
+
+#buttonInvolved {
+ background:transparent url("images/buttonInvolved_empty.png") no-repeat 0 0;
+}
+
+#buttonInvolved:hover {
+}
+
+/*
+customizing of yahoo pipes
+*/
+
+#headlines {
+ text-align: justify;
+}
+
+#headlines ul li {
+ margin: 0 0;
+ list-style-type: none;
+ list-style-image: none;
+}
+
+
+#headlines div.title {
+ display: inline;
+ margin-right: 0.5em;
+}
+
+#headlines div.meta {
+ display: inline;
+ color: #444444;
+ font-size: smaller;
+}
+
+#headlines div.item {
+ display: block;
+ }
+
+#stats {
+ color: #444444;
+ }
+
+#screencast {
+ margin-bottom: 10px;
+}
+
+#newAndNoteworthy a {
+ display: block;
+ width:218px;
+ height:51px;
+ padding: 0;
+ text-indent: -9000px;
+ background:transparent url("images/newAndNoteworthy.png") no-repeat 0 0;
+ margin-top: 10px;
+}
+
+.sideitem
+{
+ border-bottom: 1px dotted #d4d4dd;
+ margin-bottom: 10px;
+ padding-bottom: 5px;
+ clear:both;
+}
+.sideitem .modal
+{
+ background: #FFF url('/eclipse.org-common/themes/Nova/images/thinModalBg.png') repeat-x;
+ padding: 5px;
+}
+.sideitem h6
+{
+ background-color: #e8e7dd;
+ border-bottom: 2px solid #FFF;
+ font-size: 14px;
+ font-weight: bold;
+ margin-bottom: 0px;
+ -moz-border-radius-topleft:3px;
+ -moz-border-radius-topright:3px;
+ padding: 8px 5px;
+}
+.sideitem li
+{
+ text-align: justify;
+ padding: 0 10px 5px 0;
+}
+.sideitem ul, .sideitem ol, .sideitem form, .sideitem p
+{
+ font-size: 12px;
+ padding: 5px;
+}
+
+/*
+#screencast {
+ margin: 20px;
+ position: relative;
+ left: 50px;
+ width: 480px;
+ background-color: black;
+ clear: both;
+ height: 340px;
+ color: white;
+ text-align: center;
+ vertical-align: middle;
+}
+*/
+
+#midcolumn {
+ width: 640px;
+ padding: 0 10px 10px 10px;
+}
+
+#rightcolumn {
+ width: 260px;
+}
+
+
+h3 {
+ clear: both;
+}
+
+h7 {
+ font-weight: bold;
+ padding: 5px;
+}
+
+a strong {
+ text-decoration: underline;
+}
\ No newline at end of file
diff --git a/style_nova.css b/style_nova.css
new file mode 100644
index 0000000..7516dfd
--- /dev/null
+++ b/style_nova.css
@@ -0,0 +1,27 @@
+#novaContent {
+ background: url("images/backgroundMainEmpty.png") no-repeat;
+ padding-top: 210px;
+}
+
+#midcolumn {
+ width: 640px;
+ padding: 0 10px 10px 10px;
+}
+
+#rightcolumn {
+ width: 260px;
+}
+
+
+h3 {
+ clear: both;
+}
+
+h7 {
+ font-weight: bold;
+ padding: 5px;
+}
+
+a strong {
+ text-decoration: underline;
+}
\ No newline at end of file
diff --git a/support/_index.html b/support/_index.html
new file mode 100644
index 0000000..e33e1ee
--- /dev/null
+++ b/support/_index.html
@@ -0,0 +1,17 @@
+<ul>
+ <li><b><a href="/modeling/amalgam/documentation"
+ title="Documentation">Documentation</a></b> - read about
+ the details (includes a "Getting Started" tutorial)</li>
+ <li><b><a
+ href="http://www.eclipse.org/forums/index.php?t=thread&frm_id=182&"
+ title="Amalgam Newsgroup"
+ rel="nofollow">Amalgam Newsgroup</a></b>.</li>
+ <li><b><a
+ href="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Modeling&product=Amalgam&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&emailtype1=exact&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="
+ title="https://bugs.eclipse.org/bugs/buglist.cgi?query_format=advanced&short_desc_type=allwordssubstr&short_desc=&classification=Modeling&product=Amalgam&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&emailtype1=exact&email1=&emailtype2=substring&email2=&bugidtype=include&bug_id=&votes=&chfieldfrom=&chfieldto=Now&chfieldvalue=&cmdtype=doit&order=Reuse+same+sort+as+last+time&field0-0-0=noop&type0-0-0=noop&value0-0-0="
+ rel="nofollow">Amalgam Bugzilla</a></b> - review and create Bugzilla entries</li>
+ <li><b><a
+ href="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Amalgam"
+ title="https://bugs.eclipse.org/bugs/enter_bug.cgi?product=Amalgam"
+ rel="nofollow">File a bug</a></b> - file bugs and feature requests</li>
+</ul>
diff --git a/support/index.php b/support/index.php
new file mode 100644
index 0000000..814aa4d
--- /dev/null
+++ b/support/index.php
@@ -0,0 +1,10 @@
+<?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 = "Amalgam - Support";
+
+ $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/support/style2.css b/support/style2.css
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/support/style2.css
