Bug 463298 - Added the installer to main download page

Change-Id: Ic31fd04dfd17c0d871e2968650aef6960c584d8a
Signed-off-by: Eric Poirier <eric@eclipse.org>

6 files changed, 17 insertions, 64 deletions

diff --git a/assets/public/stylesheets/downloads.min.css b/assets/public/stylesheets/downloads.min.css
index ec9483c3..8cb6ccea 100644
--- a/assets/public/stylesheets/downloads.min.css
+++ b/assets/public/stylesheets/downloads.min.css
@@ -1 +1 @@
-.download-link-1 a{padding-left:12px;border-left:1px solid #fff}.padding-left-0{padding-left:0}.icon{text-align:center}@media (min-width:768px){.icon{text-align:right}}@media (max-width:767px){.xs-sm-text-center{text-align:center}}.downloadLink-icon{text-align:center;padding-top:26px}@media (min-width:768px){.downloadLink-icon{text-align:right}}.downloadLink-content ul{margin-bottom:0}.downloadLink-content ul li{padding-bottom:0}@media (min-width:768px){.downloadLink-content{padding-left:0}.downloadLink-icon{pading-right:0}}#other-releases{margin-top:6px}.ad{margin-bottom:2em}.package-row{border-top:1px solid #ddd;padding:12px 6px}.package-row.zebra{background:#fafafa}@media (max-width:767px){.package-row{padding:24px 12px}}@media (max-width:767px){.package-row .icon{margin-bottom:20px}}.package-row .download-icon{font-size:3em;text-align:right;margin-top:-7px}.package-row.promo .download-icon{margin-top:7px}.package-row .download-link a{font-weight:bold}.package-row h2{margin:10px 0 0 0;font-weight:700;font-size:1.3em}.package-row h2 a{color:#111}.os-warning{padding:10px;background:#ffe5b4}.download-container default-download>header-row{margin-top:40px}.download-container .header-row{margin-top:0}.download-container .header-row h2{color:#2c2255;font-size:30px}.download-container .installer{background-image:url(../images/installer-bg.jpg);background-size:cover;text-align:center;margin-bottom:20px;color:#fff}.download-container .installer .title{padding:20px 20px 0}@media (min-width:768px){.download-container .installer .title .installer-logo{position:absolute;left:0;top:40px}}.download-container .installer .title h2{color:#fff;margin-bottom:20px}.download-container .installer .title .new{background-color:#fff;color:#000;padding:0 5px;border-radius:3px}@media (max-width:767px){.download-container .installer .title .new{position:relative;top:10px}}.download-container .installer .options{background-color:rgba(0,0,0,0.6);padding:20px 20px 0}.download-container .installer .orange{color:#f7941e}.download-container .installer a{color:#f7941e;font-weight:normal}.download-container .default-download a{color:#f7941e;font-weight:normal}.download-container .default-download .title,.download-container .default-download .row-item{padding-bottom:10px;margin-bottom:10px}.download-container .default-download .package-row{border-top:1px solid #e6e6e6}.download-container .default-download .package-row .download-counts{background-color:#e6e6e6;padding:3px 5px;font-size:10px}.download-container .default-download .package-row .list-inline{margin-left:0}.download-container .default-download .package-row p{font-size:12px}.download-container .default-download .package-row .download .fa-download{font-size:20px}@media (max-width:767px){.download-container .default-download .package-row .download p{font-weight:bold}}.download-container .default-download .package-row.promo{position:relative}.download-container .default-download .package-row.promo .more-info{position:absolute;right:0;bottom:0;background-color:#f7941e;border-radius:5px 0 0 0;padding:0 5px}.download-container .default-download .package-row.promo .more-info a{color:#fff}.download-container .default-download .package-row.promo .more-info a:hover{text-decoration:none}.download-container .default-download h2,.download-container .default-download h3{margin-top:10px}.download-container .default-download h3{font-size:21px}.download-container .default-download h3 a{color:#2c2255}.download-container .default-download .form-choose-platform{margin-top:10px}.download-container .default-download .form-choose-platform label{font-weight:normal;font-size:12px;position:relative;top:3px;margin-right:10px}@media (min-width:768px){.download-container .default-download .form-choose-platform label{float:right}}@media (max-width:767px){.download-container .default-download .form-choose-platform label{float:left}}.download-container .default-download .form-choose-platform select{font-size:12px}@media (min-width:768px){.download-container .default-download .form-choose-platform select{float:right;margin-left:10px}}@media (max-width:767px){.download-container .default-download .form-choose-platform.text-right{text-align:left}}ul.list-inline .divider.white{border-left:1px solid #fff}ul.list-inline .divider.black{border-left:1px solid #000}ul.list-inline .divider{line-height:1.4;height:100%;height:15px;padding-right:0;padding-left:0;margin-left:4px;position:relative;top:2px}.no-border{border:none}@media (min-width:768px){.vertical-align-min-md{display:flex;align-items:center}}#filter-placeholder{margin-top:6px;text-transform:capitalize;background:#2c2f33;color:#a2a8ad;border-color:#414346;font-size:1.1em}#filter-placeholder ul.ft-menu>li.ft-field{margin-right:0}#filter-placeholder ul.ft-menu>li.ft-field>span.ft-label:before{content:"" !important;width:auto}
\ No newline at end of file
+.download-link-1 a{padding-left:12px;border-left:1px solid #fff}.padding-left-0{padding-left:0}.icon{text-align:center}@media (min-width:768px){.icon{text-align:right}}@media (max-width:767px){.xs-sm-text-center{text-align:center}}.downloadLink-icon{text-align:center;padding-top:26px}@media (min-width:768px){.downloadLink-icon{text-align:right}}.downloadLink-content ul{margin-bottom:0}.downloadLink-content ul li{padding-bottom:0}@media (min-width:768px){.downloadLink-content{padding-left:0}.downloadLink-icon{pading-right:0}}#other-releases{margin-top:6px}.ad{margin-bottom:2em}.package-row{border-top:1px solid #ddd;padding:12px 6px}.package-row.zebra{background:#fafafa}@media (max-width:767px){.package-row{padding:24px 12px}}@media (max-width:767px){.package-row .icon{margin-bottom:20px}}.package-row .download-icon{font-size:3em;text-align:right;margin-top:-7px}.package-row.promo .download-icon{margin-top:7px}.package-row .download-link a{font-weight:bold}.package-row h2{margin:10px 0 0 0;font-weight:700;font-size:1.3em}.package-row h2 a{color:#111}.os-warning{padding:10px;background:#ffe5b4}.download-container default-download>header-row{margin-top:40px}.download-container .header-row{margin-top:0}.download-container .header-row h2{color:#2c2255;font-size:30px}.download-container .installer{background-image:url(../images/installer-bg.jpg);background-size:cover;text-align:center;margin-bottom:20px;color:#fff}.download-container .installer .title{padding:20px 20px 0}@media (min-width:768px){.download-container .installer .title .installer-logo{position:absolute;left:0;top:40px}}.download-container .installer .title h2{color:#fff;margin-bottom:20px}.download-container .installer .title .new{background-color:#fff;color:#000;padding:0 5px;border-radius:3px}@media (max-width:767px){.download-container .installer .title .new{position:relative;top:10px}}.download-container .installer .options{background-color:rgba(0,0,0,0.6);padding:20px 20px 0}.download-container .installer .orange{color:#f7941e}.download-container .installer a:not(.btn-primary){color:#f7941e;font-weight:normal}.download-container .default-download a:not(.btn-primary){color:#f7941e;font-weight:normal}.download-container .default-download .btn-primary{margin-bottom:10px}.download-container .default-download .title,.download-container .default-download .row-item{padding-bottom:10px;margin-bottom:10px}.download-container .default-download .package-row{border-top:1px solid #e6e6e6}.download-container .default-download .package-row .download-counts{background-color:#e6e6e6;padding:3px 5px;font-size:10px}.download-container .default-download .package-row .list-inline{margin-left:0}.download-container .default-download .package-row p{font-size:12px}.download-container .default-download .package-row .download .fa-download{font-size:20px}@media (max-width:767px){.download-container .default-download .package-row .download p{font-weight:bold}}.download-container .default-download .package-row.promo{position:relative}.download-container .default-download .package-row.promo .more-info{position:absolute;right:0;bottom:0;background-color:#f7941e;border-radius:5px 0 0 0;padding:0 5px}.download-container .default-download .package-row.promo .more-info a{color:#fff}.download-container .default-download .package-row.promo .more-info a:hover{text-decoration:none}.download-container .default-download h2,.download-container .default-download h3{margin-top:10px}.download-container .default-download h3{font-size:21px}.download-container .default-download h3 a{color:#2c2255}.download-container .default-download .form-choose-platform{margin-top:10px}.download-container .default-download .form-choose-platform label{font-weight:normal;font-size:12px;position:relative;top:3px;margin-right:10px}@media (min-width:768px){.download-container .default-download .form-choose-platform label{float:right}}@media (max-width:767px){.download-container .default-download .form-choose-platform label{float:left}}.download-container .default-download .form-choose-platform select{font-size:12px}@media (min-width:768px){.download-container .default-download .form-choose-platform select{float:right;margin-left:10px}}@media (max-width:767px){.download-container .default-download .form-choose-platform.text-right{text-align:left}}ul.list-inline .divider.white{border-left:1px solid #fff}ul.list-inline .divider.black{border-left:1px solid #000}ul.list-inline .divider{line-height:1.4;height:100%;height:15px;padding-right:0;padding-left:0;margin-left:4px;position:relative;top:2px}.no-border{border:none}@media (min-width:768px){.vertical-align-min-md{display:flex;align-items:center}}#filter-placeholder{margin-top:6px;text-transform:capitalize;background:#2c2f33;color:#a2a8ad;border-color:#414346;font-size:1.1em}#filter-placeholder ul.ft-menu>li.ft-field{margin-right:0}#filter-placeholder ul.ft-menu>li.ft-field>span.ft-label:before{content:"" !important;width:auto}
\ No newline at end of file
diff --git a/assets/src/stylesheets/downloads.less b/assets/src/stylesheets/downloads.less
index 15010eb5..d6334ea4 100644
--- a/assets/src/stylesheets/downloads.less
+++ b/assets/src/stylesheets/downloads.less
@@ -159,17 +159,19 @@
     .orange{
       color:#F7941E;
     }
-    
     a{
       color:#F7941E;
       font-weight:normal;
     }
   }
   .default-download{
-    a{
+    a:not(.btn-primary){
       color:#F7941E;
       font-weight:normal;
     }
+    .btn-primary{
+      margin-bottom:10px;
+    }
     .title, .row-item{
       padding-bottom:10px;
       margin-bottom:10px;
diff --git a/downloads/views/view.downloads.php b/downloads/views/view.downloads.php
index afac8aa5..36a6cd19 100644
--- a/downloads/views/view.downloads.php
+++ b/downloads/views/view.downloads.php
@@ -19,9 +19,10 @@ $impression = new CampaignImpression('DOWNLOADPAGE', $_SERVER['REQUEST_URI'], @g
 $impression->recordImpression();
 ?>
 <div class="default-download">
-<?php if($page != 'download') :?>
-  <?php print $EclipseInstaller->output();?>
-<?php endif;?>
+<?php print $EclipseInstaller->output();?>
+<?php if($page == 'download'):?>
+<p class="text-center"><a class="btn btn-primary" href="/downloads/installer-instructions.php">6 Steps to Install Eclipse</a></p>
+<?php endif; ?>
 <?php if($page == 'download' && $Downloads->getOs() == "macosx") :?>
 <div class="alert alert-danger" role="alert">
 <strong>Mac OS X users please note:</strong> Eclipse requires Mac OS X 10.5 (Leopard) or greater.
diff --git a/downloads/views/view.sidebar.php b/downloads/views/view.sidebar.php
index 31e6b35b..84c12093 100644
--- a/downloads/views/view.sidebar.php
+++ b/downloads/views/view.sidebar.php
@@ -31,11 +31,6 @@ $random = rand(0,100);
       <?php print $PromotedPlugin->output();?>
     </div>
   <?php endif;?>
-  <?php if($page == 'download') :?>
-    <div class="col-sm-12 col-md-24 padding-bottom-25 clearfix">
-      <a href="installer.php"><img class="img-responsive" src="assets/public/images/btn_goto_installer.jpg" alt="Try out the new Eclipse Installer!"/></a>
-    </div>
-  <?php endif;?>
 </div>
 <div class="sideitem clearfix">
   <h6>Related Links</h6>
diff --git a/index.php b/index.php
index 1f26d1de..f1333a54 100644
--- a/index.php
+++ b/index.php
@@ -38,6 +38,14 @@
 	$Downloads->setRelease('mars');
 	//$Downloads->setFriendsEarlyAccess(TRUE);
 
+	require_once($_SERVER['DOCUMENT_ROOT'] . "/downloads/downloads/controller.eclipseInstaller.php");
+  $EclipseInstaller = new EclipseInstaller();
+  $EclipseInstaller->addlink('Windows', 'download.php?file=/oomph/epp/mars/R/eclipse-inst-win32.exe', '32 bit');
+  $EclipseInstaller->addlink('Windows', 'download.php?file=/oomph/epp/mars/R/eclipse-inst-win64.exe', '64 bit');
+  $EclipseInstaller->addlink('Linux', 'download.php?file=/oomph/epp/mars/R/eclipse-inst-linux32.tar.gz', '32 bit');
+  $EclipseInstaller->addlink('Linux', 'download.php?file=/oomph/epp/mars/R/eclipse-inst-linux64.tar.gz', '64 bit');
+  $EclipseInstaller->addlink('Mac OS X', 'download.php?file=/oomph/epp/mars/R/eclipse-inst-mac64.tar.gz', '64 bit');
+
 	$App->Promotion = TRUE;
 	require_once($_SERVER['DOCUMENT_ROOT'] . "/downloads/downloads/view.tpl.php");
 
diff --git a/installer.php b/installer.php
deleted file mode 100644
index 1cd491bd..00000000
--- a/installer.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/*******************************************************************************
- * Copyright (c) 2015 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
- *******************************************************************************/
-
-	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");
-
-	# Begin: page-specific settings.  Change these.
-	$pageTitle 		= "Eclipse Downloads";
-	$pageKeywords	= "eclipse,download,downloads,mirror,project,plug-ins,plugins,java,ide,swt,refactoring,free java ide,tools,platform,open source,development environment,development,ide";
-	$pageAuthor		= "Eclipse Foundation, Inc.";
-
-	$App->PageRSS = "/downloads/rss.php";
-	$App->PageRSSTitle = "Eclipse Releases";
-
-	$page = 'installer';
-  require_once($_SERVER['DOCUMENT_ROOT'] . "/downloads/downloads/controller.eclipseInstaller.php");
-	//$Downloads->setFriendsEarlyAccess(TRUE);
-
-
-  $EclipseInstaller = new EclipseInstaller();
-  $EclipseInstaller->addlink('Windows', 'download.php?file=/oomph/epp/mars/RC1/eclipse-inst-win32.exe', '32 bit');
-  $EclipseInstaller->addlink('Windows', 'download.php?file=/oomph/epp/mars/RC1/eclipse-inst-win64.exe', '64 bit');
-  $EclipseInstaller->addlink('Linux', 'download.php?file=/oomph/epp/mars/RC1/eclipse-inst-linux32.tar.gz', '32 bit');
-  $EclipseInstaller->addlink('Linux', 'download.php?file=/oomph/epp/mars/RC1/eclipse-inst-linux64.tar.gz', '64 bit');
-  $EclipseInstaller->addlink('Mac OS X', 'download.php?file=/oomph/epp/mars/RC1/eclipse-inst-mac64.tar.gz', '64 bit');
-
-	$App->Promotion = TRUE;
-	require_once($_SERVER['DOCUMENT_ROOT'] . "/downloads/downloads/view.tpl.php");
-
-	// Custom theme variables
-	$variables = array();
-	$variables['main_container_classes'] = 'container-full';
-	$App->setThemeVariables($variables);
-
-	# Generate the web page
-	$App->AddExtraHtmlHeader('<link href="/downloads/assets/public/stylesheets/downloads.min.css" media="screen" rel="stylesheet" type="text/css"/>');
-	$App->AddExtraJSFooter('<script type="text/javascript" src="/downloads/assets/public/javascript/downloads.min.js"></script>');
-	$App->generatePage("solstice", $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);