From 7c48ab2509d0db232ecc412923cdb1fad326ea31 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 23 Jul 2012 19:53:08 -0400 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 e7bb31af5b1d19c5f17a126c6f110ac637c6768e Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Mon, 23 Jul 2012 20:46:39 -0400 Subject: [PATCH 6/6] 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 @@