${_("Videos and Exercises")}
-
${_(" Copyright © 2012 {MIT}. All rights reserved. In order to further {MIT}'s goal of making education accessible and affordable to the world, {MIT} is planning to make {MITx} course content available under open source licenses.").format(MIT="MIT", MITx="MITx")}
+
${_(" Copyright © 2012 {MIT}. All rights reserved. In order to further {MIT}'s goal of making education accessible and affordable to the world, {MIT} is planning to make {edX} course content available under open source licenses.").format(MIT="MIT", edX="edX")}
${_("Textbook")}
${_(" Copyright © 2005 {elsevier}. All Rights Reserved. Used with permission. While our goal is to build courses with as much free and open content as possible, we apologize that we do not have the ability to do so entirely. ").format(elsevier="Elsevier Inc")}
diff --git a/lms/templates/static_templates/faq.html b/lms/templates/static_templates/faq.html
index 9b90fd5c6ca6..85d6b3567902 100644
--- a/lms/templates/static_templates/faq.html
+++ b/lms/templates/static_templates/faq.html
@@ -62,7 +62,7 @@
${_("Will {edX} be adding additional X Universities?").format(edX="edX")}
${_("{EdX} will actively explore the addition of other institutions from around the world to the {edX} platform, and looks forward to adding more \"{X_Universities}\".").format(EdX="EdX", edX="edX", X_Universities="X Universities")}
@@ -79,11 +79,11 @@
${_("Who can take {edX} courses? Will there be an admissions process?").form
${_("Will certificates be awarded?")}
${_("Yes. Online learners who demonstrate mastery of subjects can earn a certificate "
"of mastery. Certificates will be issued at the discretion of {edX} and the underlying "
- "\"{X_University}\" that offered the course under the name of the underlying \"{X_University}\" from where the course originated, i.e. {HarvardX}, {MITx} or {BerkeleyX}. "
+ "\"{X_University}\" that offered the course under the name of the underlying \"{X_University}\" from where the course originated, i.e. {HarvardX}, {edX} 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. Note: At this time, {edX} is "
"holding certificates for learners connected with Cuba, Iran, Syria and Sudan "
- "pending confirmation that the issuance is in compliance with U.S. embargoes.").format(edX="edX", X_University="X University", HarvardX="HarvardX", MITx="MITx", BerkeleyX="BerkeleyX")}
+ "pending confirmation that the issuance is in compliance with U.S. embargoes.").format(edX="edX", X_University="X University", HarvardX="HarvardX", edX="edX", BerkeleyX="BerkeleyX")}
${_("What will the scope of the online courses be? How many? Which faculty?")}
@@ -91,7 +91,7 @@ ${_("What will the scope of the online courses be? How many? Which faculty?"
${_("Who is the learner? Domestic or international? Age range?")}
- ${_("Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don't have a target group of potential learners, as the goal is to make these courses available to anyone in the world - from any demographic - who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for {MITx}'s first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years-old.").format(MITx="MITx")}
+ ${_("Improving teaching and learning for students on our campuses is one of our primary goals. Beyond that, we don't have a target group of potential learners, as the goal is to make these courses available to anyone in the world - from any demographic - who has interest in advancing their own knowledge. The only requirement is to have a computer with an internet connection. More than 150,000 students from over 160 countries registered for {edX}'s first course, 6.002x: Circuits and Electronics. The age range of students certified in this course was from 14 to 74 years-old.").format(edX="edX")}
${_("Will participating universities' standards apply to all courses offered on the edX platform?")}
@@ -116,7 +116,7 @@ ${_("Technology Platform")}
${_("What technology will {edX} use?").format(edX="edX")}
${_("The {edX} open-source online learning platform will feature interactive learning designed specifically for the web. Features will include: self-paced learning, online discussion groups, wiki-based collaborative learning, assessment of learning as a student progresses through a course, and online laboratories and other interactive learning tools. The platform will also serve as a laboratory from which data will be gathered to better understand how students learn. Because it is open source, the platform will be continuously improved by a worldwide community of collaborators, with new features added as needs arise.").format(edX="edX")}
- ${_("The first version of the technology was used in the first {MITx} course, 6.002x Circuits and Electronics, which launched in Spring, 2012.").format(MITx="MITx")}
+ ${_("The first version of the technology was used in the first {edX} course, 6.002x Circuits and Electronics, which launched in Spring, 2012.").format(edX="edX")}
${_("How is this different from what other universities are doing online?")}
diff --git a/lms/templates/static_templates/help.html b/lms/templates/static_templates/help.html
index f4f65be053a2..186d3e2f2cfb 100644
--- a/lms/templates/static_templates/help.html
+++ b/lms/templates/static_templates/help.html
@@ -182,7 +182,7 @@ ${_("Certificates & Credits")}
${_("Will I get a certificate for taking an {edX} course?").format(edX="edX")}
-
${_("Online learners who receive a passing grade for a course will receive a certificate of mastery at the discretion of {edX} and the underlying {X} University that offered the course. For example, a certificate of mastery for {MITx}\'s 6.002x Circuits & Electronics will come from {edX} and {MITx}.").format(edX="edX", X="X", MITx="MITx")}
+
${_("Online learners who receive a passing grade for a course will receive a certificate of mastery at the discretion of {edX} and the underlying {X} University that offered the course. For example, a certificate of mastery for {edX}\'s 6.002x Circuits & Electronics will come from {edX} and {edX}.").format(edX="edX", X="X", edX="edX")}
${_("If you passed the course, your certificate of mastery will be delivered online through edx.org. So be sure to check your email in the weeks following the final grading - you will be able to download and print your certificate. Note: At this time, {edX} is holding certificates for learners connected with Cuba, Iran, Syria and Sudan pending confirmation that the issuance is in compliance with U.S. embargoes.").format(edX="edX")}
User Postings
Certificates, etc.
- EdX and/or the colleges and universities providing courses on the Site may offer a certificate of mastery or other acknowledgment (a "Certificate") for students who, in their judgment, have satisfactorily demonstrated mastery of the course material. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, MITx. etc. The decision whether a Certificate will be awarded to a given student will be solely within the discretion of the awarding entity, as will the name and form of any such Certificate. EdX and/or the institutions providing courses on the Site may choose not to offer a Certificate for some courses.
+ EdX and/or the colleges and universities providing courses on the Site may offer a certificate of mastery or other acknowledgment (a "Certificate") for students who, in their judgment, have satisfactorily demonstrated mastery of the course material. Certificates will be issued by edX under the name of the underlying "X University" from where the course originated, i.e. HarvardX, edX. etc. The decision whether a Certificate will be awarded to a given student will be solely within the discretion of the awarding entity, as will the name and form of any such Certificate. EdX and/or the institutions providing courses on the Site may choose not to offer a Certificate for some courses.
When you take a course through edX, you will not be an applicant for admission to, or enrolled in, any degree program of the institution as a result of registering for or completing a course through edX. You will not be entitled to use any of the resources of the institution beyond the online courses provided on the Site, nor will you be eligible to receive student privileges or benefits provided to students enrolled in degree programs of the institution.
diff --git a/lms/templates/stripped-main.html b/lms/templates/stripped-main.html
index 28166dbd972f..f2e8545e968f 100644
--- a/lms/templates/stripped-main.html
+++ b/lms/templates/stripped-main.html
@@ -24,7 +24,7 @@
-
+
diff --git a/lms/templates/widgets/segment-io.html b/lms/templates/widgets/segment-io.html
index 87dc0eebe074..3c6728bb16b6 100644
--- a/lms/templates/widgets/segment-io.html
+++ b/lms/templates/widgets/segment-io.html
@@ -1,4 +1,4 @@
-% if settings.MITX_FEATURES.get('SEGMENT_IO_LMS'):
+% if settings.FEATURES.get('SEGMENT_IO_LMS'):
<%! from django.core.urlresolvers import reverse %>
<%! import waffle %>
@@ -29,4 +29,4 @@
};
-% endif
\ No newline at end of file
+% endif
diff --git a/lms/urls.py b/lms/urls.py
index 913c686f1bea..18351f37a646 100644
--- a/lms/urls.py
+++ b/lms/urls.py
@@ -6,7 +6,7 @@
import django.contrib.auth.views
# Uncomment the next two lines to enable the admin:
-if settings.DEBUG or settings.MITX_FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
+if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
admin.autodiscover()
urlpatterns = ('', # nopep8
@@ -63,7 +63,7 @@
url(r'^', include('waffle.urls')),
)
-# if settings.MITX_FEATURES.get("MULTIPLE_ENROLLMENT_ROLES"):
+# if settings.FEATURES.get("MULTIPLE_ENROLLMENT_ROLES"):
urlpatterns += (
url(r'^verify_student/', include('verify_student.urls')),
url(r'^course_modes/', include('course_modes.urls')),
@@ -87,7 +87,7 @@
)
# Semi-static views only used by edX, not by themes
-if not settings.MITX_FEATURES["USE_CUSTOM_THEME"]:
+if not settings.FEATURES["USE_CUSTOM_THEME"]:
urlpatterns += (
url(r'^jobs$', 'static_template_view.views.render',
{'template': 'jobs.html'}, name="jobs"),
@@ -130,7 +130,7 @@
# To allow theme templates to inherit from default templates,
# prepend a standard prefix
- if settings.MITX_FEATURES["USE_CUSTOM_THEME"]:
+ if settings.FEATURES["USE_CUSTOM_THEME"]:
template = "theme-" + template
# Make the assumption that the URL we want is the lowercased
@@ -318,13 +318,13 @@
)
# allow course staff to change to student view of courseware
- if settings.MITX_FEATURES.get('ENABLE_MASQUERADE'):
+ if settings.FEATURES.get('ENABLE_MASQUERADE'):
urlpatterns += (
url(r'^masquerade/(?P.*)$', 'courseware.masquerade.handle_ajax', name="masquerade-switch"),
)
# discussion forums live within courseware, so courseware must be enabled first
- if settings.MITX_FEATURES.get('ENABLE_DISCUSSION_SERVICE'):
+ if settings.FEATURES.get('ENABLE_DISCUSSION_SERVICE'):
urlpatterns += (
url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/discussion/',
include('django_comment_client.urls')),
@@ -339,7 +339,7 @@
'courseware.views.static_tab', name="static_tab"),
)
- if settings.MITX_FEATURES.get('ENABLE_STUDENT_HISTORY_VIEW'):
+ if settings.FEATURES.get('ENABLE_STUDENT_HISTORY_VIEW'):
urlpatterns += (
url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/submission_history/(?P[^/]*)/(?P.*?)$',
'courseware.views.submission_history',
@@ -347,7 +347,7 @@
)
-if settings.COURSEWARE_ENABLED and settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BETA_DASHBOARD'):
+if settings.COURSEWARE_ENABLED and settings.FEATURES.get('ENABLE_INSTRUCTOR_BETA_DASHBOARD'):
urlpatterns += (
url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/instructor_dashboard$',
'instructor.views.instructor_dashboard.instructor_dashboard_2', name="instructor_dashboard_2"),
@@ -356,29 +356,29 @@
include('instructor.views.api_urls'))
)
-if settings.DEBUG or settings.MITX_FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
+if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
## Jasmine and admin
urlpatterns += (url(r'^admin/', include(admin.site.urls)),)
-if settings.MITX_FEATURES.get('AUTH_USE_OPENID'):
+if settings.FEATURES.get('AUTH_USE_OPENID'):
urlpatterns += (
url(r'^openid/login/$', 'django_openid_auth.views.login_begin', name='openid-login'),
url(r'^openid/complete/$', 'external_auth.views.openid_login_complete', name='openid-complete'),
url(r'^openid/logo.gif$', 'django_openid_auth.views.logo', name='openid-logo'),
)
-if settings.MITX_FEATURES.get('AUTH_USE_SHIB'):
+if settings.FEATURES.get('AUTH_USE_SHIB'):
urlpatterns += (
url(r'^shib-login/$', 'external_auth.views.shib_login', name='shib-login'),
)
-if settings.MITX_FEATURES.get('AUTH_USE_CAS'):
+if settings.FEATURES.get('AUTH_USE_CAS'):
urlpatterns += (
url(r'^cas-auth/login/$', 'external_auth.views.cas_login', name="cas-login"),
url(r'^cas-auth/logout/$', 'django_cas.views.logout', {'next_page': '/'}, name="cas-logout"),
)
-if settings.MITX_FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD'):
+if settings.FEATURES.get('RESTRICT_ENROLL_BY_REG_METHOD'):
urlpatterns += (
url(r'^course_specific_login/(?P[^/]+/[^/]+/[^/]+)/$',
'external_auth.views.course_specific_login', name='course-specific-login'),
@@ -393,7 +393,7 @@
)
-if settings.MITX_FEATURES.get('AUTH_USE_OPENID_PROVIDER'):
+if settings.FEATURES.get('AUTH_USE_OPENID_PROVIDER'):
urlpatterns += (
url(r'^openid/provider/login/$', 'external_auth.views.provider_login', name='openid-provider-login'),
url(r'^openid/provider/login/(?:.+)$', 'external_auth.views.provider_identity', name='openid-provider-login-identity'),
@@ -401,7 +401,7 @@
url(r'^openid/provider/xrds/$', 'external_auth.views.provider_xrds', name='openid-provider-xrds')
)
-if settings.MITX_FEATURES.get('ENABLE_LMS_MIGRATION'):
+if settings.FEATURES.get('ENABLE_LMS_MIGRATION'):
urlpatterns += (
url(r'^migrate/modules$', 'lms_migration.migrate.manage_modulestores'),
url(r'^migrate/reload/(?P[^/]+)$', 'lms_migration.migrate.manage_modulestores'),
@@ -410,23 +410,23 @@
url(r'^gitreload/(?P[^/]+)$', 'lms_migration.migrate.gitreload'),
)
-if settings.MITX_FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
+if settings.FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
urlpatterns += (
url(r'^event_logs$', 'track.views.view_tracking_log'),
url(r'^event_logs/(?P.+)$', 'track.views.view_tracking_log'),
)
-if settings.MITX_FEATURES.get('ENABLE_SERVICE_STATUS'):
+if settings.FEATURES.get('ENABLE_SERVICE_STATUS'):
urlpatterns += (
url(r'^status/', include('service_status.urls')),
)
-if settings.MITX_FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
+if settings.FEATURES.get('ENABLE_INSTRUCTOR_BACKGROUND_TASKS'):
urlpatterns += (
url(r'^instructor_task_status/$', 'instructor_task.views.instructor_task_status', name='instructor_task_status'),
)
-if settings.MITX_FEATURES.get('RUN_AS_ANALYTICS_SERVER_ENABLED'):
+if settings.FEATURES.get('RUN_AS_ANALYTICS_SERVER_ENABLED'):
urlpatterns += (
url(r'^edinsights_service/', include('edinsights.core.urls')),
)
@@ -438,20 +438,20 @@
url(r'^comm/foldit_ops', 'foldit.views.foldit_ops', name="foldit_ops"),
)
-if settings.MITX_FEATURES.get('ENABLE_DEBUG_RUN_PYTHON'):
+if settings.FEATURES.get('ENABLE_DEBUG_RUN_PYTHON'):
urlpatterns += (
url(r'^debug/run_python', 'debug.views.run_python'),
)
# Crowdsourced hinting instructor manager.
-if settings.MITX_FEATURES.get('ENABLE_HINTER_INSTRUCTOR_VIEW'):
+if settings.FEATURES.get('ENABLE_HINTER_INSTRUCTOR_VIEW'):
urlpatterns += (
url(r'^courses/(?P[^/]+/[^/]+/[^/]+)/hint_manager$',
'instructor.hint_manager.hint_manager', name="hint_manager"),
)
# enable automatic login
-if settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING'):
+if settings.FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING'):
urlpatterns += (
url(r'^auto_auth$', 'student.views.auto_auth'),
)
diff --git a/package.json b/package.json
index 2213d41f8d3f..31876d5a321a 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
{
- "name": "mitx",
+ "name": "edx",
"version": "0.1.0",
"dependencies": {
"coffee-script": "1.6.X"
diff --git a/proxy/nginx.conf b/proxy/nginx.conf
index 2b48e17d0377..d53afc5f61f5 100644
--- a/proxy/nginx.conf
+++ b/proxy/nginx.conf
@@ -1,6 +1,6 @@
-# Mapping of
+# Mapping of
#
-# From the /mitx directory:
+# From the /edx directory:
# /usr/local/Cellar/nginx/1.2.2/sbin/nginx -p `pwd`/ -c nginx.conf
worker_processes 1;
@@ -49,7 +49,7 @@ http {
rewrite ^(.*)/favicon.ico$ /static/images/favicon.ico last;
- # Our catchall
+ # Our catchall
location / {
proxy_pass http://portal;
}
diff --git a/rakelib/deploy.rake b/rakelib/deploy.rake
index 1d0a1b2c4f71..53b457417127 100644
--- a/rakelib/deploy.rake
+++ b/rakelib/deploy.rake
@@ -1,7 +1,7 @@
# Packaging constants
COMMIT = (ENV["GIT_COMMIT"] || `git rev-parse HEAD`).chomp()[0, 10]
-PACKAGE_NAME = "mitx"
+PACKAGE_NAME = "edx"
BRANCH = (ENV["GIT_BRANCH"] || `git symbolic-ref -q HEAD`).chomp().gsub('refs/heads/', '').gsub('origin/', '')
desc "Build a properties file used to trigger autodeploy builds"
@@ -12,4 +12,4 @@ task :autodeploy_properties do
file.puts("UPSTREAM_JOB=#{PACKAGE_NAME}")
file.puts("UPSTREAM_REVISION=#{COMMIT}")
end
-end
\ No newline at end of file
+end
diff --git a/requirements/edx/local.txt b/requirements/edx/local.txt
index 7941f9fa5e03..b3743240cb65 100644
--- a/requirements/edx/local.txt
+++ b/requirements/edx/local.txt
@@ -1,4 +1,4 @@
-# Python libraries to install that are local to the mitx repo
+# Python libraries to install that are local to the edx repo
-e common/lib/calc
-e common/lib/capa
-e common/lib/chem
diff --git a/scripts/runone.py b/scripts/runone.py
index 19b5f7195b68..9ca38602245a 100755
--- a/scripts/runone.py
+++ b/scripts/runone.py
@@ -5,7 +5,7 @@
import sys
# I want this:
-# ERROR: test_update_and_fetch (mitx.cms.djangoapps.contentstore.tests.test_course_settings.CourseDetailsViewTest)
+# ERROR: test_update_and_fetch (edX.cms.djangoapps.contentstore.tests.test_course_settings.CourseDetailsViewTest)
# to become:
# test --settings=cms.envs.test --pythonpath=. -s cms/djangoapps/contentstore/tests/test_course_settings.py:CourseDetailsViewTest.test_update_and_fetch
@@ -34,7 +34,7 @@ def main(argv):
test_method = words[0]
test_path = words[1].split('.')
- if test_path[0] == 'mitx':
+ if test_path[0] == 'edX':
del test_path[0]
test_class = test_path[-1]
del test_path[-1]
diff --git a/scripts/setup-test-dirs.sh b/scripts/setup-test-dirs.sh
index c4db61ec161d..cba5ec40632f 100755
--- a/scripts/setup-test-dirs.sh
+++ b/scripts/setup-test-dirs.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
-# Create symlinks from ~/mitx_all/data or $ROOT/data, with root passed as first arg
-# to all the test courses in mitx/common/test/data/
+# Create symlinks from ~/edx/data or $ROOT/data, with root passed as first arg
+# to all the test courses in edx/common/test/data/
# posix compliant sanity check
if [ -z $BASH ] || [ $BASH = "/bin/sh" ]; then
@@ -9,20 +9,20 @@ echo "Please use the bash interpreter to run this script"
exit 1
fi
-ROOT="${1:-$HOME/mitx_all}"
+ROOT="${1:-$HOME/edx}"
if [[ ! -d "$ROOT" ]]; then
echo "'$ROOT' is not a directory"
exit 1
fi
-if [[ ! -d "$ROOT/mitx" ]]; then
- echo "'$ROOT' is not the root mitx_all directory"
+if [[ ! -d "$ROOT/edx" ]]; then
+ echo "'$ROOT' is not the root edx directory"
exit 1
fi
if [[ ! -d "$ROOT/data" ]]; then
- echo "'$ROOT' is not the root mitx_all directory"
+ echo "'$ROOT' is not the root edx directory"
exit 1
fi
@@ -30,7 +30,7 @@ echo "ROOT is $ROOT"
cd $ROOT/data
-for course in $(/bin/ls ../mitx/common/test/data/)
+for course in $(/bin/ls ../edx/common/test/data/)
do
# Get rid of the symlink if it already exists
if [[ -L "$course" ]]; then
@@ -39,7 +39,7 @@ do
fi
echo "Make link to '$course'"
# Create it
- ln -s "../mitx/common/test/data/$course"
+ ln -s "../edx/common/test/data/$course"
done
# go back to where we came from
"
# Can only do partial text matches because of the quotes with in quotes (and regexp step matching).
- Then I should see the update "/c4x/MITx/999/asset/my_img.jpg"
+ Then I should see the update "/c4x/edX/999/asset/my_img.jpg"
And I change the update from "/static/my_img.jpg" to "
"
- Then I should see the update "/c4x/MITx/999/asset/modified.jpg"
+ Then I should see the update "/c4x/edX/999/asset/modified.jpg"
And when I reload the page
- Then I should see the update "/c4x/MITx/999/asset/modified.jpg"
+ Then I should see the update "/c4x/edX/999/asset/modified.jpg"
Scenario: Static links are rewritten when previewing handouts
Given I have opened a new course in Studio
And I go to the course updates page
When I modify the handout to "
+ 
+ 
+ 
+ 
+ 