Skip to content
This repository was archived by the owner on Mar 26, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ pluralizeListTitles = false
styles = "css/styles.css?v1.2"
favicon = "images/ecdtools/favicon/favicon.ico"
share_img = "images/ecdtools/ecdtools-social-share.png"
gcse = ""
js = "js/solstice.js?v1.0"
gcse = "c3abf6ca625209d62"
gcse_result_url = "/search"
eclipse_search_icon = "<i data-feather=\"search\" stroke-width=\"1\"></i>"
js = "js/solstice.js"
header_wrapper_class = " featured-section-darken"
logo_width = "250"
header_left_classes = "col-sm-7"
Expand All @@ -29,7 +31,7 @@ pluralizeListTitles = false
featured_content_publish_target = "ecd_tools"
linkedin_url = "https://www.linkedin.com/showcase/ecd-tools/"
jumbotron_bg_class = "header-default-bg-img"

[taxonomies]
category = "categories"
tag = "tags"
Expand Down
3 changes: 2 additions & 1 deletion content/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ header_wrapper_class: "featured-jumbotron-home"
{{< home/highlights
id="featured-story-container"
publishTarget="ecd_tools"
templateId="featured-story-custom"
templateId="featured-story-custom"
count="5"
templatePath="/js/templates/featured-story-custom.mustache" >}}

{{< home/projects highlight="ecd.openvsx:ecd.theia:ecd.jkube">}}
{{< home/whats-new >}}
{{< mustache_js template-id="homepage-news-list-item" path="/js/templates/homepage-news-list-item.mustache" >}}
{{< home/stats >}}
{{< home/members limit="50" >}}
2 changes: 1 addition & 1 deletion content/membership/join-us/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ hide_sidebar: true
jumbotron_bg_class: "featured-jumbotron-sub-pages header-membership-bg-img"
---

