From e875a7f82d611cdd7985a72a0637c350f86342cc Mon Sep 17 00:00:00 2001 From: 1point618 Date: Fri, 18 Dec 2015 10:25:53 -0500 Subject: [PATCH 1/2] updating files --- modules/DEMO-branching-art.yml | 6 ++---- modules/DEMO-branching-lab.yml | 3 ++- modules/DEMO-intro-to-gh.yml | 4 +--- modules/DEMO-outro-art.yml | 6 ++---- modules/DEMO-outro-lab.yml | 2 +- modules/DEMO-pull-requests-art.yml | 6 ++---- modules/DEMO-pull-requests-lab.yml | 2 +- 7 files changed, 11 insertions(+), 18 deletions(-) diff --git a/modules/DEMO-branching-art.yml b/modules/DEMO-branching-art.yml index b3b55fd..aca9bb1 100644 --- a/modules/DEMO-branching-art.yml +++ b/modules/DEMO-branching-art.yml @@ -1,11 +1,9 @@ title: Branching pre-requisites: -learning-objective: +learning-objective: Using Branches screens: - - lab: + - image-slide: title: Doing Work on GitHub - id: DEMO-branching-art - presenter-script: introduction: | ## Branches diff --git a/modules/DEMO-branching-lab.yml b/modules/DEMO-branching-lab.yml index d053d5c..51f66bf 100644 --- a/modules/DEMO-branching-lab.yml +++ b/modules/DEMO-branching-lab.yml @@ -1,6 +1,6 @@ title: Branching pre-requisites: -learning-objective: +learning-objective: Using Branches screens: - lab: title: "Doing Work on GitHub: Lab" @@ -40,6 +40,7 @@ screens: failure-message: "It looks like you haven't committed the change yet." - description: | Add a commit message and commit the file directly to your branch. + id: DEMO-branching-lab-commit additional-labs: additional-questions: resources: diff --git a/modules/DEMO-intro-to-gh.yml b/modules/DEMO-intro-to-gh.yml index ef6f0b1..8c8b9a3 100644 --- a/modules/DEMO-intro-to-gh.yml +++ b/modules/DEMO-intro-to-gh.yml @@ -2,10 +2,8 @@ title: Introduction to GitHub pre-requisites: learning-objective: Learn about GitHub and The GitHub Workflow screens: - - lab: + - image-slide: title: Using GitHub - id: DEMO-intro-art - presenter-script: introduction: | ## What is GitHub? diff --git a/modules/DEMO-outro-art.yml b/modules/DEMO-outro-art.yml index 69b8d67..bfa5923 100644 --- a/modules/DEMO-outro-art.yml +++ b/modules/DEMO-outro-art.yml @@ -1,11 +1,9 @@ title: Outro pre-requisites: -learning-objective: +learning-objective: Review screens: - - lab: + - image-slide: title: Congratulations! - id: DEMO-outro-art - presenter-script: introduction: | ## You did it! diff --git a/modules/DEMO-outro-lab.yml b/modules/DEMO-outro-lab.yml index 164519f..9c50a29 100644 --- a/modules/DEMO-outro-lab.yml +++ b/modules/DEMO-outro-lab.yml @@ -1,6 +1,6 @@ title: Outro pre-requisites: -learning-objective: +learning-objective: Review screens: - lab: title: More practice! diff --git a/modules/DEMO-pull-requests-art.yml b/modules/DEMO-pull-requests-art.yml index 852c9cb..11d075f 100644 --- a/modules/DEMO-pull-requests-art.yml +++ b/modules/DEMO-pull-requests-art.yml @@ -1,11 +1,9 @@ title: Pull Requests pre-requisites: -learning-objective: +learning-objective: PRs screens: - - lab: + - image-slide: title: Collaborating on GitHub - id: DEMO-pr-art - presenter-script: introduction: | ## Submitting a Pull Request diff --git a/modules/DEMO-pull-requests-lab.yml b/modules/DEMO-pull-requests-lab.yml index 06cb1c3..8b764ab 100644 --- a/modules/DEMO-pull-requests-lab.yml +++ b/modules/DEMO-pull-requests-lab.yml @@ -1,6 +1,6 @@ title: Pull Requests pre-requisites: -learning-objective: +learning-objective: PRs screens: - lab: title: "Collaborating on GitHub: Lab" From 1520a9254d0924953934616175c96069e3b2d72b Mon Sep 17 00:00:00 2001 From: 1point618 Date: Fri, 15 Jan 2016 17:08:07 -0500 Subject: [PATCH 2/2] updating schema for JP's approval --- schema_module.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/schema_module.yml b/schema_module.yml index dbdfbb7..9aab2c7 100644 --- a/schema_module.yml +++ b/schema_module.yml @@ -79,10 +79,12 @@ mapping: "title": required: true "image": - required: true + required: false "presenter-script": - required: true + required: false type: any + "introduction": + required: false # video schema video-slide: type: map @@ -110,7 +112,7 @@ mapping: "introduction": required: false "presenter-script": - required: true + required: false type: any "steps": required: true