Merge branch 'release/1.0'

Conflicts:
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/courses.py

cms/envs/common.py

@@ -132,10 +132,10 @@ IGNORABLE_404_ENDS = ('favicon.ico')
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu'
-DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu'
+DEFAULT_FROM_EMAIL = 'registration@edx.org'
+DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
 ADMINS = (
-    ('MITx Admins', 'admin@mitx.mit.edu'),
+    ('edX Admins', 'admin@edx.org'),
 )
 MANAGERS = ADMINS
 

common/djangoapps/pipeline_mako/templates/static_content.html

@@ -1,7 +1,6 @@
 <%!
 from staticfiles.storage import staticfiles_storage
 from pipeline_mako import compressed_css, compressed_js
-from static_replace import replace_urls
 %>
 
 <%def name='url(file)'>${staticfiles_storage.url(file)}</%def>
@@ -24,5 +23,3 @@ from static_replace import replace_urls
     % endfor
   %endif
 </%def>
-
-<%def name='replace_urls(text)'>${replace_urls(text)}</%def>

common/djangoapps/student/views.py

@@ -266,13 +266,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:
@@ -408,10 +408,11 @@ def password_reset(request):
         raise Http404
     form = PasswordResetForm(request.POST)
     if form.is_valid():
-        form.save(use_https=request.is_secure(),
-                   from_email=settings.DEFAULT_FROM_EMAIL,
-                   request=request)
-        return HttpResponse(json.dumps({'success': True,
+        form.save(use_https = request.is_secure(),
+                  from_email = settings.DEFAULT_FROM_EMAIL,
+                  request = request,
+                  domain_override = settings.SITE_NAME)
+        return HttpResponse(json.dumps({'success':True,
                                         'value': render_to_string('registration/password_reset_done.html', {})}))
     else:
         return HttpResponse(json.dumps({'success': False,

lms/djangoapps/courseware/courses.py

@@ -9,6 +9,8 @@ from django.http import Http404
 from xmodule.course_module import CourseDescriptor
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
+from static_replace import replace_urls
+from staticfiles.storage import staticfiles_storage
 
 log = logging.getLogger(__name__)
 
@@ -40,15 +42,8 @@ def check_course(course_id, course_must_be_open=True, course_required=True):
     return course
 
 
-### These methods look like they should be on the course_module object itself, but they rely
-### on the lms. Maybe they should be added dynamically to the class?
-
-def course_static_url(course):
-    return settings.STATIC_URL + "/" + course.metadata['data_dir'] + "/"
-
-
 def course_image_url(course):
-    return course_static_url(course) + "images/course_image.jpg"
+    return staticfiles_storage.url(course.metadata['data_dir'] + "/images/course_image.jpg")
 
 
 def get_course_about_section(course, section_key):
@@ -81,7 +76,7 @@ def get_course_about_section(course, section_key):
                         'effort', 'end_date', 'prerequisites']:
         try:
             with course.system.resources_fs.open(path("about") / section_key + ".html") as htmlFile:
-                return htmlFile.read().decode('utf-8').format(COURSE_STATIC_URL=course_static_url(course))
+                return replace_urls(htmlFile.read().decode('utf-8'), course.metadata['data_dir'])
         except ResourceNotFoundError:
             log.warning("Missing about section {key} in course {url}".format(key=section_key, url=course.location.url()))
             return None
@@ -111,11 +106,9 @@ def get_course_info_section(course, section_key):
     if section_key in ['handouts', 'guest_handouts', 'updates', 'guest_updates']:
         try:
             with course.system.resources_fs.open(path("info") / section_key + ".html") as htmlFile:
-                return htmlFile.read().decode('utf-8')
+                return replace_urls(htmlFile.read().decode('utf-8'), course.metadata['data_dir'])
         except ResourceNotFoundError:
             log.exception("Missing info section {key} in course {url}".format(key=section_key, url=course.location.url()))
             return "! Info section missing !"
 
     raise KeyError("Invalid about key " + str(section_key))
-
-

lms/envs/common.py

@@ -158,17 +158,17 @@ TEMPLATE_DEBUG = False
 
 # Site info
 SITE_ID = 1
-SITE_NAME = "localhost:8000"
+SITE_NAME = "edx.org"
 HTTPS = 'on'
 ROOT_URLCONF = 'lms.urls'
 IGNORABLE_404_ENDS = ('favicon.ico')
 
 # Email
 EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend'
-DEFAULT_FROM_EMAIL = 'registration@mitx.mit.edu'
-DEFAULT_FEEDBACK_EMAIL = 'feedback@mitx.mit.edu'
+DEFAULT_FROM_EMAIL = 'registration@edx.org'
+DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org'
 ADMINS = (
-    ('MITx Admins', 'admin@mitx.mit.edu'),
+    ('edX Admins', 'admin@edx.org'),
 )
 MANAGERS = ADMINS
 

lms/static/images/courses/space2.jpg.REMOVED.git-id

@@ -1 +0,0 @@
-69017eed8a9ec5b9caf28814cadf01ba69b4b3bc

lms/static/images/courses/space3.jpg.REMOVED.git-id

@@ -1 +0,0 @@
-74bca798766449c9f2c87244410ca8fa30d5482e

lms/static/images/courses/space4.jpg.REMOVED.git-id

@@ -1 +0,0 @@
-184bae027b6853b575b8de2329f77089bcc87966