Removed apostrophe from MicroMaster's (#560)

* Removed apostrophe from MicroMaster's * Use MIT for alt text * Add width and height to images, use correct size image, use static * Remove quote * Add apostrophe for Master's degree, remove all for Micromasters
mitodl · Jun 22, 2016 · 7cd7483 · 7cd7483
1 parent b7ea2a0
commit 7cd7483
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 50 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
-# MicroMaster’s
-Portal for learners and course teams to access MITx MicroMaster’s programs
+# MicroMasters
+Portal for learners and course teams to access MITx MicroMasters programs
 
 ## Major Dependencies
 - Docker
@@ -26,7 +26,7 @@ with the edX instance.
 
 ## Running edX devstack locally _(optional, but recommended)_
 
-MicroMaster’s can work with a live instance of edX, but it's recommended that
+MicroMasters can work with a live instance of edX, but it's recommended that
 you get it running locally. It's obviously more configurable that way, and you'll
 likely need to run it locally for other projects in the future.
 
@@ -92,18 +92,18 @@ Django OAuth Toolkit section (/admin/oauth2_provider/), and add a
 new Application. Fill in the values as follows:
 
 - **User**: Use the lookup (magnifying glass) to find your superuser
-- **Redirect uris**: The URL where MicroMaster’s will be running, followed by "/complete/edxorg/".
+- **Redirect uris**: The URL where MicroMasters will be running, followed by "/complete/edxorg/".
 If you're running it via Docker, run ``docker-machine ip`` from the host machine to get the
-container IP. MicroMaster’s runs on port ``8079`` by default, so this value should be something
+container IP. MicroMasters runs on port ``8079`` by default, so this value should be something
 like ``http://192.168.99.100:8079/complete/edxorg/``
 - **Client type**: Set to '_Confidential_'.
 - **Authorization grant type**: Set to '_Authorization Code_'.
 - **Name**: Anything you want. Something like 'mm-local' would do fine here.
 
-#### 5) Copy relevant values to use in the MicroMaster’s .env file
+#### 5) Copy relevant values to use in the MicroMasters .env file
 
-The MicroMaster’s codebase contains a ``.env.sample`` file which will be used as
-a template to create your ``.env`` file. For MicroMaster’s to work, it needs 3 values:
+The MicroMasters codebase contains a ``.env.sample`` file which will be used as
+a template to create your ``.env`` file. For MicroMasters to work, it needs 3 values:
 
 - ``EDXORG_BASE_URL``
 
@@ -174,7 +174,7 @@ For first-time container start-up, start it with a full build:
 
     docker-compose up --build
 
-In another terminal tab, navigate the the MicroMaster’s directory
+In another terminal tab, navigate the the MicroMasters directory
 and add a superuser in the now-running Docker container:
 
     docker-compose run web python3 manage.py createsuperuser
@@ -184,16 +184,16 @@ param: ``docker-compose up``
 
 You should now be able to do the following:
 
-1. Visit MicroMaster’s in your browser on port `8079`. _(OSX Only)_ Docker auto-assigns
- the container IP. Run ``docker-machine ip`` to see it. Your MicroMaster’s URL will
+1. Visit MicroMasters in your browser on port `8079`. _(OSX Only)_ Docker auto-assigns
+ the container IP. Run ``docker-machine ip`` to see it. Your MicroMasters URL will
  be something like this: ``192.168.99.100:8079``.
 1. Click "Sign in with edX.org" and sign in by authorizing an edX client. If you're
  running edX locally, this will be the client you created in the steps above.
 
 ## Running Commands and Testing
 
 As shown above, manage commands can be executed on the Docker-contained
-MicroMaster’s app. For example, you can run a Python shell with the following command:
+MicroMasters app. For example, you can run a Python shell with the following command:
 
     docker-compose run web python3 manage.py shell
 

diff --git a/cms/templates/cms/footer.html b/cms/templates/cms/footer.html
@@ -1,8 +1,9 @@
+{% load static %}
 <footer>
      <div class="container">
         <div class="row">
            <div class="col-md-8">
-              <img src="/static/images/[email protected]" alt="MicroMaster’s">
+              <img src="{% static 'images/[email protected]' %}" alt="MIT" width="72" height="38">
               <div class="footer-links">
                   <a href="https://www.edx.org/" target="_blank">edX</a>
                   <a href="https://odl.mit.edu/" target="_blank">Office of Digital Learning</a>

diff --git a/cms/templates/cms/home_page.html b/cms/templates/cms/home_page.html
@@ -6,7 +6,7 @@
 {% wagtailuserbar %}
 {% block body_class %}template-programpage{% endblock %}
 
-{% block title %}{% trans "MIT MicroMaster’s" %}{% endblock %}
+{% block title %}{% trans "MIT MicroMasters" %}{% endblock %}
 
 {% block content %}
 
