Skip to content

Commit

Permalink
code cleanup & update CHANAGE LOG
Browse files Browse the repository at this point in the history
  • Loading branch information
mmmavis committed May 27, 2015
1 parent b8988aa commit c55112e
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 12 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ to [Semantic Versioning](http://semver.org/).
new releases of the site.
- The dev version modal now links to the latest release
of the site if the current git revision is unavailable.
- New homepage design

### Removed
- `gulp-html-prettify` is no longer listed as a dependency
Expand All @@ -42,15 +43,15 @@ to [Semantic Versioning](http://semver.org/).
- Added environment variables `MAILINGLIST_URL`
and `MAILINGLIST_PRIVACY_NAME`.
- The site now generates `index.html` files for redirects. This
was done so that `/clubs/curriculum/` redirects to
was done so that `/clubs/curriculum/` redirects to
`/activities/web-lit-basics/`.
- `lib/changelog.js` can be used as a node script to help
update `CHANGELOG.md`.
- Aspects of the structure and accuracy of this
changelog are now verified by the automated test suite.

### Changed
- The Clubs Curriculum page has been renamed to
- The Clubs Curriculum page has been renamed to
Web Literacy Basics, and is now available at
`/activities/web-lit-basics/`. It's no longer accessible
through the sidebar, but is instead listed as the
Expand All @@ -64,7 +65,7 @@ to [Semantic Versioning](http://semver.org/).
collapsed area becomes focused, improving navigation for
sighted users who can only use the keyboard for navigation.
- Signing up for the Maker Party mailing list now shows
a "Thank you" modal when the user is returned to the
a "Thank you" modal when the user is returned to the
site from BSD.
- Moved all documentation about manual testing to
`CONTRIBUTING.md`.
Expand Down
22 changes: 13 additions & 9 deletions pages/home.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ var LatestPosts = React.createClass({
this.props.data.map(function(post, i) {
return (
<li key={i}>
<a className="post-title">{post.title}</a>
<a className="post-title" href={post.link}>{post.title}</a>
<time className="published" dateTime={post.publishedDate}>
<span>{moment(post.publishedDate).format("MMM D, YYYY")}</span>
</time>
Expand Down Expand Up @@ -117,22 +117,27 @@ var BlogSection = React.createClass({
var feed = new google.feeds.Feed("https://blog.webmaker.org/tag/teachtheweb/feed");
var latestPosts = [];
feed.load(function(result) {
var featured = result.feed.entries[0];
var post;
for (var i=0; i<4; i++) {
for (var i=1; i<4; i++) {
post = result.feed.entries[i];
latestPosts.push({
title: post.title,
author: post.author,
publishedDate: post.publishedDate,
contentSnippet: sanitizeHtml(post.content, {
allowedTags: []
}).split(" ").slice(0,70).join(" ") + "...",
link: post.link
});
}
self.setState({
featuredPostData: latestPosts[0],
latestPostsData: latestPosts.slice(1)
featuredPostData: {
title: featured.title,
author: featured.author,
publishedDate: featured.publishedDate,
contentSnippet: sanitizeHtml(featured.content, {
allowedTags: []
}).split(" ").slice(0,70).join(" ") + "...",
link: post.link
},
latestPostsData: latestPosts
});
});
}
Expand Down Expand Up @@ -186,7 +191,6 @@ var HomePage = React.createClass({
head="Start A Mozilla Club"
/>
</IconButtons>

</HeroUnit>
<div className="inner-container">
<section>
Expand Down

0 comments on commit c55112e

Please sign in to comment.