Infra 2166 - Update the content of secondary pages
Change-Id: I799f77971b31487314cdd9a77512a828e480d84a
Signed-off-by: Eric Poirier <eric@eclipse.org>
diff --git a/benefits.php b/benefits.php
index 86db586..54cd7bb 100644
--- a/benefits.php
+++ b/benefits.php
@@ -9,6 +9,10 @@
* Contributors:
* Christopher Guindon (Eclipse Foundation) - Initial implementation
*******************************************************************************/
+
+// Infra 2166 - We now redirect traffic to faq.php
+header('Location: /donate/faq.php', TRUE, 302);
+
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");
diff --git a/content/en_credit.php b/content/en_credit.php
index 4268f7e..80ed060 100644
--- a/content/en_credit.php
+++ b/content/en_credit.php
@@ -1,6 +1,6 @@
<?php
/*******************************************************************************
- * Copyright (c) 2015 Eclipse Foundation and others.
+ * Copyright (c) 2015, 2016 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
@@ -8,6 +8,7 @@
*
* Contributors:
* Christopher Guindon (Eclipse Foundation) - Initial implementation
+ * Eric Poirier (Eclipse Foundation)
*******************************************************************************/
?>
<div class="jumbotron breadcrumbs-offset">
@@ -15,49 +16,9 @@
<div class="content">
<?php print $Paypal->get_client_message();?>
<h1><?php print $pageTitle;?></h1>
- <p>Eclipse is a great <a href="#">IDE and community</a>. We want to make it even better!<br>All money donated by Friends of Eclipse will go directly to funding <a href="#">Eclipse development</a>. </p>
- </div>
- </div>
-</div>
-
-
-<div class="accomplished">
- <header>
- <div class="container">
- <div class="row">
- <div class="col-md-24 content-container">
- <h2>What we've accomplished <strong>Together!</strong></h2>
- </div>
- </div>
- </div>
- </header>
-
- <div class="container">
- <div class="row">
- <div class="col-sm-12">
- <div class="row">
- <div class="col-xs-24">
- <img class="pull-left" src="images/checkmark.png" alt="Checkmark" />
- <p>Improve the install experience for Mac</p>
- </div>
- <div class="col-xs-24">
- <img class="pull-left" src="images/checkmark.png" alt="Checkmark" />
- <p>Made GTK3 support even better</p>
- </div>
- </div>
- </div>
- <div class="col-sm-12">
- <div class="row">
- <div class="col-xs-24">
- <img class="pull-left" src="images/checkmark.png" alt="Checkmark" />
- <p>Helped implement features in JDT</p>
- </div>
- <div class="col-xs-24">
- <img class="pull-left" src="images/checkmark.png" alt="" />
- <p>Performance improvements to p2</p>
- </div>
- </div>
- </div>
+ <p>Eclipse technology is a success thanks to our awesome open source
+ community. We want to make it even better! All donations
+ go directly to funding Eclipse Platform development</a>.</p>
</div>
</div>
</div>
diff --git a/content/en_faq.php b/content/en_faq.php
index 8a9e729..896ee30 100644
--- a/content/en_faq.php
+++ b/content/en_faq.php
@@ -1,71 +1,380 @@
- <div id="fullcolumn">
+<?php
+/*******************************************************************************
+ * Copyright (c) 2015, 2016 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://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Christopher Guindon (Eclipse Foundation) - Initial implementation
+ * Eric Poirier (Eclipse Foundation)
+ *******************************************************************************/
+?>
+<div id="fullcolumn">
<div id="midcolumn">
<h2><?=$pageTitle ?></h2>
<div class="homeitem3col">
- <h3>Frequently Asked Questions</h3>
- <ul>
- <br/><li><b>Do I get a charitable tax receipt for my donation? </b><br/><br/>
- No. The Eclipse Foundation is a not-for-profit organization, not a charitable organization, so we are unable to provide charitable tax receipts.<br/><br/></li>
- <li><b>What methods of payment do you accept for contributions?</b><br/><br/>
- We are using PayPal to process your donation. PayPal enables you to use a credit card or a PayPal account.<br/><br/></li>
+ <div class="panel-group" id="accordion" role="tablist"
+ aria-multiselectable="true">
- <li><b>What if I want to pay by cheque or direct deposit?</b><br/><br/>
- At this time, we are only set up to accept contributions through PayPal. It is free to
- sign up for an account at www.paypal.com.<br/><br/></li>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingOne">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseOne"
+ aria-expanded="true" aria-controls="collapseOne"> What
+ do you plan to do with the donations received? </a>
+ </h4>
+ </div>
+ <div id="collapseOne" class="panel-collapse collapse in"
+ role="tabpanel" aria-labelledby="headingOne">
+ <div class="panel-body">
+ All money donated to the Eclipse Foundation will directly
+ fund Eclipse Platform development through the <a
+ href="https://eclipse.org/contribute/dev_program.php">Friend
+ of Eclipse Enhancement Program (FEEP).</a>
+ </div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
- <li><b>What is the difference between contributing money to Eclipse and becoming a Friend of Eclipse?</b><br/><br/>
- Individuals can contribute any amount of money they want to the Eclipse Foundation. However, those that give US$35 (but less than US$100)
- qualify for "Friend" status. "Friend" status lasts for a period of 12 months and provides access to a Friends of Eclipse mirror and use
- of the "Friend" logo. Individuals that give US$100 or more qualify for the "Best Friend" status. "Best Friend" status lasts for a period
- of 12 months and provides access to the "Friend" benefits, an Eclipse t-shirt and a discount for EclipseCon events.<br/><br/></li>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingTwo">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseTwo"
+ aria-expanded="true" aria-controls="collapseTwo"> Do I
+ get a charitable tax receipt for my donation? </a>
+ </h4>
+ </div>
+ <div id="collapseTwo" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingTwo">
+ <div class="panel-body">No, you will not receive a
+ charitable tax receipt for your donation. The Eclipse
+ Foundation is a 501(c)(6) not-for-profit organization, not
+ a charitable organization, so we are unable to provide
+ charitable tax receipts.</div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
- <li><b>What amounts may I contribute?</b><br/><br/>
- You may contribute any amount you like. A contribution between US$35 and US$99.99 gives you access to the "Friend of Eclipse"
- benefits and a contribution US$100 or more qualifies you for the “Best Friend” benefits.<br/><br/></li>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingThree">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseThree"
+ aria-expanded="true" aria-controls="collapseThree"> What
+ methods of payment do you accept for contributions? </a>
+ </h4>
+ </div>
+ <div id="collapseThree" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingThree">
+ <div class="panel-body">We accept BitCoin and PayPal
+ donations. PayPal enables you to use a credit card or a
+ PayPal account to make your donation.</div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
- <li><b>What do you plan to do with the money?</b><br/><br/>
- All money donated by Friends of Eclipse will go directly to funding Eclipse IDE development.<br/><br/></li>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingFour">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseFour"
+ aria-expanded="true" aria-controls="collapseFour"> How
+ do I set-up a recurring donation? </a>
+ </h4>
+ </div>
+ <div id="collapseFour" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingFour">
+ <div class="panel-body">
+ <p>Thank you for wanting to donate periodically to the
+ Eclipse Foundation!</p>
+ <p>The only way to create an automatic recurring donation
+ is through PayPal. On the <a href="/donate">donate page</a>, select the amount
+ you would like to give periodically, click donate. In
+ the next box, make sure PayPal is selected and selected
+ a donation period, monthly or yearly. To confirm your
+ donation, click the donate button again and you will be
+ redirected to PayPal to finalize the donation. From then
+ on, donations will be made automatically on your behalf
+ monthly or yearly, depending on your selection.</p>
+ </div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
- <li><b>What should I do if I made a mistake when submitting my contribution?</b><br/><br/>
- Please email <a href="mailto:friends@eclipse.org">friends at eclipse.org</a> with all your contact
- information and an explanation of what you need corrected.<br/><br/></li>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingFive">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseFive"
+ aria-expanded="true" aria-controls="collapseFive"> How do
+ I cancel my recurring donation? </a>
+ </h4>
+ </div>
+ <div id="collapseFive" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingFive">
+ <div class="panel-body">
+ To cancel your recurring donation, you will have to log in
+ to your PayPal account to terminate the recurring payment.
+ More information is available on the <a
+ href="https://www.paypal.com/selfhelp/article/FAQ2058/3" target="_blank">PayPal
+ FAQ page.</a>
+ </div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
- <li><b>What is the Friends of Eclipse Mirror?</b><br/><br/>
- The Friends of Eclipse mirror is a high-capacity download server for Friends of Eclipse. Unlike our
- main downloads servers, the Friends mirror has priority access to our bandwidth, typically resulting
- in faster downloads. Although a local mirror in your country may still provide a faster download due
- to the proximity, the Friends mirror is our way of saying 'thank you' for your donation.<br/><br/></li>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingSix">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseSix"
+ aria-expanded="true" aria-controls="collapseSix"> What
+ if I want to donate by cheque or direct deposit? </a>
+ </h4>
+ </div>
+ <div id="collapseSix" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingSix">
+ <div class="panel-body">
+ <p>You are welcome to make a donation
+ via cheque or direct deposit, but please note that you
+ will not be eligible for the Friend of Eclipse benefits.</p>
+ <p><strong>Cheque Donations</strong></p>
+ <p>To donate via cheque, please send your cheque to:</p>
+ <p>
+ Eclipse Foundation Donations<br> 102 Centrepointe Dr.<br>
+ Ottawa, Ontario<br> Canada, K2G 6B1
+ </p>
+ <p><strong>Direct Deposit</strong></p>
+ <p>To donate via direct deposit, <a href="mailto:donate@eclipse.org">email us</a> for the banking information.</p>
+ </div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
- <li><b>Does this mean the Eclipse download site will be slower?</b><br/><br/>
- The Eclipse download site's performance varies from day to day, depending on new project releases.
- Although Friends' downloads get priority bandwidth, the Eclipse Foundation will add bandwidth as
- required to ensure an adequate level of performance from our main download site.<br/><br/></li>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingNine">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseNine"
+ aria-expanded="true" aria-controls="collapseNine"> What
+ amounts may I contribute? </a>
+ </h4>
+ </div>
+ <div id="collapseNine" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingNine">
+ <div class="panel-body">You may contribute any amount you
+ like. A contribution over 35 USD gives you access to the
+ Friend of Eclipse benefits.</div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
- <li><b>How do I get access to the Friends of Eclipse mirror?</b><br/><br/>
- Everyone that donates US$35 or more to the Eclipse Foundation will automatically be flagged as a
- Friend of Eclipse. This gives them access to the Friends of Eclipse Mirror for 12 months.
- When you register your donation, you will be asked to enter your Eclipse.org account email address. This will be used
- to login to the Friends of Eclipse Mirror.<br/><br/></li>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingTen">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseTen"
+ aria-expanded="true" aria-controls="collapseTen"> What
+ is a “Friend of Eclipse” and how do I become one? </a>
+ </h4>
+ </div>
+ <div id="collapseTen" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingTen">
+ <div class="panel-body">
+ <p>Individuals that contribute 35 USD or more qualify for
+ the Friend of Eclipse status. This status lasts for a
+ period of 12 months and provides access to:</p>
+ <ul>
+ <li>Friend of Eclipse mirror</li>
+ <li>Use of the Friend of Eclipse logo</li>
+ <li>O'Reilly discounts: 40% off prints and 50% off ebooks on oreilly.com</li>
+ <li>Badge on bugzilla identifying the user as a Friend</li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
- <li><b>Who can use the Friend of Eclipse Logo?</b><br/><br/>
- Any individual that has donated more than US$35 to the Eclipse Foundation may use the Friend of
- Eclipse logo on a personal blog or web site. The Friends of Eclipse program is for individuals, so
- the logo should not be used on an organization web site. <br/><br/></li>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingEleven">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseEleven"
+ aria-expanded="true" aria-controls="collapseEleven"> What
+ is the Friend of Eclipse Mirror? </a>
+ </h4>
+ </div>
+ <div id="collapseEleven" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingEleven">
+ <div class="panel-body">The Friend of Eclipse mirror is a
+ high-capacity download server for a Friend of Eclipse.
+ Unlike our main downloads servers, the Friend mirror has
+ priority access to our bandwidth, typically resulting in
+ faster downloads. Although a local mirror in your country
+ may still provide a faster download due to the proximity,
+ the Friend of Eclipse mirror is our way of saying 'thank
+ you' for your donation.</div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
- <li><b>What does the t-shirt, included in the "Best Friend" package look like?</b><br/><br/>
- <img src="images/tshirt.png" width="200" alt ="tshirt"/><br/><br/></li>
- <br/><br/></li>
- </ul>
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingTwelve">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseTwelve"
+ aria-expanded="true" aria-controls="collapseTwelve"> Does
+ this mean the Eclipse download site will be slower? </a>
+ </h4>
+ </div>
+ <div id="collapseTwelve" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingTwelve">
+ <div class="panel-body">The Eclipse download site's
+ performance varies from day to day, depending on new
+ project releases. Although Friend downloads get priority
+ bandwidth, Eclipse Foundation will add bandwidth as
+ required to ensure an adequate level of performance from
+ our main download site.</div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
+
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingThirteen">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseThirteen"
+ aria-expanded="true" aria-controls="collapseThirteen"> How do
+ I link my Eclipse Account to my donation? </a>
+ </h4>
+ </div>
+ <div id="collapseThirteen" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingThirteen">
+ <div class="panel-body">
+ If you have made a donation while you were logged in, your
+ donation will automatically be linked to your Eclipse
+ Account. If your Eclipse Account and your donations aren’t
+ linked and you would like them to be, please email us <a
+ href="mailto:donate@eclipse.org?subject=Link donation to my Eclipse Account">donate@eclipse.org</a>.
+ Please provide your donation details in the email: date,
+ transaction ID, full name, and your Eclipse Account email
+ address.
+ </div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
+
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingFourteen">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseFourteen"
+ aria-expanded="true" aria-controls="collapseFourteen"> What
+ should I do if I made a mistake when submitting my
+ contribution? </a>
+ </h4>
+ </div>
+ <div id="collapseFourteen" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingFourteen">
+ <div class="panel-body">
+ Please contact us at <a href="mailto:donate@eclipse.org?subject=Donation Problem">donate@eclipse.org</a>
+ with all your contact information and an explanation of
+ what you need corrected.
+ </div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
+
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingFifteen">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseFifteen"
+ aria-expanded="true" aria-controls="collapseFifteen"> Who
+ can use the Friend of Eclipse Logo? </a>
+ </h4>
+ </div>
+ <div id="collapseFifteen" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingFifteen">
+ <div class="panel-body">Any individual that has donated more
+ than 35 USD to the Eclipse Foundation may use the Friend
+ of Eclipse logo.</div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
+
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingSixteen">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseSixteen"
+ aria-expanded="true" aria-controls="collapseSixteen"> How
+ can I get recognized for my donation on the credit page?
+ </a>
+ </h4>
+ </div>
+ <div id="collapseSixteen" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingSixteen">
+ <div class="panel-body">When you make your donation, check
+ the box next to “I want to be listed on the recognition
+ page”, then enter your first and last name. Once your
+ donation has been finalized, you will be listed on the
+ <a href="/donate/credit.php">credit page</a>. If you do not check the box, your donation
+ will remain anonymous.</div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
+
+ <!-- .PANEL -->
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab" id="headingSeventeen">
+ <h4 class="panel-title">
+ <a role="button" data-toggle="collapse"
+ data-parent="#accordion" href="#collapseSeventeen"
+ aria-expanded="true" aria-controls="collapseSeventeen">
+ Contact Us </a>
+ </h4>
+ </div>
+ <div id="collapseSeventeen" class="panel-collapse collapse"
+ role="tabpanel" aria-labelledby="headingSeventeen">
+ <div class="panel-body">
+ Other questions? Email us <a
+ href="mailto:donate@eclipse.org">donate@eclipse.org</a>
+ </div>
+ </div>
+ </div>
+ <!-- /.PANEL -->
+
+ </div>
+
</div>
</div>
<div id="rightcolumn">
<div class="sideitem">
- <h6>Related Links</h6>
+ <h6>Related Links</h6>
<ul>
<li><a href="index.php">Friends of Eclipse</a></li>
<li><a href="donorlist.php">Public List of Donors</a></li>
</ul>
</div>
</div>
- </div>
\ No newline at end of file
+</div>
\ No newline at end of file