@@ -15,7 +15,7 @@
   <nav class="navbar navbar-default" role="navigation">
     <div class="container-fluid">
       <div class="navbar-header">
-        <a class="navbar-brand" href="javascript:void(0)"><img src="/static/images/logo-micromasters@2x.png" width="215" height="40" alt="MIT MicroMaster’s" /></a>
+        <a class="navbar-brand" href="javascript:void(0)"><img src="{% static 'images/logo-micromasters.png' %}" width="215" height="40" alt="MIT MicroMasters" /></a>
         <div class="nav-utility pull-right">
           {% if authenticated %}
           <a class="btn btn-danger" href="/logout">
@@ -46,7 +46,7 @@
         <div class="banner-wrapper-content">
           <h1>
             <div class="banner-image">
-              <img src="static/images/[email protected]" alt="MIT" />
+              <img src="{% static 'images/[email protected]' %}" alt="MIT" />
             </div>
             {{ title }}
           </h1>
@@ -56,14 +56,14 @@ <h1>
       <div class="row sub-banner">
         <div class="col-md-12">
           <div class="sub-banner-content">
-            MIT has created a new credential for online learners: the MicroMaster’s, which will be granted by <a href="https://www.edx.org/school/mitx" target="_blank">MITx</a> to students who do exceptionally well in a given set of graduate-level online courses and do well in a subsequent exam. <a href="javascript:void()" data-target="#modal-about" data-toggle="modal">Learn more</a>.
+            MIT has created a new credential for online learners: the MicroMasters, which will be granted by <a href="https://www.edx.org/school/mitx" target="_blank">MITx</a> to students who do exceptionally well in a given set of graduate-level online courses and do well in a subsequent exam. <a href="javascript:void()" data-target="#modal-about" data-toggle="modal">Learn more</a>.
           </div>
         </div>
       </div>
 
       <div class="panel panel-main-content">
         <div class="panel-body">
-          <h3>MicroMaster’s</h3>
+          <h3>MicroMasters</h3>
           <div class="media-list is-grid padding-bottom-50">
             <ul class="blocks list-unstyled" data-plugin="animateList" data-child=">li">
 
@@ -75,7 +75,7 @@ <h3>MicroMaster’s</h3>
                 <div class="media-item">
                   <div class="media-top">
                     <div class="image-wrap">
-                      <img class="image" src="static/images/course-1.png" alt="course image for {{program}}"> 
+                      <img class="image" src="{% static 'images/course-1.png' %}" alt="course image for {{program}}" height="135" width="377">
                     </div>
                   </div>
                   <div class="info-wrap">
@@ -106,16 +106,16 @@ <h3>MicroMaster’s</h3>
                   <br/><br/><br/>
                   <div class="container">
                     <div class="col-sm-12 title-coming-soon text-center">
-                      MIT has plans to bring more MicroMaster’s programs to motivated learners like you.
+                      MIT has plans to bring more MicroMasters programs to motivated learners like you.
                       Please sign up for our <a href="#" data-toggle="modal"
                       data-target="#subscribeAlert">mailing list</a>
-                      to hear about new MicroMaster’s programs.
-                      Also, don't hesitate to let us know about what MicroMaster’s you’d like to see.
+                      to hear about new MicroMasters programs.
+                      Also, don't hesitate to let us know about what MicroMasters you’d like to see.
                     </div>
                     <div class="row">
                       <div class="col-sm-12">
                         <button class="btn btn-danger button-subscribe-alerts center-block"  data-toggle="modal"
-                       data-target="#subscribeAlert">Yes, tell me when MicroMaster’s are available</button>
+                       data-target="#subscribeAlert">Yes, tell me when MicroMasters are available</button>
                       </div>
                     </div>
                   </div>
@@ -138,20 +138,19 @@ <h3>MicroMaster’s</h3>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
             <span aria-hidden="true">×</span>
           </button>
-          <!-- <h4 class="modal-title">About MicroMaster’s</h4> -->
         </div>
         <div class="modal-body">
-          <h2>MicroMaster’s is a new credential</h2>
+          <h2>MicroMasters is a new credential</h2>
           <p>
-          MIT has created a new credential for online learners: the “MicroMaster’s,” which will be granted by MITx (MIT’s online learning initiative) to students who do exceptionally well in a given set of graduate-level online courses and do well in a subsequent exam. The credential will first be available to students who register for the SCM program’s online courses.
+          MIT has created a new credential for online learners: the “MicroMasters,” which will be granted by MITx (MIT’s online learning initiative) to students who do exceptionally well in a given set of graduate-level online courses and do well in a subsequent exam. The credential will first be available to students who register for the SCM program’s online courses.
           </p>
