Skip to content

Commit 04a4252

Browse files
authored
Merge branch 'main' into all-contributors/add-pgmccann
2 parents fc0a7e1 + 0a5b590 commit 04a4252

8 files changed

Lines changed: 114 additions & 23 deletions

File tree

.all-contributorsrc

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,15 @@
1717
"content"
1818
]
1919
},
20+
{
21+
"login": "Llannelongue",
22+
"name": "Loïc Lannelongue",
23+
"avatar_url": "https://avatars.githubusercontent.com/u/22586038?v=4",
24+
"profile": "http://www.lannelongue-group.org",
25+
"contributions": [
26+
"projectManagement"
27+
]
28+
},
2029
{
2130
"login": "pgmccann",
2231
"name": "Paddy McCann",
@@ -35,8 +44,51 @@
3544
"profile": "http://www.software.ac.uk",
3645
"contributions": [
3746
"content",
47+
"research",
48+
"ideas"
49+
]
50+
},
51+
{
52+
"login": "wong-hl",
53+
"name": "Hui Ling Wong",
54+
"avatar_url": "https://avatars.githubusercontent.com/u/71387295?v=4",
55+
"profile": "https://hui-ling-wong.com/",
56+
"contributions": [
57+
"ideas",
58+
"research"
59+
]
60+
},
61+
{
62+
"login": "colinsauze",
63+
"name": "Colin Sauze",
64+
"avatar_url": "https://avatars.githubusercontent.com/u/1053628?v=4",
65+
"profile": "https://colinsauze.github.io/",
66+
"contributions": [
67+
"ideas",
3868
"research"
3969
]
70+
},
71+
{
72+
"login": "sfmig",
73+
"name": "sfmig",
74+
"avatar_url": "https://avatars.githubusercontent.com/u/33267254?v=4",
75+
"profile": "http://sfmig.github.io",
76+
"contributions": [
77+
"ideas",
78+
"research",
79+
"content"
80+
]
81+
},
82+
{
83+
"login": "sdruskat",
84+
"name": "Stephan Druskat",
85+
"avatar_url": "https://avatars.githubusercontent.com/u/3007126?v=4",
86+
"profile": "http://sdruskat.net",
87+
"contributions": [
88+
"ideas",
89+
"research",
90+
"code"
91+
]
4092
}
4193
]
4294
}

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Computer People Things
1+
# Explainer of Words for Computer People and Things
22

33
![Animation showing the use of Up Goer Five editor to define a scientist or research software engineer.](little_demo.gif)
44

