Merge pull request #404 from github/on-demand-content · github/training-kit@d367b9a · GitHub
Skip to content

Commit d367b9a

Browse files
author
Hector Alfaro
authored
Merge pull request #404 from github/on-demand-content
Add on-demand content
2 parents 8eb8683 + 06c0b02 commit d367b9a

527 files changed

Lines changed: 45545 additions & 121 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎_config.yml‎

Lines changed: 2 additions & 2 deletions

‎_data/navigation.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# main links links
2+
main:
3+
# Keep original nav, do not replace
4+
- title: "Introduction to GitHub"
5+
url: /intro-to-github/
6+
- title: "Using GitHub Desktop"
7+
beta: true
8+
url: /github-desktop/
9+
- title: "Community"
10+
url: /community/
11+
12+
intro-nav:
13+
- title: "Welcome"
14+
url: /intro-to-github/
15+
- title: "Exploring GitHub"
16+
url: /intro-to-github/01/
17+
- title: "Repository Features"
18+
url: /intro-to-github/02/
19+
- title: "GitHub Flow"
20+
url: /intro-to-github/03/
21+
- title: "Creating a Branch"
22+
url: /intro-to-github/04/
23+
- title: "Working on GitHub"
24+
url: /intro-to-github/05/
25+
- title: "Collaborating on GitHub"
26+
url: /intro-to-github/06/
27+
- title: "Editing Files"
28+
url: /intro-to-github/07/
29+
- title: "Merging Pull Requests"
30+
url: /intro-to-github/08/
31+
32+
github-desktop-nav:
33+
- title: "Welcome"
34+
url: /github-desktop/
35+
- title: "Install GitHub Desktop"
36+
url: /github-desktop/02/
37+
- title: "Create the Remote Repository"
38+
url: /github-desktop/03/
39+
- title: "Clone the Repository"
40+
url: /github-desktop/04/
41+
- title: "Create Local Branches"
42+
url: /github-desktop/05/
43+
- title: "Make Local Changes"
44+
url: /github-desktop/06/
45+
- title: "Add Local Commits"
46+
url: /github-desktop/07/
47+
- title: "Open a Pull Request"
48+
url: /github-desktop/08/
49+
- title: "Merge Your Pull Request"
50+
url: /github-desktop/09/
51+
- title: "View Your site"
52+
url: /github-desktop/10/
53+
- title: "Keep Things in Sync"
54+
url: /github-desktop/11/
55+
- title: "Add Your Site to the Showcase"
56+
url: /github-desktop/12/
57+
- title: "Review the local workflow"
58+
url: /github-desktop/13/
59+
- title: "Review Pushing and Opening Pull Requests"
60+
url: /github-desktop/14/
61+
- title: "Let's collaborate!"
62+
url: /github-desktop/15/
63+
- title: "Merge Your PR"
64+
url: /github-desktop/16/

