diff --git a/.gitignore b/.gitignore index 05e76c4caadb..83e2b676556d 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,7 @@ conf/locale/en/LC_MESSAGES/*.po !messages.po lms/static/sass/*.css lms/static/sass/application.scss +lms/static/sass/course.scss cms/static/sass/*.css lms/lib/comment_client/python nosetests.xml diff --git a/common/djangoapps/mitxmako/shortcuts.py b/common/djangoapps/mitxmako/shortcuts.py index 076656402767..7f7c3f9ebe80 100644 --- a/common/djangoapps/mitxmako/shortcuts.py +++ b/common/djangoapps/mitxmako/shortcuts.py @@ -41,7 +41,9 @@ def marketing_link(name): return settings.MKTG_URLS.get('ROOT') + settings.MKTG_URLS.get(name) # only link to the old pages when the marketing site isn't on elif not settings.MITX_FEATURES.get('ENABLE_MKTG_SITE') and name in link_map: - return reverse(link_map[name]) + # don't try to reverse disabled marketing links + if link_map[name] is not None: + return reverse(link_map[name]) else: log.warning("Cannot find corresponding link for name: {name}".format(name=name)) return '#' diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index 463ad333165a..474581c688ed 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -1194,6 +1194,10 @@ def accept_name_change(request): def _get_news(top=None): "Return the n top news items on settings.RSS_URL" + # Don't return anything if we're in a themed site + if settings.MITX_FEATURES["USE_CUSTOM_THEME"]: + return None + feed_data = cache.get("students_index_rss_feed_data") if feed_data is None: if hasattr(settings, 'RSS_URL'): diff --git a/lms/envs/aws.py b/lms/envs/aws.py index a3d5cb653f87..7f69d3596b23 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -99,6 +99,8 @@ with open(ENV_ROOT / CONFIG_PREFIX + "env.json") as env_file: ENV_TOKENS = json.load(env_file) +PLATFORM_NAME = ENV_TOKENS.get('PLATFORM_NAME', PLATFORM_NAME) + SITE_NAME = ENV_TOKENS['SITE_NAME'] SESSION_COOKIE_DOMAIN = ENV_TOKENS.get('SESSION_COOKIE_DOMAIN') @@ -113,11 +115,19 @@ DEFAULT_FEEDBACK_EMAIL = ENV_TOKENS.get('DEFAULT_FEEDBACK_EMAIL', DEFAULT_FEEDBACK_EMAIL) ADMINS = ENV_TOKENS.get('ADMINS', ADMINS) SERVER_EMAIL = ENV_TOKENS.get('SERVER_EMAIL', SERVER_EMAIL) +TECH_SUPPORT_EMAIL = ENV_TOKENS.get('TECH_SUPPORT_EMAIL', TECH_SUPPORT_EMAIL) +CONTACT_EMAIL = ENV_TOKENS.get('CONTACT_EMAIL', CONTACT_EMAIL) +BUGS_EMAIL = ENV_TOKENS.get('BUGS_EMAIL', BUGS_EMAIL) #Theme overrides THEME_NAME = ENV_TOKENS.get('THEME_NAME', None) if not THEME_NAME is None: enable_theme(THEME_NAME) + FAVICON_PATH = 'themes/%s/images/favicon.ico' % THEME_NAME + +# Marketing link overrides +for key, value in ENV_TOKENS.get('MKTG_URL_LINK_MAP', {}).items(): + MKTG_URL_LINK_MAP[key] = value #Timezone overrides TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) diff --git a/lms/envs/common.py b/lms/envs/common.py index 410287972321..2029715c6004 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -31,6 +31,9 @@ from .discussionsettings import * ################################### FEATURES ################################### +# The display name of the platform to be used in templates/emails/etc. +PLATFORM_NAME = "edX" + COURSEWARE_ENABLED = True ENABLE_JASMINE = False @@ -315,6 +318,9 @@ DEFAULT_FROM_EMAIL = 'registration@edx.org' DEFAULT_FEEDBACK_EMAIL = 'feedback@edx.org' SERVER_EMAIL = 'devops@edx.org' +TECH_SUPPORT_EMAIL = 'technical@edx.org' +CONTACT_EMAIL = 'info@edx.org' +BUGS_EMAIL = 'bugs@edx.org' ADMINS = ( ('edX Admins', 'admin@edx.org'), ) @@ -330,6 +336,8 @@ PROJECT_ROOT / "static", ] +FAVICON_PATH = 'images/favicon.ico' + # Locale/Internationalization TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html diff --git a/lms/static/sass/application.scss.mako b/lms/static/sass/application.scss.mako index c310347b6f2c..823587bf0487 100644 --- a/lms/static/sass/application.scss.mako +++ b/lms/static/sass/application.scss.mako @@ -4,6 +4,20 @@ @import 'base/font_face'; @import 'base/mixins'; @import 'base/variables'; + +## THEMING +## ------- +## Set up this file to import an edX theme library if the environment +## indicates that a theme should be used. The assumption is that the +## theme resides outside of this main edX repository, in a directory +## called themes//, with its base Sass file in +## themes//static/sass/_.scss. That one entry +## point can be used to @import in as many other things as needed. +% if env.get('THEME_NAME') is not None: + // import theme's Sass overrides + @import '${env.get('THEME_NAME')}'; +% endif + @import 'base/base'; @import 'base/extends'; @import 'base/animations'; @@ -36,16 +50,3 @@ @import 'news'; @import 'shame'; - -## THEMING -## ------- -## Set up this file to import an edX theme library if the environment -## indicates that a theme should be used. The assumption is that the -## theme resides outside of this main edX repository, in a directory -## called themes//, with its base Sass file in -## themes//static/sass/_.scss. That one entry -## point can be used to @import in as many other things as needed. -% if env.get('THEME_NAME') is not None: - // import theme's Sass overrides - @import '${env.get('THEME_NAME')}' -% endif diff --git a/lms/static/sass/course.scss b/lms/static/sass/course.scss.mako similarity index 73% rename from lms/static/sass/course.scss rename to lms/static/sass/course.scss.mako index e57865fa9d43..9d65505316dd 100644 --- a/lms/static/sass/course.scss +++ b/lms/static/sass/course.scss.mako @@ -4,6 +4,20 @@ @import 'base/font_face'; @import 'base/mixins'; @import 'base/variables'; + +## THEMING +## ------- +## Set up this file to import an edX theme library if the environment +## indicates that a theme should be used. The assumption is that the +## theme resides outside of this main edX repository, in a directory +## called themes//, with its base Sass file in +## themes//static/sass/_.scss. That one entry +## point can be used to @import in as many other things as needed. +% if env.get('THEME_NAME') is not None: + // import theme's Sass overrides + @import '${env.get('THEME_NAME')}'; +% endif + @import 'base/base'; @import 'base/extends'; @import 'base/animations'; diff --git a/lms/templates/course.html b/lms/templates/course.html index f009955df158..e8c7cd587545 100644 --- a/lms/templates/course.html +++ b/lms/templates/course.html @@ -1,4 +1,5 @@ <%namespace name='static' file='static_content.html'/> +<%namespace file='main.html' import="stanford_theme_enabled"/> <%! from django.core.urlresolvers import reverse from courseware.courses import course_image_url, get_course_about_section @@ -24,7 +25,11 @@

${course.number} ${get_course_about_secti

${get_course_about_section(course, 'short_description')}

- ${get_course_about_section(course, 'university')} + % if stanford_theme_enabled(): + ${get_course_about_section(course, 'university')} + % else: + ${get_course_about_section(course, 'university')} + % endif ${course.start_date_text}
diff --git a/lms/templates/courseware/course_about.html b/lms/templates/courseware/course_about.html index 941bf6169879..cc4b2ec31746 100644 --- a/lms/templates/courseware/course_about.html +++ b/lms/templates/courseware/course_about.html @@ -8,7 +8,11 @@ <%inherit file="../main.html" /> <%block name="headextra"> - <%include file="../google_analytics.html" /> + % if self.theme_enabled(): + <%include file="../theme-google-analytics.html" /> + % else: + <%include file="../google_analytics.html" /> + % endif <%block name="js_extra"> @@ -46,7 +50,12 @@
-

${course.number}: ${get_course_about_section(course, "title")}${get_course_about_section(course, "university")}

+

+ ${course.number}: ${get_course_about_section(course, "title")} + % if not self.theme_enabled(): + ${get_course_about_section(course, "university")} + % endif +

@@ -105,14 +114,26 @@

${course.number}: ${get_course_about_section(course, "title")} - - - + ## TODO: this should probably be an overrideable block, + ## or something allowing themes to do whatever they + ## want here (and on this whole page, really). + % if self.stanford_theme_enabled(): + + + % else: + + + + % endif

diff --git a/lms/templates/courseware/courses.html b/lms/templates/courseware/courses.html index a8fe851d19de..7f0d596f4b89 100644 --- a/lms/templates/courseware/courses.html +++ b/lms/templates/courseware/courses.html @@ -5,13 +5,21 @@ <%block name="title">Courses
-
+
-

Explore free courses from leading universities.

+ % if self.stanford_theme_enabled(): +

Explore free courses from Stanford University.

+ % else: +

Explore free courses from leading universities.

+ % endif
diff --git a/lms/templates/dashboard.html b/lms/templates/dashboard.html index 75c0cafabd24..e2fbaed9cf4e 100644 --- a/lms/templates/dashboard.html +++ b/lms/templates/dashboard.html @@ -150,6 +150,8 @@

${ user.username }

+ ## `news` should be `None` whenever a non-edX theme is enabled: + ## see common/djangoapps/student/views.py#_get_news %if news:
@@ -292,7 +294,7 @@

${"{0:.0f}%".format(float(course.lowest_passing_grade)*100)}. % elif cert_status['status'] == 'restricted':

- Your certificate is being held pending confirmation that the issuance of your certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting info@edx.org. + Your certificate is being held pending confirmation that the issuance of your certificate is in compliance with strict U.S. embargoes on Iran, Cuba, Syria and Sudan. If you think our system has mistakenly identified you as being connected with one of those countries, please let us know by contacting ${settings.CONTACT_EMAIL}.

% endif

@@ -449,11 +451,11 @@

Change your name

-

To uphold the credibility of edX certificates, all name changes will be logged and recorded.

+

To uphold the credibility of ${settings.PLATFORM_NAME} certificates, all name changes will be logged and recorded.


- + diff --git a/lms/templates/email_change_failed.html b/lms/templates/email_change_failed.html index e228df4a9c58..0f077ec769c0 100644 --- a/lms/templates/email_change_failed.html +++ b/lms/templates/email_change_failed.html @@ -1,3 +1,13 @@ -

E-mail change failed.

+<%inherit file="main.html" /> -

We were unable to send a confirmation email to ${email}

+
+ +
+

E-mail change failed

+
+ +

We were unable to send a confirmation email to ${email}

+ +

Go back to the home page.

+
+
diff --git a/lms/templates/email_change_successful.html b/lms/templates/email_change_successful.html index 0b05a28bf5c6..01c45d70502a 100644 --- a/lms/templates/email_change_successful.html +++ b/lms/templates/email_change_successful.html @@ -1,3 +1,12 @@ -

E-mail change successful!

+<%! from django.core.urlresolvers import reverse %> +<%inherit file="main.html" /> -

You should see your new email in your dashboard.

\ No newline at end of file +
+ +
+

E-mail change successful!

+
+ +

You should see your new email in your dashboard.

+
+
diff --git a/lms/templates/email_exists.html b/lms/templates/email_exists.html index 885fbd5520b1..e1d12bba9689 100644 --- a/lms/templates/email_exists.html +++ b/lms/templates/email_exists.html @@ -1,3 +1,13 @@ -

Could not change e-mail

+<%inherit file="main.html" /> -An account with the new e-mail address already exists. Sorry. +
+ +
+

E-mail change failed

+
+ +

An account with the new e-mail address already exists.

+ +

Go back to the home page.

+
+
diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt index 209ff9833511..d6716dc764fc 100644 --- a/lms/templates/emails/activation_email.txt +++ b/lms/templates/emails/activation_email.txt @@ -1,6 +1,8 @@ -Thank you for signing up for edX! To activate your account, -please copy and paste this address into your web browser's -address bar: +<%namespace file="../main.html" import="stanford_theme_enabled" /> + +Thank you for signing up for ${settings.PLATFORM_NAME}! To activate +your account, please copy and paste this address into your web +browser's address bar: % if is_secure: https://${ site }/activate/${ key } @@ -8,6 +10,15 @@ address bar: http://${ site }/activate/${ key } % endif -If you didn't request this, you don't need to do anything; you won't -receive any more email from us. Please do not reply to this e-mail; if -you require assistance, check the help section of the edX web site. +## Temporary hack until we develop a better way to adjust language +% if stanford_theme_enabled(): + If you didn't request this, you don't need to do anything; you won't + receive any more email from us. Please do not reply to this e-mail; + if you require assistance, check the about section of the + ${settings.PLATFORM_NAME} Courses web site. +% else: + If you didn't request this, you don't need to do anything; you won't + receive any more email from us. Please do not reply to this e-mail; + if you require assistance, check the help section of the + ${settings.PLATFORM_NAME} web site. +% endif diff --git a/lms/templates/emails/activation_email_subject.txt b/lms/templates/emails/activation_email_subject.txt index 495e0b5faddc..e78a5a8dc379 100644 --- a/lms/templates/emails/activation_email_subject.txt +++ b/lms/templates/emails/activation_email_subject.txt @@ -1 +1 @@ -Your account for edX +Your account for ${settings.PLATFORM_NAME} diff --git a/lms/templates/emails/confirm_email_change.txt b/lms/templates/emails/confirm_email_change.txt index 02aa20facfde..165846fb80a6 100644 --- a/lms/templates/emails/confirm_email_change.txt +++ b/lms/templates/emails/confirm_email_change.txt @@ -1,12 +1,25 @@ <%! from django.core.urlresolvers import reverse %> -This is to confirm that you changed the e-mail associated with edX -from ${old_email} to ${new_email}. If you did not make this request, -please contact us immediately. Contact information is listed at: +<%namespace file="../main.html" import="stanford_theme_enabled" /> +## Again, ugly hack that needs to be changed +## TODO: this probably needs better formatting to look nice in an +## email client (Mako leaves awkward whitespace) +% if stanford_theme_enabled(): + This is to confirm that you changed the e-mail associated with + ${settings.PLATFORM_NAME} from ${old_email} to ${new_email}. If you + did not make this request, please contact us at -% if is_secure: - https://${ site }${reverse('contact')} + ${settings.CONTACT_EMAIL} % else: - http://${ site }${reverse('contact')} + This is to confirm that you changed the e-mail associated with + ${settings.PLATFORM_NAME} from ${old_email} to ${new_email}. If you + did not make this request, please contact us immediately. Contact + information is listed at: + + % if is_secure: + https://${ site }${reverse('contact')} + % else: + http://${ site }${reverse('contact')} + % endif % endif We keep a log of old e-mails, so if this request was unintentional, we diff --git a/lms/templates/emails/email_change.txt b/lms/templates/emails/email_change.txt index 8f8f71108323..bff86e8da632 100644 --- a/lms/templates/emails/email_change.txt +++ b/lms/templates/emails/email_change.txt @@ -1,6 +1,8 @@ -We received a request to change the e-mail associated with your edX -account from ${old_email} to ${new_email}. If this is correct, please -confirm your new e-mail address by visiting: +<%namespace file="../main.html" import="stanford_theme_enabled" /> +We received a request to change the e-mail associated with your +${settings.PLATFORM_NAME} account from ${old_email} to ${new_email}. +If this is correct, please confirm your new e-mail address by +visiting: % if is_secure: https://${ site }/email_confirm/${ key } @@ -8,6 +10,15 @@ confirm your new e-mail address by visiting: http://${ site }/email_confirm/${ key } % endif -If you didn't request this, you don't need to do anything; you won't -receive any more email from us. Please do not reply to this e-mail; if -you require assistance, check the help section of the edX web site. +## TODO: fix this ugly hack +% if stanford_theme_enabled(): + If you didn't request this, you don't need to do anything; you won't + receive any more email from us. Please do not reply to this e-mail; + if you require assistance, check the about section of the + ${settings.PLATFORM_NAME} Courses web site. +% else: + If you didn't request this, you don't need to do anything; you won't + receive any more email from us. Please do not reply to this e-mail; + if you require assistance, check the help section of the + ${settings.PLATFORM_NAME} web site. +% endif diff --git a/lms/templates/emails/email_change_subject.txt b/lms/templates/emails/email_change_subject.txt index 599d49ee6501..57fea3ed5512 100644 --- a/lms/templates/emails/email_change_subject.txt +++ b/lms/templates/emails/email_change_subject.txt @@ -1 +1 @@ -Request to change edX account e-mail +Request to change ${settings.PLATFORM_NAME} account e-mail diff --git a/lms/templates/emails/reject_name_change.txt b/lms/templates/emails/reject_name_change.txt index 37be970830a4..2e3d32169f7f 100644 --- a/lms/templates/emails/reject_name_change.txt +++ b/lms/templates/emails/reject_name_change.txt @@ -1,5 +1,14 @@ +<%namespace file="../main.html" import="stanford_theme_enabled" /> (Not currently used) -We are sorry. Our course staff did not approve your request to change -your name from ${old_name} to ${new_name}. If you need further -assistance, please e-mail the course staff at ta@edx.org. +## TODO: fix this ugly hack +% if stanford_theme_enabled(): + We are sorry. Our course staff did not approve your request to change + your name from ${old_name} to ${new_name}. If you need further + assistance, please e-mail the tech support at + ${settings.TECH_SUPPORT_EMAIL}. +% else: + We are sorry. Our course staff did not approve your request to change + your name from ${old_name} to ${new_name}. If you need further + assistance, please e-mail the course staff at ta@edx.org. +% endif diff --git a/lms/templates/emails/welcome_body.txt b/lms/templates/emails/welcome_body.txt index 8a891e0b808b..f7ffe4554682 100644 --- a/lms/templates/emails/welcome_body.txt +++ b/lms/templates/emails/welcome_body.txt @@ -1,9 +1,15 @@ -edX has launched! To log in, visit: +<%namespace file="../main.html" import="stanford_theme_enabled" /> +## TODO: fix ugly hack +% if stanford_theme_enabled(): + ${settings.PLATFORM_NAME} Courses has launched! To log in, visit: +% else: + ${settings.PLATFORM_NAME} has launched! To log in, visit: +% endif % if is_secure: - https://edx.org + https://${settings.SITE_NAME} % else: - http://edx.org + http://${settings.SITE_NAME} % endif A login button will be at the top right-hand corner of the window. @@ -14,7 +20,12 @@ place to reset it. Thanks for joining us for the ride! -The edX team +## TODO: fix ugly hack +% if stanford_theme_enabled(): + The ${settings.PLATFORM_NAME} Courses team +% else: + The ${settings.PLATFORM_NAME} team +% endif (Please note that this e-mail address does not receive e-mails -- if you need assistance, please use the help section of the web diff --git a/lms/templates/emails/welcome_subject.txt b/lms/templates/emails/welcome_subject.txt index 748ccfe113e0..0b0f831f7ee6 100644 --- a/lms/templates/emails/welcome_subject.txt +++ b/lms/templates/emails/welcome_subject.txt @@ -1 +1,7 @@ -Welcome to edX! +<%namespace file="../main.html" import="stanford_theme_enabled" /> +## TODO: fix ugly hack +% if stanford_theme_enabled(): + Welcome to ${settings.PLATFORM_NAME} Courses! +% else: + Welcome to ${settings.PLATFORM_NAME}! +% endif diff --git a/lms/templates/emails_change_successful.html b/lms/templates/emails_change_successful.html index ed3b732d6ec4..34a5c6f0f2ef 100644 --- a/lms/templates/emails_change_successful.html +++ b/lms/templates/emails_change_successful.html @@ -1,3 +1,12 @@ -

E-mail change successful!

+<%! from django.core.urlresolvers import reverse %> +<%inherit file="main.html" /> -

You should see your new name in your profile. +

+ +
+

E-mail change successful!

+
+ +

You should see your new email in your dashboard.

+
+
diff --git a/lms/templates/forgot_password_modal.html b/lms/templates/forgot_password_modal.html index f1b3de7e5b03..0f88b88f9747 100644 --- a/lms/templates/forgot_password_modal.html +++ b/lms/templates/forgot_password_modal.html @@ -18,7 +18,7 @@

Password Reset

  • - This is the email address you used to register with edX + This is the email address you used to register with ${settings.PLATFORM_NAME}
    • diff --git a/lms/templates/index.html b/lms/templates/index.html index 109ab6fb2f44..e6b9c86ba41c 100644 --- a/lms/templates/index.html +++ b/lms/templates/index.html @@ -8,30 +8,37 @@
    -

    The Future of Online Education

    + % if self.stanford_theme_enabled(): +

    Free courses from Stanford

    + % else: +

    The Future of Online Education

    + % endif

    For anyone, anywhere, anytime

    -
    -
    - Sign Up -
    + ## Disable social buttons for non-edX sites + % if not self.theme_enabled(): +
    +
    + Sign Up +
    -
    - -
    +
    + % endif
    @@ -45,113 +52,116 @@

    For anyone, anywhere, anytime

    -

    Explore free courses from edX universities

    - -
    -
      -
    1. - - -
      - MITx -
      -       -
      2. -
    2. - - -
      - HarvardX -
      -       -
      3. -
    3. - - -
      - BerkeleyX -
      -       -
      4. -
    4. - - -
      - UTx -
      -       -
      5. -
    5. - - -
      - McGillX -
      -       -
      6. -
    6. - - -
      - ANUx -
      -       -
      7. -
    - -
    - -
      -
    1. - - -
      - WellesleyX -
      -       -
      2. -
    2. - - -
      - GeorgetownX -
      -       -
      3. -
    3. - - -
      - University of TorontoX -
      -       -
      4. -
    4. - - -
      - EPFLx -
      -       -
      5. -
    5. - - -
      - DelftX -
      -       -
      6. -
    6. - - -
      - RiceX -
      -       -
      7. -
    -
    + ## Disable university partner logos and sites for non-edX sites + % if not self.theme_enabled(): +

    Explore free courses from edX universities

    + +
    +
      +
    1. + + +
      + MITx +
      +       +
      2. +
    2. + + +
      + HarvardX +
      +       +
      3. +
    3. + + +
      + BerkeleyX +
      +       +
      4. +
    4. + + +
      + UTx +
      +       +
      5. +
    5. + + +
      + McGillX +
      +       +
      6. +
    6. + + +
      + ANUx +
      +       +
      7. +
    + +
    + +
      +
    1. + + +
      + WellesleyX +
      +       +
      2. +
    2. + + +
      + GeorgetownX +
      +       +
      3. +
    3. + + +
      + University of TorontoX +
      +       +
      4. +
    4. + + +
      + EPFLx +
      +       +
      5. +
    5. + + +
      + DelftX +
      +       +
      6. +
    6. + + +
      + RiceX +
      +       +
      7. +
    +
    + % endif
      @@ -165,47 +175,56 @@

      Explore free courses from edX universities

    -
    -
    -
    -

    edX News & Announcements

    - edX MEDIA KIT -
    -
    -
    - %for entry in news: -
    - %if entry.image: - - %endif -
    - ${entry.title} - %if entry.summary: -

    ${entry.summary}

    - %endif -

    ${strftime("%m/%d/%y", entry.published_parsed)}

    -
    -
    - %endfor -
    -
    -

    edX in the News:

    - The New York Times, - The Wall Street Journal, - The Washington Post, - CBS Television, - The Boston Globe - Read More → + ## Disable press and marketing for non-edX sites + % if not self.theme_enabled(): +
    +
    +
    +

    edX News & Announcements

    + edX MEDIA KIT +
    +
    +
    + %for entry in news: +
    + %if entry.image: + + %endif +
    + ${entry.title} + %if entry.summary: +

    ${entry.summary}

    + %endif +

    ${strftime("%m/%d/%y", entry.published_parsed)}

    +
    +
    + %endfor +
    +
    +

    edX in the News:

    + The New York Times, + The Wall Street Journal, + The Washington Post, + CBS Television, + The Boston Globe + Read More → +
    -
    + % endif
    - + <% + if self.stanford_theme_enabled(): + youtube_video_id = "2gmreZObCY4" + else: + youtube_video_id = "XNaiOGxWeto" + %> +
    diff --git a/lms/templates/invalid_email_key.html b/lms/templates/invalid_email_key.html index 437dfa151d37..212f91fa9dd9 100644 --- a/lms/templates/invalid_email_key.html +++ b/lms/templates/invalid_email_key.html @@ -1,8 +1,16 @@ -

    Invalid key

    +<%inherit file="main.html" /> -

    This e-mail key is not valid. Please check: -

      -
    • Was this key already used? Check whether the e-mail change has already happened. -
    • Did your e-mail client break the URL into two lines? -
    • The keys are valid for a limited amount of time. Has the key expired? -
    +
    + +
    +

    Invalid email change key

    +
    +

    This e-mail key is not valid. Please check:

    +
      +
    • Was this key already used? Check whether the e-mail change has already happened. +
    • Did your e-mail client break the URL into two lines? +
    • The keys are valid for a limited amount of time. Has the key expired? +
    +

    Go back to the home page.

    +
    +
    diff --git a/lms/templates/login.html b/lms/templates/login.html index 3e33c84b7a8d..f9beedd6e01d 100644 --- a/lms/templates/login.html +++ b/lms/templates/login.html @@ -2,7 +2,7 @@ <%namespace name='static' file='static_content.html'/> <%! from django.core.urlresolvers import reverse %> -<%block name="title">Log into your edX Account +<%block name="title">Log into your ${settings.PLATFORM_NAME} Account <%block name="js_extra"> - + <%static:css group='application'/> <%static:js group='main_vendor'/> <%block name="headextra"/> + % if theme_enabled(): + <%include file="theme-head-extra.html" /> + % endif @@ -105,7 +105,7 @@

    The following errors occured while processing your reg

    - Please complete the following fields to register for an edX account.
    + Please complete the following fields to register for an account.
    Required fields are noted by bold text and an asterisk (*).

    @@ -201,7 +201,7 @@

    Welcome ${extauth_email}

  • - +
    • @@ -219,7 +219,14 @@

    Welcome ${extauth_email}

    - + <% + ## TODO: provide a better way to override these links + if self.stanford_theme_enabled(): + honor_code_path = marketing_link('TOS') + "#honor" + else: + honor_code_path = marketing_link('HONOR') + %> +
    @@ -250,23 +257,33 @@

    Already registered?

    -
    -

    Welcome to edX

    -

    Registering with edX gives you access to all of our current and future free courses. Not ready to take a course just yet? Registering puts you on our mailing list – we will update you as courses are added.

    -
    + ## TODO: Use a %block tag or something to allow themes to + ## override in a more generalizable fashion. + % if not self.stanford_theme_enabled(): +
    +

    Welcome to ${settings.PLATFORM_NAME}

    +

    Registering with ${settings.PLATFORM_NAME} gives you access to all of our current and future free courses. Not ready to take a course just yet? Registering puts you on our mailing list – we will update you as courses are added.

    +
    + % endif

    Next Steps

    -

    As part of joining edX, you will receive an activation email. You must click on the activation link to complete the process. Don’t see the email? Check your spam folder and mark edX emails as ‘not spam’. At edX, we communicate mostly through email.

    + % if self.stanford_theme_enabled(): +

    You will receive an activation email. You must click on the activation link to complete the process. Don’t see the email? Check your spam folder and mark emails from class.stanford.edu as ‘not spam’, since you'll want to be able to receive email from your courses.

    + % else: +

    As part of joining ${settings.PLATFORM_NAME}, you will receive an activation email. You must click on the activation link to complete the process. Don’t see the email? Check your spam folder and mark ${settings.PLATFORM_NAME} emails as ‘not spam’. At ${settings.PLATFORM_NAME}, we communicate mostly through email.

    + % endif
    -
    -

    Need Help?

    -

    Need help in registering with edX? - - View our FAQs for answers to commonly asked questions. - - Once registered, most questions can be answered in the course specific discussion forums or through the FAQs.

    -
    + % if settings.MKTG_URL_LINK_MAP.get('FAQ'): +
    +

    Need Help?

    +

    Need help in registering with ${settings.PLATFORM_NAME}? + + View our FAQs for answers to commonly asked questions. + + Once registered, most questions can be answered in the course specific discussion forums or through the FAQs.

    +
    + % endif
    diff --git a/lms/templates/registration/activation_invalid.html b/lms/templates/registration/activation_invalid.html index 09d373a39dbf..0a6d6d30c9e2 100644 --- a/lms/templates/registration/activation_invalid.html +++ b/lms/templates/registration/activation_invalid.html @@ -12,7 +12,7 @@

    Activation Invalid

    Something went wrong. Check to make sure the URL you went to was correct -- e-mail programs will sometimes split it into two lines. If you still have issues, e-mail us to let us know what happened - at bugs@edx.org.

    + at ${settings.BUGS_EMAIL}.

    Or you can go back to the home page.

    diff --git a/lms/templates/static_templates/404.html b/lms/templates/static_templates/404.html index f29968e2f5ec..c297cec881a9 100644 --- a/lms/templates/static_templates/404.html +++ b/lms/templates/static_templates/404.html @@ -4,5 +4,5 @@

    Page not found

    -

    The page that you were looking for was not found. Go back to the homepage or let us know about any pages that may have been moved at technical@edx.org.

    +

    The page that you were looking for was not found. Go back to the homepage or let us know about any pages that may have been moved at ${settings.TECH_SUPPORT_EMAIL}.

    diff --git a/lms/templates/static_templates/server-down.html b/lms/templates/static_templates/server-down.html index 7fada34a5374..ac847db9ee2c 100644 --- a/lms/templates/static_templates/server-down.html +++ b/lms/templates/static_templates/server-down.html @@ -1,6 +1,6 @@ <%inherit file="../main.html" />
    -

    Currently the edX servers are down

    -

    Our staff is currently working to get the site back up as soon as possible. Please email us at technical@edx.org to report any problems or downtime.

    +

    Currently the ${settings.PLATFORM_NAME} servers are down

    +

    Our staff is currently working to get the site back up as soon as possible. Please email us at ${settings.TECH_SUPPORT_EMAIL} to report any problems or downtime.

    diff --git a/lms/templates/static_templates/server-error.html b/lms/templates/static_templates/server-error.html index 5564ea082e1d..04fc11d11a1e 100644 --- a/lms/templates/static_templates/server-error.html +++ b/lms/templates/static_templates/server-error.html @@ -1,6 +1,6 @@ <%inherit file="../main.html" />
    -

    There has been a 500 error on the edX servers

    -

    Please wait a few seconds and then reload the page. If the problem persists, please email us at technical@edx.org.

    +

    There has been a 500 error on the ${settings.PLATFORM_NAME} servers

    +

    Please wait a few seconds and then reload the page. If the problem persists, please email us at ${settings.TECH_SUPPORT_EMAIL}.

    diff --git a/lms/templates/static_templates/server-overloaded.html b/lms/templates/static_templates/server-overloaded.html index bbf4550ff400..2432f2b481af 100644 --- a/lms/templates/static_templates/server-overloaded.html +++ b/lms/templates/static_templates/server-overloaded.html @@ -1,6 +1,6 @@ <%inherit file="../main.html" />
    -

    Currently the edX servers are overloaded

    -

    Our staff is currently working to get the site back up as soon as possible. Please email us at technical@edx.org to report any problems or downtime.

    +

    Currently the ${settings.PLATFORM_NAME} servers are overloaded

    +

    Our staff is currently working to get the site back up as soon as possible. Please email us at ${settings.TECH_SUPPORT_EMAIL} to report any problems or downtime.

    diff --git a/lms/urls.py b/lms/urls.py index 851731e6ec50..d2265463de50 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -58,66 +58,92 @@ name='auth_password_reset_done'), url(r'^heartbeat$', include('heartbeat.urls')), +) - ## - ## Only universities without courses should be included here. If - ## courses exist, the dynamic profile rule below should win. - ## - url(r'^(?i)university_profile/WellesleyX$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'WellesleyX'}), - url(r'^(?i)university_profile/McGillX$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'McGillX'}), - url(r'^(?i)university_profile/TorontoX$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'TorontoX'}), - url(r'^(?i)university_profile/RiceX$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'RiceX'}), - url(r'^(?i)university_profile/ANUx$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'ANUx'}), - url(r'^(?i)university_profile/EPFLx$', 'courseware.views.static_university_profile', - name="static_university_profile", kwargs={'org_id': 'EPFLx'}), - - url(r'^university_profile/(?P[^/]+)$', 'courseware.views.university_profile', - name="university_profile"), - - #Semi-static views (these need to be rendered and have the login bar, but don't change) +# University profiles only make sense in the default edX context +if not settings.MITX_FEATURES["USE_CUSTOM_THEME"]: + urlpatterns += ( + ## + ## Only universities without courses should be included here. If + ## courses exist, the dynamic profile rule below should win. + ## + url(r'^(?i)university_profile/WellesleyX$', 'courseware.views.static_university_profile', + name="static_university_profile", kwargs={'org_id': 'WellesleyX'}), + url(r'^(?i)university_profile/McGillX$', 'courseware.views.static_university_profile', + name="static_university_profile", kwargs={'org_id': 'McGillX'}), + url(r'^(?i)university_profile/TorontoX$', 'courseware.views.static_university_profile', + name="static_university_profile", kwargs={'org_id': 'TorontoX'}), + url(r'^(?i)university_profile/RiceX$', 'courseware.views.static_university_profile', + name="static_university_profile", kwargs={'org_id': 'RiceX'}), + url(r'^(?i)university_profile/ANUx$', 'courseware.views.static_university_profile', + name="static_university_profile", kwargs={'org_id': 'ANUx'}), + url(r'^(?i)university_profile/EPFLx$', 'courseware.views.static_university_profile', + name="static_university_profile", kwargs={'org_id': 'EPFLx'}), + + url(r'^university_profile/(?P[^/]+)$', 'courseware.views.university_profile', + name="university_profile"), + ) + +#Semi-static views (these need to be rendered and have the login bar, but don't change) +urlpatterns += ( url(r'^404$', 'static_template_view.views.render', {'template': '404.html'}, name="404"), - url(r'^about$', 'static_template_view.views.render', - {'template': 'about.html'}, name="about_edx"), - url(r'^jobs$', 'static_template_view.views.render', - {'template': 'jobs.html'}, name="jobs"), - url(r'^contact$', 'static_template_view.views.render', - {'template': 'contact.html'}, name="contact"), - url(r'^press$', 'student.views.press', name="press"), - url(r'^media-kit$', 'static_template_view.views.render', - {'template': 'media-kit.html'}, name="media-kit"), - url(r'^faq$', 'static_template_view.views.render', - {'template': 'faq.html'}, name="faq_edx"), - url(r'^help$', 'static_template_view.views.render', - {'template': 'help.html'}, name="help_edx"), - - url(r'^tos$', 'static_template_view.views.render', - {'template': 'tos.html'}, name="tos"), - url(r'^privacy$', 'static_template_view.views.render', - {'template': 'privacy.html'}, name="privacy_edx"), - # TODO: (bridger) The copyright has been removed until it is updated for edX - # url(r'^copyright$', 'static_template_view.views.render', - # {'template': 'copyright.html'}, name="copyright"), - url(r'^honor$', 'static_template_view.views.render', - {'template': 'honor.html'}, name="honor"), - - #Press releases - url(r'^press/([_a-zA-Z0-9-]+)$', 'static_template_view.views.render_press_release', name='press_release'), - - # Favicon - (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}), - - url(r'^submit_feedback$', 'util.views.submit_feedback_via_zendesk'), - - # TODO: These urls no longer work. They need to be updated before they are re-enabled - # url(r'^reactivate/(?P[^/]*)$', 'student.views.reactivation_email'), ) +# Semi-static views only used by edX, not by themes +if not settings.MITX_FEATURES["USE_CUSTOM_THEME"]: + urlpatterns += ( + url(r'^jobs$', 'static_template_view.views.render', + {'template': 'jobs.html'}, name="jobs"), + url(r'^press$', 'student.views.press', name="press"), + url(r'^media-kit$', 'static_template_view.views.render', + {'template': 'media-kit.html'}, name="media-kit"), + url(r'^help$', 'static_template_view.views.render', + {'template': 'help.html'}, name="help_edx"), + + # TODO: (bridger) The copyright has been removed until it is updated for edX + # url(r'^copyright$', 'static_template_view.views.render', + # {'template': 'copyright.html'}, name="copyright"), + + #Press releases + url(r'^press/([_a-zA-Z0-9-]+)$', 'static_template_view.views.render_press_release', name='press_release'), + + # Favicon + (r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}), + + url(r'^submit_feedback$', 'util.views.submit_feedback_via_zendesk'), + + # TODO: These urls no longer work. They need to be updated before they are re-enabled + # url(r'^reactivate/(?P[^/]*)$', 'student.views.reactivation_email'), + ) + +# Only enable URLs for those marketing links actually enabled in the +# settings. Disable URLs by marking them as None. +for key, value in settings.MKTG_URL_LINK_MAP.items(): + # Skip disabled URLs + if value is None: + continue + + # These urls are enabled separately + if key == "ROOT" or key == "COURSES": + continue + + # Make the assumptions that the templates are all in the same dir + # and that they all match the name of the key (plus extension) + template = "%s.html" % key.lower() + + # To allow theme templates to inherit from default templates, + # prepend a standard prefix + if settings.MITX_FEATURES["USE_CUSTOM_THEME"]: + template = "theme-" + template + + # Make the assumption that the URL we want is the lowercased + # version of the map key + urlpatterns += (url(r'^%s' % key.lower(), + 'static_template_view.views.render', + {'template': template}, name=value),) + + if settings.PERFSTATS: urlpatterns += (url(r'^reprofile$', 'perfstats.views.end_profile'),)