@@ -38,6 +38,13 @@ This was made at [CW26](https://www.software.ac.uk/workshop/collaborations-works
3838
<td align="center" valign="top" width="14.28%"><a href="https://github.com/SaranjeetKaur"><img src="https://avatars.githubusercontent.com/u/28556616?v=4?s=100" width="100px;" alt="Saranjeet Kaur"/><br /><sub><b>Saranjeet Kaur</b></sub></a><br /><a href="#content-SaranjeetKaur" title="Content">🖋</a></td>
3939
<td align="center" valign="top" width="14.28%"><a href="https://orcid.org/0000-0002-9324-2775"><img src="https://avatars.githubusercontent.com/u/1590010?v=4?s=100" width="100px;" alt="Paddy McCann"/><br /><sub><b>Paddy McCann</b></sub></a><br /><a href="#content-pgmccann" title="Content">🖋</a> <a href="#ideas-pgmccann" title="Ideas, Planning, & Feedback">🤔</a> <a href="#research-pgmccann" title="Research">🔬</a></td>
4040
<td align="center" valign="top" width="14.28%"><a href="http://www.software.ac.uk"><img src="https://avatars.githubusercontent.com/u/1507151?v=4?s=100" width="100px;" alt="Neil Chue Hong"/><br /><sub><b>Neil Chue Hong</b></sub></a><br /><a href="#content-npch" title="Content">🖋</a> <a href="#research-npch" title="Research">🔬</a></td>
41+
<td align="center" valign="top" width="14.28%"><a href="http://www.lannelongue-group.org"><img src="https://avatars.githubusercontent.com/u/22586038?v=4?s=100" width="100px;" alt="Loïc Lannelongue"/><br /><sub><b>Loïc Lannelongue</b></sub></a><br /><a href="#projectManagement-Llannelongue" title="Project Management">📆</a></td>
42+
<td align="center" valign="top" width="14.28%"><a href="https://hui-ling-wong.com/"><img src="https://avatars.githubusercontent.com/u/71387295?v=4?s=100" width="100px;" alt="Hui Ling Wong"/><br /><sub><b>Hui Ling Wong</b></sub></a><br /><a href="#ideas-wong-hl" title="Ideas, Planning, & Feedback">🤔</a> <a href="#research-wong-hl" title="Research">🔬</a></td>
43+
<td align="center" valign="top" width="14.28%"><a href="https://colinsauze.github.io/"><img src="https://avatars.githubusercontent.com/u/1053628?v=4?s=100" width="100px;" alt="Colin Sauze"/><br /><sub><b>Colin Sauze</b></sub></a><br /><a href="#ideas-colinsauze" title="Ideas, Planning, & Feedback">🤔</a> <a href="#research-colinsauze" title="Research">🔬</a></td>
44+
<td align="center" valign="top" width="14.28%"><a href="http://sfmig.github.io"><img src="https://avatars.githubusercontent.com/u/33267254?v=4?s=100" width="100px;" alt="sfmig"/><br /><sub><b>sfmig</b></sub></a><br /><a href="#ideas-sfmig" title="Ideas, Planning, & Feedback">🤔</a> <a href="#research-sfmig" title="Research">🔬</a> <a href="#content-sfmig" title="Content">🖋</a></td>
45+
</tr>
46+
<tr>
47+
<td align="center" valign="top" width="14.28%"><a href="http://sdruskat.net"><img src="https://avatars.githubusercontent.com/u/3007126?v=4?s=100" width="100px;" alt="Stephan Druskat"/><br /><sub><b>Stephan Druskat</b></sub></a><br /><a href="#ideas-sdruskat" title="Ideas, Planning, & Feedback">🤔</a> <a href="#research-sdruskat" title="Research">🔬</a> <a href="#code-sdruskat" title="Code">💻</a></td>
4148
</tr>
4249
</tbody>
4350
</table>

docs/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ minimal_mistakes_skin : "default" # "air", "aqua", "contrast", "dark", "dirt"
1717
# Site Settings
1818
locale : "en-US"
1919
direction : # "ltr" (default), "rtl" # set the direction of the page
20-
title : "Stuff explainer"
20+
title : "Explainer of Words for Computer People and Things"
2121
title_separator : "-"
2222
subtitle : # site tagline that appears below site title in masthead
2323
name : "Your Name"

docs/_data/terms.yml

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,54 @@
1-
# _data/features.yml
1+
# _data/terms.yml
22

3-
- title: "Term 1"
4-
excerpt: "Longer description of the term."
5-
url: "/feature-one/"
3+
- term: "Software"
4+
definition: "Written steps to control a computer wrapped together"
5+
description: "Steps that tell a computer what to do and how to do it. Includes all the sets of steps a computer uses, like the main set of steps that runs the computer and other sets of steps people use to do different jobs."
66

7-
- title: "Term 2"
8-
excerpt: "Longer description of the term."
9-
url: "/feature-one/"
7+
- term: "Research (process)"
8+
definition: "A way to understand and look for new facts"
9+
description: "A planned way of looking into something to find out new things, check if ideas are right, or learn more about it. It means getting facts, writing them down, and working through them so they can help people know what to do. This kind of work can be done to learn new ideas, or to help fix real problems in the world."
1010

11-
- title: "Term 3"
12-
excerpt: "Longer description of the term."
13-
url: "/feature-one/"
11+
- term: "Research (findings)"
12+
definition: "Piece of work sharing new facts made from ways to understand"
13+
description: "Piece of work sharing new facts made from ways to understand the world"
1414

15-
- title: "Term 4"
16-
excerpt: "Longer description of the term."
17-
url: "/feature-one/"
15+
- term: "Scientist"
16+
definition: "Someone who looks at the world around them and asks questions like, why is it the way it is or how does it work"
17+
description: "Person who's job is to find out new things. They get facts and other things to help them come up with ideas and learn more about one part of the world, like living things, what things are made of, or how things move. They work to understand the world around us, fix problems, and tell other people what they find so everyone can know more."
1818

19-
- title: "Term 5"
20-
excerpt: "Longer description of the term."
21-
url: "/feature-one/"
19+
- term: "Data"
20+
definition: "Numbers and words that can be used to answer questions"
21+
description: "Pieces of things like numbers, words, pictures, or sounds. People work on these pieces to sort them and give them clear ideas, decide things and fix problems."
2222

23-
- title: "Term 6"
24-
excerpt: "Longer description of the term."
25-
url: "/feature-one/"
23+
- term: "University"
24+
definition: "School for students and teachers to learn how to understand and look for new facts"
25+
description: "A place where people go after school to learn more and find out new things. It has parts for people who are just starting and parts for people who have gone further. There are teachers and people work to find out new things."
26+
27+
- term: "Community"
28+
definition: "Group of people who have a shared interest or want or have something the same"
29+
description: "A group of people who share things like where they live, what they like, or who they are. They often know each other, help each other, and feel like they are part of the same group."
30+
31+
- term: "Collaborations Workshop"
32+
definition: "Lots of different people working together meeting"
33+
description: "An often exciting and sometimes fun meeting bringing many different people to have interesting conversations to change the world and themselves"
34+
35+
- term: "Research Institution"
36+
definition: "A place where people work to understand more about the world"
37+
description: "A place where people work to understand more about the world (and look for new facts)"
38+
39+
- term: "Manager"
40+
definition: "A person who manages other people"
41+
description: "A person who helps a group of people work well together. They plan what work needs to be done, give jobs to people, and make sure everything stays on track."
42+
43+
- term: "Principal Investigator"
44+
definition: "Money-getting for understanding person"
45+
description: "I lead a group of different people who work to understand the world or people by looking for new facts. My work is to get money to let us do this, and make sure that we do it in a good way so that others can learn from it."
46+
47+
- term: "Research Community Manager"
48+
definition: "World questioning people grouper"
49+
description: "I lead a group of different people who work to understand the world or people by looking for new facts. My work is to get money to let us do this, and make sure that we do it in a good way so that others can learn from it."
50+
51+
- term: "Research Software Engineer"
52+
definition: "World Questioning Computer Person"
53+
description: "I am a person who writes computer work to help find answers for a question. My work is to build and fix computer work used in studies. I make sure they work and share it with other people to use."
54+
-103 KB
Binary file not shown.
-106 KB
Binary file not shown.

docs/assets/images/rse.png

130 KB
Loading

docs/index.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
layout: splash
44
---
55

6+
{% include figure popup=true image_path="/assets/images/rse.png" alt="Drawing showing a sceptical person asking a person working on a computer 'You do what?', and the other person answering 'I am a world questioning computer person' which is expressing the answer 'I am an RSE, Research Software Engineer' in the top 1,000 most used word in English." %}
7+
8+
69
<div class="feature__wrapper">
710
{% for item in site.data.terms %}
811
<div class="feature__item">
@@ -16,10 +19,10 @@
1619

1720
<div class="archive__item-body">
1821
<!--<h2 class="archive__item-title">-->
19-
<a href="{{ item.url }}">{{ item.title }}</a>
22+
<a href="{{ item.url }}">{{ item.term }}</a>
2023
</h2>
2124
<div class="archive__item-excerpt">
22-
<p>{{ item.excerpt }}</p>
25+
<h3>{{ item.definition }}</h3><br/><p>{{ item.description }}</p>
2326
</div>
2427
</div>
2528

0 commit comments

Comments
 (0)