diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index e36bcf4b96..15d50d3ee4 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -35,9 +35,10 @@ from xmodule.modulestore.exceptions import ItemNotFoundError from models import Registration, UserProfile, PendingNameChange, PendingEmailChange, CourseEnrollment from datetime import date +from collections import namedtuple log = logging.getLogger("mitx.student") - +Article = namedtuple('Article', 'title url author image deck publication publish_date') def csrf_token(context): ''' A csrf token that can be included in a form. @@ -84,6 +85,19 @@ def course_from_id(id): course_loc = CourseDescriptor.id_to_location(id) return modulestore().get_item(course_loc) +def press(request): + json_articles = cache.get("student_press_json_articles") + if json_articles == None: + if hasattr(settings, 'RSS_URL'): + content = urllib.urlopen(settings.PRESS_URL).read() + json_articles = json.loads(content) + else: + content = open(settings.PROJECT_ROOT / "templates" / "press.json").read() + json_articles = json.loads(content) + cache.set("student_press_json_articles", json_articles) + articles = [Article(**article) for article in json_articles] + return render_to_response('static_templates/press.html', {'articles': articles}) + @login_required @ensure_csrf_cookie def dashboard(request): diff --git a/lms/envs/common.py b/lms/envs/common.py index 3b005c5dbe..8475cfa9a9 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -105,6 +105,7 @@ LIB_URL = '/static/js/' # BOOK_URL = '/static/book/' BOOK_URL = 'https://mitxstatic.s3.amazonaws.com/book_images/' # For AWS deploys # RSS_URL = r'lms/templates/feed.rss' +# PRESS_URL = r'' RSS_TIMEOUT = 600 # Configuration option for when we want to grab server error pages diff --git a/lms/static/images/press/bloomberg_logo_178x138.jpeg b/lms/static/images/press/bloomberg_logo_178x138.jpeg new file mode 100644 index 0000000000..d87819b7cd Binary files /dev/null and b/lms/static/images/press/bloomberg_logo_178x138.jpeg differ diff --git a/lms/static/images/press/chroniclehighered_logo_178x138.jpeg b/lms/static/images/press/chroniclehighered_logo_178x138.jpeg new file mode 100644 index 0000000000..95dce54e2e Binary files /dev/null and b/lms/static/images/press/chroniclehighered_logo_178x138.jpeg differ diff --git a/lms/static/images/press/harvardcrimson_logo_178x138.jpeg b/lms/static/images/press/harvardcrimson_logo_178x138.jpeg new file mode 100644 index 0000000000..7fa3bef5e1 Binary files /dev/null and b/lms/static/images/press/harvardcrimson_logo_178x138.jpeg differ diff --git a/lms/static/images/press/harvardgazette_logo_178x138.jpeg b/lms/static/images/press/harvardgazette_logo_178x138.jpeg new file mode 100644 index 0000000000..1f0bfac70b Binary files /dev/null and b/lms/static/images/press/harvardgazette_logo_178x138.jpeg differ diff --git a/lms/static/images/press/harvardmagazine_logo_178x138.jpeg b/lms/static/images/press/harvardmagazine_logo_178x138.jpeg new file mode 100644 index 0000000000..58b29a5596 Binary files /dev/null and b/lms/static/images/press/harvardmagazine_logo_178x138.jpeg differ diff --git a/lms/static/images/press/harvarduniv_logo_178x138.jpeg b/lms/static/images/press/harvarduniv_logo_178x138.jpeg new file mode 100644 index 0000000000..66dd05fb88 Binary files /dev/null and b/lms/static/images/press/harvarduniv_logo_178x138.jpeg differ diff --git a/lms/static/images/press/latimes_logo_178x138.jpeg b/lms/static/images/press/latimes_logo_178x138.jpeg new file mode 100644 index 0000000000..fed922f846 Binary files /dev/null and b/lms/static/images/press/latimes_logo_178x138.jpeg differ diff --git a/lms/static/images/press/mercurynews_logo_178x138.jpeg b/lms/static/images/press/mercurynews_logo_178x138.jpeg new file mode 100644 index 0000000000..798749ab22 Binary files /dev/null and b/lms/static/images/press/mercurynews_logo_178x138.jpeg differ diff --git a/lms/static/sass/base/_extends.scss b/lms/static/sass/base/_extends.scss index 7f6078252a..9dc10aed5f 100644 --- a/lms/static/sass/base/_extends.scss +++ b/lms/static/sass/base/_extends.scss @@ -85,7 +85,7 @@ } .success-message-colors { - background: rgb(99, 236, 137); - border: 1px solid rgb(17, 202, 54); - color: rgb(35, 143, 14); + background: rgb(19, 159, 58); + border: 1px solid rgb(6, 65, 18); + color: rgb(255, 255, 255); } diff --git a/lms/static/sass/multicourse/_course_about.scss b/lms/static/sass/multicourse/_course_about.scss index de09505252..fcf4382109 100644 --- a/lms/static/sass/multicourse/_course_about.scss +++ b/lms/static/sass/multicourse/_course_about.scss @@ -274,6 +274,24 @@ } } } + + .faq { + @include clearfix; + + .responses { + float: left; + } + + .response { + margin-bottom: 40px; + + h3 { + font-family: $sans-serif; + font-weight: 700; + margin-bottom: 15px; + } + } + } } } diff --git a/lms/templates/index.html b/lms/templates/index.html index 2b03e51280..d8b0394927 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -126,7 +126,10 @@ Huffington Post, GigaOM, MIT News, - IEEE Spectrum + ##IEEE Spectrum, + Harvard Magazine, + Bloomberg + ## The Chronicle of Higher Education Read More → diff --git a/lms/templates/portal/course_about.html b/lms/templates/portal/course_about.html index 7780d939de..e6359d0542 100644 --- a/lms/templates/portal/course_about.html +++ b/lms/templates/portal/course_about.html @@ -109,7 +109,7 @@
-

About edX

-

EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology that features learning designed specifically for interactive study via the web. Based on a long history of collaboration and their shared educational missions, the founders are creating a new distance-learning experience. Anant Agarwal, former Director of MIT's Computer Science and Artificial Intelligence Laboratory, serves as the first president of edX. Along with offering online courses, the institutions will use edX to research how students learn and how technology can transform learning—both on-campus and worldwide. EdX is based in Cambridge, Massachusetts and is governed by MIT and Harvard.

+

EdX is a not-for-profit enterprise of its founding partners Harvard University and the Massachusetts Institute of Technology that features learning designed specifically for interactive study via the web. Based on a long history of collaboration and their shared educational missions, the founders are creating a new online-learning experience with online courses that reflect their disciplinary breadth. Along with offering online courses, the institutions will use edX to research how students learn and how technology can transform learning–both on-campus and worldwide. Anant Agarwal, former Director of MIT's Computer Science and Artificial Intelligence Laboratory, serves as the first president of edX. EdX's goals combine the desire to reach out to students of all ages, means, and nations, and to deliver these teachings from a faculty who reflect the diversity of its audience. EdX is based in Cambridge, Massachusetts and is governed by MIT and Harvard.

diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html index 022e719c70..e2f3f9efbe 100644 --- a/lms/templates/static_templates/faq.html +++ b/lms/templates/static_templates/faq.html @@ -49,8 +49,8 @@

EdX will be available to anyone in the world with an internet connection, and in general, there will not be an admissions process.

-

Will certificates be awarded?

-

Yes. Online learners who demonstrate mastery of subjects can earn a certificate of completion. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, MITx or BerkeleyX. For the courses in Fall 2012, those certificates will be free. There is a plan to charge a modest fee for certificates in the future

+

Will certificates be awarded?

+

Yes. Online learners who demonstrate mastery of subjects can earn a certificate of completion. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, MITx or BerkeleyX. For the courses in Fall 2012, those certificates will be free. There is a plan to charge a modest fee for certificates in the future.