diff --git a/app/assets/images/pages/home/course2.png b/app/assets/images/pages/home/computer-science-2.png similarity index 100% rename from app/assets/images/pages/home/course2.png rename to app/assets/images/pages/home/computer-science-2.png diff --git a/app/assets/images/pages/home/course3.png b/app/assets/images/pages/home/computer-science-3.png similarity index 100% rename from app/assets/images/pages/home/course3.png rename to app/assets/images/pages/home/computer-science-3.png diff --git a/app/assets/images/pages/home/course4.png b/app/assets/images/pages/home/computer-science-4.png similarity index 100% rename from app/assets/images/pages/home/course4.png rename to app/assets/images/pages/home/computer-science-4.png diff --git a/app/assets/images/pages/home/course5.png b/app/assets/images/pages/home/computer-science-5.png similarity index 100% rename from app/assets/images/pages/home/course5.png rename to app/assets/images/pages/home/computer-science-5.png diff --git a/app/assets/images/pages/home/game-dev-1.png b/app/assets/images/pages/home/game-dev-1.png new file mode 100644 index 000000000..4fe0b8f96 Binary files /dev/null and b/app/assets/images/pages/home/game-dev-1.png differ diff --git a/app/assets/images/pages/home/course1.png b/app/assets/images/pages/home/introduction-to-computer-science.png similarity index 100% rename from app/assets/images/pages/home/course1.png rename to app/assets/images/pages/home/introduction-to-computer-science.png diff --git a/app/assets/images/pages/home/web-dev-1.png b/app/assets/images/pages/home/web-dev-1.png new file mode 100644 index 000000000..29a561a73 Binary files /dev/null and b/app/assets/images/pages/home/web-dev-1.png differ diff --git a/app/locale/en.coffee b/app/locale/en.coffee index c23b87ee9..0d1469950 100644 --- a/app/locale/en.coffee +++ b/app/locale/en.coffee @@ -71,7 +71,7 @@ curriculum: "Total curriculum hours:" ffa: "Free for all students" lesson_time: "Lesson time:" - coming_soon: "Coming this fall!" + coming_soon: "More coming soon!" # {change} courses_available_in: "Courses are available in JavaScript, Python, and Java (coming soon!)" boast: "Boasts riddles that are complex enough to fascinate gamers and coders alike." winning: "A winning combination of RPG gameplay and programming homework that pulls off making kid-friendly education legitimately enjoyable." diff --git a/app/templates/courses/teacher-class-view.jade b/app/templates/courses/teacher-class-view.jade index 37cbb69e0..ad32438aa 100644 --- a/app/templates/courses/teacher-class-view.jade +++ b/app/templates/courses/teacher-class-view.jade @@ -122,12 +122,13 @@ block content li(class=(activeTab === "#enrollment-status-tab" ? 'active' : '')) a.course-progress-tab-btn(href='#enrollment-status-tab') .small-details.text-center(data-i18n='teacher.enrollment_status') - - var courses = view.classroom.get('courses').map(function(c) { return view.courses.get(c._id); }); - if _.find(courses, function(c) { return /dev/.test(c.get('slug')); }) - .tab-spacer - li(class=(activeTab === "#student-projects-tab" ? 'active' : '')) - a.course-progress-tab-btn(href='#student-projects-tab') - .small-details.text-center(data-i18n='teacher.projects') + // TODO: Move projects into course progress tab + //- var courses = view.classroom.get('courses').map(function(c) { return view.courses.get(c._id); }); + //if _.find(courses, function(c) { return /dev/.test(c.get('slug')); }) + // .tab-spacer + // li(class=(activeTab === "#student-projects-tab" ? 'active' : '')) + // a.course-progress-tab-btn(href='#student-projects-tab') + // .small-details.text-center(data-i18n='teacher.projects') .tab-filler .tab-content diff --git a/app/templates/new-home-view.jade b/app/templates/new-home-view.jade index 6f7c77ec8..302fc9d9b 100644 --- a/app/templates/new-home-view.jade +++ b/app/templates/new-home-view.jade @@ -232,7 +232,6 @@ block content span#semester-duration #courses-row.row - var conceptsSeen = {}; - - var lastScreenshot = ""; for course, courseIndex in view.courses.models .col-md-3.col-sm-4 .media.course-details(data-course-slug=course.get('slug')) @@ -256,19 +255,16 @@ block content span.spr , - total += 1; span(data-i18n="concepts." + concept) - img.media-object(src="/images/pages/home/course"+(courseIndex+1)+".png") - - lastScreenshot = course.get('screenshot'); + img.media-object(src="/images/pages/home/" + course.get('slug') + ".png") h6.course-duration span.spr(data-i18n="new_home.lesson_time") span.course-hours= course.get('duration') || 0 span.spl.unit(data-i18n="units.hours") - for upcomingCourse in ['Computer Science 6', 'Computer Science 7', 'Computer Science 8'] - .col-md-3.col-sm-4 - .media.disabled - .media-body - h6.course-name= upcomingCourse + ':' - p.small(data-i18n="new_home.coming_soon") - img.media-object(src="/images/pages/home/inprogress.png") + .col-md-3.col-sm-4 + .media.disabled + .media-body + p.small(data-i18n="new_home.coming_soon") + img.media-object(src="/images/pages/home/inprogress.png") .clearfix .text-center diff --git a/app/views/NewHomeView.coffee b/app/views/NewHomeView.coffee index 3c222881f..68fcd7918 100644 --- a/app/views/NewHomeView.coffee +++ b/app/views/NewHomeView.coffee @@ -131,9 +131,33 @@ module.exports = class NewHomeView extends RootView onChangeSchoolLevelDropdown: (e) -> levels = - elementary: {'introduction-to-computer-science': '2-4', 'computer-science-6': '24-30', 'computer-science-7': '30-40', 'computer-science-8': '30-40', default: '16-25', total: '150-215 hours (about two and a half years)'} - middle: {'introduction-to-computer-science': '1-3', 'computer-science-6': '12-14', 'computer-science-7': '14-16', 'computer-science-8': '14-16', default: '8-12', total: '75-100 hours (about one and a half years)'} - high: {'introduction-to-computer-science': '1', 'computer-science-6': '10-12', 'computer-science-7': '12-16', 'computer-science-8': '12-16', default: '8-10', total: '65-85 hours (about one year)'} + elementary: + 'introduction-to-computer-science': '2-4' + 'game-dev-1': '2-3' + 'web-dev-1': '2-3' + 'computer-science-6': '24-30' + 'computer-science-7': '30-40' + 'computer-science-8': '30-40' + default: '16-25' + total: '150-215 hours (about two and a half years)' + middle: + 'introduction-to-computer-science': '1-3' + 'game-dev-1': '1-3' + 'web-dev-1': '1-3' + 'computer-science-6': '12-14' + 'computer-science-7': '14-16' + 'computer-science-8': '14-16' + default: '8-12' + total: '75-100 hours (about one and a half years)' + high: + 'introduction-to-computer-science': '1' + 'game-dev-1': '1-2' + 'web-dev-1': '1-2' + 'computer-science-6': '10-12' + 'computer-science-7': '12-16' + 'computer-science-8': '12-16' + default: '8-10' + total: '65-85 hours (about one year)' level = if e then $(e.target).val() else 'middle' @$el.find('#courses-row .course-details').each -> slug = $(@).data('course-slug') diff --git a/scripts/mongodb/updateCourses.js b/scripts/mongodb/updateCourses.js index 414b1dfd8..593e301d8 100644 --- a/scripts/mongodb/updateCourses.js +++ b/scripts/mongodb/updateCourses.js @@ -75,7 +75,7 @@ var courses = description: "Learn the basics of web development in this introductory HTML & CSS course.", duration: NumberInt(1), free: false, - releasePhase: 'beta' + releasePhase: 'released' }, { name: "CS: Web Development 2",