diff --git a/common/lib/xmodule/xmodule/course_module.py b/common/lib/xmodule/xmodule/course_module.py index 9cfc30f06e..42ba2b1934 100644 --- a/common/lib/xmodule/xmodule/course_module.py +++ b/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): diff --git a/lms/static/images/press/bbc_logo_178x138.jpeg b/lms/static/images/press/bbc_logo_178x138.jpeg new file mode 100644 index 0000000000..b047d814fe Binary files /dev/null and b/lms/static/images/press/bbc_logo_178x138.jpeg differ diff --git a/lms/static/images/press/bostonglobe_logo_178x138.jpeg b/lms/static/images/press/bostonglobe_logo_178x138.jpeg new file mode 100644 index 0000000000..9d2aa0bb10 Binary files /dev/null and b/lms/static/images/press/bostonglobe_logo_178x138.jpeg differ diff --git a/lms/static/images/press/edx_logo_108x81.jpeg b/lms/static/images/press/edx_logo_108x81.jpeg new file mode 100644 index 0000000000..a1fb02d8ec Binary files /dev/null and b/lms/static/images/press/edx_logo_108x81.jpeg differ diff --git a/lms/static/images/press/gigaom_logo_178x138.jpeg b/lms/static/images/press/gigaom_logo_178x138.jpeg new file mode 100644 index 0000000000..0e7712add8 Binary files /dev/null and b/lms/static/images/press/gigaom_logo_178x138.jpeg differ diff --git a/lms/static/images/press/huffpost_logo_178x138.jpeg b/lms/static/images/press/huffpost_logo_178x138.jpeg new file mode 100644 index 0000000000..d2b170c3d6 Binary files /dev/null and b/lms/static/images/press/huffpost_logo_178x138.jpeg differ diff --git a/lms/static/images/press/ieee_logo_178x138.jpeg b/lms/static/images/press/ieee_logo_178x138.jpeg new file mode 100644 index 0000000000..c4482883c4 Binary files /dev/null and b/lms/static/images/press/ieee_logo_178x138.jpeg differ diff --git a/lms/static/images/press/mit_logo_178x138.jpeg b/lms/static/images/press/mit_logo_178x138.jpeg new file mode 100644 index 0000000000..7914cfefdf Binary files /dev/null and b/lms/static/images/press/mit_logo_178x138.jpeg differ diff --git a/lms/static/images/press/npr_logo_178x138.jpeg b/lms/static/images/press/npr_logo_178x138.jpeg new file mode 100644 index 0000000000..9d7b9ac73b Binary files /dev/null and b/lms/static/images/press/npr_logo_178x138.jpeg differ diff --git a/lms/static/images/press/nyt_logo_178x138.jpeg b/lms/static/images/press/nyt_logo_178x138.jpeg new file mode 100644 index 0000000000..8a9a75b7f1 Binary files /dev/null and b/lms/static/images/press/nyt_logo_178x138.jpeg differ diff --git a/lms/static/images/press/oef_logo_178x138.jpeg b/lms/static/images/press/oef_logo_178x138.jpeg new file mode 100644 index 0000000000..d39e890d14 Binary files /dev/null and b/lms/static/images/press/oef_logo_178x138.jpeg differ diff --git a/lms/static/images/press/univworldnews_logo_178x138.jpeg b/lms/static/images/press/univworldnews_logo_178x138.jpeg new file mode 100644 index 0000000000..757643de17 Binary files /dev/null and b/lms/static/images/press/univworldnews_logo_178x138.jpeg differ diff --git a/lms/static/images/press/usa_logo_178x138.jpeg b/lms/static/images/press/usa_logo_178x138.jpeg new file mode 100644 index 0000000000..3d6024b75f Binary files /dev/null and b/lms/static/images/press/usa_logo_178x138.jpeg differ diff --git a/lms/static/images/press/usnews_logo_178x138.jpeg b/lms/static/images/press/usnews_logo_178x138.jpeg new file mode 100644 index 0000000000..09d4c07280 Binary files /dev/null and b/lms/static/images/press/usnews_logo_178x138.jpeg differ diff --git a/lms/static/images/press/wbur_logo_178x138.jpeg b/lms/static/images/press/wbur_logo_178x138.jpeg new file mode 100644 index 0000000000..09b6d5de12 Binary files /dev/null and b/lms/static/images/press/wbur_logo_178x138.jpeg differ diff --git a/lms/static/sass/_about_pages.scss b/lms/static/sass/_about_pages.scss index 89263c0f8a..fd4891b8bf 100644 --- a/lms/static/sass/_about_pages.scss +++ b/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%; } } diff --git a/lms/static/sass/_course_about.scss b/lms/static/sass/_course_about.scss index 0f453e242a..04cb976fb9 100644 --- a/lms/static/sass/_course_about.scss +++ b/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); diff --git a/lms/templates/courses.html b/lms/templates/courses.html index 0601177a57..a4c0c2480a 100644 --- a/lms/templates/courses.html +++ b/lms/templates/courses.html @@ -5,7 +5,7 @@ <%block name="title">Courses
-
+
diff --git a/lms/templates/signup_modal.html b/lms/templates/signup_modal.html index ee59f40396..7c14778adc 100644 --- a/lms/templates/signup_modal.html +++ b/lms/templates/signup_modal.html @@ -36,6 +36,7 @@
I agree to the - Terms of Service* + Terms of Service*
diff --git a/lms/templates/static_templates/about.html b/lms/templates/static_templates/about.html index 9694cb3586..7772ca19d6 100644 --- a/lms/templates/static_templates/about.html +++ b/lms/templates/static_templates/about.html @@ -14,12 +14,12 @@
-
- -