-          <h3>Join the MIT MicroMaster’s community</h3>
+          <h3>Join the MIT MicroMasters community</h3>
           <p>
-          MicroMaster’s aren't just about courseware. Part of the the MIT experience is interacting with other exceptional students like yourself. Fill out your profile on this site and build professional relationships with like-minded learners.
+          MicroMasters aren't just about courseware. Part of the the MIT experience is interacting with other exceptional students like yourself. Fill out your profile on this site and build professional relationships with like-minded learners.
           </p>
-          <h3>MicroMaster’s courses are delivered through edX.org</h3>
+          <h3>MicroMasters courses are delivered through edX.org</h3>
           <p>
-          Use your edX.org account to enroll in a MicroMaster’s program and share your grades and progress with MIT. When you complete all the requirements and earn a MicroMaster’s credential, you can use it to apply for a Masters degree at MIT.
+          Use your edX.org account to enroll in a MicroMasters program and share your grades and progress with MIT. When you complete all the requirements and earn a MicroMasters credential, you can use it to apply for a Master’s degree at MIT.
           </p>
         </div>
       </div>

diff --git a/cms/templates/cms/program_page.html b/cms/templates/cms/program_page.html
@@ -19,9 +19,10 @@
             <div class="container-fluid">
               <div class="navbar-header">
                 <a class="navbar-brand" href="javascript:void(0)"><img
-                        src="/static/images/logo-mit-micromasters-whitered.png"
+                        src="{% static 'images/logo-mit-micromasters-whitered.png' %}"
                         width="215" height="40"
-                        alt="MIT Micromasters"/></a>
+                        alt="MIT Micromasters"/>
+                </a>
                 <div class="nav-utility pull-right">
                   {% if authenticated %}
                     <a class="btn btn-danger" href="/logout">
@@ -198,7 +199,7 @@ <h3>Courses</h3>
           <div class="modal-body">
             <h2>Micromasters is a new credential</h2>
             <p>
-              MIT has created a new credential for online learners: the “MicroMaster’s,” which will be
+              MIT has created a new credential for online learners: the “MicroMasters,” which will be
               granted by MITx (MIT’s online learning initiative) to students who do exceptionally well in
               a given set of graduate-level online courses and do well in a subsequent exam. The
               credential will first be available to students who register for the SCM program’s online
@@ -214,7 +215,7 @@ <h3>Micromasters courses are delivered through edX.org</h3>
             <p>
               Use your edX.org account to enroll in a Micromasters program and share your grades and
               progress with MIT. When you complete all the requirements and earn a Micromasters
-              credential, you can use it to apply for a Masters degree at MIT.
+              credential, you can use it to apply for a Master’s degree at MIT.
             </p>
           </div>
           <!--

diff --git a/micromasters/settings.py b/micromasters/settings.py
@@ -370,7 +370,7 @@ def get_var(name, default):
 REACT_GA_DEBUG = get_var("REACT_GA_DEBUG", False)
 
 # Wagtail
-WAGTAIL_SITE_NAME = "MIT MicroMaster’s"
+WAGTAIL_SITE_NAME = "MIT MicroMasters"
 MEDIA_ROOT = get_var('MEDIA_ROOT', '/tmp/')
 MEDIA_URL = '/media/'
 MICROMASTERS_USE_S3 = get_var('MICROMASTERS_USE_S3', False)

