Skip to content

Commit 128894f

Browse files
bishaboshabishabosha
committed
add new paragraph for governance page
reorder the tiles in governance reorder links of Scala Center tile in governance improve governance styling
1 parent babd32e commit 128894f

File tree

5 files changed

+247
-190
lines changed

5 files changed

+247
-190
lines changed

‎_data/governance.yml

Lines changed: 61 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,44 @@
1-
introText: The development of this page is in progress.
1+
introText: |
2+
The Scala Programming Language is an open source project, created at [EPFL](https://epfl.ch) by
3+
[Prof. Martin Odersky](https://lampwww.epfl.ch/~odersky/). Decisions on major language changes are made by
4+
the community through the Scala Improvement Process (SIP).
5+
Scala's associated websites and user forums are managed by the [Scala Center](https://scala.epfl.ch).
6+
The Scala Tooling Summit is organised by the Scala Center, bringing together the various teams and organizations
7+
that maintain tools for Scala to collaborate and improve the tooling experience for all.
8+
Recommendations for
9+
the Scala Center's activities can be made by [joining its Advisory Board](https://scala.epfl.ch/corporate-membership.html).
10+
Major contributions to the Scala language come from the Scala Center, [Martin's research group at EPFL](https://www.epfl.ch/labs/lamp/), and
11+
the Scala teams at [Lightbend](https://www.lightbend.com) and [VirtusLab](https://virtuslab.com).
12+
Contributions also come from the Scala community more broadly, with participation
13+
from many companies, organizations, and individuals.
14+
215
cards:
16+
- title: "Scala Center"
17+
description: "The organization fostering the Scala community, education, and OSS library/tool development."
18+
expandText: "Learn More"
19+
anchorTarget: "gov-scala-center"
20+
links:
21+
- text: |
22+
The Scala Center contributes to the language core, open source Scala tooling and libraries, and
23+
delivers high-quality education materials.
24+
It fosters conversations in the community, and coordinates with various parties to unblock and improve
25+
the Scala ecosystem.
26+
[Joining the Advisory Board](https://scala.epfl.ch/corporate-membership.html) is an effective way to
27+
have your voice heard, as well as supporting the Center to achieve its goals.
28+
- name: "Advisory Board Proceedings"
29+
url: https://github.com/scalacenter/advisoryboard#the-scala-center-advisory-board
30+
- name: "5 Year Impact Report"
31+
url: https://scala.epfl.ch/records/first-five-years/
32+
- name: "2023 Roadmap"
33+
url: https://www.scala-lang.org/blog/2023/01/31/scala-center-2023-roadmap.html
34+
- name: Team
35+
url: https://scala.epfl.ch/team.html
36+
- name: "Homepage"
37+
url: https://scala.epfl.ch/
338
- title: "Scala Improvement Process"
439
description: "The SIP is the primary mechanism for evolving the Scala language."
540
expandText: "Process & People"
41+
anchorTarget: "gov-sip"
642
links:
743
- text: "This process aims to evolve Scala openly and collaboratively. Anyone from the community is welcome to submit a Scala Improvement Proposal (SIP), which is then reviewed and discussed by a Committee. Every month, the Committee votes on the proposals to accept in the language."
844
- name: SIP Homepage
@@ -11,51 +47,45 @@ cards:
1147
url: https://docs.scala-lang.org/sips/process-specification.html#the-sip-committee
1248
- name: SIP Process Specification
1349
url: https://docs.scala-lang.org/sips/process-specification.html
50+
- title: "Scala Tooling Summit"
51+
description: "Bringing together maintainers of build tools, linters, IDEs, and other tools."
52+
expandText: "Process & People"
53+
anchorTarget: "gov-tooling"
54+
links:
55+
- text: "The process and people behind the Scala Tooling Summit are still TBD, however you can read below about previously held summits."
56+
- fancy: "Process & People TBD"
57+
- fancy: "Scala Tooling Summit of September 2023"
58+
- name: "Scala Tooling Summit of March 2023"
59+
url: https://www.scala-lang.org/blog/2023/04/11/march-2023-scala-tooling-summit.html
60+
- title: "Scala 2 Maintenance"
61+
description: "Managing the Scala 2 compiler, standard library and documentation."
62+
expandText: "Process & People"
63+
anchorTarget: "gov-scala-2"
64+
links:
65+
- name: "Core Maintainers"
66+
url: "https://github.com/scala/scala#get-in-touch"
67+
- name: "Contribution Process"
68+
url: "https://github.com/scala/scala#how-to-contribute"
1469
- title: "Scala 3 Maintenance"
1570
description: "Managing the Scala 3 compiler, standard library and documentation."
1671
expandText: "Process & People"
72+
anchorTarget: "gov-scala-3"
1773
links:
1874
- name: Core Maintainers
1975
url: https://github.com/lampepfl/dotty/blob/main/MAINTENANCE.md#compiler
2076
- name: Maintenance Procedures
2177
url: https://github.com/lampepfl/dotty/blob/main/MAINTENANCE.md
22-
- title: "Tooling"
23-
description: "Managing build tools, linters, IDEs, and other tools."
24-
expandText: "Process & People"
25-
links:
26-
- text: "Process and People are TBD, please stay tuned! However you can read below about the Scala Tooling Summit:"
27-
- name: "Scala Tooling Summit of March 2023"
28-
url: https://www.scala-lang.org/blog/2023/04/11/march-2023-scala-tooling-summit.html
2978
- title: "Moderation"
3079
description: "Learn how the Scala community is moderated."
3180
expandText: "Process & People"
81+
anchorTarget: "gov-moderation"
3282
links:
33-
- text: "The Scala community is moderated by the Moderation Team over all the official communication channels. The moderation is governed by the Code of Conduct."
34-
- name: "Moderation Team"
35-
url: https://www.scala-lang.org/conduct/#contact
83+
- text: "The Scala community is moderated by the Moderation Team over all the official communication channels hosted by the Scala organisation. The moderation is governed by the Code of Conduct."
3684
- name: Code of Conduct
3785
url: https://www.scala-lang.org/conduct/
3886
- name: "Inclusive Language Guide"
3987
url: https://docs.scala-lang.org/contribute/inclusive-language-guide.html
4088
- name: "Communication Channels"
4189
url: https://scala-lang.org/community/
42-
- title: "Scala Center"
43-
description: "The organization fostering the Scala community, education, and OSS library development."
44-
expandText: "Learn More"
45-
links:
46-
- name: "Homepage"
47-
url: https://scala.epfl.ch/
48-
- name: Team
49-
url: https://scala.epfl.ch/team.html
50-
- name: "Advisory Board"
51-
url: https://github.com/scalacenter/advisoryboard#the-scala-center-advisory-board
52-
- name: "5 Year Report"
53-
url: https://scala.epfl.ch/records/first-five-years/
54-
- title: "Scala 2 Maintenance"
55-
description: "Who maintains the Scala 2 compiler?"
56-
expandText: "Process & People"
57-
links:
58-
- name: "Contribution Process"
59-
url: "https://github.com/scala/scala#how-to-contribute"
60-
- name: "Core Maintainers"
61-
url: "https://github.com/scala/scala#get-in-touch"
90+
- name: "Moderation Team"
91+
url: https://www.scala-lang.org/conduct/#contact

‎_includes/masthead-community.html

Lines changed: 104 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,131 @@
1-
<section class="governance">
1+
<section class="governance table-of-content">
22
<div class="wrap">
33
<div class="inner-box">
44
<div class="heading-box">
55
<h2 id="governance">Governance</h2>
6-
<p>{{site.data.governance.introText}}</p>
76
</div>
87
<div class="community">
9-
<div class="scala-items-list">
8+
<div class="scala-items-grid">
109
<div class="items-menu">
1110
{% for scalaItem in site.data.governance.cards %}
12-
{% assign loopIndexMod = forloop.index | minus: 1 | modulo: 3 %}
13-
14-
{% if loopIndexMod == 0 %}
15-
{% assign codeSnippets = '' | split: ',' %}
16-
<div class="wrap">
17-
{% endif %}
18-
1911
<!-- Show the below content only if the scalaItem.expandable either doesn't exist or is false -->
20-
{% unless scalaItem.dontExpand %}
21-
{% capture box_content %}
22-
<div class="wrap">
23-
<ul class="vertical-buttons-list">
24-
{% for link in scalaItem.links %}
25-
{% if link.text %}
26-
<li><p>{{ link.text }}</p></li>
27-
{% else %}
28-
<li><a href="{{ link.url }}" class="button button-expand" target="_blank" rel="none">{{ link.name }}</a></li>
29-
{% endif %}
30-
{% endfor %}
31-
</ul>
32-
</div>
33-
{% endcapture %}
34-
{% assign codeSnippets = codeSnippets | push: box_content %}
35-
{% endunless %}
3612
<div class="scala-item scala-item__governance">
37-
<div class="top">
38-
<h4>{{scalaItem.title}}</h4>
39-
<p>{{scalaItem.description}}</p>
40-
</div>
13+
<div class="top">
14+
<h4>{{scalaItem.title}}</h4>
15+
<p>{{scalaItem.description}}</p>
16+
</div>
4117
{% unless scalaItem.dontExpand %}
42-
<div class="button button-more">{{scalaItem.expandText}}</div>
18+
<a href="#{{scalaItem.anchorTarget}}" class="button button-more">{{scalaItem.expandText}}</a>
4319
{% endunless %}
4420
</div>
45-
{% if loopIndexMod == 2 or forloop.last %}
21+
<div id="{{scalaItem.anchorTarget}}" class="items-content">
22+
{% unless scalaItem.dontExpand %}
23+
<div class="wrap">
24+
<a id="{{scalaItem.anchorTarget}}-close" class="items-content_close" href="#{{scalaItem.anchorTarget}}-close"><i
25+
class="fa fa-close"></i></a>
4626
</div>
47-
<div class="items-content">
48-
{% for snippet in codeSnippets %}
49-
<div class="items-code">{{snippet}}</div>
50-
{% endfor %}
27+
<div class="items-code">
28+
<div class="wrap">
29+
<ul class="vertical-buttons-list">
30+
{% for link in scalaItem.links %}
31+
{% if link.text %}
32+
<li>
33+
{{ link.text | markdownify }}
34+
</li>
35+
{% elsif link.fancy %}
36+
<li><div class="button button-announce">{{ link.fancy }}</div></li>
37+
{% else %}
38+
<li><a href="{{ link.url }}" class="button button-expand" target="_blank" rel="none">{{ link.name }}</a></li>
39+
{% endif %}
40+
{% endfor %}
41+
</ul>
42+
</div>
5143
</div>
52-
{% endif %}
44+
{% endunless %}
45+
</div>
5346
{% endfor %}
5447
</div>
5548
</div>
5649
</div>
50+
<div class="community">
51+
<div class="summary">{{site.data.governance.introText | markdownify}}</div>
52+
</div>
5753
</div>
5854
</div>
5955
</section>
6056

6157
<section class="table-of-content">
62-
<div class="wrap">
63-
<div class="inner-box">
64-
<div class="community">
65-
<div class="discourse">
66-
<h2>Discourse</h2>
67-
<span>Forums</span>
68-
<ul>
69-
{% for forum in site.data.chats-forums.discourseForums %}
70-
<li>
71-
<img src="/resources/img/frontpage/discourse-logo.png" alt="{{forum.title}}">
72-
<div>
73-
<h4><a href="{{forum.url}}">{{forum.title}}</a></h4>
74-
<p>{{forum.subtitle}}</p>
75-
</div>
76-
</li>
77-
{% endfor %}
78-
</ul>
79-
</div>
80-
<div class="discord">
81-
<h2>Discord</h2>
82-
<span>Real-time chat</span>
83-
<ul>
84-
{% for server in site.data.chats-forums.discordServers %}
85-
<li>
86-
<a href="{{server.url}}">
87-
<img src="/resources/img/frontpage/discord-logo.png" alt="{{channel.name}}">
88-
<h4>{{server.name}}</h4>
89-
</a>
90-
</li>
91-
{% endfor %}
92-
</ul>
93-
<span>More chat venues are listed below.</span>
94-
</div>
95-
</div>
96-
</div>
97-
</div>
58+
<div class="wrap">
59+
<div class="inner-box">
60+
<div class="community">
61+
<div class="discourse">
62+
<h2>Discourse</h2>
63+
<span>Forums</span>
64+
<ul>
65+
{% for forum in site.data.chats-forums.discourseForums %}
66+
<li>
67+
<img src="/resources/img/frontpage/discourse-logo.png" alt="{{forum.title}}">
68+
<div>
69+
<h4><a href="{{forum.url}}">{{forum.title}}</a></h4>
70+
<p>{{forum.subtitle}}</p>
71+
</div>
72+
</li>
73+
{% endfor %}
74+
</ul>
75+
</div>
76+
<div class="discord">
77+
<h2>Discord</h2>
78+
<span>Real-time chat</span>
79+
<ul>
80+
{% for server in site.data.chats-forums.discordServers %}
81+
<li>
82+
<a href="{{server.url}}">
83+
<img src="/resources/img/frontpage/discord-logo.png" alt="{{channel.name}}">
84+
<h4>{{server.name}}</h4>
85+
</a>
86+
</li>
87+
{% endfor %}
88+
</ul>
89+
<span>More chat venues are listed below.</span>
90+
</div>
91+
</div>
92+
</div>
93+
</div>
9894
</section>
9995
<section class="upcoming-events">
100-
<div class="wrap">
101-
<div class="inner-box">
102-
<div class="heading-box">
103-
<h2>Upcoming Events and Trainings</h2>
104-
</div>
105-
<div class="events-items-list">
106-
{% assign upcomingEvents = '' | split: ',' %}
107-
{% capture now %}{{site.time | date: '%s' | plus: 0}}{% endcapture %}
108-
{% for event in site.events %}
109-
{% capture date %}{{event.end|date: '%s'|plus: 86400}}{% endcapture %}
110-
{% if now <= date %} {% assign upcomingEvents=upcomingEvents | push: event %} {% endif %} {% endfor %} {% for event in
111-
upcomingEvents limit:6 %} <div href="#" class="event-item">
112-
<a href="{{event.link-out}}" class="card">
113-
<img src="{{event.logo}}" alt="{{event.title}}">
114-
<div class="card-text">
115-
<h4>{{event.title}}</h4>
116-
<ul>
117-
<li class="event-location">{{event.location}}</li>
118-
</ul>
119-
<ul>
120-
<li class="date-event">{{event.start | date_to_string}} {% if event.start != event.end %}- {{event.end |
121-
date_to_string}}{% endif %}</li>
122-
</ul>
123-
</div>
124-
</a>
125-
</div>
126-
{% endfor %}
127-
</div>
128-
<div class="call-to-action action-medium">
129-
<p class="align-top">See <a href="/events/">more events</a> or <a
130-
href="https://github.com/scala/scala-lang/tree/master/events">add one to our events feed</a></p>
131-
</div>
132-
{% include upcoming-training.html %}
133-
</div>
134-
</div>
96+
<div class="wrap">
97+
<div class="inner-box">
98+
<div class="heading-box">
99+
<h2>Upcoming Events and Trainings</h2>
100+
</div>
101+
<div class="events-items-list">
102+
{% assign upcomingEvents = '' | split: ',' %}
103+
{% capture now %}{{site.time | date: '%s' | plus: 0}}{% endcapture %}
104+
{% for event in site.events %}
105+
{% capture date %}{{event.end|date: '%s'|plus: 86400}}{% endcapture %}
106+
{% if now <= date %} {% assign upcomingEvents=upcomingEvents | push: event %} {% endif %} {% endfor %} {% for event in
107+
upcomingEvents limit:6 %} <div href="#" class="event-item">
108+
<a href="{{event.link-out}}" class="card">
109+
<img src="{{event.logo}}" alt="{{event.title}}">
110+
<div class="card-text">
111+
<h4>{{event.title}}</h4>
112+
<ul>
113+
<li class="event-location">{{event.location}}</li>
114+
</ul>
115+
<ul>
116+
<li class="date-event">{{event.start | date_to_string}} {% if event.start != event.end %}- {{event.end |
117+
date_to_string}}{% endif %}</li>
118+
</ul>
119+
</div>
120+
</a>
121+
</div>
122+
{% endfor %}
123+
</div>
124+
<div class="call-to-action action-medium">
125+
<p class="align-top">See <a href="/events/">more events</a> or <a
126+
href="https://github.com/scala/scala-lang/tree/master/events">add one to our events feed</a></p>
127+
</div>
128+
{% include upcoming-training.html %}
129+
</div>
130+
</div>
135131
</section>

0 commit comments

Comments
 (0)