Merge pull request #17674 from code-dot-org/fix-csf-remix

re-enable Remix, Make your own, and Make your own app buttons
code-dot-org · Sep 12, 2017 · 316eaeb · 316eaeb
2 parents b1efe31 + 088c967
commit 316eaeb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 20 deletions.
diff --git a/apps/src/StudioApp.js b/apps/src/StudioApp.js
@@ -291,7 +291,6 @@ StudioApp.prototype.init = function (config) {
       noHowItWorks: config.noHowItWorks,
       isLegacyShare: config.isLegacyShare,
       isResponsive: getStore().getState().pageConstants.isResponsive,
-      isTooYoung: config.isTooYoung,
       wireframeShare: config.wireframeShare,
     });
   }
@@ -1892,7 +1891,6 @@ StudioApp.prototype.handleHideSource_ = function (options) {
             channelId: project.getCurrentId(),
             appType: project.getStandaloneApp(),
             isLegacyShare: options.isLegacyShare,
-            isTooYoung: !!options.isTooYoung,
           }), div);
         }
       }
@@ -2823,9 +2821,6 @@ StudioApp.prototype.setPageConstants = function (config, appSpecificConstants) {
     inputOutputTable: config.level.inputOutputTable,
     is13Plus: config.is13Plus,
     isSignedIn: config.isSignedIn,
-    // The user is signed in, under 13, and does not have a teacher that has
-    // accepted the terms of service.
-    isTooYoung: !!config.isTooYoung,
     textToSpeechEnabled: config.textToSpeechEnabled,
     isK1: config.level.isK1,
     appType: config.app,

diff --git a/apps/src/applab/applab.js b/apps/src/applab/applab.js
@@ -161,14 +161,14 @@ function shouldRenderFooter() {
   return studioApp().share;
 }
 
-Applab.makeFooterMenuItems = function (isIframeEmbed, isTooYoung) {
+Applab.makeFooterMenuItems = function (isIframeEmbed) {
   const footerMenuItems = [
     window.location.search.indexOf('nosource') < 0 && {
       text: i18n.t('footer.how_it_works'),
       link: project.getProjectUrl('/view'),
       newWindow: true,
     },
-    isIframeEmbed && !dom.isMobile() && !isTooYoung && {
+    isIframeEmbed && !dom.isMobile() && {
       text: applabMsg.makeMyOwnApp(),
       link: '/projects/applab/new',
     },
@@ -199,9 +199,8 @@ function renderFooterInSharedGame() {
   divApplab.parentNode.insertBefore(footerDiv, divApplab.nextSibling);
 
   const isIframeEmbed = getStore().getState().pageConstants.isIframeEmbed;
-  const isTooYoung = getStore().getState().pageConstants.isTooYoung;
 
-  const menuItems = Applab.makeFooterMenuItems(isIframeEmbed, isTooYoung);
+  const menuItems = Applab.makeFooterMenuItems(isIframeEmbed);
 
   ReactDOM.render(
     <SmallFooter

diff --git a/apps/src/code-studio/header.js b/apps/src/code-studio/header.js
@@ -250,15 +250,13 @@ function remixProject() {
 // Minimal project header for viewing channel shares and legacy /c/ share pages.
 header.showMinimalProjectHeader = function () {
   var projectName = $('<div class="project_name_wrapper header_text">')
-      .append($('<div class="project_name header_text">').text(dashboard.project.getCurrentName()));
+      .append($('<div class="project_name header_text">').text(dashboard.project.getCurrentName()))
+      .append($('<div class="project_updated_at header_text">').text(dashboard.i18n.t('project.click_to_remix')));
 
-  $('.project_info').append(projectName);
-
-  if (!appOptions.isTooYoung) {
-    projectName.append($('<div class="project_updated_at header_text">').text(dashboard.i18n.t('project.click_to_remix')));
-    $('.project_info').append($('<div class="project_remix header_button">').text(dashboard.i18n.t('project.remix')));
-    $('.project_remix').click(remixProject);
-  }
+  $('.project_info')
+      .append(projectName)
+      .append($('<div class="project_remix header_button">').text(dashboard.i18n.t('project.remix')));
+  $('.project_remix').click(remixProject);
 };
 
 // Project header for script levels that are backed by a project. Shows a

diff --git a/apps/src/redux/pageConstants.js b/apps/src/redux/pageConstants.js
@@ -51,7 +51,6 @@ var ALLOWED_KEYS = new Set([
   'nonResponsiveVisualizationColumnWidth',
   'is13Plus',
   'isSignedIn',
-  'isTooYoung',
   'isK1',
   'textToSpeechEnabled',
   'documentationUrl',

diff --git a/apps/src/templates/WireframeButtons.jsx b/apps/src/templates/WireframeButtons.jsx
@@ -59,7 +59,6 @@ let WireframeButtons = React.createClass({
     channelId: PropTypes.string,
     appType: PropTypes.string.isRequired,
     isLegacyShare: PropTypes.bool.isRequired,
-    isTooYoung: PropTypes.bool.isRequired,
   },
 
   getInitialState: function () {
@@ -114,7 +113,7 @@ let WireframeButtons = React.createClass({
     var isLegacyShare = window.location.pathname[1] === 'c';
     var appTypeAndLegacy = this.props.appType + (isLegacyShare ? '_legacy' : '');
     var url = APP_TYPE_TO_NEW_PROJECT_URL[appTypeAndLegacy];
-    if (url && !this.props.isTooYoung) {
+    if (url) {
       return (
           <span style={{display: 'inline-block'}}>
             <a className="WireframeButtons_button" href={url}>

diff --git a/dashboard/config/locales/en.yml b/dashboard/config/locales/en.yml
@@ -500,6 +500,7 @@ en:
     secure: 'Secure Version'
     report_abuse: 'Report Abuse'
     built_on_code_studio: 'Built on Code Studio'
+    make_my_own_app: 'Make my own app'
     how_it_works: 'How it Works (View Code)'
     try_hour_of_code: 'Try an Hour of Code!'
   reference_area: