Skip to content

Commit f34dfd5

Browse files
heathermillerheathermiller
committed
Promoting blog to frontpage of scala-lang
1 parent 22dd9cf commit f34dfd5

File tree

68 files changed

+297
-417
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+297
-417
lines changed

‎_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ul>
3030
<li><h5>Scala</h5></li>
3131
<li><a href="{{ site.baseurl }}/blog">Blog</a></li>
32-
<li><a href="{{ site.baseurl }}/news">News &amp; Announcements</a></li>
32+
<li><a href="{{ site.baseurl }}/news">Blog, News, &amp; Announcements Archive</a></li>
3333
<li><a href="{{ site.baseurl }}/conduct.html">Code of Conduct</a></li>
3434
<li><a href="{{ site.baseurl }}/license.html">License</a></li>
3535
</ul>

‎_includes/news-feed.html

Lines changed: 61 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,71 +1,84 @@
11
<div class="span7">
22
<h2 class="whats-new">What's New</h2>
3-
{% for p in site.categories.news limit: 1 %}
4-
<div class="news-item newsbox left">
5-
{% if p.post-type %}
6-
<div class="news-category">{{ p.post-type }}</div>
7-
{% endif %}
8-
{% if p.link-out %}
9-
<div class="news-title"><a href="{{ p.link-out }}">{{ p.title }}</a></div>
10-
{% else %}
11-
<div class="news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></div>
12-
{% endif %}
13-
{% if p.author %}
14-
<div class="news-author"><span class="by">By</span> <div class="news-author-name">{{ p.author }}</div></div>
15-
{% endif %}
16-
<div class="news-date"><img src="{{ site.baseurl }}/resources/img/date-icon.png" alt="date icon" /> {{ p.date | date: "%A, %B %d, %Y" }}</div>
17-
{% if p.short %}
18-
<div class="news-body">{{ p.short }}</div>
19-
{% else %}
20-
<div class="news-body">{{ p.content }}</div>
21-
{% endif %}
22-
</div>
23-
<div class="shadow">
24-
{% if p.link-out %}
25-
<div class="more"><a href="{{ p.link-out }}">more...</a></div>
26-
{% else %}
27-
<div class="more"><a href="{{ site.baseurl }}{{ p.url }}">more...</a></div>
28-
{% endif %}
29-
</div>
30-
{% endfor %}
31-
</div>
32-
<div class="span5 newsbox right">
33-
<h2 class="recently">Recently...</h2>
34-
<div class="recent-news-items">
35-
{% for p in site.categories.news limit: 4 %}
36-
{% if forloop.first %}
37-
{% comment %} DO NOTHING {% endcomment %}
38-
{% else %}
39-
<div class="recent-news-item">
3+
<!-- This is a horrendous way to filter out elements in an array. Blasphemy. Blame Liquid. -->
4+
{% assign maxCount = 1 %}
5+
{% assign count = 0 %}
6+
{% for p in site.posts %}
7+
{% if p.category != "events" and count < maxCount %}
8+
{% assign count = count | plus: 1 %}
9+
{% assign firstTitle = p.title %}
10+
<div class="news-item newsbox left">
11+
{% if p.post-type %}
12+
<div class="news-category">{{ p.post-type }}</div>
13+
{% endif %}
4014
{% if p.link-out %}
41-
<div class="recent-news-title"><a href="{{ p.link-out }}">{{ p.title }}</a></div>
15+
<div class="news-title"><a href="{{ p.link-out }}">{{ p.title }}{{ page.category }}</a></div>
4216
{% else %}
43-
<div class="recent-news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></div>
17+
<div class="news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}{{ page.category }}</a></div>
4418
{% endif %}
4519
{% if p.author %}
46-
<div class="recent-news-author"><span class="by">By</span> <div class="recent-news-author-name">{{ p.author }}</div></div>
20+
<div class="news-author"><span class="by">By</span> <div class="news-author-name">{{ p.author }}</div></div>
4721
{% endif %}
48-
<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" }}
49-
{% if p.post-type %}
50-
<span class="recent-news-category">{{ p.post-type }}</span>
51-
{% endif %}</div>
22+
<div class="news-date"><img src="{{ site.baseurl }}/resources/img/date-icon.png" alt="date icon" /> {{ p.date | date: "%A, %B %d, %Y" }}</div>
5223
{% if p.short %}
53-
<div class="recent-news-body">{{ p.short }}</div>
24+
<div class="news-body">{{ p.short }}</div>
5425
{% else %}
55-
<div class="recent-news-body">{{ p.content | strip_html | truncatewords: 25 }}</div>
26+
<div class="news-body">{{ p.content }}</div>
27+
{% endif %}
28+
</div>
29+
<div class="shadow">
30+
{% if p.link-out %}
31+
<div class="more"><a href="{{ p.link-out }}">more...</a></div>
32+
{% else %}
33+
<div class="more"><a href="{{ site.baseurl }}{{ p.url }}">more...</a></div>
5634
{% endif %}
5735
</div>
5836
{% endif %}
5937
{% endfor %}
38+
</div>
39+
<div class="span5 newsbox right">
40+
<h2 class="recently">Recently...</h2>
41+
<div class="recent-news-items">
42+
<!-- This is a horrendous way to filter out elements in an array. Blasphemy. Blame Liquid. -->
43+
{% assign maxCount = 3 %}
44+
{% assign count = 0 %}
45+
{% for p in site.posts %}
46+
{% if p.category != "event" and p.title != firstTitle and count < maxCount %}
47+
{% assign count = count | plus: 1 %}
48+
{% if forloop.first %}
49+
{% comment %} DO NOTHING {% endcomment %}
50+
{% else %}
51+
<div class="recent-news-item">
52+
{% if p.link-out %}
53+
<div class="recent-news-title"><a href="{{ p.link-out }}">{{ p.title }}</a></div>
54+
{% else %}
55+
<div class="recent-news-title"><a href="{{ site.baseurl }}{{ p.url }}">{{ p.title }}</a></div>
56+
{% endif %}
57+
{% if p.author %}
58+
<div class="recent-news-author"><span class="by">By</span> <div class="recent-news-author-name">{{ p.author }}</div></div>
59+
{% endif %}
60+
<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" }}
61+
{% if p.post-type %}
62+
<span class="recent-news-category">{{ p.post-type }}</span>
63+
{% endif %}</div>
64+
{% if p.short %}
65+
<div class="recent-news-body">{{ p.short }}</div>
66+
{% else %}
67+
<div class="recent-news-body">{{ p.content | strip_html | truncatewords: 25 }}</div>
68+
{% endif %}
69+
</div>
70+
{% endif %}
71+
{% endif %}
72+
{% endfor %}
6073
</div>
6174
<!-- <a class="more-news">More News</div> -->
6275
<a class="rss" href="{{ site.baseurl }}/feed/index.xml"><img src="{{ site.baserul }}/resources/img/rss-icon.png" alt="date-icon" ></a>
6376
</div>
6477
<div class="span12">
6578
<div class="post-news">
6679
For more, visit our<br/>
67-
<a class="archive-btn" href="{{ site.baseurl }}/news/" title="News archive">News archive</a>
80+
<a class="archive-btn" href="{{ site.baseurl }}/news/" title="Archive">News archive</a>
6881
or
6982
<a class="archive-btn" href="{{ site.baseurl }}/blog/" title="News archive">Blog</a>
7083
</div>
71-
</div>
84+
</div>

0 commit comments

Comments
 (0)