{{< page/join-us >}}
{{< hubspot_contact_form portalId="5413615" formId="b2d1d804-1d76-4fe9-9647-03f478af1780" >}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm assuming you're adding this here since you're making changes to ECDtools?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should be using our shortcode for this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any conflicts?

19 changes: 11 additions & 8 deletions content/resources/blogs/_index.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
---
title: "Blogs"
description: "Useful resources to learn more about Eclipse Cloud DevTools"
headline: "Blogs"
jumbotron_bg_class: "featured-jumbotron-sub-pages header-projects-bg-img"
icon: "file-text"
layout: "resources-sub-section"
title: Blogs
description: Useful resources to learn more about Eclipse Cloud DevTools
headline: Blogs
jumbotron_bg_class: featured-jumbotron-sub-pages header-projects-bg-img
icon: file-text
layout: resources-sub-section
weight: 5
hide_sidebar: true
---
lastmod: '2021-12-06T16:41:08.491Z'
layout: "single"
---

{{< solstice_rss_blog_list urls="/resources/blogs/index.xml,https://planeteclipse.org/planet/ecdtools.xml">}}
5 changes: 5 additions & 0 deletions content/search/_index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
title: "Search"
date: 2021-11-17T16:09:45-04:00
---
{{< search_results >}}
3 changes: 0 additions & 3 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import 'eclipsefdn-solstice-assets'
import './src/userprofile'
import './src/projects'
import './src/eclipseApi'
import 'jquery-parallax.js/parallax.min.js'
import './src/parallax'

const solsticeSliderHome = () => {
Expand All @@ -34,8 +33,6 @@ $(window).on("load", function() {
solsticeSliderHome();
});



$("body").on("shown.ef.featured_story", function(e) {
var owl = $('.solstice-slider-home');
owl.trigger('destroy.owl.carousel');
Expand Down
4 changes: 3 additions & 1 deletion js/src/parallax.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import 'jquery-parallax.js/parallax.min.js'

(function($, window, document) {
$(function() {
parallax();
$(window).resize(function() {
parallax();
parallax();
});
});

Expand Down
5 changes: 5 additions & 0 deletions js/templates/homepage-news-list-item.mustache
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{{#items}}
<p class="whats-new-date">{{#formatDate}}{{date}}{{/formatDate}}</p>
<h4 class="whats-new-title"><a href="{{ link }}">{{ title }}</a></h4>
<p class="whats-new-description">{{summary}}</p>
{{/items}}
49 changes: 0 additions & 49 deletions layouts/partials/google_search.html

This file was deleted.

22 changes: 22 additions & 0 deletions layouts/partials/sidebar.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<!--
Copyright (c) 2018 Eclipse Foundation, Inc.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0 which is available at
http://www.eclipse.org/legal/epl-2.0.
Contributors:
Christopher Guindon <chris.guindon@eclipse-foundation.org>
SPDX-License-Identifier: EPL-2.0
-->

{{- if hasPrefix .File.Dir "resources/blogs/" }}
<aside class="subpage-sidebar">
<h3>Community Posts</h3>
<p>
In order to add your blog post, you must add your blog to
<a href="https://planeteclipse.org/planet/">planeteclipse.org</a>.
This section includes all the post from
<a href="https://planeteclipse.org/planet/">planeteclipse.org</a> with the
<strong>ECDTools</strong> tag.
</p>
</aside>
{{- end }}
16 changes: 7 additions & 9 deletions layouts/shortcodes/home/whats-new.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
Copyright (c) 2021 Eclipse Foundation, Inc.

This program and the accompanying materials are made available under the
Expand Down Expand Up @@ -37,15 +37,14 @@ <h4 class="whats-new-title"><a href="{{ .link }}">{{ .title }}</a></h4>

</div>
<div class="row">

<div class="col-sm-10 col-sm-offset-2 match-height-item-by-row whats-new-item">
<div class="whats-new-icon"><img alt="Blogs icon" src="images/ecdtools/home/blogs.svg"></div>
{{ range first 1 (where .Site.Pages "Params.category" "blog") }}
<p class="whats-new-date">{{ dateFormat "Monday, January 2, 2006" .Date }}</p>
<h4 class="whats-new-title"><a href="{{ .Permalink }}">{{ .Title }}</a></h4>
<p class="whats-new-description">{{ .Summary }}</p>
{{ end }}
<p class="whats-new-view-all"><a href="/resources/blogs">View All Blog Posts <i class="fa fa-angle-right" aria-hidden="true"></i></a></p>
<div class="solstice-rss-blog-list" data-limit="1" data-template-id="mustache-tpl-home-page-blog-item" data-urls="/resources/blogs/index.xml,https://planeteclipse.org/planet/ecdtools.xml">
<p class="solstice-loading">
<i class="fa fa-spinner fa-pulse"></i>
</p>
</div>
<p class="whats-new-view-all"><a href="/resources/blogs">View All Blog Posts <i class="fa fa-angle-right" aria-hidden="true"></i></a></p>
</div>
<div class="col-sm-10 match-height-item-by-row whats-new-item">
<div class="whats-new-icon"><img alt="Events icon" src="images/ecdtools/home/events.svg"></div>
Expand All @@ -54,7 +53,6 @@ <h4 class="whats-new-title"><a href="{{ .Permalink }}">{{ .Title }}</a></h4>
</div>
</div>
</div>

</div>
</div>
</div>
8 changes: 0 additions & 8 deletions layouts/shortcodes/page/join-us.html

This file was deleted.

32 changes: 14 additions & 18 deletions less/_components/homepage.less
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
/*!
* Copyright (c) 2021 Eclipse Foundation, Inc.
*
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v. 2.0 which is available at
* http://www.eclipse.org/legal/epl-2.0.
*
*
* Contributors:
* Eric Poirier <eric.poirier@eclipse-foundation.org>
*
*
* SPDX-License-Identifier: EPL-2.0
*/

Expand Down Expand Up @@ -45,14 +45,10 @@
}
}

.eclipse-search {
.eclipse-gcse {
.feather-search {
color:@brand-primary;
font-size: 24px;
width: 30px;
height: 30px;
top: -7px;
position: relative;
}
}

Expand Down Expand Up @@ -149,22 +145,22 @@
max-width:116px;
height:116px;
}
.image-container {
height: 75px;

.image-container {
height: 75px;
}
li {
li {
padding-right: 10px;
padding-left: 10px;
& > div:not(#featured-more-projects) > a {
position: absolute;
bottom: 20px;
& > div:not(#featured-more-projects) > a {
position: absolute;
bottom: 20px;
margin-left: auto;
margin-right: auto;
left: 20px;
margin-right: auto;
left: 20px;
right: 20px;
}
& > div:not(#featured-more-projects) {
& > div:not(#featured-more-projects) {
padding:20px;
padding-bottom: 0;
background-color: #fff;
Expand Down
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,14 @@
"hot": "NODE_ENV=development webpack-dev-server --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
"production": "NODE_ENV=production webpack --progress --config=node_modules/laravel-mix/setup/webpack.config.js",
"install": "NODE_ENV=production npm run production",
"postinstall": "npm run fetch_blogs && npm run fetch_projects && npm run yaml2json_projects",
"postinstall": "npm run fetch_projects && npm run yaml2json_projects",
"fetch_projects": "node node_modules/eclipsefdn-hugo-solstice-theme/bin/projects/index.js -l data -u https://projects.eclipse.org/api/projects?working_group=cloud-development-tools",
"yaml2json_projects": "node node_modules/js-yaml/bin/js-yaml.js -c data/eclipsefdn_projects.yaml | node node_modules/json-minify/index.js > static/js/projects.json",
"fetch_blogs": "curl https://planeteclipse.org/planet/ecdtools.xml -o static/documents/ecdtools.xml",
"disallow_robots_txt": "echo \"User-agent: *\r\nDisallow: /\" > layouts/robots.txt",
"build_netlify": "NODE_ENV=production npm run disallow_robots_txt && npm run production && npm run fetch_blogs && npm run fetch_projects && npm run yaml2json_projects"
"build_netlify": "NODE_ENV=production npm run disallow_robots_txt && npm run production && npm run fetch_projects && npm run yaml2json_projects"
},
"dependencies": {
"core-js": "^3.8.2",
"eclipsefdn-hugo-solstice-theme": "0.0.135",
"eclipsefdn-hugo-solstice-theme": "0.0.139",
"jquery-parallax.js": "^1.5.0",
"js-yaml": "^3.13.1",
"json-minify": "^1.0.0",
Expand Down
71 changes: 0 additions & 71 deletions static/documents/ecdtools.xml

This file was deleted.

Loading