Permalink
Browse files

Promoting blog to frontpage of scala-lang

  • Loading branch information...
1 parent 22dd9cf commit f34dfd5aab45cf739742f636fe638b9d768e6ebe @heathermiller heathermiller committed Feb 4, 2016
Showing with 297 additions and 417 deletions.
  1. +1 −1 _includes/footer.html
  2. +61 −48 _includes/news-feed.html
  3. +168 −128 _layouts/frontpage.html
  4. +0 −239 _layouts/frontpage2.html
  5. +3 −0 events/README.md
  6. +1 −0 events/_posts/2013-03-02-TestEvent.md
  7. +1 −0 events/_posts/2013-03-12-AnotherEvent.md
  8. +1 −0 events/_posts/2013-07-08-lambda-jam-chicago.md
  9. +1 −0 events/_posts/2013-08-02-svss.md
  10. +1 −0 events/_posts/2013-09-18-strange-loop.md
  11. +1 −0 events/_posts/2013-09-22-cufp.md
  12. +1 −0 events/_posts/2013-09-25-icfp.md
  13. +1 −0 events/_posts/2013-10-19-pnwscala.md
  14. +1 −0 events/_posts/2013-10-24-scala-io.md
  15. +1 −0 events/_posts/2013-10-26-splash.md
  16. +1 −0 events/_posts/2013-11-11-devoxx-beligum.md
  17. +1 −0 events/_posts/2013-12-2-scala-exchange.md
  18. +1 −0 events/_posts/2013-12-3-code-mesh.md
  19. +1 −0 events/_posts/2014-01-11-data-days-texas.md
  20. +1 −0 events/_posts/2014-02-27-lambda-days.md
  21. +1 −0 events/_posts/2014-03-01-nescala.md
  22. +1 −0 events/_posts/2014-03-14-fp-exchange.md
  23. +1 −0 events/_posts/2014-04-05-scalar.md
  24. +1 −0 events/_posts/2014-04-07-react.md
  25. +1 −0 events/_posts/2014-04-22-phillyete.md
  26. +1 −0 events/_posts/2014-05-12-flatmap-oslo.md
  27. +1 −0 events/_posts/2014-06-24-uberconf.md
  28. +1 −0 events/_posts/2014-09-05-scala-downunder.md
  29. +1 −0 events/_posts/2014-09-06-scala-matsuri.md
  30. +1 −0 events/_posts/2014-09-15-scalasummit.md
  31. +1 −0 events/_posts/2014-09-17-strange-loop.md
  32. +1 −0 events/_posts/2014-09-22-scalapeno.md
  33. +1 −0 events/_posts/2014-10-23-scala-io.md
  34. +1 −0 events/_posts/2014-12-08-scalax.md
  35. +1 −0 events/_posts/2015-01-30-nescala.md
  36. +1 −0 events/_posts/2015-02-26-lambda-days.md
  37. +1 −0 events/_posts/2015-03-16-scaladaysSF.md
  38. +1 −0 events/_posts/2015-04-07-phillyete.md
  39. +1 −0 events/_posts/2015-04-11-scalar.md
  40. +1 −0 events/_posts/2015-04-27-flatmap-oslo.md
  41. +1 −0 events/_posts/2015-05-22-lambdaconf.md
  42. +1 −0 events/_posts/2015-06-08-scaladaysAMS.md
  43. +1 −0 events/_posts/2015-07-06-curryon.md
  44. +1 −0 events/_posts/2015-07-15-lambdajam.md
  45. +1 −0 events/_posts/2015-08-10-jvmls.md
  46. +1 −0 events/_posts/2015-08-13-scalabythebay.md
  47. +1 −0 events/_posts/2015-08-31-icfp.md
  48. +1 −0 events/_posts/2015-09-03-cufp.md
  49. +1 −0 events/_posts/2015-09-20-scalaworld.md
  50. +1 −0 events/_posts/2015-09-25-scalaupnorth.md
  51. +1 −0 events/_posts/2015-10-08-applyscala.md
  52. +1 −0 events/_posts/2015-10-24-lambda-world.md
  53. +1 −0 events/_posts/2015-12-10-scalax15.md
  54. +1 −0 events/_posts/2016-01-30-scala-matsuri.md
  55. +1 −0 events/_posts/2016-02-11-scalasphere.md
  56. +1 −0 events/_posts/2016-02-19-scala-downunder.md
  57. +1 −0 events/_posts/2016-03-02-typelevel.md
  58. +1 −0 events/_posts/2016-03-04-nescala.md
  59. +1 −0 events/_posts/2016-04-08-scalaua.md
  60. +1 −0 events/_posts/2016-04-11-philly-ete.md
  61. +1 −0 events/_posts/2016-04-16-scalar.md
  62. +1 −0 events/_posts/2016-05-02-flatmap-oslo.md
  63. +1 −0 events/_posts/2016-05-04-typelevel.md
  64. +1 −0 events/_posts/2016-05-09-scaladays-nyc.md
  65. +1 −0 events/_posts/2016-05-26-lambdaconf.md
  66. +1 −0 events/_posts/2016-06-15-scaladays-berlin.md
  67. +1 −0 events/_posts/2016-09-11-scalaworld.md
  68. +2 −1 index.md
