Skip to content

Commit 47b6032

Browse files
julienrfjulienrf
committed
Update website to new SIP data and process
1 parent eaa0609 commit 47b6032

File tree

12 files changed

+543
-636
lines changed

12 files changed

+543
-636
lines changed

‎_data/sip-data.yml

+31-11
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,47 @@
1+
design:
2+
color: "#839496"
3+
text: "Design"
4+
5+
implementation:
6+
color: "#839496"
7+
text: "Implementation"
8+
9+
submitted:
10+
color: "#2aa198"
11+
text: "Submitted"
12+
113
under-review:
214
color: "#b58900"
315
text: "Under Review"
416

5-
pending:
17+
vote-requested:
618
color: "#b58900"
7-
text: "Pending"
8-
9-
dormant:
10-
color: "#839496"
11-
text: "Dormant"
19+
text: "Vote Requested"
1220

13-
under-revision:
14-
color: "#2aa198"
15-
text: "Under Revision"
21+
waiting-for-implementation:
22+
color: "#b58900"
23+
text: "Waiting for Implementation"
1624

1725
accepted:
1826
color: "#859900"
1927
text: "Accepted"
2028

21-
complete:
29+
shipped:
2230
color: "#859900"
23-
text: "Complete"
31+
text: "Shipped"
2432

2533
rejected:
2634
color: "#dc322f"
2735
text: "Rejected"
36+
37+
withdrawn:
38+
color: "#839496"
39+
text: "Withdrawn"
40+
41+
accept:
42+
color: "#859900"
43+
text: "Accept"
44+
45+
reject:
46+
color: "#dc322f"
47+
text: "Reject"

‎_layouts/sip.html

+21-8
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,32 @@
1414
<!-- TOC -->
1515
<div class="content-nav">
1616
<div class="inner-box sidebar-toc-wrapper sip-toc" style="">
17-
{% if page.vote-status %}
18-
<h5 class="contents">SIP Committee Decision</h5>
19-
<div class="tag" style="background-color: {{ site.data.sip-data[page.vote-status].color }}">{{ site.data.sip-data[page.vote-status].text }}</div>
20-
<p class="vote-text" style="color: {{ site.data.sip-data[page.vote-status].color }}">
21-
{% if page.vote-text %}{{ page.vote-text }}{% endif %}
22-
</p>
23-
{% endif %}
17+
<h5 class="contents">Status</h5>
18+
{% if page.stage == "implementation" %}
19+
<p>
20+
This proposal has been accepted by the committee.
21+
{% if page.status == "waiting-for-implementation" %}
22+
An implementation is welcome in the compiler.
23+
{% else %}
24+
It might be available as an experimental feature in the latest version of the compiler.
25+
{% endif %}
26+
</p>
27+
{% else if page.stage == "completed" %}
28+
<p>
29+
This proposal has been implemented,
30+
{% if page.status == "accepted" %}
31+
it will be available in the next minor release of the compiler.
32+
{% else if page.status == "shipped" %}
33+
it is available in the latest version of the compiler.
34+
{% endif %}
35+
</p>
36+
{% endif %}
2437
<h5 class="contents">SIP Contents</h5>
2538
<div class="inner-toc" id="sidebar-toc">
2639
<div id="toc"></div>
2740
</div>
2841
<hr>
29-
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/main/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
42+
<div class="help-us"><a href="https://github.com/scala/improvement-proposals/blob/main/content/{{ page.name }}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>
3043
</div>
3144
</div>
3245

‎_layouts/sips.html

+3-12
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,18 @@ <h5 class="contents" style="line-height: 1.1; margin-bottom: 18px;">Scala Improv
1717
<div style="text-align: center; margin-bottom: 24px;">
1818
<a href="{{ site.baseurl }}/sips/all.html" class="button">View all SIPs</a>
1919
</div>
20-
<h5 class="contents" style="margin-bottom: 0;">SIP/SPP Meetings</h5>
20+
<h5 class="contents" style="margin-bottom: 0;">SIP Meetings</h5>
2121
<div id="sip-meetings">
22-
<div id="upcoming-meeting">
23-
<h6>Next meeting:</h6>
24-
<div id="meeting-title">&nbsp;&nbsp;<span class="tag" style="background-color: #dc322f; top: 0px; margin-bottom: 6px;">Live</span></div>
25-
<div id="meeting-time"></div>
26-
<div id="live-on-youtube">
27-
Tune in and join us, live! Ask the SIP committee questions, weigh in, or just follow along.
28-
<br><a id="watch-meeting">Watch →</a>
29-
</div>
30-
</div>
3122
<div id="meeting-minutes">
3223
<ul>
3324
<li><a href="{{ site.baseurl }}/sips/minutes-list.html">Meeting Minutes</a></li>
3425
<li><a href="https://www.youtube.com/channel/UCn_8OeZlf5S6sqCqntAvaIw/videos?view=2&sort=dd&shelf_id=1&live_view=502">Meeting Video Registrations (YouTube)</a></li>
3526
</ul>
3627
</div>
3728
</div>
38-
<h5 class="contents" style="margin-bottom: 0;">Writing a SIP</h5>
29+
<h5 class="contents" style="margin-bottom: 0;">Submitting a SIP</h5>
3930
<ul>
40-
<li><a href="{{ site.baseurl }}/sips/sip-submission.html">Submitting a SIP</a></li>
31+
<li><a href="{% link _sips/process-specification.md %}">Process Specification</a></li>
4132
<li><a href="{{ site.baseurl }}/sips/sip-tutorial.html">Tutorial: Writing a SIP</a></li>
4233
</ul>
4334
<div class="help-us"><a href="https://github.com/scala/docs.scala-lang/blob/main/{% if page.collection %}{{ page.relative_path }}{% else %}{{ page.path }}{% endif %}"><i class="fa fa-pencil" aria-hidden="true"></i> Problem with this page?<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Please help us fix it!</a></div>

