Merge branch 'solstice'
Conflicts:
.settings/org.eclipse.wst.common.project.facet.core.xml
diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml
index ad32966..51ea29a 100644
--- a/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ b/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
+<<<<<<< HEAD
<fixed facet="php.core.component"/>
<fixed facet="php.component"/>
+=======
+ <fixed facet="php.component"/>
+ <fixed facet="php.core.component"/>
+>>>>>>> refs/heads/solstice
<installed facet="php.core.component" version="1"/>
<installed facet="php.component" version="5.4"/>
</faceted-project>
diff --git a/assets/.gitignore b/assets/.gitignore
new file mode 100644
index 0000000..07e6e47
--- /dev/null
+++ b/assets/.gitignore
@@ -0,0 +1 @@
+/node_modules
diff --git a/assets/Gruntfile.js b/assets/Gruntfile.js
new file mode 100644
index 0000000..61d505c
--- /dev/null
+++ b/assets/Gruntfile.js
@@ -0,0 +1,34 @@
+module.exports = function(grunt) {
+ // Initializing the configuration object
+ grunt.initConfig({
+ // Task configuration
+ less: {
+ development: {
+ options: {
+ compress: true,
+ // minifying the result
+ },
+ files: {
+ // compiling styles.less into styles.css
+ "./public/stylesheets/styles.min.css": "./src/less/styles.less",
+ }
+ }
+ },
+
+ watch: {
+ less: {
+ files: ['./src/less/*.less', './src/less/**/*.less'],
+ tasks: ['less'],
+ options: {
+ livereload: true
+ // reloads the browser
+ }
+ },
+ }
+ });
+ // Plugin loading
+ grunt.loadNpmTasks('grunt-contrib-watch');
+ grunt.loadNpmTasks('grunt-contrib-less');
+ // Task definition
+ grunt.registerTask('default', ['watch']);
+};
\ No newline at end of file
diff --git a/assets/package.json b/assets/package.json
new file mode 100644
index 0000000..aaf5651
--- /dev/null
+++ b/assets/package.json
@@ -0,0 +1,13 @@
+{
+ "name": "eclipse-luna",
+ "version": "0.0.1",
+ "description": "Assets for eclipse.org downloads section.",
+ "main": "Gruntfile.js",
+ "author": "Christopher Guindon",
+ "license": "EPL",
+ "devDependencies": {
+ "grunt": "~0.4.3",
+ "grunt-contrib-less": "~0.9.0",
+ "grunt-contrib-watch": "~0.5.3"
+ }
+}
diff --git a/assets/public/images/friends_badge.png b/assets/public/images/friends_badge.png
new file mode 100644
index 0000000..be090a0
--- /dev/null
+++ b/assets/public/images/friends_badge.png
Binary files differ
diff --git a/assets/public/stylesheets/styles.min.css b/assets/public/stylesheets/styles.min.css
new file mode 100644
index 0000000..797dd54
--- /dev/null
+++ b/assets/public/stylesheets/styles.min.css
@@ -0,0 +1 @@
+div#novaContent.container-full{background:#efefef}.padding-top{padding-top:2em}h1{margin-bottom:1.5em}.circle-badge{position:relative;margin:0 auto 3em auto;background:url("../images/friends_badge.png") no-repeat;height:295px;width:294px;text-align:center}.circle-badge .btn{margin-top:14em}
\ No newline at end of file
diff --git a/assets/src/less/styles.less b/assets/src/less/styles.less
new file mode 100644
index 0000000..a5b4fd8
--- /dev/null
+++ b/assets/src/less/styles.less
@@ -0,0 +1,23 @@
+div#novaContent.container-full{
+ background:#efefef;
+}
+
+.padding-top{
+ padding-top:2em;
+}
+
+h1{
+ margin-bottom:1.5em;
+}
+.circle-badge{
+ position:relative;
+ margin:0 auto 3em auto;
+ background:url("../images/friends_badge.png") no-repeat;
+ height:295px;
+ width: 294px;
+ text-align:center;
+ .btn{
+ margin-top:14em;
+ }
+}
+
diff --git a/content/en_index.php b/content/en_index.php
new file mode 100644
index 0000000..6ce5182
--- /dev/null
+++ b/content/en_index.php
@@ -0,0 +1,73 @@
+<?php
+/*******************************************************************************
+ * Copyright (c) 2014 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
+ *******************************************************************************/
+?>
+<div class="breadcrumbs-offset">
+ <div class="container ">
+ <div class="col-md-16 padding-top">
+ <div class="row">
+ <h1><?php print $pageTitle;?></h1>
+
+ <div class="block-box block-box-classic">
+ <h3>Report Bugs and Enhancements</h3>
+ <div class="content">
+ <ul class="fa-ul">
+ <li><i class="fa fa-li fa-chevron-circle-right orange"></i> Download one of the latest <a href="/downloads/index-developer.php">Eclipse Package Milestone Builds</a>. Take it for a test drive before the final release and <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi">report any bugs</a> you find.</li>
+ <li><i class="fa fa-li fa-chevron-circle-right orange"></i> <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi">Report Enhancements</a>: Got an idea for a killer feature? Or maybe something you use often could use some tweaking? Post an enhancement request!</li>
+ </ul>
+ </div>
+ <h3>Fix Bugs or Implement Enhancements</h3>
+ <div class="content">
+ <ul class="fa-ul">
+ <li><i class="fa fa-li fa-chevron-circle-right orange"></i> <a href="http://bugs.eclipse.org/bugs/query.cgi">Is there some bug</a> that really bothers you? Instead of just reporting it, fix it. And there are <a href="http://bugs.eclipse.org/bugs/buglist.cgi?keywords=helpwanted&resolution=---">many bugs marked with helpwanted</a>.
+ <ul class="">
+ <li><i class="fa fa-li fa-chevron-circle-right orange"></i> First sign a <a href="https://dev.eclipse.org/site_login/?takemeback=https://projects.eclipse.org/user/login/sso">Contributor License Agreement</a>.</li>
+ <li>To learn how the bug-fixing process works, check out the <a href="http://wiki.eclipse.org/Bug_Reporting_FAQ">bug reporting FAQ</a>.</li>
+ <li>To learn about the lifecycle of bugzilla entries, check out the <a href="http://wiki.eclipse.org/Development_Resources/HOWTO/Bugzilla_Use">development process</a>.</li>
+ </ul>
+ <li><i class="fa fa-li fa-chevron-circle-right orange"></i> <a href="http://wiki.eclipse.org/Google_Summer_of_Code">Google Summer of Code</a>: Participate and get paid for coding!</li>
+ </ul>
+ </div>
+ <h3>Become a Committer</h3>
+ <div class="content">
+ <ul class="fa-ul">
+ <li><i class="fa fa-li fa-chevron-circle-right orange"></i> Start a <a href='http://wiki.eclipse.org/Development_Resources/HOWTO/Starting_A_New_Project'>new project</a> or become a committer on an <a href="/membership/become_a_member/committer.php">existing project</a>.</li>
+ </ul>
+ </div>
+ <h3>Promote Eclipse Technologies</h3>
+ <div class="content">
+ <ul class="fa-ul">
+ <li><i class="fa fa-li fa-chevron-circle-right orange"></i> Let other people know that your application is <a href="/artwork">Built on Eclipse or Eclipse Ready</a>.</li>
+ <li><i class="fa fa-li fa-chevron-circle-right orange"></i> Do you or your company have a success story about Eclipse? Send us a <a href="mailto:news@eclipse.org?subject=Success%20story%20about%20Eclipse">story</a> and we'll help you spread the word.</li>
+ <li><i class="fa fa-li fa-chevron-circle-right orange"></i> Follow the Eclipse community on <a href="http://wiki.eclipse.org/Twitter">Twitter</a>.</li>
+ </ul>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="col-md-7 col-md-offset-1 padding-top">
+ <div class="row">
+ <div class="circle-badge">
+ <!-- <a href="//projects.eclipse.org/" class="btn btn-warning">Start a new project</a> -->
+ </div>
+ <!--
+ <div class="block-box block-box-classic">
+ <h3><i class="fa fa-twitter"></i> ECLIPSE COMMUNITY TWITTER FEED</h3>
+ <div class="content">
+ <a class="twitter-timeline" href="https://twitter.com/EclipseFdn" data-widget-id="471021436174229505" data-chrome="noheader transparent">Tweets by @EclipseFdn</a>
+ <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+"://platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+ </div>
+ </div>
+ -->
+ </div>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/functions.js b/functions.js
deleted file mode 100644
index 14876e4..0000000
--- a/functions.js
+++ /dev/null
@@ -1,106 +0,0 @@
-function flipAnimation () {
- //Top Section
- var helpTopFade = new YAHOO.util.Anim("help", { opacity:{to:0} }, 1, YAHOO.util.Easing.easeOut );
- var helpTopShow = new YAHOO.util.Anim("help", { opacity:{to:1} }, 1, YAHOO.util.Easing.easeIn );
- var categoriesTopFade = new YAHOO.util.Anim("categories", { opacity:{to:0} }, 1, YAHOO.util.Easing.easeOut );
- var categoriesTopShow = new YAHOO.util.Anim("categories", { opacity:{to:1} }, 1, YAHOO.util.Easing.easeIn );
- //List Section
- var helpListFade = new YAHOO.util.Anim("helpList", { opacity:{to:0} }, 1, YAHOO.util.Easing.easeOut );
- var helpListShow = new YAHOO.util.Anim("helpList", { opacity:{to:1} }, 1, YAHOO.util.Easing.easeIn );
- var categoriesListFade = new YAHOO.util.Anim("categoriesList", { opacity:{to:0} }, 1, YAHOO.util.Easing.easeOut );
- var categoriesListShow = new YAHOO.util.Anim("categoriesList", { opacity:{to:1} }, 1, YAHOO.util.Easing.easeIn );
-
- function show (e) {
- var el = document.getElementById(e);
- el.className = "visible";
- }
-
- function hide (e) { var el = document.getElementById(e); el.className = "invisible"; }
-
- //Top Help Functions
- var helpFadeStart = function (type, args) {
- show('categories');
- }
- var helpShowStart = function (type, args) {
- var help = document.getElementById('help');
- help.style.opacity = 0;
- }
- var helpFadeComplete = function (type, args) { hide('help'); hide('categoriesList'); show('helpList'); helpListShow.animate(); }
- helpTopFade.onStart.subscribe(helpFadeStart);
- helpTopFade.onComplete.subscribe(helpFadeComplete);
- helpTopShow.onStart.subscribe(helpShowStart);
-
- //Top Categories Functions
- var categoriesFadeStart = function (type, args) {
- show('help');
- }
- var categoriesShowStart = function (type, args) {
- var categories = document.getElementById('categories');
- categories.style.opacity = 0;
- }
- var categoriesFadeComplete = function (type, args) { hide('categories');}
- categoriesTopFade.onStart.subscribe(categoriesFadeStart);
- categoriesTopFade.onComplete.subscribe(categoriesFadeComplete);
- categoriesTopShow.onStart.subscribe(categoriesShowStart)
-
-
-
-
-
-
- //List Help Functions
- var helpListShowStart = function (type, args) {
- var helpList = document.getElementById('helpList');
- helpList.style.opacity = 0;
- }
- var helpListFadeComplete = function (type, args) { hide('helpList'); show('categoriesList'); categoriesListShow.animate(); }
- helpListShow.onStart.subscribe(helpListShowStart);
- helpListFade.onComplete.subscribe(helpListFadeComplete);
-
- //List Categories Functions
- var categoriesListShowStart = function (type, args) {
- var categoriesList = document.getElementById('categoriesList');
- categoriesList.style.opacity = 0;
- }
- var categoriesListFadeComplete = function (type, args) { hide('categoriesList'); show('helpList'); helpListShow.animate(); }
- categoriesListShow.onStart.subscribe(categoriesListShowStart);
- categoriesListFade.onComplete.subscribe(categoriesListFadeComplete);
-
- var exdate = new Date();
- exdate.setDate(exdate.getDate()+7);
- var checkState = document.getElementById('help');
- if (checkState.className != "invisible")
- {
- document.cookie = "userSwap=categories" + ((7===null) ? "" : ";expires="+exdate.toGMTString());
- if (YAHOO.env.ua.ie > 0)
- {
- show('categories');
- hide('help');
- hide('categoriesList');
- show('helpList');
- }
- else {
- categoriesListFade.animate();
- helpTopFade.animate();
- categoriesTopShow.animate();
-
- }
- }
- else
- {
- document.cookie = "userSwap=help" + ((7===null) ? "" : ";expires="+exdate.toGMTString());
- if (YAHOO.env.ua.ie > 0)
- {
- show('help');
- hide('categories');
- hide('helpList');
- show('categoriesList');
- }
- else {
- helpListFade.animate();
- categoriesTopFade.animate();
- helpTopShow.animate();
-
- }
- }
-}
\ No newline at end of file
diff --git a/images/background.png b/images/background.png
deleted file mode 100644
index b7a49fb..0000000
--- a/images/background.png
+++ /dev/null
Binary files differ
diff --git a/images/eclipse_plus.png b/images/eclipse_plus.png
deleted file mode 100644
index 1438d1a..0000000
--- a/images/eclipse_plus.png
+++ /dev/null
Binary files differ
diff --git a/images/getinvolved.png b/images/getinvolved.png
deleted file mode 100644
index 41d7a80..0000000
--- a/images/getinvolved.png
+++ /dev/null
Binary files differ
diff --git a/images/plusbullet.png b/images/plusbullet.png
deleted file mode 100644
index 130847b..0000000
--- a/images/plusbullet.png
+++ /dev/null
Binary files differ
diff --git a/index.php b/index.php
index 02e6272..e3747f8 100644
--- a/index.php
+++ b/index.php
@@ -1,90 +1,41 @@
-<?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'
+<?php
+/*******************************************************************************
+ * Copyright (c) 2014 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
+ *******************************************************************************/
- #*****************************************************************************
- #
- # index.php (/contribute)
- #
- # Author: Nathan Gervais
- # Date: 2010-01-29
- #
- # Description: Contribute Landing Page
- #
- #
- #****************************************************************************
+ 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();
+
# Begin: page-specific settings. Change these.
- $pageTitle = "Contribute to Eclipse";
- $pageKeywords = "eclipse contribute, how can i help, contributing to eclipse";
- $pageAuthor = "Nathan Gervais";
+ $pageTitle = "Get involved!";
+ $pageKeywords = "eclipse contribute, how can I help, contributing to eclipse";
+ $pageAuthor = "Christopher Guindon";
- # End: page-specific settings
- #
- $root = $_SERVER['DOCUMENT_ROOT'];
-
+ // Place your html content in a file called content/en_pagename.php
ob_start();
- ?>
-<script type="text/javascript" src="functions.js"></script>
-<link rel="stylesheet" type="text/css" href="style.css" media="screen" />
-<div id="widecontainer">
- <div id="contentContainer">
+ include("content/en_" . $App->getScriptName());
- <p class="intro">So you want to help? Great! You don't have to be an Eclipse guru or code monkey to help. There are many ways to participate in the Eclipse community. </p>
-
- <h2>Report Bugs and Enhancements</h2>
- <ul>
- <li>Download one of the latest <a href="/downloads/index-developer.php">Eclipse Package Milestone Builds</a>. Take it for a test drive before the final release and <a href="https://bugs.eclipse.org/bugs/enter_bug.cgi">report any bugs</a> you find.</li>
- <li><a href="https://bugs.eclipse.org/bugs/enter_bug.cgi">Report Enhancements</a>: Got an idea for a killer feature? Or maybe something you use often could use some tweaking? Post an enhancement request!</li>
- </ul>
-
-
- <h2>Fix Bugs or Implement Enhancements</h2>
- <ul>
- <li><a href="http://bugs.eclipse.org/bugs/query.cgi">Is there some bug</a> that really bothers you? Instead of just reporting it, fix it. And there are <a href="http://bugs.eclipse.org/bugs/buglist.cgi?keywords=helpwanted&resolution=---">many bugs marked with helpwanted</a>.
- <br/><br/> To learn how the bug-fixing process works, check out the <a href="http://wiki.eclipse.org/Bug_Reporting_FAQ">bug reporting FAQ</a>:
- <br/> To learn about the lifecycle of bugzilla entries, check out the <a href="http://wiki.eclipse.org/Development_Resources/HOWTO/Bugzilla_Use">development process</a></li>
-
- <li><a href="http://wiki.eclipse.org/Google_Summer_of_Code">Google Summer of Code</a>: Participate and get paid for coding! </li>
- </ul>
-
- <h2>Become a Committer</h2>
- <ul>
- <li>Start a <a href='http://wiki.eclipse.org/Development_Resources/HOWTO/Starting_A_New_Project'>new project</a> or become a committer on an <a href="/projects/listofprojects.php">existing project</a></li>
- </ul>
-
- <h2>Promote Eclipse Technologies</h2>
- <ul>
- <li>Teach with Eclipse. Check out our <a href="/university-outreach/">University Outreach</a> program.</li>
- <li>Let other people know that your application is <a href="/artwork">Built on Eclipse or Eclipse Ready</a></li>
- <li>Do you or your company have a success story about Eclipse? Send us a <a href="/community/news/eclipseinthenews.php">story</a> and we'll help you spread the word</li>
- <li>Follow the Eclipse community on <a href="http://wiki.eclipse.org/Twitter">Twitter</a></li>
- </ul>
-
- <h2>Share Your Knowledge</h2>
- <ul>
- <li>Help other users on the <a href="/forums/">forums</a> or on <a href="http://wiki.eclipse.org/IRC">IRC</a></li>
- <li>Share your Eclipse <a href="/resources/">article</a>, <a href="http://planet.eclipse.org/planet/">blog</a> or <a href="http://live.eclipse.org/">multi-media presentation</a>.</li>
- <li>Contribute your knowledge to the <a href="http://wiki.eclipse.org">Eclipse Wiki</a></li>
- <li>Localization: Help <a href="http://babel.eclipse.org/">translate Eclipse</a> into other languages </li>
- </ul>
-
-
- <h2>Donate</h2>
- <ul>
- <li>Individuals: Make a donation and become a <a href="/donate/">Friend of Eclipse</a></li>
- <li>Companies and Organizations: <a href="/membership/become_a_member/">Become a Member</a></li>
- </ul>
-
-
-
- </div>
-</div>
- <?
$html = ob_get_clean();
- $html = mb_convert_encoding($html, "HTML-ENTITIES", "auto");
+
+ // Custom theme variables
+ $variables = array();
+ $variables['main_container_classes'] = 'container-full footer-offset';
+ $App->setThemeVariables($variables);
+
# Generate the web page
$App->Promotion = TRUE;
- $App->generatePage("Nova", $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
-?>
-
+ $App->AddExtraHtmlHeader('<link rel="stylesheet" type="text/css" href="assets/public/stylesheets/styles.min.css" media="screen" />');
+ $App->generatePage("solstice", $Menu, NULL, $pageAuthor, $pageKeywords, $pageTitle, $html);
diff --git a/style.css b/style.css
deleted file mode 100644
index a37da4a..0000000
--- a/style.css
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Main Layout tags */
-#widecontainer {
- background: transparent url('images/background.png') top left repeat-x;
-}
-
-#contentContainer {
- float:none;
- margin-left: 330px;
- margin-right:25px;
- padding-top:85px;
-}
-
-#contentContainer h2 {
- color:#650286;
-}
-
-#contentContainer ul {
- margin-bottom:20px;
-}
-
-#contentContainer ul li {
- margin-left:25px;
- list-style-image: url("images/plusbullet.png");
-}
-
-
-img {
- behavior: url('/eclipse.org-common/themes/Nova/iepngfix.htc');
-}
-
-p.intro {
- font-size:16px;
- color:#650286;
- font-weight:bold;
- line-height:1.5em;
-}
\ No newline at end of file
