Skip to content

Commit 7bb375b

Browse files
committed
Split the project meetings from the team meetings
1 parent 3b8a692 commit 7bb375b

File tree

3 files changed

+47
-35
lines changed

3 files changed

+47
-35
lines changed

_includes/header.html

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
<a href="#" class="nav-link dropdown-toggle" id="dropdown03" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Join us</a>
4545
<ul class="dropdown-menu" aria-labelledby="dropdown03">
4646
<li class="dropdown-item"> <a class="nav-link" href="/vacancies">Openings</a></li>
47-
<li class="dropdown-item"> <a class="nav-link" href="/meetings">Meetings</a></li>
47+
<li class="dropdown-item"> <a class="nav-link" href="/meetings">Project Meetings</a></li>
48+
<li class="dropdown-item"> <a class="nav-link" href="/team_meetings">Team Meetings</a></li>
4849
<li class="dropdown-item"> <a class="nav-link" href="/open_projects">Open Projects</a></li>
4950
<li class="dropdown-item"> <a class="nav-link" target="_blank" href="https://www.linkedin.com/groups/9579649/">Follow Us</a></li>
5051
</ul>

_pages/meetings.md

+2-34
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,12 @@ permalink: /meetings/
99
# Project Meetings
1010

1111
{% assign sorted_meetings = site.data.meetinglist | sort: "date" | reverse %}
12-
{% assign standing_meetings = site.data.standing_meetings %}
13-
{% assign n_standing_meetings = standing_meetings | size %}
1412

15-
{% assign number_printed = 0 %}
1613
{% for meeting in sorted_meetings %}
1714

1815
<div class="row">
1916
<span id="{{meeting.label}}">&nbsp;</span>
20-
<div class="col-sm-6 clearfix">
17+
<div class="clearfix">
2118
<div class="well" style="padding-left: 20px; padding-right: 20px">
2219
<a style="text-decoration:none;" href="#{{meeting.label}}">
2320
{{ meeting.name }} -- {{ meeting.date | date_to_long_string }} at {{meeting.time_cest}} Geneva (CH) Time
@@ -31,7 +28,7 @@ permalink: /meetings/
3128
({{item.speaker}})
3229
{% endif %}
3330
{% if item.description %}
34-
<br/> <i>Abstract:</i> <small>{{item.description | markdownify }}</small>
31+
<br/> <i>Abstract:</i>{{item.description | markdownify }}
3532
{% endif %}
3633
{% if item.slides %}
3734
<a style="text-decoration:none;" href="{{item.slides}}">Slides</a>
@@ -46,35 +43,6 @@ permalink: /meetings/
4643
</div>
4744
</div>
4845

49-
{% if number_printed < n_standing_meetings %}
50-
{% assign smeeting = standing_meetings[number_printed] %}
51-
<div class="col-sm-6 clearfix">
52-
<div class="well" style="padding-left: 20px; padding-right: 20px">
53-
<a style="text-decoration:none;" href="#{{smeeting.label}}">
54-
{{ smeeting.name }} -- {{ smeeting.date }} at {{smeeting.time_cest}} Geneva (CH) Time
55-
</a>
56-
<div>
57-
Connection information: {{smeeting.connect}} <br />
58-
</div><div>
59-
Agenda:
60-
<ul>
61-
{% for item in smeeting.agenda %}
62-
<li><strong>{{item.title}}</strong>
63-
{% if item.speaker %}
64-
({{item.speaker}}) [{{item.date|date: "%b %-d, %Y"}}]
65-
{% endif %}
66-
{{item.link | markdownify}}
67-
</li>
68-
{% endfor %}
69-
</ul>
70-
</div>
71-
</div>
72-
</div>
73-
74-
{% endif %}
75-
76-
{% assign number_printed = number_printed | plus: 1 %}
77-
7846
</div>
7947

8048
{% endfor %}

_pages/team_meetings.md

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
title: "Team Meetings"
3+
layout: gridlay
4+
excerpt: "Team Meetings"
5+
sitemap: false
6+
permalink: /team_meetings/
7+
---
8+
9+
# Team Meetings
10+
11+
{% assign standing_meetings = site.data.standing_meetings %}
12+
13+
{% for smeeting in standing_meetings %}
14+
15+
<div class="row">
16+
<span id="{{meeting.label}}">&nbsp;</span>
17+
18+
<div class="clearfix">
19+
<div class="well" style="padding-left: 20px; padding-right: 20px">
20+
<a style="text-decoration:none;" href="#{{smeeting.label}}">
21+
{{ smeeting.name }} -- {{ smeeting.date }} at {{smeeting.time_cest}} Geneva (CH) Time
22+
</a>
23+
<div>
24+
Connection information: {{smeeting.connect}} <br />
25+
</div><div>
26+
Agenda:
27+
<ul>
28+
{% for item in smeeting.agenda %}
29+
<li><strong>{{item.title}}</strong>
30+
{% if item.speaker %}
31+
({{item.speaker}}) [{{item.date|date: "%b %-d, %Y"}}]
32+
{% endif %}
33+
{{item.link | markdownify}}
34+
</li>
35+
{% endfor %}
36+
</ul>
37+
</div>
38+
</div>
39+
</div>
40+
41+
</div>
42+
43+
{% endfor %}

0 commit comments

Comments
 (0)