From ed10dc43d9697646113fb59fe8a089a335b3f27d Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Sun, 22 Jul 2012 17:35:10 -0400 Subject: [PATCH 01/48] Added UC Berkeley press release. Moved press releases to their own folder. --- lms/static/sass/_press_release.scss | 10 ++ .../MIT_and_Harvard_announce_edX.html} | 4 +- .../press_releases/UC_Berkeley_joins_edX.html | 96 +++++++++++++++++++ lms/urls.py | 9 +- 4 files changed, 115 insertions(+), 4 deletions(-) rename lms/templates/static_templates/{pressrelease.html => press_releases/MIT_and_Harvard_announce_edX.html} (98%) create mode 100644 lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html diff --git a/lms/static/sass/_press_release.scss b/lms/static/sass/_press_release.scss index d135c8b81f..0694eb0a27 100644 --- a/lms/static/sass/_press_release.scss +++ b/lms/static/sass/_press_release.scss @@ -18,6 +18,16 @@ margin-bottom: 30px; text-align: center; } + + li { + color: $base-font-color; + font: normal 1em/1.6em $serif; + margin: 0px; + } + + li + li { + margin-top: 20px; + } > article { border: 1px solid rgb(220,220,220); diff --git a/lms/templates/static_templates/pressrelease.html b/lms/templates/static_templates/press_releases/MIT_and_Harvard_announce_edX.html similarity index 98% rename from lms/templates/static_templates/pressrelease.html rename to lms/templates/static_templates/press_releases/MIT_and_Harvard_announce_edX.html index c9ec29e08b..e1bd890a3d 100644 --- a/lms/templates/static_templates/pressrelease.html +++ b/lms/templates/static_templates/press_releases/MIT_and_Harvard_announce_edX.html @@ -1,7 +1,7 @@ <%! from django.core.urlresolvers import reverse %> -<%inherit file="../main.html" /> +<%inherit file="../../main.html" /> -<%namespace name='static' file='../static_content.html'/> +<%namespace name='static' file='../../static_content.html'/> <%block name="title">MIT and Harvard announce edX diff --git a/lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html b/lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html new file mode 100644 index 0000000000..463aea25f5 --- /dev/null +++ b/lms/templates/static_templates/press_releases/UC_Berkeley_joins_edX.html @@ -0,0 +1,96 @@ +<%! from django.core.urlresolvers import reverse %> +<%inherit file="../../main.html" /> + +<%namespace name='static' file='../../static_content.html'/> + +<%block name="title">UC Berkeley joins edX + +
+
+

UC Berkeley joins edX

+
+ +
+

UC Berkeley joins Harvard and MIT not-for-profit online learning collaborative; edX broadens free course offerings into public health, computer science and chemistry and opens registration

+ +

EdX, the online learning initiative founded by Harvard University and the Massachusetts Institute of Technology (MIT) and launched by the two universities in May, announced today the addition of the University of California, Berkeley to its platform. UC Berkeley, ranked No. 1 among public universities in the United States in 2012 by US News & World Report, will collaborate with edX to expand the group of participating “X Universities.”

+ +

Through edX, the “X Universities” will provide interactive education wherever there is access to the Internet and will enhance teaching and learning through research about how students learn and how technologies can facilitate effective teaching both on-campus and online. EdX plans to add other X Universities from around the world to the edX platform in the coming months.

+ +

UC Berkeley will offer two courses on BerkeleyX this fall, and the university will also serve as the inaugural chair of the to-be-formed X University Consortium.

+ +

Robert J. Birgeneau, the Chancellor of Berkeley announced: “We are committed to excellence in online education with the dual goals of distributing higher education more broadly and enriching the quality of campus-based education. We share the vision of MIT and Harvard leadership and believe that collaborating with the not-for-profit model of edX is the best way to do this. Fiat Lux.”

+ +

Meanwhile, edX announced two new courses each from HarvardX and MITx to be launched on edX this fall, along with MITx’s 6.002x Circuits & Electronics. All of the courses will be hosted from edX’s website, www.edx.org.

+ +

MIT launched its MITx online learning initiative in December 2011, with 6.002x as its prototype course, and more than 150,000 students worldwide enrolled. EdX was announced by Harvard and MIT in May, with each university committing to contribute $30 million toward the online partnership.

+ +

“We are very excited that UC Berkeley is joining us in this effort,” said Anant Agarwal, President of edX. “edX is about revolutionizing learning, and we have received a tremendous outpouring of excitement and interest from universities around the world. UC Berkeley is an extraordinary public institution known not only for its academic excellence but also for its innovativeness. With this collaboration, edX is now positioned to improve education more rapidly, both online and on-campus worldwide.”

+ +

“From the outset, we have imagined edX as a platform to be shared with other educational institutions,” said MIT President L. Rafael Reif. “Berkeley's decision to join the effort is great news: MIT is already seeing the benefits of its collaboration with Harvard, and we look forward to working with our remarkable colleagues at Berkeley as we explore the future of online education.”

+ +

In addition to the funding commitments by Harvard and MIT, edX has already garnered outside financial support, including two individual leadership gifts. MIT alumnus Philippe P. Laffont, founder and chief investment officer of Coatue Management, LLC, has made a gift to support MITx in honor of MIT Professor Stephen A. Ward, Laffont’s thesis advisor at MIT. Harvard Alumnus Jonathan Grayer, former chairman and CEO of Kaplan, Inc. and cofounder of Weld North LLC, has also made a gift in support of the initiative.

+ +

Foundation support has also begun to flow in. Earlier in the summer, edX received a grant from the Bill & Melinda Gates Foundation. Grant funds will go towards developing an introduction to computer science course and partnering with a postsecondary institution that targets low-income young adults to offer this introductory course in a “flipped classroom” setting, where students watch course videos at home and work together in the classroom.

+ +

“Interest from other institutions in collaborating with edX has been enormous from the outset and we are delighted that the partnership announced today by Berkeley has come together so quickly,” said Harvard President Drew Faust. “Since the beginning, our goal has been to broaden edX offerings by partnering with other universities who are equally committed to both expanding access to education and improving research about teaching and learning. Today’s announcement is in an important step in that direction.”

+ +

UC Berkeley will bring significant, new, open source technology to the edX platform. The lead developer of Berkeley’s effort, Ph.D student Arjun Singh, has been working directly with edX developers to integrate the two platforms. “The Berkeley open-source and non-for-profit vision were incredibly well aligned with edX,” said Singh. “I’m thrilled to join forces with MIT and Harvard and integrate Berkeley’s technology into the edX platform.”

+ +

EdX will release its learning platform as open source software so that anyone around the world can adopt and improve this invaluable shared tool. Timing of the release has not yet been determined.

+ +

The classes to be offered on edX this fall are:

+ +
    +
  • HarvardX – “Counting on Health: Quantitative Methods in Clinical and Public Health Research” a course in Biostatistics and Epidemiology focused on teaching a diversity of health care practitioners and other students from around the world how to design rigorous clinical and public health studies and analyze complex health data, thereby furthering the school’s mission of improving global health. The course is taught by Professors E. Francis Cook and Marcello Pagano. Dr. Cook is a Professor of Epidemiology at the Harvard School of Public Health (HSPH) and at the Harvard Medical School and he has won citations for Excellence in Teaching from the Harvard School of Public Health on four occasions. Dr. Pagano obtained a Ph.D. from Johns Hopkins University and has spent the last 35 years on the faculty at HSPH teaching biostatistics and advising students.
  • + +
  • HarvardX - “Computer Science 50” (CS 50) is Harvard College’ introduction to the intellectual enterprises of computer science and the art of programming for majors and non-majors alike. An entry-level course CS50 teaches students how to think algorithmically and solve problems efficiently. Topics include abstraction, data structures, memory management, and security. Languages include C, PHP, and JavaScript. The course is designed for students with or without prior programming experience. As of Fall 2011, CS50 was Harvard College's third-largest course. It is taught by Harvard Senior Lecturer David J. Malan. He received his A.B., S.M., and Ph.D. in Computer Science from Harvard in 1999, 2004, and 2007, respectively.
  • + +
  • MITx - “Introduction to Computer Science and Programming” provides an understanding of computational approaches to scientific problem solving for students with little or no prior programming experience. It is based on the most popular course on MIT’s OpenCourseware platform and provides a tour of the major features of the python programming language and object-oriented programming, algorithmic design and analysis, and computational approaches to generating and understanding data, with examples drawn largely from the sciences and social sciences. The principle instructors for the course are John Guttag, W. Eric Grimson, and Chris Terman. John Guttag is the Dugald C. Jackson Professor of Computer Science and Electrical Engineering at MIT, and currently heads the Computer Science and Artificial Intelligence Laboratory's Data-driven Medical Research Group. Christopher J. Terman has taught computer science courses in the EECS department for many years; his research has been in the areas of programming languages, compilers, computer-aided design tools and educational technologies. W. Eric Grimson is the Bernard Gordon Professor of Medical Engineering and Chancellor of MIT.
  • + +
  • MITx – “Introduction to Solid State Chemistry” a first-year college course where chemical principles are explained by examination of the properties of materials. The electronic structure and chemical bonding of materials is related to applications and engineering systems throughout the course. The on-campus version of the course has been taught for more than 40 years and is one of the largest classes at MIT. The instructor for the course is MIT Professor of Materials Science and Engineering Michael J. Cima. Cima is author or co-author of more than 200 peer-reviewed scientific publications and 45 patents.
  • + +
  • MITx – “Circuits and Electronics” an introductory undergraduate electrical engineering course, taught by visiting MIT Associate Professor Khurram K. Afridi, and developed by edX president MIT Professor Anant Agarwal, MIT Professor Gerald J. Sussman, MIT Senior Lecturer Christopher J. Terman, and edX Chief Scientist Piotr Mitros.
  • + +
  • BerkeleyX - “Artificial Intelligence” is a course in the basic ideas and techniques underlying the design of intelligent computer systems, with a specific emphasis on the statistical and decision-theoretic modeling paradigm. By the end of this course, students will have built autonomous agents that reason in uncertain environments and have developed machine learning algorithms that will classify handwritten digits and photographs. The on-campus version of the course is one of the most popular computer science courses at Berkeley. It will be taught by UC Berkeley Assistant Professor Pieter Abbeel and Associate Professor Dan Klein, a recent recipient of the Distinguished Teaching Award, UC Berkeley's highest teaching honor.
  • + +
  • BerkeleyX –“Software as a Service” teaches the fundamentals for engineering long-lived software using highly-productive agile techniques to develop Software as a Service (SaaS) using Ruby on Rails. The topics include test-driven development, behavior-driven/user-centric design, design patterns, legacy code, refactoring, and deployment. It will be taught by UC Berkeley Adjunct Associate Professor Armando Fox, who has received teaching and mentoring awards from Stanford University, the Society of Women Engineers and Tau Beta Pi Honor Society, and Professor David A. Patterson, winner of the ACM Karl Karlstrom Teaching Award and the IEEE Mulligan Medal in Education.
  • +
+ +

Certificates of mastery will be available at no charge for each of the courses to those learners motivated and able to demonstrate their knowledge of the course material.

+ + +

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

+ + +

About Harvard University

+ +

Harvard University is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. Harvard faculty are engaged with teaching and research to push the boundaries of human knowledge. The University has twelve degree-granting Schools in addition to the Radcliffe Institute for Advanced Study.

+ +

Established in 1636, Harvard is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. Harvard has more than 360,000 alumni around the world.

+ + +

About MIT

+ +

The Massachusetts Institute of Technology — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; Sloan School of Management; and Science.

+ +

MIT's commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. Seventy-eight alumni, faculty, researchers and staff have won Nobel Prizes.

+ +

Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.

+ + +

About the University of California, Berkeley

+ +

The University of California, Berkeley is the world’s premier public university with a mission to excel in teaching, research and public service. This longstanding mission has led to the university's distinguished record of Nobel-level scholarship, constant innovation, a concern for the betterment of our world, and consistently high rankings of its schools and departments. The campus offers superior, high value education for extraordinarily talented students from all walks of life; operational excellence and a commitment to the competitiveness and prosperity of California and the nation.

+ +

The University of California was chartered in 1868 and its flagship campus in Berkeley, on San Francisco Bay, was envisioned as a “City of Learning.” Today, there are more than 1,500 full-time and 500 part-time faculty members dispersed among more than 130 academic departments and more than 80 interdisciplinary research units. Twenty-two Nobel Prizes have been garnered by faculty and twenty-eight Nobel prizes have been awarded to UC Berkeley alumni. There are 9 Nobel Laureates, 32 MacArthur Fellows, and 4 Pulitzer Prize winners among the current faculty.

+ + +
+
+
diff --git a/lms/urls.py b/lms/urls.py index ce03d9ef14..af1f910cb4 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -64,8 +64,7 @@ urlpatterns = ('', {'template': 'faq.html'}, name="faq_edx"), url(r'^help$', 'static_template_view.views.render', {'template': 'help.html'}, name="help_edx"), - url(r'^pressrelease$', 'static_template_view.views.render', - {'template': 'pressrelease.html'}, name="pressrelease"), + url(r'^tos$', 'static_template_view.views.render', {'template': 'tos.html'}, name="tos"), url(r'^privacy$', 'static_template_view.views.render', @@ -75,6 +74,12 @@ urlpatterns = ('', url(r'^honor$', 'static_template_view.views.render', {'template': 'honor.html'}, name="honor"), + #Press releases + url(r'^press/mit-and-harvard-announce-edx$', 'static_template_view.views.render', + {'template': 'press_releases/MIT_and_Harvard_announce_edX.html'}, name="press/mit-and-harvard-announce-edx"), + url(r'^press/uc-berkeley-joins-edx$', 'static_template_view.views.render', + {'template': 'press_releases/UC_Berkeley_joins_edX.html'}, name="press/uc-berkeley-joins-edx"), + # TODO: These urls no longer work. They need to be updated before they are re-enabled # url(r'^send_feedback$', 'util.views.send_feedback'), From e1ba9579592746c7b39010d2f57dc0b614c6e2da Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Sun, 22 Jul 2012 17:55:37 -0400 Subject: [PATCH 02/48] Added UC Berkeley press release to rss feed at bottom of index. --- lms/templates/feed.rss | 2 +- lms/templates/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/templates/feed.rss b/lms/templates/feed.rss index 52b2e2366c..3ab3ed3134 100644 --- a/lms/templates/feed.rss +++ b/lms/templates/feed.rss @@ -11,7 +11,7 @@ tag:www.edx.org,2012:Post/3 2012-07-16T14:08:12-07:00 2012-07-16T14:08:12-07:00 - + UC Berkeley joins edX <img src="${static.url('images/press/edx_logo_108x81.jpeg')}" /> <p>edX broadens course offerings</p> diff --git a/lms/templates/index.html b/lms/templates/index.html index b55fa5a849..dd426e2f2b 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -119,7 +119,7 @@ From 1e1e777e0453cd81e18f7b1532fb228f9b352edc Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 23 Jul 2012 19:19:27 -0400 Subject: [PATCH 31/48] Fixed bugs caused by modal cloning. Now, only video modals are cloned. --- lms/static/js/toggle_login_modal.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/lms/static/js/toggle_login_modal.js b/lms/static/js/toggle_login_modal.js index b4e5c881c8..df62a01505 100644 --- a/lms/static/js/toggle_login_modal.js +++ b/lms/static/js/toggle_login_modal.js @@ -23,11 +23,17 @@ $(".modal").hide(); var modal_id = $(this).attr("href"); + + if ($(modal_id).hasClass("video-modal")) { + //Video modals need to be cloned before being presented as a modal + //This is because actions on the video get recorded in the history. + //Deleting the video (clone) prevents the odd back button behavior. + var modal_clone = $(modal_id).clone(true, true); + modal_clone.attr('id', 'modal_clone'); + $(modal_id).after(modal_clone); + modal_id = '#modal_clone'; + } - modal_clone = $(modal_id).clone(true, true); - modal_clone.attr('id', 'modal_clone'); - $(modal_id).after(modal_clone); - modal_id = '#modal_clone'; $("#lean_overlay").click(function() { close_modal(modal_id); @@ -74,7 +80,9 @@ $("#lean_overlay").fadeOut(200); $('iframe', modal_id).attr('src', ''); $(modal_id).css({ 'display' : 'none' }); - $(modal_id).remove(); + if (modal_id == '#modal_clone') { + $(modal_id).remove(); + } } } }); From 3008c177303879a0ad48f1817329798fbf313452 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Mon, 23 Jul 2012 19:19:50 -0400 Subject: [PATCH 32/48] Added bottom margin for articles in help --- lms/static/sass/multicourse/_help.scss | 10 +++++++--- lms/templates/static_templates/help.html | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/lms/static/sass/multicourse/_help.scss b/lms/static/sass/multicourse/_help.scss index 9fed09907d..ca1011951e 100644 --- a/lms/static/sass/multicourse/_help.scss +++ b/lms/static/sass/multicourse/_help.scss @@ -4,10 +4,14 @@ width: flex-grid(9); margin-right: flex-gutter(); - h2 { - border-bottom: 1px solid rgb(220,220,220); + article { margin-bottom: 40px; - padding-bottom: 20px; + + h2 { + border-bottom: 1px solid rgb(220,220,220); + margin-bottom: 40px; + padding-bottom: 20px; + } } } diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html index f7e69634ba..6f01fd8040 100644 --- a/lms/templates/static_templates/help.html +++ b/lms/templates/static_templates/help.html @@ -14,6 +14,10 @@

What are "X Universities"?

Harvard, MIT and UC Berkeley, as the first universities whose courses are delivered on the edX website, are "X Universities." The three institutions will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities" as soon as possible. Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.

+
+

What are "X Universities"?

+

Harvard, MIT and UC Berkeley, as the first universities whose courses are delivered on the edX website, are "X Universities." The three institutions will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities" as soon as possible. Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.

+
From 7c48ab2509d0db232ecc412923cdb1fad326ea31 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 23 Jul 2012 19:53:08 -0400 Subject: [PATCH 33/48] Changed press dates to international format. --- lms/templates/static_templates/press.html | 28 +++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/lms/templates/static_templates/press.html b/lms/templates/static_templates/press.html index 72388774ff..33b9fe045f 100644 --- a/lms/templates/static_templates/press.html +++ b/lms/templates/static_templates/press.html @@ -25,14 +25,14 @@ articles = [ image="univworldnews_logo_178x138.jpeg", deck=None, publication="University World News", - publish_date="7/19/2012 Issue No:231"), + publish_date="July 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"), + publish_date="July 18, 2012"), Article(title="Lessons learned from MITx's prototype course", url="http://mitne.ws/Mdabcp", author="Larry Hardesty, MIT News Office", @@ -46,84 +46,84 @@ articles = [ image="gigaom_logo_178x138.jpeg", deck=None, publication="GigaOM", - publish_date="7/16/2012"), + publish_date="July 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"), + publish_date="July 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"), + publish_date="July 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"), + publish_date="June 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"), + publish_date="June 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"), + publish_date="June 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"), + publish_date="June 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"), + publish_date="June 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"), + publish_date="May 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"), + publish_date="May 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"), + publish_date="May 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"), + publish_date="May 02, 2012"), ] %> From e3b023b0ac19b1d848c9a2d4a0724c6fc1a6965e Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 23 Jul 2012 19:54:03 -0400 Subject: [PATCH 34/48] Removed unecessary quotation mark from contact page. --- lms/templates/static_templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/templates/static_templates/contact.html b/lms/templates/static_templates/contact.html index 7404522166..c80a509643 100644 --- a/lms/templates/static_templates/contact.html +++ b/lms/templates/static_templates/contact.html @@ -22,7 +22,7 @@

