walterbender / training

training activity for Sugar
GNU General Public License v3.0
4 stars 7 forks source link

Additional HTML content drafts #2

Closed cottonpaul closed 10 years ago

cottonpaul commented 10 years ago

Here comes my first pull request. Hopefully I've gotten it the right way around ;)

Added content drafts for: More Activities, Collaboration, and Assessment.

Worth noting that in More Activities section, the HTML has been split into moreactivities/turtle/physics to indicate that they will function best as different sections.

Moreactivities 1 and 2 should wrap turtle and physics.

So in paging: moreactivities1.html then turtle1 turtle2 etc then physics1 physics2 etc then moreactivities2.html

Also, I'd greatly appreciate it if you took a look at the Turtle Blocks content - have I overcomplicated it? Could it be more straightforward or efficient?

And finally, it might be worth breaking out the "assessment-yes" html (where the teacher assessment instructions sit.) Not sure if it's too cramped doing it all at once.

walterbender commented 10 years ago

Seems to have worked. Much easier for me this way. Thanks. I'll fold your new content in this morning.

regards.

-walter

On Thu, Jan 30, 2014 at 11:20 PM, cottonpaul notifications@github.comwrote:

Here comes my first pull request. Hopefully I've gotten it the right way around ;)

Added content drafts for: More Activities, Collaboration, and Assessment.

Worth noting that in More Activities section, the HTML has been split into moreactivities/turtle/physics to indicate that they will function best as different sections.

Moreactivities 1 and 2 should wrap turtle and physics.

So in paging: moreactivities1.html then turtle1 turtle2 etc then physics1 physics2 etc then moreactivities2.html

Also, I'd greatly appreciate it if you took a look at the Turtle Blocks content - have I overcomplicated it? Could it be more straightforward or efficient?

And finally, it might be worth breaking out the "assessment-yes" html (where the teacher assessment instructions sit.) Not sure if it's too

cramped doing it all at once.

You can merge this Pull Request by running

git pull https://github.com/cottonpaul/training master

Or view, comment on, or merge it at:

https://github.com/walterbender/training/pull/2 Commit Summary

  • Changed full screen task copy to reflect task.
  • Additional HTML content drafts

File Changes

  • A html-content/Assessment/assessment-no.htmlhttps://github.com/walterbender/training/pull/2/files#diff-0(20)
  • A html-content/Assessment/assessment-yes.htmlhttps://github.com/walterbender/training/pull/2/files#diff-1(25)
  • A html-content/Assessment/assessment1.htmlhttps://github.com/walterbender/training/pull/2/files#diff-2(21)
  • A html-content/Collaboration/collaboration1.htmlhttps://github.com/walterbender/training/pull/2/files#diff-3(21)
  • A html-content/Collaboration/collaboration2.htmlhttps://github.com/walterbender/training/pull/2/files#diff-4(20)
  • A html-content/Collaboration/collaboration3.htmlhttps://github.com/walterbender/training/pull/2/files#diff-5(24)
  • A html-content/Collaboration/collaboration4.htmlhttps://github.com/walterbender/training/pull/2/files#diff-6(18)
  • A html-content/Collaboration/collaboration5.htmlhttps://github.com/walterbender/training/pull/2/files#diff-7(25)
  • A html-content/Collaboration/collaboration6.htmlhttps://github.com/walterbender/training/pull/2/files#diff-8(20)
  • A html-content/Collaboration/collaboration7.htmlhttps://github.com/walterbender/training/pull/2/files#diff-9(26)
  • A html-content/Collaboration/collaboration8.htmlhttps://github.com/walterbender/training/pull/2/files#diff-10(20)
  • M html-content/MoreActivities/moreactivities1.htmlhttps://github.com/walterbender/training/pull/2/files#diff-11(6)
  • A html-content/MoreActivities/moreactivities2.htmlhttps://github.com/walterbender/training/pull/2/files#diff-12(20)
  • M html-content/MoreActivities/physics1.htmlhttps://github.com/walterbender/training/pull/2/files#diff-13(35)
  • A html-content/MoreActivities/physics2.htmlhttps://github.com/walterbender/training/pull/2/files#diff-14(18)
  • M html-content/MoreActivities/turtle1.htmlhttps://github.com/walterbender/training/pull/2/files#diff-15(36)
  • A html-content/MoreActivities/turtle2.htmlhttps://github.com/walterbender/training/pull/2/files#diff-16(34)
  • A html-content/MoreActivities/turtle3.htmlhttps://github.com/walterbender/training/pull/2/files#diff-17(18)
  • A html-content/MoreActivities/turtle4.htmlhttps://github.com/walterbender/training/pull/2/files#diff-18(32)
  • A html-content/MoreActivities/turtle5.htmlhttps://github.com/walterbender/training/pull/2/files#diff-19(18)
  • A html-content/MoreActivities/turtle6.htmlhttps://github.com/walterbender/training/pull/2/files#diff-20(29)
  • A html-content/MoreActivities/turtle7.htmlhttps://github.com/walterbender/training/pull/2/files#diff-21(18)
  • A html-content/MoreActivities/turtle8.htmlhttps://github.com/walterbender/training/pull/2/files#diff-22(29)
  • A html-content/MoreActivities/turtle9.htmlhttps://github.com/walterbender/training/pull/2/files#diff-23(18)
  • M html-content/Toolbar/toolbar6.htmlhttps://github.com/walterbender/training/pull/2/files#diff-24(2)

Patch Links:

Reply to this email directly or view it on GitHubhttps://github.com/walterbender/training/pull/2 .

Walter Bender Sugar Labs http://www.sugarlabs.org