‎_data/ui-text.yml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# User interface text and labels
2+
3+
# English (default)
4+
# -----------------
5+
en: &DEFAULT_EN
6+
page : "Page"
7+
pagination_previous : "Previous"
8+
pagination_next : "Next"
9+
breadcrumb_home_label : "Home"
10+
breadcrumb_separator : "/"
11+
toc_label : "On This Page"
12+
ext_link_label : "Direct Link"
13+
less_than : "less than"
14+
minute_read : "minute read"
15+
minutes_read : "minutes read"
16+
share_on_label : "Share on"
17+
meta_label :
18+
tags_label : "Tags:"
19+
categories_label : "Categories:"
20+
date_label : "Updated:"
21+
comments_label : "Leave a Comment"
22+
more_label : "Learn More"
23+
related_label : "You May Also Enjoy"
24+
follow_label : "Follow:"
25+
feed_label : "Feed"
26+
powered_by : "Powered by"
27+
website_label : "Website"
28+
email_label : "Email"
29+
recent_posts : "Recent Posts"
30+
en-US:
31+
<<: *DEFAULT_EN
32+
en-UK:
33+
<<: *DEFAULT_EN
34+
35+
# Spanish
36+
# --------------
37+
es: &DEFAULT_ES
38+
page : "Página"
39+
pagination_previous : "Anterior"
40+
pagination_next : "Siguiente"
41+
breadcrumb_home_label : "Inicio"
42+
breadcrumb_separator : "/"
43+
toc_label : "Contenidos"
44+
ext_link_label : "Enlace"
45+
less_than : "menos de"
46+
minute_read : "minuto de lectura"
47+
minutes_read : "minutos de lectura"
48+
share_on_label : "Compartir"
49+
meta_label :
50+
tags_label : "Etiquetas:"
51+
categories_label : "Categorías:"
52+
date_label : "Actualizado:"
53+
comments_label : "Comentar"
54+
more_label : "Ver más"
55+
related_label : "Podrías ver también"
56+
follow_label : "Seguir:"
57+
feed_label : "Feed"
58+
powered_by : "Powered by"
59+
website_label : "Sitio web"
60+
email_label : "Email"
61+
recent_posts : "Entradas recientes"
62+
es-ES:
63+
<<: *DEFAULT_ES
64+
es-CO:
65+
<<: *DEFAULT_ES
66+
67+
# Another locale
68+
# --------------

‎_includes/activity/01-join-intro-repo.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{% capture activity-text %}
2+
# Activity: Join the Class Repository
3+
4+
It's time to get your hands dirty! Use these steps to access our shared project:
5+
6+
1. Sign in with your GitHub account.
7+
2. Navigate to <a href="https://github.com/githubschool/open-enrollment-classes-introduction-to-github" target="_blank">our shared project</a>.
8+
3. Leave a comment on the collaborator issue. The GitHubTeacher user will auto-magically add you to our project as a collaborator. **TODO: Add link to actual collaborator issue.**
9+
10+
{% endcapture %}
11+
12+
<div class="notice--warning">
13+
{{ activity-text | markdownify }}
14+
</div>
15+
16+
Need help? Click **open chat** below for answers from GitHub trainers!
17+
{: .notice--success}

‎_includes/activity/02-find-your-hometown.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{% capture activity-text %}
2+
# Activity: Find or Create an Issue for Your City
3+
4+
First, let's see if an issue already exists for your city:
5+
6+
1. Click on the <a href="https://github.com/githubschool/open-enrollment-classes-introduction-to-github/issues" target="_blank">Issues tab</a> in the class repository.
7+
2. Using the search field at the top of the issues view, type the name of the city you call home.
8+
3. Press enter and check the results. Is there already an issue for your city? Remember to check the closed Issues too!
9+
4. If an issue **already exists for your city**, comment on the issue to let others know that you will be adding your name to the pin for that city!
10+
5. If the issue is closed, re-open it.
11+
12+
If an issue **does not exist** for your city, you get to start one!
13+
14+
1. Click the `New Issue` button.
15+
2. Complete the pre-populated issue template, adding a subject to the issue and replacing the placeholders for <your-city> name.
16+
3. If you need help finding your city's coordinates to complete the issue template, [Click here](http://mynasadata.larc.nasa.gov/latitudelongitude-finder/) and search for your city.
17+
18+
{% endcapture %}
19+
20+
<div class="notice--warning">
21+
{{ activity-text | markdownify }}
22+
</div>
23+
24+
Need help? Click **open chat** below for answers from GitHub trainers!
25+
{: .notice--success}