We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.

General Inquiries and Feedback

-

"If you have a general question about edX please email info@edx.org. To see if your question has already been answered, visit our FAQ page. You can also join the discussion on our facebook page. Though we may not have a chance to respond to every email, we take all feedback into consideration.

+

If you have a general question about edX please email info@edx.org. To see if your question has already been answered, visit our FAQ page. You can also join the discussion on our facebook page. Though we may not have a chance to respond to every email, we take all feedback into consideration.

Technical Inquiries and Feedback

If you have suggestions/feedback about the overall edX platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at technical@edx.org. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: bugs@edx.org.

From 45bdcbdcae0d7d49c068cbc4f162fdad423c08a3 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 23 Jul 2012 19:55:07 -0400 Subject: [PATCH 35/48] Unecessary capitalized letter on contact page. --- lms/templates/static_templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/templates/static_templates/contact.html b/lms/templates/static_templates/contact.html index c80a509643..cd571cfd18 100644 --- a/lms/templates/static_templates/contact.html +++ b/lms/templates/static_templates/contact.html @@ -31,7 +31,7 @@

Please visit our media/press page for more information. For any media or press enquiries, please email press@edx.org.

Universities

-

If you are a university wishing to Collaborate or with questions about edX, please email university@edx.org.

+

If you are a university wishing to collaborate or with questions about edX, please email university@edx.org.

