Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Image Representation Topic #1225

Merged
merged 28 commits into from
Sep 2, 2019
Merged

Image Representation Topic #1225

merged 28 commits into from
Sep 2, 2019

Conversation

caitlind
Copy link
Contributor

Adds the new Image Representation topic.
Includes:

  • Unit Plan
  • Lesson 1, Colour by numbers, for ages 5-7 and 8-10 students

@caitlind
Set up basic folders, markdown files, and yaml configuration files fo…
c5fd9af 
…r the Image Representation topic. Added the Image Representation topic to structure.yaml
@caitlind
Added a temporary icon for image representation.
18c9313
@caitlind
Added general headings for image-rep unit plan and lesson 1. Began ad…
bc6d500 
…ding content to these.Added note about completing the binary numbers lesson first to the ima-rep introduction
@caitlind
Adding content to the image-rep unit plan and lesson 1
d25fbb1
@caitlind
Added content to image-rep unit plan and lesson 1
e7c68bf
@caitlind
Added images for image-rep lesson 1
706917a
@caitlind
Add classroom resources and resource notes panel
788a71f
@caitlind
Added lesson reflection to colour by numbers lesson
d5488fa
@caitlind
Writing Digital Technologies sections in image rep unit plan
5f3a361
@caitlind
Added real world implications section, and added compress to glossary
7a93ddd
@caitlind
Working on lesson 1
4089036
@caitlind
Adding content to lesson 1
ca16fcd
@caitlind
Working on lesson 1 content
6078990
@caitlind
Added three new 1 page image options to the pixel painter interactive
082e14a
@caitlind
Adding to lesson 1 and editing unit plan
be78bbe
@caitlind
Small content changes
5b37174
@caitlind
Unit plan and lesson 1 for ages 5-7 and 8-10 completed and ready for …
6f3197d 
…author review. Lesson content requires issue #1220 to be merged, otherwise it is innacurate where the pixel painter instructions are given.
@caitlind caitlind added content: topics/lessons author Requires attention from a content author labels Jul 22, 2019
@caitlind caitlind requested a review from timbellnz July 22, 2019 04:10
@JackMorganNZ JackMorganNZ self-requested a review July 22, 2019 06:11
JackMorganNZ
JackMorganNZ requested changes Jul 22, 2019
View reviewed changes
Copy link
Member

@JackMorganNZ JackMorganNZ left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great to see some new content. Various queries throughout, I didn't check the content of the PR (that's for @timbellnz), and it would be great to get @eAlasdair to review the content also (he's amazing with grammar/structure).

Also is csunplugged/static/img/topics/a_in_binary_code.png used anywhere?

csunplugged/topics/content/en/glossary/pixel.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/lessons/colour-by-numbers.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/lessons/colour-by-numbers.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/lessons/colour-by-numbers.md Show resolved Hide resolved
csunplugged/topics/content/en/glossary/compress.md Outdated Show resolved Hide resolved
@caitlind caitlind requested a review from eAlasdair July 22, 2019 20:55
eAlasdair
eAlasdair reviewed Jul 23, 2019
View reviewed changes
Copy link
Contributor

@eAlasdair eAlasdair left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As requested, I've looked through the PR for content/grammar/spelling. Because I don't know the project it's much harder to say one way is definitely correct over the other - so I'm leaving all of this as comments rather than requesting changes. Feel free to ignore anything that would be inconsistent, but otherwise, really good work! The explanations themselves are really easy to understand

csunplugged/topics/content/en/glossary/compress.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/glossary/compress.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/glossary/pixel.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/image-representation.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/image-representation.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/image-representation.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/lessons/colour-by-numbers.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/unit-plan.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/unit-plan.md Outdated Show resolved Hide resolved
csunplugged/topics/content/en/image-representation/unit-plan/unit-plan.md Outdated Show resolved Hide resolved
@caitlind caitlind removed the request for review from timbellnz July 25, 2019 03:45
eAlasdair
eAlasdair approved these changes Sep 2, 2019
View reviewed changes
Copy link
Contributor

@eAlasdair eAlasdair left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@caitlind caitlind merged commit 16f12af into develop Sep 2, 2019
@JackMorganNZ JackMorganNZ deleted the content/image-rep branch December 16, 2019 07:47
@JackMorganNZ JackMorganNZ mentioned this pull request Dec 19, 2019
Merged
@uccser-bot uccser-bot mentioned this pull request Mar 15, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JackMorganNZ JackMorganNZ JackMorganNZ approved these changes

@eAlasdair eAlasdair eAlasdair approved these changes

Assignees
No one assigned
Labels
author Requires attention from a content author content: topics/lessons
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@caitlind @JackMorganNZ @eAlasdair