Skip to content

Commit 38454ad

Browse files
anatoliykmetyukanatoliykmetyuk
committed
Projects are fetched from a dedicated YAML array
1 parent 956efa7 commit 38454ad

File tree

6 files changed

+70
-73
lines changed

6 files changed

+70
-73
lines changed

‎_data/projects.yml

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
- name: Processes managed by the Scala Center
2+
projects:
3+
- name: Advisory Board Meeting
4+
web: https://scala.epfl.ch/records.html#board-meeting-minutes
5+
github: https://github.com/scalacenter/advisoryboard
6+
origin:
7+
contributors: [sjrd]
8+
process: true
9+
description: Each quarter the advisory board meets to make recommendations on the activities of the Scala Center.
10+
11+
- name: Scala Improvement Process
12+
web: https://docs.scala-lang.org/sips/index.html
13+
github: https://github.com/scala/docs.scala-lang/tree/master/_sips
14+
origin: https://github.com/scalacenter/advisoryboard/blob/master/proposals/004-sip-and-slip-coordination.md
15+
contributors: [jorge, darja, sjrd]
16+
process: true
17+
description: "Set of processes involving the community and aiming at improving the Scala language."
18+
19+
20+
- name: Education
21+
projects:
22+
- name: Documentation Improvements
23+
web: https://www.scala-lang.org
24+
github:
25+
origin: https://github.com/scalacenter/advisoryboard/blob/master/proposals/008-websites.md
26+
contributors: [julien, jorge]
27+
description: "Simplify and upgrade code examples, improve the structure and the design of the scala-lang.org website."

‎_includes/project-block.html

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
2-
{% assign projects_by_status = projects | sort: "priority" | reverse %}
3-
{% for project in projects_by_status %}
1+
{% for project in projects %}
42
<div class="col-md-6">
5-
<div class="project" id="{{ project.label }}">
3+
<div class="project">
64
<div class="header" data-title="{{ project.name }}">
75
{% if project.logo %}
86
<img class="project-logo" src="{{ project.logo }}" alt="{{ project.name }}"/>
@@ -11,24 +9,19 @@ <h3>{{ project.name }}</h3>
119
{% endif %}
1210
<div class="references">
1311
{% if project.web %}
14-
<a href="{{ project.web }}" target="_blank"><i class="fa fa-globe"></i></a>
12+
<a href="{{ project.web }}" target="_blank"><i class="fa fa-globe"></i></a>
1513
{% endif %}
1614
{% if project.github %}
17-
<a href="{{ project.github }}" target="_blank"><i class="fa fa-github"></i></a>
15+
<a href="{{ project.github }}" target="_blank"><i class="fa fa-github"></i></a>
16+
{% endif %}
17+
{% if project.origin %}
18+
<a href="{{ project.origin }}" target="_blank"><i class="fa fa-eye"></i></a>
1819
{% endif %}
1920
</div>
2021
</div>
2122
<div class="clearfix"></div>
2223
<div class="content">
2324
{{ project.description }}
24-
{% if project.content.size > 1 %}
25-
<a href="#" class="read-more clearfix">
26-
<i class="fa fa-plus"></i> Read more
27-
</a>
28-
{% endif %}
29-
{% if project.origin %}
30-
<a class="origin" href="{{ project.origin }}"><i class="fa fa-eye"></i> <span class="hidden-xs hidden-sm">Origin of the project</span></a>
31-
{% endif %}
3225
</div>
3326
<div class="hidden modal-content-text">
3427
{{ project }}
@@ -46,6 +39,13 @@ <h3>{{ project.name }}</h3>
4639
</ul>
4740
{% endif %}
4841
</div>
42+
<div class="project_status">
43+
{% if project.process %}
44+
<img src="/resources/img/project_status_ongoing.png" >
45+
{% else %}
46+
<img src="/resources/img/project_status_done.png" >
47+
{% endif %}
48+
</div>
4949
</div>
5050
</div>
5151
{% endfor %}

