Skip to content

E
edx-platform
Commit 7e8986fc by David Ormsbee
Options

Merge pull request #287 from MITx/release_fixes 

Release fixes
parents 48d69faf e7bb31af
Showing with 26 additions and 26 deletions
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:
......
lms/templates/dashboard.html
......@@ -95,7 +95,7 @@
</section>
</section>
</article>
<a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">Unenroll</a>
<a href="#unenroll-modal" class="unenroll" rel="leanModal" data-course-id="${course.id}" data-course-number="${course.number}">Unregister</a>
% endfor
% else:
......@@ -113,7 +113,7 @@
<section id="unenroll-modal" class="modal unenroll-modal">
<div class="inner-wrapper">
<header>
<h2>Are you sure you want to unenroll from <span id="unenroll_course_number"></span>?</h2>
<h2>Are you sure you want to unregister from <span id="unenroll_course_number"></span>?</h2>
<hr>
</header>
......@@ -121,7 +121,7 @@
<input name="course_id" id="unenroll_course_id" type="hidden" />
<input name="enrollment_action" type="hidden" value="unenroll" />
<div class="submit">
<input name="submit" type="submit" value="Unenroll" />
<input name="submit" type="submit" value="Unregister" />
</div>
</form>
......
lms/templates/static_templates/contact.html
......@@ -22,7 +22,7 @@
<p>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&nbsp;class.</p>
<h2>General Inquiries and Feedback</h2>
<p>"If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
<p>If you have a general question about edX please email <a href="mailto:info@edx.org">info@edx.org</a>. To see if your question has already been answered, visit our <a href="${reverse('faq_edx')}">FAQ page</a>. You can also join the discussion on our <a href="http://www.facebook.com/EdxOnline">Facebook page</a>. Though we may not have a chance to respond to every email, we take all feedback into consideration.</p>
<h2>Technical Inquiries and Feedback</h2>
<p>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 <a href="mailto:technical@edx.org">technical@edx.org</a>. 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: <a href="mailto:bugs@edx.org">bugs@edx.org</a>.</p>
......@@ -31,7 +31,7 @@
<p>Please visit our <a href="${reverse('press')}">media/press page</a> for more information. For any media or press enquiries, please email <a href="mailto:press@edx.org">press@edx.org</a>.</p>
<h2>Universities</h2>
<p>If you are a university wishing to Collaborate or with questions about edX, please email <a href="mailto:university@edx.org">university@edx.org</a>.</p>
<p>If you are a university wishing to collaborate or with questions about edX, please email <a href="mailto:university@edx.org">university@edx.org</a>.</p>
</div>
</section>
......
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"),
]
%>
......
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