ITP Onboarding Updates

common-content/en/blocks/git-branching-workshop/index.md

@@ -20,7 +20,7 @@ This workshop addresses a problem we see regularly: trainees submit PRs that con
 
 Before this workshop, make sure you have completed [Using GitHub](../using-github) and read the [Trainee PR Guide](../../guides/reviewing/trainee-pr-guide).
 
-Also look at the [branching notes in the Onboarding module](https://curriculum.codeyourfuture.io/itp/onboarding/sprints/1/prep/#branching) for a visual guide to creating branches.
+Also look at the [branching notes in the JavaScript Fundamentals module](https://curriculum.codeyourfuture.io/itp/javascript-fundamentals/sprints/1/prep/#branching) for a visual guide to creating branches.
 
 ## The Core Problem
 

common-content/en/blocks/prep-dir/index.md

@@ -1,5 +1,5 @@
 +++
-title = 'Prep dir'
+title = 'Prep Directory'
 time = 10
 [objectives]
     1='Create a working prep directory for the module'
@@ -9,18 +9,14 @@ time = 10
   publishResources = false
 +++
 
-### 📂 Create a working directory for the module
+We will provide some code examples as you progress through the course but you will also write a lot of code yourself. You're going to need somewhere in your system to store it all.
 
-1. Fork the coursework module (always linked in every backlog) and open it in VSCode.
-1. In your VSCode terminal, navigate to the root of your project directory.
-1. Create a new directory called `prep` to store all the files you'll be working on for this module.
+### Create a working directory for the module
 
-As you work through the module, you'll be creating files in this directory to code along with the prep content. You are expected to code along with the prep content.
-
-For simple one liners, use the terminal REPL to run the code. For more complex problems, create files in the `prep` directory and write the code there. Make commented notes as you go along explaining why you're doing what you're doing. Your future self will thank you.
+1. Fork the coursework module (always linked in every backlog), clone it to your laptop and open it in VSCode.
+2. In your VSCode terminal, navigate to the root of your project directory.
+3. Create a new directory called `prep` to store all the files you'll be working on for this module.
 
-### 🔑 The most important thing is to secure your understanding
-
-The prep content is designed to help you understand the concepts you'll be working with in the module. Don't just read it, code along with it. Also take notes, draw diagrams, pose your own questions and try to answer them.
+As you work through the module, you'll be creating files in this directory to code along with the prep content. You are expected to code along with the prep content.
 
-To really understand programming, you need to write the code yourself, and do the exercises. You must [take active part](https://www.pnas.org/doi/10.1073/pnas.1319030111) in your learning to succeed.
+You will need to do this at the start of every module. We suggest adding further sub-directories for each sprint but it's up to you to organise your files in a way that suits you. For more complex problems you may need to create further sub-directories and write the code there. Try making notes as you go to document the process. Having your own notes will be very useful if you need to remind yourself how to do something in future!

common-content/en/module/fundamentals/next-steps/index.md

@@ -3,7 +3,7 @@ title = 'Next steps'
 time="30"
 [objectives]
     1='Figure out what we need to do next in the sprint'
-    2='Locate the prep, backlog, day plan, and end of sprint/module review views on the curriculum'
+    2='Locate the prep, backlog, day plan, and end of sprint review pages on the curriculum'
     3='Practice asking for guidance/help when we are stuck'
 [build]
   render = 'never'
@@ -14,7 +14,7 @@ time="30"
 
 As a group, run through the structure of a module and a sprint in the curriculum.
 
-Then spend {{<timer>}}30{{</timer>}} completing the following tasks. When you're done, spend {{<timer>}}15{{</timer>}} discussing any challenges you had and making sure you're ready for the week.
+Then spend {{<timer>}}15{{</timer>}} completing the following tasks. When you're done, spend {{<timer>}}15{{</timer>}} discussing any challenges you had and making sure you're ready for the week.
 
 ## For trainees
 
@@ -23,17 +23,16 @@ In this section, you have a set of questions/tasks to orient you towards what is
 Pair up with a new person. In pairs, complete the following tasks:
 
 > [!WARNING]
-> If you're unsure about the answer to any of the questions below, start a thread in Slack to clarify the answer (unless there is already a thread discussing this matter).
+> If you're unsure about the answer to any of the questions below, ask the other people in your class for help!
 
-1. Starting from the home page of this website, locate the end of module review page for the next module. Have you already achieved any of the learning objectives?
+1. Starting from the home page of this website, locate the end of module sprint page for the _next_ sprint. Can you already do any of the learning objectives?
 1. Starting from the home page of this website, locate the prep page for sprint 1 of the next module.
-1. List the things you need to install (if anything) for sprint 1 of the upcoming module.
 1. Check you can find the backlog page for the next sprint.
-1. When should you start the prep work for the upcoming module?
+1. When should you start the prep work for the upcoming sprint?
 
 ## For volunteers
 
-1. Check the end of module review page for the next module, and the next sprint. What are we trying to help the trainees to achieve?
+1. Check the end of sprint review page for the next sprint. What are we trying to help the trainees to achieve?
 1. Check the instructions and links on the prep and backlog issues for the upcoming sprint - what will trainees need help with?
 1. Read the day-plan for the upcoming sprint - what should you prepare for?
-1. In the day-plan for the upcoming sprint, identify the instructions for any workshops and visit the repository containing that readme. Check the instructions make sense.
+1. In the day-plan for the upcoming sprint, identify the instructions for any workshops. Check the instructions make sense.

common-content/en/module/how-our-curriculum-works/now-backlog/index.md

@@ -10,7 +10,7 @@ time=5
 
 +++
 
-Now that you've finished the prep for this sprint, find the backlog for the Sprint and work through the items. When you've done this, find the End Of Module Review page, and make sure you've completed all of the learning objectives.
+Now that you've finished the prep for this sprint, find the backlog for the Sprint and work through the items. When you've done this, find the End Of Sprint Review page, and make sure you've completed all of the learning objectives.
 
 There should be a link to the next page (Backlog) at the bottom of this one. You can also get to the Sprint overview page (which links to Prep, Backlog, End of Sprint Review, and anything else relevant) by clicking the name of the Sprint at the top of the page.
 

common-content/en/module/how-our-curriculum-works/overview/index.md

@@ -25,9 +25,9 @@ The course is divided into modules, each with a theme and learning objectives. M
 
 Usually a lively morning workshop and quieter afternoon study-group. **Everyone** should review the plan to prepare for class.
 
-##### 4. Review with: **✅ Success**, the learning objectives for the sprint.
+##### 4. Review with: **✅ End of Sprint Review**, the learning objectives for the sprint.
 
-**Learners** check off goals. **Mentors** help us focus on the sprint goals.
+**Learners** check off goals. If you can't do any of them, take time to work on them. **Mentors** help us focus on the sprint goals.
 
 ### Still lost?
 

common-content/en/module/html-css/what-are-forms/index.md

@@ -3,19 +3,24 @@ title = 'What are forms?'
 
 time = 60
 hide_from_overview = true
-[objectives]
-    1='Define form, field, and input'
-    2='Define form elements and attributes'
-    3='Explain the purpose of validation'
-    4='Write form validations'
+objectives = [
+    'Define form, field, and input in a website',
+    'Define HTML form elements and attributes',
+    'Explain the purpose of validation in an HTML form',
+    'Write form validations in an HTML form',
+]
 [build]
   render = 'never'
   list = 'local'
   publishResources = false
 
 +++
 
-These questions and answers are compiled from recorded sessions on HTML forms, and are the collective contribution of several mentors and students. This time we've included a trainee answer and a mentor answer, per question.
+Watch this video about HTML forms:
+
+{{<youtube>}}https://www.youtube.com/watch?v=fNcJuPIZ2WE{{</youtube>}}
+
+After you've watched this video, consider the following questions. Try to answer them yourself. After you've answered each question for yourself, expand others' answers which have been compiled from other trainees and volunteers.
 
 {{<note type="question" title="10 Things About Forms">}}
 

common-content/en/module/induction/accounts/index.md

@@ -1,7 +1,7 @@
 +++
-title="Professional Accounts"
+title="Creating Accounts & Installing Tools"
 time=45
-objectives=["Create a professional Google account", "Download and install the apps you will need to complete the course"]
+objectives=["Create a professional Google account if you don't already have one", "Download and install the apps you will need to complete the course"]
 hide_from_overview=true
 [build]
   render = 'never'
@@ -52,7 +52,7 @@ You will use [GitHub](https://github.com/signup) to store your code and to colla
 
 ### LinkedIn
 
-Sign up for LinkedIn. LinkedIn is the largest professional social network. You will use it to help you get a job and to advance your career.
+Sign up for [LinkedIn](https://www.linkedin.com/). LinkedIn is the largest professional social network. You will use it to help you get a job and to advance your career.
 
 Make a LinkedIn account. Use your real name. Sign in with Google. Connect with your cohort.
 
@@ -79,8 +79,6 @@ See this example fully filled-in Slack profile - make sure yours has at least th
 
 ## Applications
 
-If you're working on a library computer, you can't download these applications. You will use [GitHub Dev](https://github.dev/) to complete coursework instead.
-
 ### Google Chrome
 
 - [ ] I have downloaded and installed Google Chrome.
@@ -90,12 +88,15 @@ Use your professional Chrome profile for all your {{<our-name>}} work. You will
 
 ### VSCode
 
-We will use [Visual Studio Code](https://code.visualstudio.com/) (VSCode), a professional IDE you will use on this course and at work.
+We will use [Visual Studio Code](https://code.visualstudio.com/) (VSCode), a customisable text editor you will use on this course and at work. If you are new to using tools like VSCode there are [video resources](https://www.youtube.com/watch?v=B-s71n0dHUk) which can help you familiarise yourself with the interface.
+
+We will customise VSCode by installing some extensions. These will add some tools which will support your learning through teh course. Once you have installed VSCode you can [install the CodeYourFuture Extension Pack](https://marketplace.visualstudio.com/items?itemName=CodeYourFuture.cyf-extension-pack).
 
 - [ ] I have downloaded and installed [Visual Studio Code](https://code.visualstudio.com/).
+- [ ] I have downloaded and installed [the extension pack](https://marketplace.visualstudio.com/items?itemName=CodeYourFuture.cyf-extension-pack).
 
 ### Zoom
 
-Usually we use [Meet](https://applieddigitalskills.withgoogle.com/c/college-and-continuing-education/en/google-meet-for-beginners/overview.html), but sometimes we use [Zoom for remote sessions](https://zoom.us/download). Install it now.
+Usually we use [Meet](https://applieddigitalskills.withgoogle.com/c/college-and-continuing-education/en/google-meet-for-beginners/overview.html), but sometimes we use [Zoom for remote sessions](https://zoom.us/download). If you are using a library computer you can use the web version, if you are using your own computer you should install it now.
 
 - [ ] I have downloaded and installed [Zoom](https://zoom.us/download) onto my computer.

common-content/en/module/induction/branching/index.md

@@ -16,11 +16,13 @@ We can check the commits on the remote repository as before:
 
 ![commit-history](commit-history.png)
 
+> When you check the history today your view will be slightly different. The commits in the screenshot will still be there, but there will be newer commits too.
+
 On the left page of the page, we see additional information:
 
 ![main-branch-highlighted](main-branch-highlighted.png)
 
-> So what is **`main`**?
+So what is `main`?
 
 `main` is a **branch**.
 
@@ -35,7 +37,7 @@ gitGraph
 
 A branch represents a particular history of development in a project - the different versions there have been.
 
-{{<note type="definition" title="definition: Branch">}}
+{{<note type="definition" title="Definition: Branch">}}
 
 A **branch** is a sequence of commits in a project.
 
@@ -50,14 +52,18 @@ gitGraph
         commit
         commit
         branch "try-purple"
+        checkout "try-purple"
         commit
         commit
         checkout main
         branch "try-blue"
         commit
+        checkout main
+        commit
+        commit
 ```
 
-The **`main`** branch is often treated as a special branch - it's where we put commits which people working on the project have agreed on. Other branches (e.g. the experimental purple branch) may have extra changes that have not been agreed on. If people working on the project agree the changes from the purple branch are good, we'll add those changes to the main branch.
+The `main` branch is often treated as a special branch - it's where we put commits which people working on the project have agreed on. Other branches (e.g. the `try-purple` branch) may have extra changes that have not been agreed on. If people working on the project agree the changes from the purple branch are good, we'll add those changes to the main branch.
 
 When we're working on something new, we haven't agreed with other people that our new thing is good yet, so we often don't add our changes to the main branch straight away. Instead we make our own branch to experiment on.
 
@@ -75,13 +81,11 @@ gitGraph
 
 In the diagram above, we can continue to commit on the "week-1-coursework" branch without altering the history of the `main` branch.
 
-{{<note type="exercise" title="exercise 8.1">}}
-
-### Creating a local branch
+{{<note type="exercise" title="Exercise: Creating a local branch">}}
 
 1. Open the `education-blog` repository in VSCode.
 
-2. Using this clip, create a new branch called `update-blog-1` in your local repository 👉 https://youtube.com/clip/UgkxvXsnm_98Rx0NUZq25apQWA6POccRoQzw
+2. Using [this clip](https://youtube.com/clip/UgkxvXsnm_98Rx0NUZq25apQWA6POccRoQzw), create a new branch called `update-blog-1` in your local repository.
 
 📋 How can you check that you've successfully created a branch?
 

common-content/en/module/induction/check-git-installation/index.md

@@ -1,9 +1,9 @@
 +++
-title = 'Check Git installation'
+title = 'Check Git Installation'
 time = 15
 vocabulary=[]
 [tasks]
-1='Double check Git is installed on your local machine'
+1='Check Git is installed on your local machine'
 [build]
   render = 'never'
   list = 'local'
@@ -13,16 +13,19 @@ vocabulary=[]
 
 ### Git
 
-You will use Git continually as a developer. We will cover Git in more depth later in the course. Right now, we will just check that you have it installed.
+{{<note type="definition" title="Definition: Git">}}
 
-Open up a terminal and run the command `git --version` to double check you have Git installed.
+Git is **version control software** that allows developers to create and manage different versions of a project.
+
+{{</note>}}
+
+You will use Git continually as a developer. Before we can do any work with it we need to check that you have it installed.
+
+Open your computer's terminal application and run the command `git --version` to double check you have Git installed.
 If it is installed successfully, you should get a version number (which may not be exactly the same as this example, but should look similar):
 
 ```
 git version 2.40.0
 ```
 
-Otherwise, you will need to [install](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) it or ask for support on your Slack channel.
-
-> [!TIP]
-> If you are working on a library computer, you do not have a terminal, but your github.dev account already has Git installed. (It's called "Source Control".) So you can skip this step.
+Otherwise, you will need to [install git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git) or ask for support on your Slack channel.

common-content/en/module/induction/checkout-a-commit/index.md

@@ -1,7 +1,7 @@
 +++
 title = 'Inspecting a commit'
 
-time ="15"
+time = 15
 [objectives]
     1='Given a remote repository on GitHub, identify the files and folders from any commit in a version timeline'
 [build]
@@ -16,7 +16,7 @@ Recall that a commit is a snapshot of our project at some point in time.
 Therefore, we should be able to check out a previous version of our project and look at the files and folders there.
 We can use the Github interface to check out the files and folders at a previous commit.
 
-{{<note type="exercise">}}
+{{<note type="exercise" title="Exercise - Explore a Commit">}}
 
 Go back to this page https://github.com/CodeYourFuture/education-blog/commits/main
 

common-content/en/module/induction/cyf-blog/index.md

@@ -1,6 +1,6 @@
 +++
-title = 'Blog'
-time ="5"
+title = 'CYF Blog'
+time = 5
 hide_from_overview = true
 [build]
   render = 'never'
@@ -14,6 +14,6 @@ Ahmed and Naima are writing a blog together about their struggles learning codin
 
 The published blog is live here 👉 [Educational blog](https://git-demo-week1.netlify.app/)
 
-{{<note type="exercise" title="exercise 1.1">}}
+{{<note type="exercise" title="Exercise - Investigate the Resources">}}
 Explore the [Educational blog](https://git-demo-week1.netlify.app/). Click on the link on the site and check to see if it is working.
 {{</note>}}

common-content/en/module/induction/cyf-folder/index.md

@@ -38,6 +38,3 @@ Use this [cli documentation](https://www.techrepublic.com/article/16-terminal-co
 6. Double check you're in the right place by **p**rinting your current **w**orking **d**irectory (by running `pwd`) again.
 
 </details>
-
-> [!TIP]
-> If you're working on a library computer, skip this step. You will store your work in your GitHub account.

common-content/en/module/induction/development-process/index.md

@@ -1,6 +1,6 @@
 +++
 title = 'Development process'
-time ="10"
+time = 10
 hide_from_overview = true
 [build]
   render = 'never'
@@ -11,15 +11,15 @@ hide_from_overview = true
 
 Ahmed and Naima are using the following **development process** for writing their blog:
 
-> - writing the blog in a single file on a **single** computer
-> - saving multiple versions of the file on the same computer
-> - taking turns to use the computer during the day
+- Writing the blog in a single file on a **single** computer
+- Saving multiple versions of the file on the same computer
+- Taking turns to use the computer during the day
 
 At the moment, the computer has a folder with the blog that looks like this:
 
 ![different-blog-versions](different-blog-versions.png)
 
-{{<note type="exercise" title="Exercise">}}
+{{<note type="exercise" title="Exercise - Challenges">}}
 
 Describe some of the challenges that Ahmed and Naima face when trying to write a blog together in this way.