Skip to content

Commit 4f2c240

Browse files
committed
Multiple News Timelines POC - Front Page Layout 4
- added 4 fixed height boxes showing the following timelines: - Project Meetings - Recent News - Open Projects - Team Meetings - Updated `homelay.html` to add new boxes - updated `news.html` and added similar `open-projects`, `project-meetings` and `team-meetings` layouts to make up the timeline boxes - removed `scroll` functionality to make the boxes uniform - Had to reformat the `standing_meetings.yml`, since it was only considering it as one news item. - Also had to edit `date` parameter to enable sorting. - Finally, moved the `updates` link to meeting notes doc outside the `agenda` since it was messing with the sorting (error: can't sort null date) - removed an extra space ( ) from `team_meetings` page that was messing up the layout
1 parent 4d5db8e commit 4f2c240

File tree

7 files changed

+401
-73
lines changed

7 files changed

+401
-73
lines changed

_data/standing_meetings.yml

Lines changed: 314 additions & 56 deletions
Large diffs are not rendered by default.

_includes/news.html

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11

22
<div class="well">
3-
<h4>Timeline</h4>
4-
<div class="pre-scrollable" style="max-height: 455px">
3+
<h4><b>Recent News</b></h4>
4+
<div style="height: 300px">
55

6-
{% for article in site.data.news %}
7-
<p>
8-
<b>{{ article.date }}</b><br /> <a href="{{article.link}}">{{article.headline}}</a></p>
9-
{% endfor %}
6+
{% assign sorted_news = site.data.news | sort: 'date' | reverse %}
7+
{% for article in sorted_news limit:3 %}
8+
<p>
9+
<b>{{ article.date }}</b><br /> <a href="{{article.link}}">{{article.headline}}</a></p>
10+
{% endfor %}
11+
1012

1113

1214
</div>

_includes/open-projects.html

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
2+
<div class="well">
3+
<h4><b>Open Projects</b></h4>
4+
<div style="height: 300px">
5+
6+
{% assign top_articles = site.data.openprojectlist %}
7+
{% for article in top_articles limit:4 %}
8+
<p>
9+
- <a href="{{ site.url }}{{ site.baseurl }}/open_projects">{{ article.name }}</a>
10+
</p>
11+
{% endfor %}
12+
13+
14+
</div>
15+
<h4><a href="{{ site.url }}{{ site.baseurl }}/open_projects">... see details</a></h4>
16+
</div>

_includes/project-meetings.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<div class="well">
2+
<h4><b>Project Meetings</b></h4>
3+
<div style="height: 300px">
4+
5+
{% assign top_articles = site.data.meetinglist | slice: 0, 3 %}
6+
{% for article in top_articles %}
7+
<p>
8+
<b>{{ article.date | date: "%Y-%m-%d" }}</b><br /> <a href="{{ site.url }}{{ site.baseurl }}/meetings/#{{ article.label }}">{{ article.agenda[0].title }}</a>
9+
</p>
10+
{% endfor %}
11+
12+
</div>
13+
<h4><a href="{{ site.url }}{{ site.baseurl }}/meetings">... see details</a></h4>
14+
</div>

_includes/team-meetings.html

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
<div class="well">
3+
<h4><b>Team Meetings</b></h4>
4+
<div style="height: 300px">
5+
6+
{% assign top_articles = site.data.standing_meetings %}
7+
{% for article in top_articles limit:3 %}
8+
<p>
9+
<b>{{ article.date | date: "%Y-%m-%d" }}</b><br /> <a href="{{ site.url }}{{ site.baseurl }}/team_meetings">{{ article.agenda[0].title }}</a>
10+
</p>
11+
{% endfor %}
12+
13+
14+
15+
</div>
16+
<h4><a href="{{ site.url }}{{ site.baseurl }}/team_meetings">... see details</a></h4>
17+
</div>

_layouts/homelay.html

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,33 @@
1313
<div id="thumbs" class="col-sm-12">
1414
{% include thumbnails.html %}
1515
</div>
16-
<div id="homeid" class="col-sm-8">
17-
{{ content }}
18-
</div>
1916

20-
<div id="upcomingid" class="col-sm-4" >
21-
<div style="width: 359px">
22-
{% include upcoming.html %}
17+
<div id="newsid" class="col-sm-3" >
18+
<div style="width: 265px">
19+
{% include project-meetings.html %}
2320
</div>
2421
</div>
25-
<div id="newsid" class="col-sm-4" >
26-
<div style="width: 359px">
22+
23+
<div id="newsid" class="col-sm-3" >
24+
<div style="width: 265px">
2725
{% include news.html %}
2826
</div>
2927
</div>
28+
29+
<div id="newsid" class="col-sm-3" >
30+
<div style="width: 265px">
31+
{% include open-projects.html %}
32+
</div>
33+
</div>
34+
35+
<div id="newsid" class="col-sm-3" >
36+
<div style="width: 265px">
37+
{% include team-meetings.html %}
38+
</div>
39+
</div>
40+
41+
<div id="homeid" class="col-sm-12">
42+
{{ content }}
43+
</div>
44+
3045
</div>

_pages/team_meetings.md

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ scheduled once a week on Wednesdays, serving as a collaborative space where team
1616
members often initiate discussions or share presentations to inform the group
1717
about ongoing plans and results.
1818

19+
<br>
20+
1921
{% assign standing_meetings = site.data.standing_meetings %}
2022

2123
{% for smeeting in standing_meetings %}
2224

2325
<div class="row">
24-
<span id="{{meeting.label}}">&nbsp;</span>
26+
2527

2628
<div class="clearfix">
2729
<div class="well" style="padding-left: 20px; padding-right: 20px">
@@ -30,13 +32,17 @@ about ongoing plans and results.
3032
</a>
3133
<div>
3234
Connection information: {{smeeting.connect}} <br />
33-
</div><div>
35+
</div>
36+
<div>
37+
Meeting Updates: {{smeeting.updates}} <br />
38+
</div>
39+
<div>
3440
Agenda:
3541
<ul>
3642
{% for item in smeeting.agenda %}
3743
<li><strong>{{item.title}}</strong>
3844
{% if item.speaker %}
39-
({{item.speaker}}) [{{item.date|date: "%b %-d, %Y"}}]
45+
({{item.speaker}}) [{{smeeting.date|date: "%b %-d, %Y"}}]
4046
{% endif %}
4147
{{item.link | markdownify}}
4248
</li>

0 commit comments

Comments
 (0)