Merge 9545e53 into 02e2ec8

scratchfoundation · Apr 26, 2018 · da2160e · da2160e
2 parents 02e2ec8 + 9545e53
commit da2160e
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 29 deletions.
diff --git a/src/components/navigation/conference/2018/navigation.jsx b/src/components/navigation/conference/2018/navigation.jsx
@@ -33,14 +33,6 @@ const Navigation = () => (
             </li>
             <li className="li-right mod-2018">
                 <ul className="li-right-ul mod-2018">
-                    <li className="link info">
-                        <a
-                            className="link-a"
-                            href="#info"
-                        >
-                            Registration Info
-                        </a>
-                    </li>
                     <li className="link questions">
                         <a
                             className="link-a"

diff --git a/src/views/conference/2018/index/index.jsx b/src/views/conference/2018/index/index.jsx
@@ -3,7 +3,6 @@ const FormattedMessage = require('react-intl').FormattedMessage;
 const React = require('react');
 const render = require('../../../../lib/render.jsx');
 
-const Button = require('../../../../components/forms/button.jsx');
 const FlexRow = require('../../../../components/flex-row/flex-row.jsx');
 const Page = require('../../../../components/page/conference/2018/page.jsx');
 const TitleBanner = require('../../../../components/title-banner/title-banner.jsx');
@@ -20,13 +19,12 @@ const ConferenceSplash = () => (
             <h3>
                 <FormattedMessage id="conference-2018.dateDesc" />
             </h3>
-            <p>
-                <a href="https://scratch2018.eventbrite.com">
-                    <Button className="mod-register">
-                        <FormattedMessage id="conference-2018.registerNow" />
-                    </Button>
-                </a>
-            </p>
+            <h3>
+                <FormattedMessage id="conference-2018.soldOut" />
+            </h3>
+            <h4>
+                <FormattedMessage id="conference-2018.comingSoon" />
+            </h4>
         </TitleBanner>
         <div className="inner">
             <section className="info">
@@ -68,20 +66,15 @@ const ConferenceSplash = () => (
                 </FlexRow>
                 <FlexRow className="uneven">
                     <div className="long">
-                        <h3 id="info"><FormattedMessage id="conference-2018.registrationTitle" /></h3>
-                        <p className="conf2018-panel-desc">
-                            <b><FormattedMessage id="conference-2018.registrationEarly" /></b>
-                            <br />
-                            <b><FormattedMessage id="conference-2018.registrationStandard" /></b>
-                        </p>
-                        <p>
-                            <a href="https://scratch2018.eventbrite.com">
-                                <Button className="mod-register">
-                                    <FormattedMessage id="conference-2018.registerNow" />
-                                </Button>
-                            </a>
-                        </p>
                         <h3 id="questions"><FormattedMessage id="conference-2018.questionsTitle" /></h3>
+                        <div>
+                            <p className="conf2018-question">
+                                <FormattedMessage id="conference-2018.soldoutQ" />
+                            </p>
+                            <p className="conf2018-answer">
+                                <FormattedMessage id="conference-2018.soldoutAns" />
+                            </p>
+                        </div>
                         <div>
                             <p className="conf2018-question">
                                 <FormattedMessage id="conference-2018.submissionQ" />

diff --git a/src/views/conference/2018/index/index.scss b/src/views/conference/2018/index/index.scss
@@ -17,6 +17,10 @@
             text-align: center;
             color: $type-white;
         }
+
+        h4 {
+            font-weight: normal;
+        }
 
         p {
             margin-top: 3rem;

diff --git a/src/views/conference/2018/index/l10n.json b/src/views/conference/2018/index/l10n.json
@@ -13,6 +13,8 @@
     "conference-2018.desc2": "We're planning a very participatory conference, with an entire day of hands-on workshops and lots of opportunities for peer-to-peer discussion and collaboration. The conference is intended primarily for adults who support young people learning Scratch.",
     "conference-2018.registrationDate": "Registration opens March 1, 2018.",
     "conference-2018.registerNow": "Register Now!",
+    "conference-2018.soldOut": "Scratch@MIT is sold out!",
+    "conference-2018.comingSoon": "Full event schedule coming soon",
     "conference-2018.sessionDesc": "Interested in offering a session? We invite four types of proposals:",
     "conference-2018.sessionItem1Title": "Poster/demonstration (90 minutes).",
     "conference-2018.sessionItem1Desc": "Show off your project in an exhibition setting, alongside other presenters. You will be provided with display space for a poster and table space for a computer or handouts.",
@@ -34,6 +36,8 @@
 
     "conference-2018.questions": "Questions? Contact the Scratch Team at {emailLink}",
     "conference-2018.questionsTitle": "Questions:",
+    "conference-2018.soldoutQ": "The conference is sold out. What can I do?",
+    "conference-2018.soldoutAns": "Scratch@MIT is sold out and at capacity. Regrettably, we are unable to add any additional guests. Please keep in mind that you must have registered on Eventbrite to attend Scratch@MIT; people who are not registered / do not have a ticket will not be able to attend the conference.",
     "conference-2018.submissionQ": "I missed the submission deadline. Can I still submit a proposal for the conference?",
     "conference-2018.submissionAns": "We are no longer accepting proposal submissions.",
     "conference-2018.regQ": "I can only attend one day of the conference. Do you offer single-day registration?",