From 80f46c216b2218bf9f942e6d39b499f492a634bd Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 23 Jul 2012 19:56:10 -0400 Subject: [PATCH 36/48] Capitalized facebook on contact page. --- lms/templates/static_templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/templates/static_templates/contact.html b/lms/templates/static_templates/contact.html index cd571cfd18..d848164720 100644 --- a/lms/templates/static_templates/contact.html +++ b/lms/templates/static_templates/contact.html @@ -22,7 +22,7 @@

We are always seeking feedback to improve our courses. If you are an enrolled student and have any questions, feedback, suggestions, or any other issues specific to a particular class, please post on the discussion forums of that class.

General Inquiries and Feedback

-

If you have a general question about edX please email info@edx.org. To see if your question has already been answered, visit our FAQ page. You can also join the discussion on our facebook page. Though we may not have a chance to respond to every email, we take all feedback into consideration.

+

If you have a general question about edX please email info@edx.org. To see if your question has already been answered, visit our FAQ page. You can also join the discussion on our Facebook page. Though we may not have a chance to respond to every email, we take all feedback into consideration.

Technical Inquiries and Feedback

If you have suggestions/feedback about the overall edX platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at technical@edx.org. For technical questions, please make sure you are using a current version of Firefox or Chrome, and include browser and version in your e-mail, as well as screenshots or other pertinent details. If you find a bug or other issues, you can reach us at the following: bugs@edx.org.