‎hall-of-fame.html

+11-53
Original file line numberDiff line numberDiff line change
@@ -8,59 +8,17 @@
88
<div class="clearfix"></div>
99

1010
<div class="projects">
11-
{% assign projects = site.projects | where: "category", "tooling" %}
12-
<div class="col-md-12 title tooling">
13-
<h2>Tooling</h2>
14-
</div>
15-
<div class=" project-list tooling">
11+
{% for category in site.data.projects %}
12+
<div class="col-md-12 title">
13+
<h2>{{ category.name }}</h2>
14+
</div>
15+
<div class=" project-list tooling">
16+
{% assign projects = category.projects %}
1617
{% include project-block.html %}
17-
</div>
18-
{% assign projects = site.projects | where: "category", "scala3migration" %}
19-
<div class="col-md-12 title scala3migration">
20-
<h2>Scala 3 Migration</h2>
21-
</div>
22-
<div class=" project-list scala3migration">
23-
{% include project-block.html %}
24-
</div>
25-
{% assign projects = site.projects | where: "category", "enhancement" %}
26-
<div class="col-md-12 title enhancement">
27-
<h2>Scala Language Enhancements</h2>
28-
</div>
29-
<div class=" project-list enhancement">
30-
{% include project-block.html %}
31-
</div>
32-
{% assign projects = site.projects | where: "category", "community" %}
33-
<div class="col-md-12 title community">
34-
<h2>Community</h2>
35-
</div>
36-
<div class=" project-list community">
37-
{% include project-block.html %}
38-
</div>
39-
{% assign projects = site.projects | where: "category", "education" %}
40-
<div class="col-md-12 title education">
41-
<h2>Education</h2>
42-
</div>
43-
<div class=" project-list education">
44-
{% include project-block.html %}
45-
</div>
46-
{% assign projects = site.projects | where: "category", "process" %}
47-
<div class="col-md-12 title process">
48-
<h2>Processes Managed by the Scala Center</h2>
49-
</div>
50-
<div class=" project-list process">
51-
{% include project-block.html %}
52-
</div>
53-
<div class="col-md-12 no-results">
54-
<h3>No results found</h3>
55-
</div>
18+
</div>
19+
{% endfor %}
5620
</div>
5721
</div>
58-
59-
<div class="modal fade description-dialog" tabindex="-1" role="dialog" id="modal-description">
60-
<div class="modal-dialog modal-lg" role="document">
61-
<div class="modal-content">
62-
<div class="modal-body project">
63-
</div>
64-
</div><!-- /.modal-content -->
65-
</div><!-- /.modal-dialog -->
66-
</div>
22+
<div class="row icon-attribution">
23+
Icons courtesy of <a href="https://blendicons.com/">Blend Icons</a>
24+
</div>

‎resources/css/main.scss

+18-6
Original file line numberDiff line numberDiff line change
@@ -1519,12 +1519,13 @@ ul.nav {
15191519
line-height: 1.5;
15201520
}
15211521

1522-
.project .status {
1523-
text-transform: uppercase;
1524-
font-size: 12px;
1525-
padding: 2px 6px;
1526-
border-radius: 3px;
1527-
margin-right: 10px;
1522+
.project .project_status img {
1523+
width: 50px;
1524+
height: 50px;
1525+
1526+
position: absolute;
1527+
bottom: 25px;
1528+
left: 25px;
15281529
}
15291530

15301531
.project .status.active {
@@ -1564,3 +1565,14 @@ ul.nav {
15641565
border-radius: 50%;
15651566
object-fit: cover;
15661567
}
1568+
1569+
.icon-attribution {
1570+
font-size: 12px;
1571+
color: #999;
1572+
margin-top: 10px;
1573+
align-self: center;
1574+
1575+
a {
1576+
color: #999;
1577+
}
1578+
}

‎resources/img/project_status_done.png

8.85 KB
Loading

‎resources/img/project_status_ongoing.png

9.42 KB
Loading

0 commit comments

Comments
 (0)