diff --git a/apps/src/sites/studio/pages/home/_homepage.js b/apps/src/sites/studio/pages/home/_homepage.js
index 482e994489d21..e73340b34d002 100644
--- a/apps/src/sites/studio/pages/home/_homepage.js
+++ b/apps/src/sites/studio/pages/home/_homepage.js
@@ -147,7 +147,6 @@ function showHomepage() {
id: announcementId
}
]}
- hocLaunch={homepageData.hoc_launch}
courses={homepageData.courses}
joinedSections={homepageData.joined_sections}
topCourse={homepageData.topCourse}
diff --git a/apps/src/templates/studioHomepages/TeacherHomepage.jsx b/apps/src/templates/studioHomepages/TeacherHomepage.jsx
index 7aaf23e3d79b2..e038497f4abda 100644
--- a/apps/src/templates/studioHomepages/TeacherHomepage.jsx
+++ b/apps/src/templates/studioHomepages/TeacherHomepage.jsx
@@ -2,7 +2,6 @@ import React, {PropTypes, Component} from 'react';
import ReactDOM from 'react-dom';
import $ from 'jquery';
import HeaderBanner from '../HeaderBanner';
-import {SpecialAnnouncementActionBlock} from './TwoColumnActionBlock';
import Notification from '../Notification';
import RecentCourses from './RecentCourses';
import TeacherSections from './TeacherSections';
@@ -12,7 +11,6 @@ import ProjectWidgetWithData from '@cdo/apps/templates/projects/ProjectWidgetWit
import shapes from './shapes';
import ProtectedStatefulDiv from '../ProtectedStatefulDiv';
import i18n from "@cdo/locale";
-import {pegasus} from '@cdo/apps/lib/util/urlHelpers';
const styles = {
clear: {
@@ -30,7 +28,6 @@ export default class TeacherHomepage extends Component {
isRtl: PropTypes.bool.isRequired,
queryStringOpen: PropTypes.string,
canViewAdvancedTools: PropTypes.bool,
- hocLaunch: PropTypes.object,
isEnglish: PropTypes.bool.isRequired
};
@@ -42,7 +39,7 @@ export default class TeacherHomepage extends Component {
render() {
const { courses, topCourse, announcements, isRtl, queryStringOpen, joinedSections } = this.props;
- const { canViewAdvancedTools, hocLaunch, isEnglish } = this.props;
+ const { canViewAdvancedTools } = this.props;
return (
@@ -56,73 +53,8 @@ export default class TeacherHomepage extends Component {
- {hocLaunch &&
- hocLaunch.special_announcement &&
- (hocLaunch.special_announcement === "mc2017" ||
- (hocLaunch.special_announcement === "applab2017" && !isEnglish) ||
- (hocLaunch.special_announcement === "celebs2017" && !isEnglish)) && (
-
- )}
-
- {hocLaunch &&
- hocLaunch.special_announcement &&
- hocLaunch.special_announcement === "applab2017" &&
- isEnglish && (
-
- )}
-
- {hocLaunch &&
- hocLaunch.special_announcement &&
- hocLaunch.special_announcement === "celebs2017" &&
- isEnglish && (
-
- )}
-
- {hocLaunch &&
- hocLaunch.special_announcement &&
- hocLaunch.special_announcement === "celebs2017actualhoc" &&
- isEnglish && (
-
- )}
- {announcements.length > 0 &&
- !(hocLaunch && hocLaunch.hide_teacher_announcement) && (
+ {announcements.length > 0 && (
; rel=preload; as=image; media=\"#{css_retina?(false)}\";"
- - response.add_header 'Link', "; rel=preload; as=image; media=\"#{css_retina?}\";"
- .widehero_do_not_hide.mobile-feature{style: "background-image: url(\"/images/homepage/celebs_hoc2017_mobile_1x.jpg\"); background-position: #{entry[:param1_s]}; z-index: -5"}
- .widehero_do_not_hide.desktop-feature{style: "background-image: url(\"/images/homepage/celebs_hoc2017_desktop_1x.jpg\"); background-position: #{entry[:param1_s]}; z-index: -5"}
-
- - else
- -#
- Use Link rel=preload HTTP headers to preload as early as possible.
- Two headers with inverse media queries conditionally load the correctly-sized image.
- - response.add_header 'Link', "<#{entry[:image_t]}>; rel=preload; as=image; media=\"#{css_retina?(false)}\";"
- - response.add_header 'Link', "<#{entry[:image_t].gsub('.jpg', '_2x.jpg')}>; rel=preload; as=image; media=\"#{css_retina?}\";"
- .widehero#fullwidth0{style: "background-position: #{entry[:param1_s]}; background-image: url(#{entry[:image_t]});"}
+ -#
+ Use Link rel=preload HTTP headers to preload as early as possible.
+ Two headers with inverse media queries conditionally load the correctly-sized image.
+ - response.add_header 'Link', "<#{entry[:image_t]}>; rel=preload; as=image; media=\"#{css_retina?(false)}\";"
+ - response.add_header 'Link', "<#{entry[:image_t].gsub('.jpg', '_2x.jpg')}>; rel=preload; as=image; media=\"#{css_retina?}\";"
+ .widehero#fullwidth0{style: "background-position: #{entry[:param1_s]}; background-image: url(#{entry[:image_t]});"}
- else
.widehero.lazyload{id: "fullwidth#{index}", "data-bg"=> "#{entry[:image_t]}", style: "background-position: #{entry[:param1_s]}"}
@@ -192,7 +115,7 @@
= view :mobile_header_responsive
#caption_container.container_responsive
- - if show_census_layout || show_hoc_launch_layout
+ - if show_census_layout
.bigannounce{style: "padding: 20px; text-align: center"}
#actions
= main_actions
diff --git a/pegasus/sites.v3/code.org/views/stats_homepage.haml b/pegasus/sites.v3/code.org/views/stats_homepage.haml
index 479d77837ec7a..58b59fb14ceae 100644
--- a/pegasus/sites.v3/code.org/views/stats_homepage.haml
+++ b/pegasus/sites.v3/code.org/views/stats_homepage.haml
@@ -1,8 +1,6 @@
:ruby
- hoc_mode = DCDO.get('hoc_mode', nil)
-
student_accounts_percent = "25%"
- female_students = hoc_mode == 'actual-hoc' ? "10M" : "9M"
+ female_students = "10M"
teacher_users = "700K"
world_students_hoc_percent = "10%"
states_policy_change = "20"
diff --git a/pegasus/sites.v3/hourofcode.com/public/learn/index.haml b/pegasus/sites.v3/hourofcode.com/public/learn/index.haml
index cd45965371051..4795db642d592 100644
--- a/pegasus/sites.v3/hourofcode.com/public/learn/index.haml
+++ b/pegasus/sites.v3/hourofcode.com/public/learn/index.haml
@@ -92,8 +92,6 @@ social:
%script{src: asset_path("js/#{js_locale}/tutorialExplorer_locale.js")}
%script{src: minifiable_asset_path("js/tutorialExplorer.js")}
-- hoc_launch = DCDO.get('hoc_launch', nil)
-
-# Load tutorial images from code.org so we don't have to duplicate them on hourofcode.com.
- tutorials_contents = Tutorials.new(:tutorials).contents(request.host_with_port)
- tutorials_contents.each do |tutorial|
@@ -111,10 +109,6 @@ social:
- tutorial[:string_detail_platforms] = hoc_s(prefix + "string_detail_platforms")
- tutorial[:string_detail_programming_languages] = hoc_s(prefix + "string_detail_programming_languages")
- - if hoc_launch && hoc_launch["tutorial_explorer_mc2017_image"]
- - if tutorial[:short_code] == "mchoc"
- - tutorial[:image] = CDO.code_org_url("/images/tutorials/hoc2017/minecraft2017.png")
-
#tutorials
.clear{style: "clear: both"}