Update the Oppia blog link; redo text on the Teach with Oppia page. (o…

…ppia#3945)
anna-gavrilova · Oct 8, 2017 · c2ce3f5 · c2ce3f5
1 parent e7fa295
commit c2ce3f5
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 95 deletions.
diff --git a/README.md b/README.md
@@ -60,7 +60,7 @@ The Oppia code is released under the [Apache v2 license](https://github.com/oppi
 
 ## Keeping in touch
 
-  * [Blog](https://oppiablog.blogspot.com/)
+  * [Blog](https://medium.com/oppia-org)
   * [Discussion forum](http://groups.google.com/group/oppia)
   * [Announcements mailing list](http://groups.google.com/group/oppia-announce)
   * Social media: [G+](https://plus.google.com/109898456505810251700/about), [YouTube](https://www.youtube.com/channel/UC5c1G7BNDCfv1rczcBp9FPw), [FB](https://www.facebook.com/oppiaorg), [Twitter](https://twitter.com/oppiaorg)

diff --git a/core/controllers/pages.py b/core/controllers/pages.py
@@ -106,19 +106,6 @@ def get(self):
         self.render_template('pages/teach/teach.html')
 
 
-class BlogPage(base.BaseHandler):
-    """Page embedding the Oppia blog."""
-
-    @acl_decorators.open_access
-    def get(self):
-        """Handles GET requests."""
-        self.values.update({
-            'meta_description': feconf.BLOG_PAGE_DESCRIPTION,
-            'nav_mode': feconf.NAV_MODE_BLOG,
-        })
-        self.render_template('pages/blog/blog.html')
-
-
 class ContactPage(base.BaseHandler):
     """Page with information about how to contact Oppia."""
 

diff --git a/core/templates/dev/head/components/side_navigation_bar/side_navigation_bar_directive.html b/core/templates/dev/head/components/side_navigation_bar/side_navigation_bar_directive.html
@@ -124,8 +124,8 @@
       </a>
     </li>
 
-    <li ng-class="{'active': NAV_MODE === 'blog'}">
-      <a href="/blog">
+    <li>
+      <a href="https://medium.com/oppia-org" target="_blank">
         <img ng-src="<[getStaticImageUrl('/sidebar/blogger.png')]>" class="oppia-sidebar-menu-icon" alt="Oppia Blog">
         <span translate="I18N_SIDEBAR_BLOG"></span>
       </a>

diff --git a/core/templates/dev/head/components/top_navigation_bar/top_navigation_bar_directive.html b/core/templates/dev/head/components/top_navigation_bar/top_navigation_bar_directive.html
@@ -42,7 +42,7 @@
           <li><a class="protractor-test-about-link oppia-navbar-tab-content" href="/about" translate="I18N_TOPNAV_ABOUT_OPPIA"></a></li>
           <li><a class="protractor-test-get-started-link oppia-navbar-tab-content" href="/get_started" translate="I18N_TOPNAV_GET_STARTED"></a></li>
           <li><a class="protractor-test-teach-link oppia-navbar-tab-content" href="/teach" translate="I18N_TOPNAV_TEACH_WITH_OPPIA"></a></li>
-          <li><a href="/blog" class="oppia-navbar-tab-content" translate="I18N_TOPNAV_BLOG"></a></li>
+          <li><a href="https://medium.com/oppia-org" target="_blank" class="oppia-navbar-tab-content" translate="I18N_TOPNAV_BLOG"></a></li>
           <li><a href="/forum" class="oppia-navbar-tab-content" translate="I18N_TOPNAV_FORUM"></a></li>
           <li><a class="protractor-test-contact-link oppia-navbar-tab-content" href="/contact" translate="I18N_TOPNAV_CONTACT_US"></a></li>
           <li><a href="/foundation" class="oppia-navbar-tab-content" translate="I18N_TOPNAV_OPPIA_FOUNDATION"></a></li>

diff --git a/core/templates/dev/head/pages/blog/blog.html b/core/templates/dev/head/pages/blog/blog.html
diff --git a/core/templates/dev/head/pages/teach/Teach.js b/core/templates/dev/head/pages/teach/Teach.js
@@ -65,7 +65,7 @@ oppia.controller('Teach', [
     $scope.onApplyToTeachWithOppia = function() {
       siteAnalyticsService.registerApplyToTeachWithOppiaEvent();
       $timeout(function() {
-        $window.location = 'https://goo.gl/forms/ljmQ9R3AZRkT2kU23';
+        $window.location = 'https://goo.gl/forms/tDUx4TS6B8Apkqhq2';
       }, 150);
       return false;
     };

diff --git a/core/templates/dev/head/pages/teach/teach.html b/core/templates/dev/head/pages/teach/teach.html
@@ -29,7 +29,7 @@ <h1 translate="I18N_TEACH_PAGE_HEADING"></h1>
           <ul class="oppia-about-tabs">
             <li class="oppia-about-tabs-active">
               <a ng-click="onTabClick(TAB_ID_TEACH)" class="oppia-about-tabs-text" href="" id="teach" translate="I18N_TEACH_PAGE_TAB_TEACH_WITH_OPPIA">
-                
+
               </a>
             </li>
             <li>
@@ -45,58 +45,16 @@ <h1 translate="I18N_TEACH_PAGE_HEADING"></h1>
           <div class="oppia-static-card-content oppia-static-card-content-narrow">
             <h2>Teach with Oppia</h2>
             <p>
-              You might know a student who's struggling with a topic at school.
-              They really want to learn it, but they've gotten a bit stuck, and
-              it's hard for them to get the personalized support they need. And
-              it's not just this student: other students, all over the world, are
-              likely to have trouble with the same topics, again and again.
-            </p>
-            <p>
-              To address this, we're excited to announce the
-              <em>Teach with Oppia</em> program, which enables anyone to
-              contribute to a collection of free, accessible lessons on topics
-              that learners find challenging. These lessons, called
-              <em>explorations</em>, use Oppia's unique technology to recreate 1-on-1
-              tutoring, combining engaging instruction, clear explanations, and
-              ample exercises that allow students to gain proficiency with the subject.
-              Students can then do these lessons at their own pace, supported by
-              useful, targeted feedback.
-            </p>
-            <p>
-              Ultimately, Oppia's goal is to cover as many subjects as possible.
-              However, our short-term goal is to create a set of effective,
-              enjoyable explorations for basic mathematics (up to pre-algebra)
-              that students can use on their own, and that provably help them learn.
+              The Oppia team is currently working hard on a series of free online lessons on <strong>basic mathematics</strong>. These lessons are targeted at students who don't have access to textbooks and good teachers, but who do have (low-end) mobile devices. We hope students will be able to learn from these lessons at their own pace, supported by useful, targeted feedback.
             </p>
             <p>
-              To achieve this, the <em>Teach with Oppia</em> program is currently accepting
-              applications from individuals who can demonstrate a passion and aptitude
-              for helping students learn basic mathematics. Participants will receive
-              personalized feedback on the lessons they create, as well as
-              assistance with playtesting and promoting their lessons. They'll
-              also be able to connect with other like-minded creators, as well as
-              the Oppia development team, to ensure that their creations are as
-              well-realized as possible.
+              The story-based lessons we're creating relate mathematics to a student's real-life experience (similar to this <a href="https://www.oppia.org/explore/DIWZiVgs0km-?collection_id=4UgTQUc1tala">sample lesson</a> on Fractions). We want them to be demonstrably effective, to represent the best that can be done with online teaching, and to be available to anyone free-of-charge. We also plan to improve the lessons over time, so that they're as useful for as many students around the world as possible.
             </p>
             <p>
-              Though the program runs year-round, we can only accommodate a
-              limited number of participants at any given time. We accept
-              submissions on a rolling basis, so please fill out
-              <a href="https://goo.gl/forms/ljmQ9R3AZRkT2kU23">this form</a>
-              if you'd like to take part.
+              The <a href="https://goo.gl/forms/tDUx4TS6B8Apkqhq2"><em>Teach with Oppia</em></a> program invites applications from volunteers who can demonstrate a passion and aptitude for helping students learn basic mathematics. Participants will receive personalized feedback on the lessons they create, as well as assistance with playtesting and promoting their lessons. They'll also be able to connect with other like-minded creators, as well as the Oppia development team, to ensure their creations are well-realized.
             </p>
             <p>
-              Interested individuals who wish to contribute explorations <em>not</em>
-              focused on basic mathematics may also still apply. However,
-              because Oppia is entirely volunteer-driven, we simply do not have
-              the time to support every educator interested in the program.
-              Therefore, in order to receive the same level of support from the
-              Oppia team, these individuals will need to create, promote, and
-              refine at least one exploration on their own first. This
-              demonstrates that the individual could be a valuable long-term
-              contributor to the project and is committed to Oppia's mission of
-              helping anyone learn anything they want in an effective and
-              enjoyable way.
+              Although the program runs year-round, we can only accommodate a limited number of participants. However, we are currently accepting submissions on a rolling basis -- so if you love coming up with engaging stories, explaining a topic clearly, or identifying roadblocks that students may run into and helping them overcome these, please don't hesitate to get in touch!
             </p>
 
           </div>

diff --git a/data/explorations/about_oppia.yaml b/data/explorations/about_oppia.yaml
@@ -72,7 +72,7 @@ states:
       html: <div>If you have a question relating to this site, you can get in touch
         by posting to our forum:</div><div><oppia-noninteractive-link url-with-value="&amp;quot;https://www.oppia.org/forum&amp;quot;"></oppia-noninteractive-link><br></div><div><br></div><div>You
         can also follow our blog to get the latest updates:</div><div><oppia-noninteractive-link
-        url-with-value="&amp;quot;http://oppiablog.blogspot.com/&amp;quot;"></oppia-noninteractive-link><br></div><div><br></div><div>If
+        url-with-value="&amp;quot;https://medium.com/oppia-org&amp;quot;"></oppia-noninteractive-link><br></div><div><br></div><div>If
         you find a bug or have a feature request, please create an issue on the Oppia
         bug tracker:</div><div><oppia-noninteractive-link url-with-value="&amp;quot;https://github.com/oppia/oppia/issues/new&amp;quot;"></oppia-noninteractive-link><br></div><div><br></div><div>You
         can also get in touch with the developers of the open-source Oppia codebase

diff --git a/feconf.py b/feconf.py
@@ -585,7 +585,6 @@ def get_empty_ratings():
 
 NAV_MODE_ABOUT = 'about'
 NAV_MODE_GET_STARTED = 'get_started'
-NAV_MODE_BLOG = 'blog'
 NAV_MODE_COLLECTION = 'collection'
 NAV_MODE_CONTACT = 'contact'
 NAV_MODE_CREATE = 'create'
@@ -727,8 +726,6 @@ def get_empty_ratings():
     'scenarios for others.')
 GET_STARTED_PAGE_DESCRIPTION = (
     'Learn how to get started using Oppia.')
-BLOG_PAGE_DESCRIPTION = (
-    'Keep up to date with Oppia news and updates via our blog.')
 CONTACT_PAGE_DESCRIPTION = (
     'Contact the Oppia team, submit feedback, and learn how to get involved '
     'with the Oppia project.')

diff --git a/main.py b/main.py
@@ -170,7 +170,6 @@ def ui_access_wrapper(self, *args, **kwargs):
     get_redirect_route(r'/console_errors', pages.ConsoleErrorPage),
     get_redirect_route(r'/contact', pages.ContactPage),
 
-    get_redirect_route(r'/blog', pages.BlogPage),
     get_redirect_route(r'/forum', pages.ForumPage),
     get_redirect_route(r'/donate', pages.DonatePage),
     get_redirect_route(r'/thanks', pages.ThanksPage),