‎_sass/layout/sips.scss

+8-57
Original file line numberDiff line numberDiff line change
@@ -103,41 +103,29 @@
103103

104104
.sips {
105105

106-
.pending,
107-
.completed,
108-
.dormant,
109-
.rejected {
110-
.date {
111-
display: block;
112-
font-size: $font-size-small;
113-
text-transform: uppercase;
114-
font-weight: $font-bold;
115-
color: $base-font-color-light;
116-
margin-top: 4px;
117-
}
106+
.sip-list {
118107

119108
strong {
120109
font-weight: $font-black;
110+
display: block;
111+
}
112+
113+
.no-fragmentation {
114+
break-inside: avoid;
121115
}
122116

123117
.tag {
124118
float: left;
125-
position: relative;
126119
display: block;
127-
top: 3px;
128120
color: #fff;
129121
text-transform: uppercase;
130122
font-size: 11px;
131123
font-weight: 700;
132124
padding: 1px 5px;
125+
margin-left: 1px;
126+
margin-top: 1px;
133127
}
134-
}
135128

136-
.pending {
137-
display: flex;
138-
// flex-direction: column;
139-
// flex-wrap: wrap;
140-
// max-height: 400px;
141129
ul {
142130
list-style: inside disc;
143131
-webkit-column-count: 2; /* Chrome, Safari, Opera */
@@ -163,41 +151,4 @@
163151
}
164152
}
165153

166-
.other-sips {
167-
@include display(flex);
168-
@include flex-direction(row);
169-
@include flex-wrap(wrap);
170-
@include justify-content(space-between);
171-
172-
.completed,
173-
.dormant,
174-
.rejected {
175-
display: flex;
176-
flex-direction: column;
177-
// justify-content: flex-end;
178-
position: relative;
179-
flex: 0 1 calc(50% - 1em);
180-
181-
@include bp(medium) {
182-
flex: 0 1 calc(100% - 0.5em);
183-
}
184-
185-
ul {
186-
// padding-left: 0px;
187-
188-
li {
189-
// margin-left: 1em;
190-
padding-bottom: 24px;
191-
line-height: 1;
192-
}
193-
194-
a {
195-
color: $gray-darker;
196-
&:hover {
197-
color: $brand-primary;
198-
}
199-
}
200-
}
201-
}
202-
}
203154
}

‎_sips/all.md

+77-50
Original file line numberDiff line numberDiff line change
@@ -7,65 +7,92 @@ redirect_from:
77
- "/sips/pending/index.html"
88
---
99

10+
{% assign sips = site.sips | sort: title %}
11+
{% assign sipData = site.data.sip-data %}
12+
13+
## Pre-SIP Discussions
14+
15+
You can find so-called “pre-SIP discussions” in the Scala Contributors forum, under
16+
the category [Scala Improvement Process](https://contributors.scala-lang.org/c/sip/13).
17+
The goal of pre-SIP discussions is to gather initial community feedback and support.
1018

1119
## Pending SIPs
1220

13-
<div class="pending">
21+
Proposals that are at the design or implementation stage, and that are actively
22+
discussed by the committee and the proposals’ authors. Click on a proposal to
23+
read its content, or the corresponding discussions on GitHub if its design has
24+
not been accepted yet.
25+
26+
<div class="sip-list">
1427
<ul>
15-
{% assign sips = site.sips | sort: date | reverse %}
1628
{% for sip in sips %}
17-
{% if sip.vote-status == "under-review" or sip.vote-status == "pending" or sip.vote-status == "under-revision" %}
18-
<li>
19-
<strong><a href="{{ sip.url }}">{{ sip.title }}</a></strong>
20-
<div class="date">{{ sip.date | date: '%B %Y' }}</div>
21-
<div class="tag" style="background-color: {{ site.data.sip-data[sip.vote-status].color }}">{{ site.data.sip-data[sip.vote-status].text }}</div>
29+
{% if sip.stage == "design" or sip.stage == "implementation" %}
30+
<li class="no-fragmentation">
31+
<strong>
32+
<a href="{% if sip.pull-request-number %}https://github.com/scala/improvement-proposals/pull/{{ sip.pull-request-number }}{% else %}{{ sip.url }}{% endif %}">
33+
{{ sip.title }}
34+
</a>
35+
</strong>
36+
<div class="tag" style="background-color: {{ sipData[sip.stage].color }}">Stage: {{ sipData[sip.stage].text }}</div>
37+
<div class="tag" style="background-color: {{ sipData[sip.status].color }}">Status: {{ sipData[sip.status].text }}</div>
38+
{% if sip.recommendation %}
39+
<div class="tag" style="background-color: {{ sipData[sip.recommendation].color }}">Recommendation: {{ sipData[sip.recommendation].text }}</div>
40+
{% endif %}
2241
</li>
2342
{% endif %}
2443
{% endfor %}
2544
</ul>
2645
</div>
2746

28-
<div class="other-sips">
29-
<div class="completed">
30-
<h2>Completed</h2>
31-
<ul>
32-
{% for sip in sips %}
33-
{% if sip.vote-status == "complete" or sip.vote-status == "accepted" %}
34-
<li>
35-
<strong><a href="{{ sip.url }}">{{ sip.title }}</a></strong>
36-
<div class="date">{{ sip.date | date: '%B %Y' }}</div>
37-
<div class="tag" style="background-color: {{ site.data.sip-data[sip.vote-status].color }}">{{ site.data.sip-data[sip.vote-status].text }}</div>
38-
</li>
39-
{% endif %}
40-
{% endfor %}
41-
</ul>
42-
</div>
43-
<div class="dormant">
44-
<h2>Dormant</h2>
45-
<ul>
46-
{% for sip in sips %}
47-
{% if sip.vote-status == "dormant" %}
48-
<li>
49-
<strong><a href="{{ sip.url }}">{{ sip.title }}</a></strong>
50-
<div class="date">{{ sip.date | date: '%B %Y' }}</div>
51-
<div class="tag" style="background-color: {{ site.data.sip-data[sip.vote-status].color }}">{{ site.data.sip-data[sip.vote-status].text }}</div>
52-
</li>
53-
{% endif %}
54-
{% endfor %}
55-
</ul>
56-
</div>
57-
<div class="rejected">
58-
<h2>Rejected</h2>
59-
<ul>
60-
{% for sip in sips %}
61-
{% if sip.vote-status == "rejected" %}
62-
<li>
63-
<strong><a href="{{ sip.url }}">{{ sip.title }}</a></strong>
64-
<div class="date">{{ sip.date | date: '%B %Y' }}</div>
65-
<div class="tag" style="background-color: {{ site.data.sip-data[sip.vote-status].color }}">{{ site.data.sip-data[sip.vote-status].text }}</div>
66-
</li>
67-
{% endif %}
68-
{% endfor %}
69-
</ul>
70-
</div>
47+
## Completed SIPs
48+
49+
Proposals that have been implemented in the compiler and that are available as a stable
50+
feature of the compiler (shipped), or that will be available in the next minor release
51+
of the compiler (accepted). Click on a proposal to read its content.
52+
53+
<div class="sip-list">
54+
<ul>
55+
{% for sip in sips %}
56+
{% if sip.stage == "completed" %}
57+
<li class="no-fragmentation">
58+
<strong><a href="{{ sip.url }}">{{ sip.title }}</a></strong>
59+
<div class="tag" style="background-color: {{ sipData[sip.status].color }}">{{ sipData[sip.status].text }}</div>
60+
</li>
61+
{% endif %}
62+
{% endfor %}
63+
</ul>
64+
</div>
65+
66+
## Rejected SIPs
67+
68+
Proposals that have been rejected by the committee. Click on a proposal to read the
69+
corresponding discussions on GitHub.
70+
71+
<div class="sip-list">
72+
<ul>
73+
{% for sip in sips %}
74+
{% if sip.status == "rejected" %}
75+
<li>
76+
<strong><a href="https://github.com/scala/improvement-proposals/pull/{{ sip.pull-request-number }}">{{ sip.title }}</a></strong>
77+
</li>
78+
{% endif %}
79+
{% endfor %}
80+
</ul>
81+
</div>
82+
83+
## Withdrawn SIPs
84+
85+
Proposals that have been withdrawn by their authors. Click on a proposal to read the
86+
corresponding discussions on GitHub.
87+
88+
<div class="sip-list">
89+
<ul>
90+
{% for sip in sips %}
91+
{% if sip.status == "withdrawn" %}
92+
<li>
93+
<strong><a href="https://github.com/scala/improvement-proposals/pull/{{ sip.pull-request-number }}">{{ sip.title }}</a></strong>
94+
</li>
95+
{% endif %}
96+
{% endfor %}
97+
</ul>
7198
</div>

0 commit comments

Comments
 (0)