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 38 additions and 39 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">
......
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