From cfe1255432388fc65772b4dde67baf4a613e3af9 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 23 Jul 2012 20:03:38 -0400 Subject: [PATCH 37/48] Updated error messages for missing signup fields. --- common/djangoapps/student/views.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 0f6ffd6fdd..d0da67f247 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -261,13 +261,13 @@ def create_account(request, post_override=None): # TODO: Check password is sane for a in ['username', 'email', 'name', 'password', 'terms_of_service', 'honor_code']: if len(post_vars[a]) < 2: - error_str = {'username' : 'Username of length 2 or greater', - 'email' : 'Properly formatted e-mail', - 'name' : 'Your legal name ', - 'password': 'Valid password ', - 'terms_of_service': 'Accepting Terms of Service', - 'honor_code': 'Agreeing to the Honor Code'} - js['value']="{field} is required.".format(field=error_str[a]) + error_str = {'username' : 'Username must be minimum of two characters long.', + 'email' : 'A properly formatted e-mail is required.', + 'name' : 'Your legal name must be a minimum of two characters long.', + 'password': 'A valid password is required.', + 'terms_of_service': 'Accepting Terms of Service is required.', + 'honor_code': 'Agreeing to the Honor Code is required.'} + js['value']= error_str[a] return HttpResponse(json.dumps(js)) try: From 38d54f42caf21036b3d83701497584489ce00b10 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Mon, 23 Jul 2012 20:38:09 -0400 Subject: [PATCH 38/48] Let people know courses are free. --- lms/templates/courses.html | 2 +- lms/templates/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/templates/courses.html b/lms/templates/courses.html index a4c0c2480a..25930184a9 100644 --- a/lms/templates/courses.html +++ b/lms/templates/courses.html @@ -11,7 +11,7 @@ -

