diff --git a/lms/envs/common.py b/lms/envs/common.py index c7b4744032..cb8153a09e 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -1032,6 +1032,8 @@ MKTG_URL_LINK_MAP = { 'TOS': 'tos', 'HONOR': 'honor', 'PRIVACY': 'privacy_edx', + 'JOBS': 'jobs', + 'PRESS': 'press', # Verified Certificates 'WHAT_IS_VERIFIED_CERT': 'verified-certificate', diff --git a/lms/static/images/about_1.jpg b/lms/static/images/about_1.jpg deleted file mode 100644 index a67cafe344..0000000000 Binary files a/lms/static/images/about_1.jpg and /dev/null differ diff --git a/lms/static/images/contact-page.jpg b/lms/static/images/contact-page.jpg deleted file mode 100644 index 8b9e9a9bfa..0000000000 Binary files a/lms/static/images/contact-page.jpg and /dev/null differ diff --git a/lms/static/images/jobs.jpeg b/lms/static/images/jobs.jpeg deleted file mode 100644 index af2424f154..0000000000 Binary files a/lms/static/images/jobs.jpeg and /dev/null differ diff --git a/lms/static/images/press-kit/3.091x_high-res.png b/lms/static/images/press-kit/3.091x_high-res.png deleted file mode 100644 index 4bd1950734..0000000000 Binary files a/lms/static/images/press-kit/3.091x_high-res.png and /dev/null differ diff --git a/lms/static/images/press-kit/3.091x_x200.jpg b/lms/static/images/press-kit/3.091x_x200.jpg deleted file mode 100644 index 9dff993e6b..0000000000 Binary files a/lms/static/images/press-kit/3.091x_x200.jpg and /dev/null differ diff --git a/lms/static/images/press-kit/6.002x_high-res.png b/lms/static/images/press-kit/6.002x_high-res.png deleted file mode 100755 index b785b825fd..0000000000 Binary files a/lms/static/images/press-kit/6.002x_high-res.png and /dev/null differ diff --git a/lms/static/images/press-kit/6.002x_x200.jpg b/lms/static/images/press-kit/6.002x_x200.jpg deleted file mode 100644 index c12588797c..0000000000 Binary files a/lms/static/images/press-kit/6.002x_x200.jpg and /dev/null differ diff --git a/lms/static/images/press-kit/anant-agarwal_high-res.jpg b/lms/static/images/press-kit/anant-agarwal_high-res.jpg deleted file mode 100755 index b154ce99fb..0000000000 Binary files a/lms/static/images/press-kit/anant-agarwal_high-res.jpg and /dev/null differ diff --git a/lms/static/images/press-kit/anant-agarwal_x200.jpg b/lms/static/images/press-kit/anant-agarwal_x200.jpg deleted file mode 100644 index a004b7ecdb..0000000000 Binary files a/lms/static/images/press-kit/anant-agarwal_x200.jpg and /dev/null differ diff --git a/lms/static/images/press-kit/anant-tablet_high-res.jpg b/lms/static/images/press-kit/anant-tablet_high-res.jpg deleted file mode 100755 index 2b8c58b098..0000000000 Binary files a/lms/static/images/press-kit/anant-tablet_high-res.jpg and /dev/null differ diff --git a/lms/static/images/press-kit/anant-tablet_x200.jpg b/lms/static/images/press-kit/anant-tablet_x200.jpg deleted file mode 100644 index 1d35360745..0000000000 Binary files a/lms/static/images/press-kit/anant-tablet_x200.jpg and /dev/null differ diff --git a/lms/static/images/press-kit/edx-video-editing_high-res.jpg b/lms/static/images/press-kit/edx-video-editing_high-res.jpg deleted file mode 100755 index 7d8b9879f7..0000000000 Binary files a/lms/static/images/press-kit/edx-video-editing_high-res.jpg and /dev/null differ diff --git a/lms/static/images/press-kit/edx-video-editing_x200.jpg b/lms/static/images/press-kit/edx-video-editing_x200.jpg deleted file mode 100644 index c4ed87a503..0000000000 Binary files a/lms/static/images/press-kit/edx-video-editing_x200.jpg and /dev/null differ diff --git a/lms/static/images/press-kit/piotr-mitros_high-res.jpg b/lms/static/images/press-kit/piotr-mitros_high-res.jpg deleted file mode 100755 index caf8b43337..0000000000 Binary files a/lms/static/images/press-kit/piotr-mitros_high-res.jpg and /dev/null differ diff --git a/lms/static/images/press-kit/piotr-mitros_x200.jpg b/lms/static/images/press-kit/piotr-mitros_x200.jpg deleted file mode 100644 index 36c21becd6..0000000000 Binary files a/lms/static/images/press-kit/piotr-mitros_x200.jpg and /dev/null differ diff --git a/lms/static/images/university/anu/anu-cover.jpg b/lms/static/images/university/anu/anu-cover.jpg deleted file mode 100644 index 591df9791d..0000000000 Binary files a/lms/static/images/university/anu/anu-cover.jpg and /dev/null differ diff --git a/lms/static/images/university/anu/anu.png b/lms/static/images/university/anu/anu.png deleted file mode 100644 index 5caeb0b180..0000000000 Binary files a/lms/static/images/university/anu/anu.png and /dev/null differ diff --git a/lms/static/images/university/berkeley/berkeley-cover.jpeg b/lms/static/images/university/berkeley/berkeley-cover.jpeg deleted file mode 100644 index 16c807555d..0000000000 Binary files a/lms/static/images/university/berkeley/berkeley-cover.jpeg and /dev/null differ diff --git a/lms/static/images/university/berkeley/berkeley.png b/lms/static/images/university/berkeley/berkeley.png deleted file mode 100644 index 9fb7ffa6e7..0000000000 Binary files a/lms/static/images/university/berkeley/berkeley.png and /dev/null differ diff --git a/lms/static/images/university/berkeley/berkeley_bw.png b/lms/static/images/university/berkeley/berkeley_bw.png deleted file mode 100644 index 77204c3913..0000000000 Binary files a/lms/static/images/university/berkeley/berkeley_bw.png and /dev/null differ diff --git a/lms/static/images/university/berkeley/berkeley_fountain_2025x550.jpg b/lms/static/images/university/berkeley/berkeley_fountain_2025x550.jpg deleted file mode 100644 index 16c807555d..0000000000 Binary files a/lms/static/images/university/berkeley/berkeley_fountain_2025x550.jpg and /dev/null differ diff --git a/lms/static/images/university/delft/delft-cover.jpg b/lms/static/images/university/delft/delft-cover.jpg deleted file mode 100644 index fe41928b41..0000000000 Binary files a/lms/static/images/university/delft/delft-cover.jpg and /dev/null differ diff --git a/lms/static/images/university/delft/delft.png b/lms/static/images/university/delft/delft.png deleted file mode 100644 index 03c566e91f..0000000000 Binary files a/lms/static/images/university/delft/delft.png and /dev/null differ diff --git a/lms/static/images/university/epfl/epfl-cover.jpg b/lms/static/images/university/epfl/epfl-cover.jpg deleted file mode 100644 index e585966e7b..0000000000 Binary files a/lms/static/images/university/epfl/epfl-cover.jpg and /dev/null differ diff --git a/lms/static/images/university/epfl/epfl.png b/lms/static/images/university/epfl/epfl.png deleted file mode 100644 index 6725340a1a..0000000000 Binary files a/lms/static/images/university/epfl/epfl.png and /dev/null differ diff --git a/lms/static/images/university/georgetown/georgetown-cover_2025x550.jpg b/lms/static/images/university/georgetown/georgetown-cover_2025x550.jpg deleted file mode 100644 index e2ac736fd1..0000000000 Binary files a/lms/static/images/university/georgetown/georgetown-cover_2025x550.jpg and /dev/null differ diff --git a/lms/static/images/university/georgetown/georgetown-rollover_350x150.png b/lms/static/images/university/georgetown/georgetown-rollover_350x150.png deleted file mode 100644 index 8213df72cc..0000000000 Binary files a/lms/static/images/university/georgetown/georgetown-rollover_350x150.png and /dev/null differ diff --git a/lms/static/images/university/georgetown/georgetown.png b/lms/static/images/university/georgetown/georgetown.png deleted file mode 100644 index 8213df72cc..0000000000 Binary files a/lms/static/images/university/georgetown/georgetown.png and /dev/null differ diff --git a/lms/static/images/university/harvard/about-harvard.jpg b/lms/static/images/university/harvard/about-harvard.jpg deleted file mode 100644 index 1e348faaa5..0000000000 Binary files a/lms/static/images/university/harvard/about-harvard.jpg and /dev/null differ diff --git a/lms/static/images/university/harvard/about_harvard_page_2025x550.jpg b/lms/static/images/university/harvard/about_harvard_page_2025x550.jpg deleted file mode 100644 index 342543ef26..0000000000 Binary files a/lms/static/images/university/harvard/about_harvard_page_2025x550.jpg and /dev/null differ diff --git a/lms/static/images/university/harvard/harvard-cover.jpeg b/lms/static/images/university/harvard/harvard-cover.jpeg deleted file mode 100644 index 2c29dd99ee..0000000000 Binary files a/lms/static/images/university/harvard/harvard-cover.jpeg and /dev/null differ diff --git a/lms/static/images/university/harvard/harvard.png b/lms/static/images/university/harvard/harvard.png deleted file mode 100644 index cee03aeeba..0000000000 Binary files a/lms/static/images/university/harvard/harvard.png and /dev/null differ diff --git a/lms/static/images/university/harvard/harvard_bw.png b/lms/static/images/university/harvard/harvard_bw.png deleted file mode 100644 index 5d1afefb84..0000000000 Binary files a/lms/static/images/university/harvard/harvard_bw.png and /dev/null differ diff --git a/lms/static/images/university/harvard/harvard_cropped.png b/lms/static/images/university/harvard/harvard_cropped.png deleted file mode 100644 index e76b24fd59..0000000000 Binary files a/lms/static/images/university/harvard/harvard_cropped.png and /dev/null differ diff --git a/lms/static/images/university/mcgill/mcgill-cover.jpg b/lms/static/images/university/mcgill/mcgill-cover.jpg deleted file mode 100644 index 4d213c8c92..0000000000 Binary files a/lms/static/images/university/mcgill/mcgill-cover.jpg and /dev/null differ diff --git a/lms/static/images/university/mcgill/mcgill.png b/lms/static/images/university/mcgill/mcgill.png deleted file mode 100644 index 5a0bcb56ad..0000000000 Binary files a/lms/static/images/university/mcgill/mcgill.png and /dev/null differ diff --git a/lms/static/images/university/mit/about-mit.jpg b/lms/static/images/university/mit/about-mit.jpg deleted file mode 100644 index f2051eeb9b..0000000000 Binary files a/lms/static/images/university/mit/about-mit.jpg and /dev/null differ diff --git a/lms/static/images/university/mit/mit.png b/lms/static/images/university/mit/mit.png deleted file mode 100644 index 8be5c5f2b6..0000000000 Binary files a/lms/static/images/university/mit/mit.png and /dev/null differ diff --git a/lms/static/images/university/mit/mit_bw.png b/lms/static/images/university/mit/mit_bw.png deleted file mode 100644 index 121683acd9..0000000000 Binary files a/lms/static/images/university/mit/mit_bw.png and /dev/null differ diff --git a/lms/static/images/university/mit/shot-2-large.jpg b/lms/static/images/university/mit/shot-2-large.jpg deleted file mode 100644 index 09541dc372..0000000000 Binary files a/lms/static/images/university/mit/shot-2-large.jpg and /dev/null differ diff --git a/lms/static/images/university/mit/shot-3-large.jpg b/lms/static/images/university/mit/shot-3-large.jpg deleted file mode 100644 index 327073f937..0000000000 Binary files a/lms/static/images/university/mit/shot-3-large.jpg and /dev/null differ diff --git a/lms/static/images/university/mit/shot-4-large.jpg b/lms/static/images/university/mit/shot-4-large.jpg deleted file mode 100644 index 7c488bfccf..0000000000 Binary files a/lms/static/images/university/mit/shot-4-large.jpg and /dev/null differ diff --git a/lms/static/images/university/mit/shot-5-large.jpg b/lms/static/images/university/mit/shot-5-large.jpg deleted file mode 100644 index b845e6886a..0000000000 Binary files a/lms/static/images/university/mit/shot-5-large.jpg and /dev/null differ diff --git a/lms/static/images/university/rice/rice-cover.jpg b/lms/static/images/university/rice/rice-cover.jpg deleted file mode 100644 index 2266a72c6d..0000000000 Binary files a/lms/static/images/university/rice/rice-cover.jpg and /dev/null differ diff --git a/lms/static/images/university/rice/rice.png b/lms/static/images/university/rice/rice.png deleted file mode 100644 index 95865f2dba..0000000000 Binary files a/lms/static/images/university/rice/rice.png and /dev/null differ diff --git a/lms/static/images/university/toronto/toronto-cover.jpg b/lms/static/images/university/toronto/toronto-cover.jpg deleted file mode 100644 index 0d3434659e..0000000000 Binary files a/lms/static/images/university/toronto/toronto-cover.jpg and /dev/null differ diff --git a/lms/static/images/university/toronto/toronto.png b/lms/static/images/university/toronto/toronto.png deleted file mode 100644 index 86851b9468..0000000000 Binary files a/lms/static/images/university/toronto/toronto.png and /dev/null differ diff --git a/lms/static/images/university/ut/ut-cover_2025x550.jpg b/lms/static/images/university/ut/ut-cover_2025x550.jpg deleted file mode 100644 index 4f3f7e8a9b..0000000000 Binary files a/lms/static/images/university/ut/ut-cover_2025x550.jpg and /dev/null differ diff --git a/lms/static/images/university/ut/ut-rollover_160x90.png b/lms/static/images/university/ut/ut-rollover_160x90.png deleted file mode 100644 index 1bc7f1621d..0000000000 Binary files a/lms/static/images/university/ut/ut-rollover_160x90.png and /dev/null differ diff --git a/lms/static/images/university/ut/ut-rollover_350x150.png b/lms/static/images/university/ut/ut-rollover_350x150.png deleted file mode 100644 index bf1c3ff461..0000000000 Binary files a/lms/static/images/university/ut/ut-rollover_350x150.png and /dev/null differ diff --git a/lms/static/images/university/ut/ut-standalone_187x80.png b/lms/static/images/university/ut/ut-standalone_187x80.png deleted file mode 100644 index 386eb76142..0000000000 Binary files a/lms/static/images/university/ut/ut-standalone_187x80.png and /dev/null differ diff --git a/lms/static/images/university/ut/ut.png b/lms/static/images/university/ut/ut.png deleted file mode 100644 index 1659cd75f7..0000000000 Binary files a/lms/static/images/university/ut/ut.png and /dev/null differ diff --git a/lms/static/images/university/utaustin/utaustin-cover_2025x550.jpg b/lms/static/images/university/utaustin/utaustin-cover_2025x550.jpg deleted file mode 100644 index 4cf76ba8a1..0000000000 Binary files a/lms/static/images/university/utaustin/utaustin-cover_2025x550.jpg and /dev/null differ diff --git a/lms/static/images/university/utaustin/utaustin-standalone_187x80.png b/lms/static/images/university/utaustin/utaustin-standalone_187x80.png deleted file mode 100644 index 5349800763..0000000000 Binary files a/lms/static/images/university/utaustin/utaustin-standalone_187x80.png and /dev/null differ diff --git a/lms/static/images/university/wellesley/wellesley-cover_2025x550.jpg b/lms/static/images/university/wellesley/wellesley-cover_2025x550.jpg deleted file mode 100644 index 3d8bb94308..0000000000 Binary files a/lms/static/images/university/wellesley/wellesley-cover_2025x550.jpg and /dev/null differ diff --git a/lms/static/images/university/wellesley/wellesley-rollover_160x90.png b/lms/static/images/university/wellesley/wellesley-rollover_160x90.png deleted file mode 100644 index 889414c8f4..0000000000 Binary files a/lms/static/images/university/wellesley/wellesley-rollover_160x90.png and /dev/null differ diff --git a/lms/static/images/university/wellesley/wellesley-rollover_350x150.png b/lms/static/images/university/wellesley/wellesley-rollover_350x150.png deleted file mode 100644 index 8636424d15..0000000000 Binary files a/lms/static/images/university/wellesley/wellesley-rollover_350x150.png and /dev/null differ diff --git a/lms/static/images/university/wellesley/wellesley.png b/lms/static/images/university/wellesley/wellesley.png deleted file mode 100644 index f2fd2e8143..0000000000 Binary files a/lms/static/images/university/wellesley/wellesley.png and /dev/null differ diff --git a/lms/templates/static_templates/about.html b/lms/templates/static_templates/about.html index fa6188746a..fe5c8e9fec 100644 --- a/lms/templates/static_templates/about.html +++ b/lms/templates/static_templates/about.html @@ -1,64 +1,9 @@ <%! from django.utils.translation import ugettext as _ %> -<%! from django.core.urlresolvers import reverse %> -<%namespace name='static' file='../static_content.html'/> - <%inherit file="../main.html" /> -<%block name="title">${_("About {edX}").format(edX="edX")} +<%block name="title">${_("Vision")} -
- - -
- ##
- ## - ##

“${_('The mission of {edX} is to enhance human fulfillment worldwide through online ## learning, transforming education in quality, efficiency and scale through technology and research, for the benefit of campus-based ## students and the worldwide community of online learners.').format(edX="edX")}”

- ##
- -
-
- -
-
-

${_('About {span_start}{edX}{span_end}'.format(span_start='', span_end='', edX="edX"))}

-

${_("{EdX} is a not-for-profit enterprise of its founding partners {harvard_university} and the {massachusetts_institute_of_technology} that features learning designed specifically for interactive study via the web. Based on a long history of collaboration and their shared educational missions, the founders are creating a new online-learning experience with online courses that reflect their disciplinary breadth. Along with offering online courses, the institutions will use {edX} to research how students learn and how technology can transform learning–both on-campus and worldwide. Anant Agarwal, former Director of {MIT}'s Computer Science and Artificial Intelligence Laboratory, serves as the first president of {edX}. {EdX}'s goals combine the desire to reach out to students of all ages, means, and nations, and to deliver these teachings from a faculty who reflect the diversity of its audience. {EdX} is based in Cambridge, Massachusetts and is governed by {MIT} and {Harvard}.").format(edX="edX", EdX="EdX", harvard_university="Harvard University", Harvard="Harvard", MIT="MIT", massachusetts_institute_of_technology="Massachusetts Institute of Technology")}

-
-
-
- -
-
- -
-
-

${_("{harvard_university}").format(harvard_university="Harvard University")}

-

${_("{harvard_university} is devoted to excellence in teaching, learning, and research, and to developing leaders in many disciplines who make a difference globally. {Harvard} faculty are engaged with teaching and research to push the boundaries of human knowledge. The University has twelve degree-granting Schools in addition to the {radcliffe_institute_for_advanced_study}.").format(harvard_university="Harvard University", Harvard="Harvard", radcliffe_institute_for_advanced_study="Radcliffe Institute for Advanced Study")}

-

${_("Established in 1636, {Harvard} is the oldest institution of higher education in the United States. The University, which is based in Cambridge and Boston, Massachusetts, has an enrollment of over 20,000 degree candidates, including undergraduate, graduate, and professional students. {Harvard} has more than 360,000 alumni around the world.").format(Harvard="Harvard")}

-
-
-
- -
-
- -
-
-

${_("{massachusetts_institute_of_technology}").format(massachusetts_institute_of_technology="Massachusetts Institute of Technology")}

-

${_("The {massachusetts_institute_of_technology} — a coeducational, privately endowed research university founded in 1861 — is dedicated to advancing knowledge and educating students in science, technology, and other areas of scholarship that will best serve the nation and the world in the 21st century. The Institute has close to 1,000 faculty and 10,000 undergraduate and graduate students. It is organized into five Schools: Architecture and Urban Planning; Engineering; Humanities, Arts, and Social Sciences; {Sloan} School of Management; and Science.").format(massachusetts_institute_of_technology="Massachusetts Institute of Technology", Sloan="Sloan")}

-

${_("{MIT}'s commitment to innovation has led to a host of scientific breakthroughs and technological advances. Achievements of the Institute's faculty and graduates have included the first chemical synthesis of penicillin and vitamin A, the development of inertial guidance systems, modern technologies for artificial limbs, and the magnetic core memory that made possible the development of digital computers. 78 alumni, faculty, researchers and staff have won Nobel Prizes.").format(MIT="MIT")}

-

${_("Current areas of research and education include neuroscience and the study of the brain and mind, bioengineering, cancer, energy, the environment and sustainable development, information sciences and technology, new media, financial technology, and entrepreneurship.")}

-
-
- -
-
-
+
+

${_("Vision")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

- diff --git a/lms/templates/static_templates/contact.html b/lms/templates/static_templates/contact.html index dcdc953f86..d39f17023e 100644 --- a/lms/templates/static_templates/contact.html +++ b/lms/templates/static_templates/contact.html @@ -1,62 +1,9 @@ <%! from django.utils.translation import ugettext as _ %> -<%! from django.core.urlresolvers import reverse %> -<%namespace name='static' file='../static_content.html'/> - <%inherit file="../main.html" /> -<%block name="title">${_("Contact {platform_name}").format(platform_name=settings.PLATFORM_NAME)} +<%block name="title">${_("Contact")} -
- - -
-
- -
-
-

${_("Class Feedback")}

-

${_("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 {platform_name} please email {email}. To see if your question has already been answered, visit our {faq_link_start}FAQ page{faq_link_end}. You can also join the discussion on our {fb_link_start}facebook page{fb_link_end}. Though we may not have a chance to respond to every email, we take all feedback into consideration.').format( - platform_name=settings.PLATFORM_NAME, - email='{contact_email}'.format(contact_email=settings.CONTACT_EMAIL), - faq_link_start=''.format(url=reverse('faq_edx')), - faq_link_end='', - fb_link_start='', - fb_link_end='' - )}

- -

${_("Technical Inquiries and Feedback")}

-

${_('If you have suggestions/feedback about the overall {platform_name} platform, or are facing general technical issues with the platform (e.g., issues with email addresses and passwords), you can reach us at {tech_email}. 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: {bug_email}.').format( - platform_name=settings.PLATFORM_NAME, - tech_email='{tech_support_email}'.format(tech_support_email=settings.TECH_SUPPORT_EMAIL), - bug_email='{bugs_email}'.format(bugs_email=settings.BUGS_EMAIL) - )}

- -

${_("Media")}

-

${_('Please visit our {link_start}media/press page{link_end} for more information. For any media or press inquiries, please email {email}.').format( - link_start=''.format(url=reverse('faq_edx')), - link_end='', - email='{email}'.format(email="press@edx.org"), - )}

- -

${_("Universities")}

-

${_('If you are a university wishing to collaborate or you have questions about {platform_name}, please email {email}.'.format( - platform_name="edX", - email='{email}'.format( - email="university@edx.org" - ) - ))}

- -

${_("Accessibility")}

-

${_('{platform_name} strives to create an innovative online-learning platform that promotes accessibility for everyone, including students with disabilities. We are dedicated to improving the accessibility of the platform and welcome your comments or questions at {email}.'.format(platform_name="EdX", email='{email}'.format(email="accessibility@edx.org")))}

-
-
+
+

${_("Contact")}

+

${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}

- diff --git a/lms/templates/static_templates/copyright.html b/lms/templates/static_templates/copyright.html index b60b06b568..68ec3640de 100644 --- a/lms/templates/static_templates/copyright.html +++ b/lms/templates/static_templates/copyright.html @@ -1,25 +1,9 @@ <%! from django.utils.translation import ugettext as _ %> -<%! from django.core.urlresolvers import reverse %> <%inherit file="../main.html" /> -<%namespace name='static' file='../static_content.html'/> - <%block name="title">${_("Copyright")} -