‎_includes/activity/03-create-branch.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{% capture activity-text %}
2+
# Activity: Create your Branch
3+
4+
It is time to create the branch you will use to propose the addition of your pin to the map. Here's how you do it:
5+
6+
1. Navigate to the <a href="https://github.com/githubschool/open-enrollment-classes-introduction-to-github/" target="_blank">Code tab</a> in the class repository.
7+
2. Click the drop-down titled `master`.
8+
3. In the field, enter this unique name for your branch: `<your-username-your-city>`.
9+
4. Press Enter to create your branch.
10+
{% endcapture %}
11+
12+
<div class="notice--warning">
13+
{{ activity-text | markdownify }}
14+
</div>
15+
16+
Need help? Click **open chat** below for answers from GitHub trainers!
17+
{: .notice--success}

‎_includes/activity/04-create-a-file-on-github.md‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{% capture activity-text %}
2+
# Activity: Adding Yourself to the Map
3+
4+
## Adding a New Pin
5+
6+
- In your new branch, add a new file named: `_pins/YOUR-USERNAME.json`.
7+
- Enter the following code in your file:
8+
9+
```
10+
---
11+
githubHandle: YOUR_USERNAME
12+
latitude: YOUR_LATITUDE
13+
longitude: YOUR_LONGITUDE
14+
---
15+
```
16+
17+
- Ensure you've replaced:
18+
19+
- `YOUR_USERNAME` with your GitHub username.
20+
- `YOUR_LATITUDE` with your north/south coordinate.
21+
- `YOUR_LONGITUDE` with your east/west coordinate.
22+
23+
- Enter a commit message that describes your addition.
24+
- Commit your change to your branch.
25+
26+
{% endcapture %}
27+
28+
<div class="notice--warning">
29+
{{ activity-text | markdownify }}
30+
</div>
31+
32+
Need help? Click **open chat** below for answers from GitHub trainers!
33+
{: .notice--success}

‎_includes/activity/05-create-a-pull-request.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
{% capture activity-text %}
2+
# Activity: Creating a Pull Request
3+
4+
1. Navigate to the <a href="https://github.com/githubschool/open-enrollment-classes-introduction-to-github/pulls" target="_blank">Pull Requests tab</a>.
5+
2. Click `New Pull Request`.
6+
3. In the *base* dropdown, choose `master`.
7+
4. In the *compare* dropdown, choose your branch.
8+
5. Click `Create Pull Request`
9+
6. You can leave the default title or make it more descriptive.
10+
7. Use [markdown formatting](https://guides.github.com/features/mastering-markdown/) to explain the work you have done on your branch.
11+
- Summarize your proposed change.
12+
- Mention the training team using `@githubteacher`.
13+
- Use the keywords `closes` immediately followed by your issue number (e.g. `closes #3`)to note which Issue the Pull Request is addressing. When you do this, the issue will be automatically closed when the pull request is merged.
14+
15+
> Pull Request messages are an excellent opportunity for you to describe the changes you have made to the project. For example, you could also include information explaining the type of feedback you'd like others to give you or providing collaborators an idea of your timeline.
16+
17+
8. Click *Preview* to see how your Pull Request will look.
18+
9. Assign the pull request to yourself by clicking `assign to yourself` in the Assignees section.
19+
10. Click `Create Pull Request`.
20+
21+
{% endcapture %}
22+
23+
<div class="notice--warning">
24+
{{ activity-text | markdownify }}
25+
</div>

‎_includes/activity/05a-collaborate-on-pull-request.md‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{% capture activity-text %}
2+
# Activity: Collaborating on a Pull Request
3+
4+
Now that your pull request has been created, go back to the list to find an <a href="https://github.com/githubschool/open-enrollment-classes-introduction-to-github/pulls?q=is%3Aopen+is%3Apr" target="_blank">open pull request</a> -- other than your own -- and provide feedback :loudspeaker: and motivation :tada:.
5+
6+
{% endcapture %}
7+
8+
<div class="notice--warning">
9+
{{ activity-text | markdownify }}
10+
</div>
11+
12+
Need help? Click **open chat** below for answers from GitHub trainers!
13+
{: .notice--success}

‎_includes/activity/06-merge-a-pr.md‎

Lines changed: 24 additions & 0 deletions

0 commit comments

Comments
 (0)