Skip to content

E
edx-platform
Commit b7e00ad1 by David Ormsbee
Options

Merge pull request #252 from MITx/dormsbee/copy_edits_3 

Dormsbee/copy edits 3
parents 53303968 b67db2bb
Showing with 174 additions and 227 deletions
common/lib/xmodule/xmodule/course_module.py
......@@ -39,7 +39,7 @@ class CourseDescriptor(SequenceDescriptor):
@property
def start_date_text(self):
return time.strftime("%m/%d/%y", self.start)
return time.strftime("%b %d, %Y", self.start)
@property
def title(self):
......
lms/static/sass/_about_pages.scss
......@@ -220,15 +220,15 @@
border: 1px solid rgb(120,120,120);
@include box-sizing(border-box);
float: left;
height: 120px;
height: 140px;
margin-right: flex-gutter();
overflow: hidden;
width: flex-grid(2);
img {
display: block;
min-height: 100%;
width: 100%;
//min-height: 100%;
//width: 100%;
}
}
......
lms/static/sass/_course_about.scss
......@@ -5,7 +5,7 @@
header.course-profile {
background: rgb(245,245,245);
@include background-image(url('/static/images/homepage_interns_placeholder_2025x550.jpg'));
@include background-image(url('/static/images/homepage-bg.jpg'));
background-size: cover;
@include box-shadow(0 1px 80px 0 rgba(0,0,0, 0.5));
border-bottom: 1px solid rgb(100,100,100);
......
lms/templates/courses.html
......@@ -5,7 +5,7 @@
<%block name="title"><title>Courses</title></%block>
<section class="find-courses">
<header class="search" style="background: url('/static/images/homepage_interns_placeholder_2025x550.jpg')">
<header class="search" style="background: url('/static/images/homepage-bg.jpg')">
<div class="inner-wrapper main-search">
<hgroup>
<div class="logo">
......
lms/templates/feed.rss
......@@ -2,18 +2,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<%namespace name='static' file='static_content.html'/>
<feed xml:lang="en-US" xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
<id>tag:mitx.mit.edu,2012:/blog</id>
<id>tag:www.edx.org,2012:/blog</id>
<link type="text/html" rel="alternate" href="http://blog.edx.org/"/>
##<link type="application/atom+xml" rel="self" href="https://github.com/blog.atom"/>
<title>The GitHub Blog</title>
<title>EdX Blog</title>
<updated>2012-07-16T14:08:12-07:00</updated>
<entry>
<id>tag:www.edx.org,2012:Post/3</id>
<published>2012-07-16T14:08:12-07:00</published>
<updated>2012-07-16T14:08:12-07:00</updated>
<link type="text/html" rel="alternate" href="#"/>
<title>Berkeley Press Release</title>
<content type="html">&lt;img src=&quot;${static.url('images/header-logo.png')}&quot; /&gt;</content>
<title>UC Berkeley joins edX</title>
<content type="html">&lt;img src=&quot;${static.url('images/press/edx_logo_108x81.jpeg')}&quot; /&gt;
&lt;p&gt;edX broadens course offerings&lt;/p&gt;</content>
</entry>
<entry>
<id>tag:www.edx.org,2012:Post/2</id>
......@@ -28,7 +29,7 @@
<published>2012-07-16T14:08:12-07:00</published>
<updated>2012-07-16T14:08:12-07:00</updated>
<link type="text/html" rel="alternate" href="http://edxonline.tumblr.com/post/27589835076/beyond-the-circuits-a-students-experience-with-6-002x"/>
<title>6.002x – Way beyond a learning experience</title>
<title>Brazilian teen blogs about his 6.002x experience</title>
<content type="html">&lt;img src=&quot;http://media.tumblr.com/tumblr_m7bdkyV9Lp1rsal4c.png&quot; /&gt;</content>
</entry>
</feed>
lms/templates/index.html
......@@ -9,7 +9,7 @@
<div class="title">
<hgroup>
<h1>The Future of Online Education</h1>
<h2>For anyone, anywhere, anytime.</h2>
<h2>For anyone, anywhere, anytime</h2>
</hgroup>
<section class="actions">
......@@ -108,12 +108,10 @@
%for entry in entries:
<article>
%if entry.image:
<a href="${entry.link}" class="post-graphics">
<img src="${entry.image}" />
</a>
<a href="${entry.link}" class="post-graphics" target="_blank"><img src="${entry.image}" /></a>
%endif
<div class="post-name">
<a href="${entry.link}">${entry.title}</a>
<a href="${entry.link}" target="_blank">${entry.title}</a>
<p class="post-date">${strftime("%m/%d/%y", entry.published_parsed)}</p>
</div>
</article>
......@@ -122,13 +120,12 @@
<section class="press-links">
<h3>edX in the News:</h3>
##<a href="${reverse('pressrelease')}">The edX Press Release</a>
<a href="http://www.nytimes.com/2012/07/20/education/edlife/anant-agarwal-discusses-free-online-courses-offered-by-a-harvard-mit-partnership.html">New York Times</a>,
<a href="http://www.bostonglobe.com/magazine/2012/07/14/anant-agarwal-believes-online-education-from-mit-and-harvard-should-available-all/Af0kX44dPqpBKRV2IOSjPP/story.html">Boston Globe</a>,
<a href="http://www.huffingtonpost.co.uk/2012/06/20/harvard-and-mit-create-edx-free-university-courses_n_1612143.html?utm_hp_ref=uk">Huffington Post</a>,
<a href="http://gigaom.com/cloud/everybody-codes/">GigaOM</a>,
<a href="http://bostinno.com/2012/07/06/why-comparing-edx-to-mit-is-like-comparing-a-toyota-to-a-ferrari/">BostInno</a>,
<a href="http://web.mit.edu/newsoffice/2012/mitx-edx-first-course-recap-0716.html">MIT News</a>
<a target="_blank" href="http://www.nytimes.com/2012/07/20/education/edlife/anant-agarwal-discusses-free-online-courses-offered-by-a-harvard-mit-partnership.html">New York Times</a>,
<a target="_blank" href="http://www.bostonglobe.com/magazine/2012/07/14/anant-agarwal-believes-online-education-from-mit-and-harvard-should-available-all/Af0kX44dPqpBKRV2IOSjPP/story.html"target="_blank" >Boston Globe</a>,
<a target="_blank" href="http://www.huffingtonpost.co.uk/2012/06/20/harvard-and-mit-create-edx-free-university-courses_n_1612143.html?utm_hp_ref=uk">Huffington Post</a>,
<a target="_blank" href="http://gigaom.com/cloud/everybody-codes/">GigaOM</a>,
<a target="_blank" href="http://web.mit.edu/newsoffice/2012/mitx-edx-first-course-recap-0716.html">MIT News</a>,
<a target="_blank" href="http://spectrum.ieee.org/at-work/education/review-mitxs-online-circuit-design-and-analysis-course">IEEE Spectrum</a>
</section>
</section>
</section>
......
lms/templates/signup_modal.html
......@@ -36,6 +36,7 @@
<label>Country</label>
<div class="input-wrapper">
<select name="country">
<option value="">--</option>
%for country_code, country_name in COUNTRIES:
<option value="${country_code}">${country_name}</option>
%endfor
......@@ -86,13 +87,13 @@
<label class="terms-of-service">
<input name="terms_of_service" type="checkbox" value="true">
I agree to the
<a href="${reverse('tos')}">Terms of Service</a>*
<a href="${reverse('tos')}" target="_blank">Terms of Service</a>*
</label>
<label class="honor-code">
<input name="honor_code" type="checkbox" value="true">
I agree to the
<a href="${reverse('honor')}">Honor Code</a>*
<a href="${reverse('honor')}" target="_blank">Honor Code</a>*
</label>
</div>
......
lms/templates/static_templates/about.html
......@@ -14,12 +14,12 @@
</nav>
<section class="vision">
<div class="our-mission">
<div class="logo">
<img src="${static.url('images/edx-logo-large-bw.png')}">
</div>
<h2 class="mission-quote">&ldquo;The mission of <span class="edx">edX</span> is to enhance human fulfillment worldwide through online learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based students and the worldwide community of online learners.&rdquo;</h2>
</div>
## <div class="our-mission">
## <div class="logo">
## <img src="${static.url('images/edx-logo-large-bw.png')}">
## </div>
## <h2 class="mission-quote">&ldquo;The mission of <span class="edx">edX</span> is to enhance human fulfillment worldwide through online ## learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based ## students and the worldwide community of online learners.&rdquo;</h2>
## </div>
<section class="message left">
<div class="photo">
......
lms/templates/static_templates/jobs.html
......@@ -17,7 +17,7 @@
<h2>Our mission is to transform learning.</h2>
<blockquote>
<p>&ldquo;Edx represents a unique opportunity to improve education on our campuses though online learning, while simultaneously creating a bold new educational path for millions of learners worldwide.&rdquo;</p>
<p>&ldquo;EdX represents a unique opportunity to improve education on our campuses though online learning, while simultaneously creating a bold new educational path for millions of learners worldwide.&rdquo;</p>
<cite>&mdash;Rafael Reif, MIT President </cite>
</blockquote>
......@@ -42,13 +42,13 @@
</div>
</article>
<article id="edx-fellow" class="job">
<div class="inner-wrapper">
<h3>edX Fellow</h3>
<p>The edX fellows program is intended as an alternative to the traditional academic track for candidates with a strong focus on teaching. Fellows act as contact points for departments at MIT and Harvard , and help facilitate putting together online courses.</p>
<p>If you're interested in this position, send an e-mail to <a href="mailto:fellow-jobs@edx.org">fellow-jobs@edx.org</a></p>
</div>
</article>
## <article id="edx-fellow" class="job">
## <div class="inner-wrapper">
## <h3>edX Fellow</h3>
## <p>The edX fellows program is intended as an alternative to the traditional academic track for candidates with a ## strong focus on teaching. Fellows act as contact points for departments at MIT and Harvard , and help facilitate ## putting together online courses.</p>
## <p>If you're interested in this position, send an e-mail to <a href="mailto:fellow-jobs@edx.org">fellow-jobs@edx.org## </a></p>
## </div>
## </article>
<article id="content-engineer" class="job">
<div class="inner-wrapper">
......
lms/templates/static_templates/press.html
......@@ -5,6 +5,129 @@
<%block name="title"><title>edX in the Press</title></%block>
<%!
from collections import namedtuple
Article = namedtuple('Article',
'title url author image deck publication publish_date')
articles = [
Article(title="Review: MITx's Online Circuit Design and Analysis Course",
url="http://spectrum.ieee.org/at-work/education/review-mitxs-online-circuit-design-and-analysis-course",
author="Steven J. Frank",
image="ieee_logo_178x138.jpeg",
deck="This latest experiment in remote learning is not for a casual audience.",
publication="IEEE Spectrum",
publish_date="July 2012"),
Article(title="More universities sign on to free online course initiative",
url="http://www.universityworldnews.com/article.php?story=20120719082235228",
author="Alison Moodie",
image="univworldnews_logo_178x138.jpeg",
deck=None,
publication="University World News",
publish_date="7/19/2012 Issue No:231"),
Article(title="One Course, 150,000 Students",
url="http://nyti.ms/LtlQ5k",
author="Tamar Lewin",
image="nyt_logo_178x138.jpeg",
deck=None,
publication="The New York Times",
publish_date="7/18/2012"),
Article(title="Lessons learned from MITx's prototype course",
url="http://mitne.ws/Mdabcp",
author="Larry Hardesty, MIT News Office",
image="mit_logo_178x138.jpeg",
deck="As the team behind MIT's ambitious online learning program gears up to introduce new courses in the fall, it takes stock of its initial experiences.",
publication="MIT News",
publish_date="7/16/2012"),
Article(title="Software coding: not just for programmers anymore",
url="http://gigaom.com/cloud/everybody-codes/",
author="Barb Darrow",
image="gigaom_logo_178x138.jpeg",
deck=None,
publication="GigaOM",
publish_date="7/16/2012"),
Article(title="Anant Agarwal believes an online education from MIT and Harvard should be available to all",
url="http://b.globe.com/P6XKlB",
author="Jon Marcus",
image="bostonglobe_logo_178x138.jpeg",
deck=None,
publication="The Boston Globe",
publish_date="7/15/2012"),
Article(title="Online Classes Cut Costs, But Do They Dilute Brands?",
url="http://n.pr/Lt5ydM",
author="Tovia Smith",
image="npr_logo_178x138.jpeg",
deck=None,
publication="NPR",
publish_date="7/02/2012"),
Article(title="Coming Your Way: Free Virtual Courses From Top U.S. Universities",
url="http://www.openequalfree.org/coming-your-way-free-virtual-courses-from-top-u-s-universities/13993",
author=None,
image="oef_logo_178x138.jpeg",
deck=None,
publication="Open Equal Free",
publish_date="6/29/2012"),
Article(title="Open Online Courses Are No Substitute for Classroom Learning",
url="http://bit.ly/MMEdEX",
author="Joshua Kim",
image="usnews_logo_178x138.jpeg",
deck=None,
publication="US News",
publish_date="6/29/2012"),
Article(title="Harvard and MIT create edX to offer free video online courses to the world",
url="http://huff.to/LBucd3",
author="Lucy Sheriff",
image="huffpost_logo_178x138.jpeg",
deck=None,
publication="The Huffington Post",
publish_date="6/20/2012"),
Article(title="Top universities put their reputations online",
url="http://bbc.in/M5avea",
author="Irina Khokhlova",
image="bbc_logo_178x138.jpeg",
deck=None,
publication="BBC News",
publish_date="6/20/2012"),
Article(title="MIT receives $1 million to support edX partnership",
url="http://mitne.ws/Md5Aaa",
author=None,
image="mit_logo_178x138.jpeg",
deck="Institute receives award as part of Gates Foundation efforts to boost postsecondary graduation rates.",
publication="MIT News",
publish_date="6/19/2012"),
Article(title="Column: Ivy League education? Online is the new option",
url="http://usat.ly/J73NW7",
author="Katrina Trinko",
image="usa_logo_178x138.jpeg",
deck=None,
publication="USA Today",
publish_date="5/15/2012"),
Article(title="What is edX?",
url="http://mitne.ws/PgYhya",
author=None,
image="mit_logo_178x138.jpeg",
deck="Answering common questions about MIT and Harvard's new partnership in online education.",
publication="MIT News",
publish_date="5/02/2012"),
Article(title="MIT and Harvard announce edX",
url="http://mitne.ws/Md5yit",
author=None,
image="mit_logo_178x138.jpeg",
deck="Joint partnership builds on MITx and Harvard distance learning; aims to benefit campus-based education and beyond.",
publication="MIT News",
publish_date="5/02/2012"),
Article(title="MIT and Harvard launch a 'revolution in education'",
url="http://mitne.ws/PgZQvY",
author=None,
image="mit_logo_178x138.jpeg",
deck="Online edX courses will open both universities' classrooms to the world while enhancing on-campus learning.",
publication="MIT News",
publish_date="5/02/2012"),
]
%>
<section class="container about">
<nav>
<a href="${reverse('about_edx')}">Vision</a>
......@@ -14,202 +137,27 @@
</nav>
<section class="press">
## Preserving for reference what an article should look like if we have all the pieces we want
##
## <article class="press-story">
## <div class="article-cover">
## <img src="${static.url('images/courses/circuits.jpeg')}" />
## </div>
## <div class="press-info">
## <header>
## <h3>Online Classes Cut Costs, But Do They Dilute Brands?</h3>
## <span class="post-date">7/12/2012</span>
## <a href="http://www.npr.org/2012/07/02/156122748/online-classes-cut-costs-but-do-they-dilute-brands">http://n.pr/Lt5ydM</a>
## </header>
## <p>"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know ## exactly what they're doing, I think that would be a far cry from reality."</p>
## </div>
## </article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>More universities sign on to free online course initiative</h3>
<span class="post-date">7/19/2012</span>
<a href="http://www.universityworldnews.com/article.php?story=20120719082235228">http://www.universityworldnews.com/article.php?story=20120719082235228</a>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>One Course, 150,000 Students</h3>
<span class="post-date">7/18/2012</span>
<a href="http://www.nytimes.com/2012/07/20/education/edlife/anant-agarwal-discusses-free-online-courses-offered-by-a-harvard-mit-partnership.html?_r=2">http://nyti.ms/LtlQ5k</a>
</header>
<p>"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."</p>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>Lessons learned from MITx's prototype course</h3>
<span class="post-date">7/16/2012</span>
<a href="http://web.mit.edu/newsoffice/2012/mitx-edx-first-course-recap-0716.html">http://mitne.ws/Mdabcp</a>
<p>As the team behind MIT's ambitious online learning program gears up to introduce new courses in the fall, it takes stock of its initial experiences.</p>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>Software coding: not just for programmers anymore</h3>
<span class="post-date">7/16/2012</span>
<a href="http://gigaom.com/cloud/everybody-codes/">http://gigaom.com/cloud/everybody-codes/</a>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>Anant Agarwal believes an online education from MIT and Harvard should be available to all</h3>
<span class="post-date">7/15/2012</span>
<a href="http://www.bostonglobe.com/magazine/2012/07/14/anant-agarwal-believes-online-education-from-mit-and-harvard-should-available-all/Af0kX44dPqpBKRV2IOSjPP/story.html">http://b.globe.com/P6XKlB</a>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>Online Classes Cut Costs, But Do They Dilute Brands?</h3>
<span class="post-date">7/02/2012</span>
<a href="http://www.npr.org/2012/07/02/156122748/online-classes-cut-costs-but-do-they-dilute-brands">http://n.pr/Lt5ydM</a>
</header>
<p>"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."</p>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>Coming Your Way: Free Virtual Courses From Top U.S. Universities</h3>
<span class="post-date">6/29/2012</span>
<a href="http://www.openequalfree.org/coming-your-way-free-virtual-courses-from-top-u-s-universities/13993">http://www.openequalfree.org/coming-your-way-free-virtual-courses-from-top-u-s-universities/13993</a>
</header>
<p>"You know this is the Wild West. There's a lot of things we have to figure out," Agarwal says. "And you know if anybody says they know exactly what they're doing, I think that would be a far cry from reality."</p>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>Open Online Courses Are No Substitute for Classroom Learning</h3>
<span class="post-date">6/29/2012</span>
<a href="http://www.usnews.com/opinion/blogs/economic-intelligence/2012/06/29/open-online-courses-are-not-subsitutes-for-classroom-learning">http://bit.ly/MMEdEX</a>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>Harvard and MIT create edX to offer free video online courses to the world</h3>
<span class="post-date">6/21/2012</span>
<a href="http://www.huffingtonpost.co.uk/2012/06/20/harvard-and-mit-create-edx-free-university-courses_n_1612143.html?utm_hp_ref=uk">http://huff.to/LBucd3</a>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>Top universities put their reputations online</h3>
<span class="post-date">6/20/2012</span>
<a href="http://www.bbc.co.uk/news/education-18518508">http://bbc.in/M5avea</a>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>MIT receives $1 million to support edX partnership</h3>
<span class="post-date">6/19/2012</span>
<a href="http://web.mit.edu/newsoffice/2012/edx-partnership-0620.html">http://mitne.ws/Md5Aaa</a>
</header>
<p>Institute receives award as part of Gates Foundation efforts to boost postsecondary graduation rates.</p>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>Column: Ivy League education? Online is the new option</h3>
<span class="post-date">5/15/2012</span>
<a href="http://www.usatoday.com/news/opinion/forum/story/2012-05-15/online-classes-college-education-tuition/54979794/1">http://usat.ly/J73NW7</a>
</header>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>What is edX?</h3>
<span class="post-date">5/02/2012</span>
<a href="http://web.mit.edu/newsoffice/2012/edx-faq-050212.html">http://mitne.ws/PgYhya</a>
</header>
<p>Answering common questions about MIT and Harvard’s new partnership in online education.</p>
</div>
</article>
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
</div>
<div class="press-info">
<header>
<h3>MIT and Harvard announce edX</h3>
<span class="post-date">5/02/2012</span>
<a href="http://web.mit.edu/newsoffice/2012/mit-harvard-edx-announcement-050212.html">http://mitne.ws/Md5yit</a>
</header>
<p>Joint partnership builds on MITx and Harvard distance learning; aims to benefit campus-based education and beyond.</p>
</div>
</article>
% for article in articles:
<article class="press-story">
<div class="article-cover">
<img src="${static.url('images/courses/circuits.jpeg')}" />
<a href="${article.url}" target="_blank"/><img src="${static.url('images/press/' + article.image)}" /></a>
</div>
<div class="press-info">
<header>
<h3>MIT and Harvard launch a 'revolution in education'</h3>
<span class="post-date">5/02/2012</span>
<a href="http://web.mit.edu/newsoffice/2012/edx-launched-0502.html">http://mitne.ws/PgZQvY</a>
<h3>${article.title}</h3>
% if article.deck:
<p>${article.deck}</p>
% endif
<span class="post-date">${article.publication} | ${article.publish_date}
% if article.author:
| By ${article.author}
% endif
</span><br/>
</header>
<p>Online edX courses will open both universities' classrooms to the world while enhancing on-campus learning.</p>
<a href="${article.url}" target="_blank">${article.url}</a>
</div>
</article>
% endfor
</section>
</section>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment