bug 566458 - drop fax number, remove Inc.
bug 566458 - updated address info, add Germany address
bug 566458- remove directions page and update contact page
Change-Id: I2e6a21f0e9ad91a602ccd4ec826b9fee5fa5e67c
diff --git a/foundation/content/en_contact.php b/foundation/content/en_contact.php
index 29fd3c5..a3a8b77 100644
--- a/foundation/content/en_contact.php
+++ b/foundation/content/en_contact.php
@@ -19,7 +19,7 @@
<h1><?php print $pageTitle;?></h1>
<div class="panel panel-default">
<!-- Default panel contents -->
- <div class="panel-heading">Need to contact someone at Eclipse.org?</div>
+ <div class="panel-heading">Need to contact someone at the Eclipse Foundation?</div>
<!-- List group -->
<ul class="list-group">
@@ -56,42 +56,47 @@
</ul>
</div>
- <h2>Directions</h2>
+
<div class="row">
<div class="col-sm-24">
+ <h2>Offices</h2>
+ <p>All correspondence should be directed to our Ottawa office:</p>
<p>
- Eclipse Foundation, Inc.<br /> 2934 Baseline Road, Suite 202<br />
- Ottawa, Ontario,<br /> Canada, K2H 1B2
+ Eclipse Foundation <br />
+ 2934 Baseline Road, Suite 202 <br />
+ Ottawa, Ontario, <br />
+ Canada, K2H 1B2
</p>
-
- <ul style="padding-left: 2em;">
- <li><a
- href="https://goo.gl/maps/NtBkZJD9CvEBHnGw5"
- target="_blank">Google map</a></li>
- <li><a
- href="https://www.google.com/maps/dir/Ottawa+International+Airport+(YOW),+Airport+Parkway+Private,+Ottawa,+ON/2934+Baseline+Rd+%23202,+Nepean,+ON+K2H+8T5/@45.3623756,-75.7947688,12z/data=!3m1!4b1!4m13!4m12!1m5!1m1!1s0x4cce083f06d206e1:0x50fd37ed2e082d1a!2m2!1d-75.6691652!2d45.319212!1m5!1m1!1s0x4cce00b41f033107:0x96ee3015fb6541bc!2m2!1d-75.7970318!2d45.3359991"
- target="_blank">Directions from the Ottawa Airport: </a></li>
- <li><a
- href="https://www.google.com/maps/dir/King+Edward+Ave,+Ottawa,+ON/2934+Baseline+Rd+%23202,+Nepean,+ON+K2H+8T5/@45.3826285,-75.7715971,13z/data=!3m1!4b1!4m14!4m13!1m5!1m1!1s0x4cce050896bd3be1:0x691804cdefe56694!2m2!1d-75.6864187!2d45.4293909!1m5!1m1!1s0x4cce00b41f033107:0x96ee3015fb6541bc!2m2!1d-75.7970318!2d45.3359991!3e0"
- target="_blank">Directions from downtown:</a></li>
- <li><a
- href="https://www.google.com/maps/dir/Kanata,+Ottawa,+ON/2934+Baseline+Rd+%23202,+Nepean,+ON+K2H+8T5/@45.3226198,-75.8800091,13z/data=!3m1!4b1!4m14!4m13!1m5!1m1!1s0x4ccdff86df946877:0x286ff73092245b34!2m2!1d-75.8986835!2d45.3088185!1m5!1m1!1s0x4cce00b41f033107:0x96ee3015fb6541bc!2m2!1d-75.7970318!2d45.3359991!3e0"
- target="_blank">Directions from Kanata</a></li>
- </ul>
+ <p>
+ <i class="fa fa-map-marker orange"></i>
+ <a href="https://goo.gl/maps/NtBkZJD9CvEBHnGw5" target="_blank"> Google map</a>
+ </p>
<p>
<i class="fa fa-phone orange"></i> +1.613.224.9461
</p>
- <p>
- <i class="fa fa-fax orange"></i> +1.613.224.5172
- </p>
- </div>
- <div class="col-xs-24">
- <br />
- <h3>Parking and entrance</h3>
- <p>From Baseline Road, turn onto Monterey Drive. The parking lot is your first right. Enter the roundabout and take the third intersection, which leads you to the free visitor parking.</p>
-
</div>
</div>
+
+ <div class="row">
+ <div class="col-sm-24">
+ <p>The mailing address of our Eclipse Foundation Europe GmbH subsidiary:</p>
+ <p>
+ Eclipse Foundation GmbH <br />
+ Annastrasse 46 <br />
+ 64673 Zwingenberg, <br />
+ Germany<br />
+ </p>
+
+ <p>
+ <i class="fa fa-map-marker orange"></i>
+ <a href="https://goo.gl/maps/HanH1uQx6ZnjteXQ6" target="_blank"> Google map</a>
+ </p>
+ <p>
+ <i class="fa fa-phone orange"></i> +49 6251 8606413
+ </p>
+ </div>
+ </div>
+
</div>
<div id="rightcolumn">
<div class="sideitem">
diff --git a/foundation/content/en_directions.php b/foundation/content/en_directions.php
deleted file mode 100644
index 832bdb2..0000000
--- a/foundation/content/en_directions.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Copyright (c) 2005, 2017, 2018 Eclipse Foundation.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * Contributors:
- * Eric Poirier (Eclipse Foundation)
- *
- * SPDX-License-Identifier: EPL-2.0
- */
-?>
-<div id="midcolumn">
- <h1><?php print $pageTitle; ?></h1>
- <div class="row">
- <div class="col-sm-12">
- <h2>Eclipse Foundation, Inc.</h2>
- <p>
- 2934 Baseline Road, Suite 202<br />
- Ottawa, Ontario,<br /> Canada, K2H 1B2
- </p>
-
- <ul style="padding-left: 2em;">
- <li><a
- href="https://goo.gl/maps/NtBkZJD9CvEBHnGw5"
- target="_blank">Google map</a></li>
- <li><a
- href="https://www.google.com/maps/dir/Ottawa+International+Airport+(YOW),+Airport+Parkway+Private,+Ottawa,+ON/2934+Baseline+Rd+%23202,+Nepean,+ON+K2H+8T5/@45.3623756,-75.7947688,12z/data=!3m1!4b1!4m13!4m12!1m5!1m1!1s0x4cce083f06d206e1:0x50fd37ed2e082d1a!2m2!1d-75.6691652!2d45.319212!1m5!1m1!1s0x4cce00b41f033107:0x96ee3015fb6541bc!2m2!1d-75.7970318!2d45.3359991"
- target="_blank">Directions from the Ottawa Airport: </a></li>
- <li><a
- href="https://www.google.com/maps/dir/King+Edward+Ave,+Ottawa,+ON/2934+Baseline+Rd+%23202,+Nepean,+ON+K2H+8T5/@45.3826285,-75.7715971,13z/data=!3m1!4b1!4m14!4m13!1m5!1m1!1s0x4cce050896bd3be1:0x691804cdefe56694!2m2!1d-75.6864187!2d45.4293909!1m5!1m1!1s0x4cce00b41f033107:0x96ee3015fb6541bc!2m2!1d-75.7970318!2d45.3359991!3e0"
- target="_blank">Directions from downtown:</a></li>
- <li><a
- href="https://www.google.com/maps/dir/Kanata,+Ottawa,+ON/2934+Baseline+Rd+%23202,+Nepean,+ON+K2H+8T5/@45.3226198,-75.8800091,13z/data=!3m1!4b1!4m14!4m13!1m5!1m1!1s0x4ccdff86df946877:0x286ff73092245b34!2m2!1d-75.8986835!2d45.3088185!1m5!1m1!1s0x4cce00b41f033107:0x96ee3015fb6541bc!2m2!1d-75.7970318!2d45.3359991!3e0"
- target="_blank">Directions from Kanata</a></li>
- </ul>
- <p>
- <i class="fa fa-phone orange"></i> +1.613.224.9461
- </p>
- <p>
- <i class="fa fa-fax orange"></i> +1.613.224.5172
- </p>
- </div>
- <div class="col-sm-12">
- <h2>Eclipse Foundation Europe</h2>
- <p>
- Annastrasse 46<br />
- 64673 Zwingenberg, <br />Germany
- </p>
- <ul style="padding-left: 2em;">
- <li><a
- href="https://goo.gl/maps/sLRQ3bp75aD2" target="_blank">Google map</a></li>
- </ul>
- <p>
- <i class="fa fa-phone orange"></i> +49 6251 8606413
- </p>
- </div>
- </div>
-
-</div>
\ No newline at end of file
diff --git a/foundation/directions.php b/foundation/directions.php
index 20b8530..4044fe1 100644
--- a/foundation/directions.php
+++ b/foundation/directions.php
@@ -12,24 +12,5 @@
* SPDX-License-Identifier: EPL-2.0
*/
-require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/app.class.php");
-require_once ($_SERVER['DOCUMENT_ROOT'] . "/eclipse.org-common/system/nav.class.php");
-$App = new App();
-$Nav = new Nav();
-$Theme = $App->getThemeClass();
-
-include ($App->getProjectCommon());
-
-$pageTitle = "Directions";
-
-$Theme->setPageTitle($pageTitle);
-$Theme->setPageKeywords("foundation, office, directions");
-$Theme->setPageAuthor("Mike Milinkovich, Nov. 22, 2005");
-
-ob_start();
-include("content/en_" . $App->getScriptName());
-$html = ob_get_clean();
-
-$Theme->setNav($Nav);
-$Theme->setHtml($html);
-$Theme->generatePage();
\ No newline at end of file
+header('Location: /org/foundation/contact.php', TRUE, 301);
+exit;
\ No newline at end of file