Explore courses from leading universities.

+

Explore free courses from leading universities.

diff --git a/lms/templates/index.html b/lms/templates/index.html index d3cbf25cfe..0466da0408 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -45,7 +45,7 @@
-

Explore courses from edX universities

+

Explore free courses from edX universities

    From e53ea2f81d4c706a371df7e5b030ea3294c09358 Mon Sep 17 00:00:00 2001 From: David Ormsbee Date: Mon, 23 Jul 2012 20:39:26 -0400 Subject: [PATCH 39/48] Add common tech problems to help page --- lms/templates/static_templates/help.html | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html index 6f01fd8040..7d1748776c 100644 --- a/lms/templates/static_templates/help.html +++ b/lms/templates/static_templates/help.html @@ -11,12 +11,23 @@
    -

    What are "X Universities"?

    -

    Harvard, MIT and UC Berkeley, as the first universities whose courses are delivered on the edX website, are "X Universities." The three institutions will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities" as soon as possible. Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.

    +

    I tried to sign up, but it says the username is already taken.

    +

    If you have previously signed up for an MITx account, you already have an edX account and can log in with your existing username and password. If you don’t have an MITx account and received this error, it's possible that someone else has already signed up with that username. Please try a different, more unique username – for example, try adding a random number to the end.

    -

    What are "X Universities"?

    -

    Harvard, MIT and UC Berkeley, as the first universities whose courses are delivered on the edX website, are "X Universities." The three institutions will work collaboratively to establish the "X University" Consortium, whose membership will expand to include additional "X Universities" as soon as possible. Each member of the consortium will offer courses on the edX platform as an "X University." The gathering of many universities’ educational content together on one site will enable learners worldwide to access the course content of any participating university from a single website, and to use a set of online educational tools shared by all participating universities.

    +

    How will I know that the course I have signed up for has started?

    +

    The start date for each course is listed on the right-hand side of the Course About page.

    +
    +
    +

    I just signed up into edX. I have not received any form of acknowledgement that I have enrolled.

    +

    You should receive a single activation e-mail. If you did not, it may be because:

    +
      +
    • There was a typo in your e-mail address.
    • +
    • The activation e-mail was caught by your spam filter. Please check your spam folder.
    • +
    • You may be using an older browser. We recommend downloading the current version of Firefox or Chrome.
    • +
    • JavaScript is disabled in your browser. Please confirm it is enabled.
    • +
    • If you run into issues, try recreating your account. There is no need to do anything about the old account, if any. If it is not activated through the link in the e-mail, it will disappear later.
    • +
    From e7bb31af5b1d19c5f17a126c6f110ac637c6768e Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 23 Jul 2012 20:46:39 -0400 Subject: [PATCH 40/48] Changed unenroll to unregister on dashboard. --- lms/templates/dashboard.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index c0273ef709..b0d4308253 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -95,7 +95,7 @@
- Unenroll + Unregister % endfor % else: @@ -113,7 +113,7 @@ -