diff --git a/static/js/components/Footer.js b/static/js/components/Footer.js
@@ -7,7 +7,7 @@ class Footer extends React.Component {
          <div className="container container-footer">
             <div className="row">
                <div className="col-md-8">
-                  <img src="/static/images/[email protected]" alt="MicroMaster’s" />
+                  <img src="/static/images/[email protected]" alt="MIT" width="72" height="38" />
                   <div className="footer-links">
                       <a href="https://www.edx.org/" target="_blank">edX</a>
                       <a href="https://odl.mit.edu/" target="_blank">Office of Digital Learning</a>

diff --git a/static/js/components/Header.js b/static/js/components/Header.js
@@ -21,7 +21,7 @@ class Header extends React.Component {
         <Navbar.Header>
           <Navbar.Brand>
             <a href="/">
-              <img src="/static/images/logo-micromasters@2x.png" width="215" height="40" alt="MIT MicroMaster’s" />
+              <img src="/static/images/logo-micromasters.png" width="215" height="40" alt="MIT MicroMasters" />
             </a>
           </Navbar.Brand>
           {content}

diff --git a/static/js/components/PersonalTab.js b/static/js/components/PersonalTab.js
@@ -20,8 +20,8 @@ class PersonalTab extends React.Component {
     return <div>
       <Grid className="profile-splash">
         <Cell col={12}>
-          Please tell us more about yourself so you can participate in the MicroMaster’s
-          community and qualify for your MicroMaster’s credential.
+          Please tell us more about yourself so you can participate in the MicroMasters
+          community and qualify for your MicroMasters credential.
         </Cell>
       </Grid>
       <Grid className="profile-tab-grid">

diff --git a/static/js/containers/ProfilePage.js b/static/js/containers/ProfilePage.js
@@ -24,7 +24,7 @@ class ProfilePage extends ProfileFormContainer {
     }
 
     let text = `Welcome ${getPreferredName(profile.profile)}, let's
-    complete your enrollment to MIT MicroMaster’s.`;
+    complete your enrollment to MIT MicroMasters.`;
 
     let childrenWithProps = this.childrenWithProps(profile);
     return <div className="card">

diff --git a/static/js/containers/TermsOfServicePage.js b/static/js/containers/TermsOfServicePage.js
@@ -50,7 +50,7 @@ class TermsOfServicePage extends React.Component {
               </div>
               <div className="terms-of-service-content">
                 <p>
-                  Welcome to the MITx MicroMaster’s website (the “Site”).  By accessing this Site, users agree to be
+                  Welcome to the MITx MicroMasters website (the “Site”).  By accessing this Site, users agree to be
                   bound by the following terms and conditions which MIT may revise at any time.  Users are encouraged
                   to visit this page periodically to review current terms and conditions, as your continued use of this
                   Site signifies your agreement to these term and conditions.  If you do not understand or do not agree
@@ -59,8 +59,8 @@ class TermsOfServicePage extends React.Component {
                 <ol>
                   <li>
                     Your use of this Site is entirely voluntary.  This Site is designed to assist and facilitate your
-                    successful attainment of the MITx MicroMaster’s credential, but use of this Site is not required
-                    in order to participate in the MITx MicroMaster’s program. These terms and conditions govern
+                    successful attainment of the MITx MicroMasters credential, but use of this Site is not required
+                    in order to participate in the MITx MicroMasters program. These terms and conditions govern
                     your use of this Site alone. When enrolled in specific MITx courses, all users must adhere to
                     the edX terms of service, including its Honor Code, which are available
                     at <a href="https://www.edx.org/edx-terms-service"
@@ -77,7 +77,7 @@ class TermsOfServicePage extends React.Component {
                     employment background; and (3) your participation and progress in MITx courses and your online
                     education.  Among other things, MIT may use the personally identifiable information that you
                     provide to respond to your questions; provide you the specific courses and/or services you select;
-                    send you updates about courses and information, including specifically the MITx MicroMaster’s
+                    send you updates about courses and information, including specifically the MITx MicroMasters
                     program and information about MIT events; send you information about Site maintenance or updates;
                     and for all appropriate MIT administrative and research purposes. Except as set forth herein or
                     as specifically agreed to by you, MIT will not disclose any personally identifiable information

diff --git a/static/js/util/ProfileFormFields.js b/static/js/util/ProfileFormFields.js
@@ -33,11 +33,11 @@ export default class ProfileFormFields extends React.Component {
     }));
     this.languageOptions = _.sortBy(languageOptions, 'label');
     this.privacyOptions = [
-      { value: 'public', label: 'Public to the world', helper: `Your MicroMaster’s profile will be 
+      { value: 'public', label: 'Public to the world', helper: `Your MicroMasters profile will be 
         visible to all website visitors.` },
-      { value: 'public_to_mm', label: "Public to other MicroMaster’s students", helper: `Your profile will be 
-        visible to other MicroMaster’s learners, and to MIT faculty and staff.` },
-      { value: 'private', label: 'Private', helper: `Your MicroMaster’s profile will only 
+      { value: 'public_to_mm', label: "Public to other MicroMasters students", helper: `Your profile will be 
+        visible to other MicroMasters learners, and to MIT faculty and staff.` },
+      { value: 'private', label: 'Private', helper: `Your MicroMasters profile will only 
         be visible to MIT faculty and staff.` }
     ];
     this.educationLevelOptions = EDUCATION_LEVELS;

diff --git a/ui/templates/dashboard.html b/ui/templates/dashboard.html
@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 {% load i18n static %}
 
-{% block title %}{% trans "MIT MicroMaster’s" %}{% endblock %}
+{% block title %}{% trans "MIT MicroMasters" %}{% endblock %}
 
 {% block content %}
 <div id="dashboard"></div>

diff --git a/ui/views_test.py b/ui/views_test.py
@@ -187,7 +187,7 @@ def test_authenticated_user_doesnt_redirect(self):
         response = self.client.get(DASHBOARD_URL)
         self.assertContains(
             response,
-            "MicroMaster’s",
+            "MicroMasters",
             status_code=200
         )