“The mission of edX 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.”

-
+ ##
+ ## + ##

“The mission of edX 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.”

+ ##
diff --git a/lms/templates/static_templates/jobs.html b/lms/templates/static_templates/jobs.html index d182e55165..6b3114e555 100644 --- a/lms/templates/static_templates/jobs.html +++ b/lms/templates/static_templates/jobs.html @@ -17,7 +17,7 @@

Our mission is to transform learning.

-

“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.”

+

“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.”

—Rafael Reif, MIT President
@@ -42,13 +42,13 @@
-
-
-

edX Fellow

-

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.

-

If you're interested in this position, send an e-mail to fellow-jobs@edx.org

-
-
+ ##
+ ##
+ ##

edX Fellow

+ ##

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.

+ ##

If you're interested in this position, send an e-mail to fellow-jobs@edx.org##

+ ##
+ ##
diff --git a/lms/templates/static_templates/press.html b/lms/templates/static_templates/press.html index b4a7da5704..72388774ff 100644 --- a/lms/templates/static_templates/press.html +++ b/lms/templates/static_templates/press.html @@ -5,6 +5,129 @@ <%block name="title">edX in the Press +<%! +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"), +] + +%> +
- ## Preserving for reference what an article should look like if we have all the pieces we want - ## - ##
- ##
- ## - ##
- ##
- ##
- ##

Online Classes Cut Costs, But Do They Dilute Brands?

- ## 7/12/2012 - ## http://n.pr/Lt5ydM - ##
- ##

"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."

- ##
- ##
- -
-
- -
-
-
-

One Course, 150,000 Students

- 7/18/2012 - http://nyti.ms/LtlQ5k -
-

"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."

-
-
-
-
- -
-
-
-

Lessons learned from MITx's prototype course

- 7/16/2012 - http://mitne.ws/Mdabcp -

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.

-
-
- -
-
- -
-
-
-

Anant Agarwal believes an online education from MIT and Harvard should be available to all

- 7/15/2012 - http://b.globe.com/P6XKlB -
-
-
-
- -
-
-
-

Online Classes Cut Costs, But Do They Dilute Brands?

- 7/02/2012 - http://n.pr/Lt5ydM -
-

"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."

-
-
- -
-
- -
-
-
-

Open Online Courses Are No Substitute for Classroom Learning

- 6/29/2012 - http://bit.ly/MMEdEX -
-
-
-
- -
-
-
-

Harvard and MIT create edX to offer free video online courses to the world

- 6/21/2012 - http://huff.to/LBucd3 -
-
- -
-
- -
-
-
-

MIT receives $1 million to support edX partnership

- 6/19/2012 - http://mitne.ws/Md5Aaa -
-

Institute receives award as part of Gates Foundation efforts to boost postsecondary graduation rates.

-
-
-
-
- -
-
-
-

Column: Ivy League education? Online is the new option

- 5/15/2012 - http://usat.ly/J73NW7 -
-
-
-
-
- -
-
-
-

What is edX?

- 5/02/2012 - http://mitne.ws/PgYhya -
-

Answering common questions about MIT and Harvard’s new partnership in online education.

-
-
-
-
- -
-
-
-

MIT and Harvard announce edX

- 5/02/2012 - http://mitne.ws/Md5yit -
-

Joint partnership builds on MITx and Harvard distance learning; aims to benefit campus-based education and beyond.

-
-
-
-
- -
-
-
-

MIT and Harvard launch a 'revolution in education'

- 5/02/2012 - http://mitne.ws/PgZQvY -
-

Online edX courses will open both universities' classrooms to the world while enhancing on-campus learning.

-
-
+ % for article in articles: +
+
+ +
+
+
+

${article.title}

+ % if article.deck: +

${article.deck}

+ % endif + ${article.publication} | ${article.publish_date} + % if article.author: + | By ${article.author} + % endif +
+
+ ${article.url} +
+
+ % endfor