Bug 496899 - Remove Friends mirror
Change-Id: Id0abf34bc8c3fb59fe426496ac87274e6168e480
Signed-off-by: Christopher Guindon <chris.guindon@eclipse-foundation.org>
diff --git a/content/en_download.php b/content/en_download.php
index d9add07..355d99d 100644
--- a/content/en_download.php
+++ b/content/en_download.php
@@ -25,8 +25,6 @@
$strFileName = substr($strFileName, 0, 30) . "..." . substr($strFileName, $strlength-30, 30);
}
-$friends_html = getFriendsHTML();
-
$download_link = array(
'url' => 'download.php?file=' . $_file,
'text' => '',
@@ -52,13 +50,7 @@
$commiter_link = " Eclipse Committers can <a href='" . $Session->getLoginPageURL() . "'>log in</a> for faster download.";
}
-if ($Friend->getIsBenefit()) {
- // Friends of Eclipse
- $download_link['url'] .= "&mirror_id=2";
- $download_link['text'] = 'Friends of Eclipse Mirror';
- $download_link['icon'] = '<i class="fa fa-star orange"></i>';
-}
-elseif ($_country_code != "xx" && $myrow = mysql_fetch_assoc($rs)) {
+if ($_country_code != "xx" && $myrow = mysql_fetch_assoc($rs)) {
// Preferred mirror
$download_link['url'] .= "&mirror_id=" . $myrow['mirror_id'];
$download_link['text'] = '' . $myrow['country_desc'] .' - ' . $myrow['organization'] .' (' . $myrow['protocol'] . ')';
@@ -128,29 +120,6 @@
return $html;
}
-function getFriendsHTML() {
-
- $friendsHTML = "";
- global $Friend, $Session;
-
- if(!$Friend->getIsBenefit()) {
- $loginstring = "";
- if($Session->getGID() == "") {
- $loginstring = ' <i class="fa fa-star orange"></i> <a href="http://dev.eclipse.org/site_login">Friends login</a>';
- }
- $friendsHTML .= <<<EOHTML
-<div class="choose-mirror">
- <h3>Friends of Eclipse Mirror</h3>
- <ul class="list-unstyled">
- <li><i class="fa fa-star orange"></i> Canada - Friends of Eclipse Mirror <i class="fa fa-star orange"></i>
- <a href="/donate">Become a Friend!</a>$loginstring
- </li>
- </ul>
-</div>
-EOHTML;
- }
- return $friendsHTML;
-}
$mirror_html = '';
if (!empty($mirrors)) {
ob_start();
@@ -170,9 +139,6 @@
<?php endforeach;?>
<a class="btn btn-sm btn-primary" id="show_all_mirrors" href="#show_all_mirrors">Show all</a>
</div>
- <?php if (count($companies) > 0) :?>
- <?php print $friends_html;?>
- <?php endif;?>
<div class="choose-mirror">
<h3>Main Download Site</h3>
<ul class="list-unstyled">
@@ -259,10 +225,8 @@
<?php endforeach;?>
</div>
<?php endif;?>
- <?php if (empty($members_html)) :?>
- <div class="text-center"><?php print $friends_html; ?></div>
- <?php else:?>
- <?php print $members_html;?>
+ <?php if (!empty($members_html)) :?>
+ <?php print $members_html;?>
<?php endif;?>
</div>
</div>
diff --git a/friends_promo.css b/friends_promo.css
deleted file mode 100644
index 49f28ed..0000000
--- a/friends_promo.css
+++ /dev/null
@@ -1,59 +0,0 @@
-@CHARSET "ISO-8859-1";
-
-body {
- margin:0px;
- padding:0px;
- background:#FFF url('/Nova/images/bg.png') repeat-x;
-}
-
-#container {
- width:980px;
- margin:0px auto;
-}
-
-#content {
- text-align:center;
-}
-
-#content h1{
- color:#0D3656;
-}
-
-#back {
- float:none;
- clear:both;
- color:#0D3656;
-}
-
-#donate {
- font-weight:bold;
- color:#F66D02;
-}
-
-#friendsBlock img {
- float:left;
-}
-
-#friendsBlurb {
- float:left;
- width:500px;
- text-align:left;
-}
-
-#friendsBlurb ul {
- float:left;
-}
-
-#navigate {
- width:100%;
- clear:both;
-}
-
-ul {
- margin-top:0px;
- list-style-image: url('/downloads/images/friendBullet.png');
-}
-
-ul li {
-
-}
\ No newline at end of file
diff --git a/friends_promo.php b/friends_promo.php
deleted file mode 100644
index 4f2dbc8..0000000
--- a/friends_promo.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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("_projectCommon.php"); # All on the same line to unclutter the user's desktop'
-
-
- #*****************************************************************************
- #
- # index.php
- #
- # Author: Nathan Gervais
- # Date: 2008-12-17
- #
- # Description: Page to promote friends of Eclipse after the user has downloaded something.
- #
- #****************************************************************************
-
- #
- # Begin: page-specific settings. Change these.
- $pageTitle = "Thanks for downloading";
- ?>
- <html>
- <head>
- <title><?=$pageTitle;?></title>
- <link rel="stylesheet" type="text/css" href="friends_promo.css"/>
- </head>
- <body>
- <div id="container">
- <div id="content">
- <h1>Thanks for downloading from Eclipse</h1>
- <div id="friendsBlock">
- <img src="/downloads/images/friends_promo.png" />
- <div id="friendsBlurb">
- <p><b>Become a Friend of Eclipse and get access to the Friends of Eclipse Mirror Site!</b></p>
- <ul>
- <li>Dedicated Bandwith for faster downloads</li>
- <li>Early Access to new builds when the new release train ships</li>
- </ul>
- <p><b>Friends of Eclipse also help the Eclipse Foundation provide services for the Eclipse community, such as:</b></p>
- <ul>
- <li>Providing more bandwidth for users and committers</li>
- <li>Purchasing additional servers to host Eclipse projects</li>
- <li>Sending students to EclipseCon</li>
- <li>Sponsoring Eclipse community events</li>
- </ul>
- </div>
- <div id="navigate">
- <a id="back" href="/">Back to Eclipse.org</a> - <a id="donate" href="/donate">Donate Now!</a>
- </div>
- </div>
- <br/>
-
- </div>
- </div>
- </body>
- </html>
diff --git a/images/friendBullet.png b/images/friendBullet.png
deleted file mode 100644
index 3a1d39f..0000000
--- a/images/friendBullet.png
+++ /dev/null
Binary files differ
diff --git a/images/friends_promo.png b/images/friends_promo.png
deleted file mode 100644
index 2ffe287..0000000
--- a/images/friends_promo.png
+++ /dev/null
Binary files differ