@@ -29,7 +29,7 @@
<ul>
<li><h5>Scala</h5></li>
<li><a href="{{ site.baseurl }}/blog">Blog</a></li>
- <li><a href="{{ site.baseurl }}/news">News &amp; Announcements</a></li>
+ <li><a href="{{ site.baseurl }}/news">Blog, News, &amp; Announcements Archive</a></li>
<li><a href="{{ site.baseurl }}/conduct.html">Code of Conduct</a></li>
<li><a href="{{ site.baseurl }}/license.html">License</a></li>
</ul>
@@ -1,71 +1,84 @@
<div class="span7">
<h2 class="whats-new">What's New</h2>
- {% for p in site.categories.news limit: 1 %}
- <div class="news-item newsbox left">
- {% if p.post-type %}
- <div class="news-category">{{ p.post-type }}</div>
- {% endif %}
- {% if p.link-out %}
- <div class="news-title"><a href="{{ p.link-out }}">{{ p.title }}</a></div>
- {% else %}
- <div class="news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></div>
- {% endif %}
- {% if p.author %}
- <div class="news-author"><span class="by">By</span> <div class="news-author-name">{{ p.author }}</div></div>
- {% endif %}
- <div class="news-date"><img src="{{ site.baseurl }}/resources/img/date-icon.png" alt="date icon" /> {{ p.date | date: "%A, %B %d, %Y" }}</div>
- {% if p.short %}
- <div class="news-body">{{ p.short }}</div>
- {% else %}
- <div class="news-body">{{ p.content }}</div>
- {% endif %}
- </div>
- <div class="shadow">
- {% if p.link-out %}
- <div class="more"><a href="{{ p.link-out }}">more...</a></div>
- {% else %}
- <div class="more"><a href="{{ site.baseurl }}{{ p.url }}">more...</a></div>
- {% endif %}
- </div>
- {% endfor %}
-</div>
-<div class="span5 newsbox right">
- <h2 class="recently">Recently...</h2>
- <div class="recent-news-items">
- {% for p in site.categories.news limit: 4 %}
- {% if forloop.first %}
- {% comment %} DO NOTHING {% endcomment %}
- {% else %}
- <div class="recent-news-item">
+ <!-- This is a horrendous way to filter out elements in an array. Blasphemy. Blame Liquid. -->
+ {% assign maxCount = 1 %}
+ {% assign count = 0 %}
+ {% for p in site.posts %}
+ {% if p.category != "events" and count < maxCount %}
+ {% assign count = count | plus: 1 %}
+ {% assign firstTitle = p.title %}
+ <div class="news-item newsbox left">
+ {% if p.post-type %}
+ <div class="news-category">{{ p.post-type }}</div>
+ {% endif %}
{% if p.link-out %}
- <div class="recent-news-title"><a href="{{ p.link-out }}">{{ p.title }}</a></div>
+ <div class="news-title"><a href="{{ p.link-out }}">{{ p.title }}{{ page.category }}</a></div>
{% else %}
- <div class="recent-news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></div>
+ <div class="news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}{{ page.category }}</a></div>
{% endif %}
{% if p.author %}
- <div class="recent-news-author"><span class="by">By</span> <div class="recent-news-author-name">{{ p.author }}</div></div>
+ <div class="news-author"><span class="by">By</span> <div class="news-author-name">{{ p.author }}</div></div>
{% endif %}
- <div class="recent-news-date"><img style="margin-top: -3px;" src="{{ site.baseurl }}/resources/img/recent-date-icon.png" alt="date-icon" /> {{ p.date | date: "%A, %B %d, %Y" }}
- {% if p.post-type %}
- <span class="recent-news-category">{{ p.post-type }}</span>
- {% endif %}</div>
+ <div class="news-date"><img src="{{ site.baseurl }}/resources/img/date-icon.png" alt="date icon" /> {{ p.date | date: "%A, %B %d, %Y" }}</div>
{% if p.short %}
- <div class="recent-news-body">{{ p.short }}</div>
+ <div class="news-body">{{ p.short }}</div>
{% else %}
- <div class="recent-news-body">{{ p.content | strip_html | truncatewords: 25 }}</div>
+ <div class="news-body">{{ p.content }}</div>
+ {% endif %}
+ </div>
+ <div class="shadow">
+ {% if p.link-out %}
+ <div class="more"><a href="{{ p.link-out }}">more...</a></div>
+ {% else %}
+ <div class="more"><a href="{{ site.baseurl }}{{ p.url }}">more...</a></div>
{% endif %}
</div>
{% endif %}
{% endfor %}
+</div>
+<div class="span5 newsbox right">
+ <h2 class="recently">Recently...</h2>
+ <div class="recent-news-items">
+ <!-- This is a horrendous way to filter out elements in an array. Blasphemy. Blame Liquid. -->
+ {% assign maxCount = 3 %}
+ {% assign count = 0 %}
+ {% for p in site.posts %}
+ {% if p.category != "event" and p.title != firstTitle and count < maxCount %}
+ {% assign count = count | plus: 1 %}
+ {% if forloop.first %}
+ {% comment %} DO NOTHING {% endcomment %}
+ {% else %}
+ <div class="recent-news-item">
+ {% if p.link-out %}
+ <div class="recent-news-title"><a href="{{ p.link-out }}">{{ p.title }}</a></div>
+ {% else %}
+ <div class="recent-news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></div>
+ {% endif %}
+ {% if p.author %}
+ <div class="recent-news-author"><span class="by">By</span> <div class="recent-news-author-name">{{ p.author }}</div></div>
+ {% endif %}
+ <div class="recent-news-date"><img style="margin-top: -3px;" src="{{ site.baseurl }}/resources/img/recent-date-icon.png" alt="date-icon" /> {{ p.date | date: "%A, %B %d, %Y" }}
+ {% if p.post-type %}
+ <span class="recent-news-category">{{ p.post-type }}</span>
+ {% endif %}</div>
+ {% if p.short %}
+ <div class="recent-news-body">{{ p.short }}</div>
+ {% else %}
+ <div class="recent-news-body">{{ p.content | strip_html | truncatewords: 25 }}</div>
+ {% endif %}
+ </div>
+ {% endif %}
+ {% endif %}
+ {% endfor %}
</div>
<!-- <a class="more-news">More News</div> -->
<a class="rss" href="{{ site.baseurl }}/feed/index.xml"><img src="{{ site.baserul }}/resources/img/rss-icon.png" alt="date-icon" ></a>
</div>
<div class="span12">
<div class="post-news">
For more, visit our<br/>
- <a class="archive-btn" href="{{ site.baseurl }}/news/" title="News archive">News archive</a>
+ <a class="archive-btn" href="{{ site.baseurl }}/news/" title="Archive">News archive</a>
or
<a class="archive-btn" href="{{ site.baseurl }}/blog/" title="News archive">Blog</a>
</div>
-</div>
+</div>
Oops, something went wrong.

0 comments on commit f34dfd5

Please sign in to comment.