Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lms/envs/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -1032,6 +1032,8 @@
'TOS': 'tos',
'HONOR': 'honor',
'PRIVACY': 'privacy_edx',
'JOBS': 'jobs',
'PRESS': 'press',

# Verified Certificates
'WHAT_IS_VERIFIED_CERT': 'verified-certificate',
Expand Down
Binary file removed lms/static/images/about_1.jpg
Binary file not shown.
Binary file removed lms/static/images/contact-page.jpg
Binary file not shown.
Binary file removed lms/static/images/jobs.jpeg
Binary file not shown.
Binary file removed lms/static/images/press-kit/3.091x_high-res.png
Binary file not shown.
Binary file removed lms/static/images/press-kit/3.091x_x200.jpg
Binary file not shown.
Binary file removed lms/static/images/press-kit/6.002x_high-res.png
Binary file not shown.
Binary file removed lms/static/images/press-kit/6.002x_x200.jpg
Binary file not shown.
Binary file not shown.
Binary file removed lms/static/images/press-kit/anant-agarwal_x200.jpg
Binary file not shown.
Binary file not shown.
Binary file removed lms/static/images/press-kit/anant-tablet_x200.jpg
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed lms/static/images/press-kit/piotr-mitros_x200.jpg
Binary file not shown.
Binary file removed lms/static/images/university/anu/anu-cover.jpg
Binary file not shown.
Binary file removed lms/static/images/university/anu/anu.png
Binary file not shown.
Binary file not shown.
Binary file removed lms/static/images/university/berkeley/berkeley.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed lms/static/images/university/delft/delft-cover.jpg
Binary file not shown.
Binary file removed lms/static/images/university/delft/delft.png
Binary file not shown.
Binary file removed lms/static/images/university/epfl/epfl-cover.jpg
Binary file not shown.
Binary file removed lms/static/images/university/epfl/epfl.png
Binary file not shown.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed lms/static/images/university/harvard/harvard.png
Diff not rendered.
Binary file removed lms/static/images/university/harvard/harvard_bw.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed lms/static/images/university/mcgill/mcgill.png
Diff not rendered.
Binary file removed lms/static/images/university/mit/about-mit.jpg
Diff not rendered.
Binary file removed lms/static/images/university/mit/mit.png
Diff not rendered.
Binary file removed lms/static/images/university/mit/mit_bw.png
Diff not rendered.
Binary file removed lms/static/images/university/mit/shot-2-large.jpg
Diff not rendered.
Binary file removed lms/static/images/university/mit/shot-3-large.jpg
Diff not rendered.
Binary file removed lms/static/images/university/mit/shot-4-large.jpg
Diff not rendered.
Binary file removed lms/static/images/university/mit/shot-5-large.jpg
Diff not rendered.
Binary file removed lms/static/images/university/rice/rice-cover.jpg
Diff not rendered.
Binary file removed lms/static/images/university/rice/rice.png
Diff not rendered.
Diff not rendered.
Binary file removed lms/static/images/university/toronto/toronto.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed lms/static/images/university/ut/ut.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed lms/static/images/university/wellesley/wellesley.png
Diff not rendered.
63 changes: 4 additions & 59 deletions lms/templates/static_templates/about.html
Original file line number Diff line number Diff line change
@@ -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"><title>${_("About {edX}").format(edX="edX")}</title></%block>

<section class="container about">
<nav>
<a href="${reverse('about_edx')}" class="active">${_("Vision")}</a>
<a href="${reverse('faq_edx')}">${_("Faq")}</a>
<a href="${reverse('press')}">${_("Press")}</a>
<a href="${reverse('contact')}">${_("Contact")}</a>
</nav>

<section class="vision">
## <div class="our-mission">
## <div class="logo">
## <img src="${static.url('images/edx-logo-large-bw.png')}">
## </div>
## <h2 class="mission-quote">&ldquo;${_('The mission of <span class="edx">{edX}</span> 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")}&rdquo;</h2>
## </div>

<section class="message left">
<div class="photo">
<img src="${static.url('images/about_1.jpg')}">
</div>
<article>
<h2>${_('About {span_start}{edX}{span_end}'.format(span_start='<span class="edx">', span_end='</span>', edX="edX"))}</h2>
<p>${_("{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&ndash;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")}</p>
</article>
<hr class="fade-right-hr-divider">
</section>
<%block name="title"><title>${_("Vision")}</title></%block>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why "Vision" and not "About"? I find this kind of weird

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason for About -> Vision was that the anchor text linking to the page actually said "Vision" so I was being consistent with the anchor text.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, weird. I got to this page by clicking "About" at the bottom of the page. Where is this paged linked to with "Vision" anchor text?


<section class="message left">
<div class="photo">
<img src="${static.url('images/university/harvard/about-harvard.jpg')}">
</div>
<article>
<h2>${_("{harvard_university}").format(harvard_university="Harvard University")}</h2>
<p>${_("{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")}</p>
<p>${_("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")}</p>
</article>
<hr class="fade-left-hr-divider">
</section>

<section class="message left">
<div class="photo">
<img src="${static.url('images/university/mit/about-mit.jpg')}">
</div>
<article>
<h2>${_("{massachusetts_institute_of_technology}").format(massachusetts_institute_of_technology="Massachusetts Institute of Technology")}</h2>
<p>${_("The {massachusetts_institute_of_technology} &mdash; a coeducational, privately endowed research university founded in 1861 &mdash; 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")}</p>
<p>${_("{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")}</p>
<p>${_("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.")}</p>
</article>
</section>

<section class="partners">
</section>
</section>
<section class="container">
<h1>${_("Vision")}</h1>
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>

61 changes: 4 additions & 57 deletions lms/templates/static_templates/contact.html
Original file line number Diff line number Diff line change
@@ -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"><title>${_("Contact {platform_name}").format(platform_name=settings.PLATFORM_NAME)}</title></%block>

<section class="container about">
<nav>
<a href="${reverse('about_edx')}">${_("Vision")}</a>
<a href="${reverse('faq_edx')}">${_("Faq")}</a>
<a href="${reverse('press')}">${_("Press")}</a>
<a href="${reverse('contact')}" class="active">${_("Contact")}</a>
</nav>

<section class="contact">
<div class="photo">
<img src="${static.url('images/contact-page.jpg')}">
</div>
<div class="contacts">
<h2>${_("Class Feedback")}</h2>
<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 {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='<a href="mailto:{contact_email}">{contact_email}</a>'.format(contact_email=settings.CONTACT_EMAIL),
faq_link_start='<a href="{url}">'.format(url=reverse('faq_edx')),
faq_link_end='</a>',
fb_link_start='<a href="http://www.facebook.com/EdxOnline">',
fb_link_end='</a>'
)}</p>
<%block name="title"><title>${_("Contact")}</title></%block>

<h2>${_("Technical Inquiries and Feedback")}</h2>
<p>${_('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='<a href="mailto:{tech_support_email}">{tech_support_email}</a>'.format(tech_support_email=settings.TECH_SUPPORT_EMAIL),
bug_email='<a href="mailto:{bugs_email}">{bugs_email}</a>'.format(bugs_email=settings.BUGS_EMAIL)
)}</p>

<h2>${_("Media")}</h2>
<p>${_('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='<a href="{url}">'.format(url=reverse('faq_edx')),
link_end='</a>',
email='<a href="mailto:{email}">{email}</a>'.format(email="press@edx.org"),
)}</p>

<h2>${_("Universities")}</h2>
<p>${_('If you are a university wishing to collaborate or you have questions about {platform_name}, please email {email}.'.format(
platform_name="edX",
email='<a href="mailto:{email}">{email}</a>'.format(
email="university@edx.org"
)
))}</p>

<h2>${_("Accessibility")}</h2>
<p>${_('{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='<a href="mailto:{email}">{email}</a>'.format(email="accessibility@edx.org")))}</p>
</div>
</section>
<section class="container">
<h1>${_("Contact")}</h1>
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>

22 changes: 3 additions & 19 deletions lms/templates/static_templates/copyright.html
Original file line number Diff line number Diff line change
@@ -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"><title>${_("Copyright")}</title></%block>

<section class="static-container copyright">
<h1>${_(" Licensing Information ")}</h1>
<hr class="horizontal-divider">

<div class="inner-wrapper">
<h2>${_("Videos and Exercises")}</h2>
<p>${_(" Copyright &copy; 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 <i>{MITx}</i> course content available under open source licenses.").format(MIT="MIT", MITx="MITx")}</p>

<h2>${_("Textbook")}</h2>
<p>${_(" Copyright &copy; 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")}</p>

<h2>${_("Student-generated content")}</h2>
<p>${_("Copyright &copy; 2012. All Rights Reserved. Due to privacy concerns, we do not know what portion of these will be released under open licenses.")}</p>

<p>${_("{MIT} and <i>{MITx}</i> are trademarks of the {MIT_long}, and may not be used without permission.").format(MIT="MIT", MITx="MITx", MIT_long="Massachusetts Institute of Technology")}</p>
</div>
<section class="container">
<h1>${_("Copyright")}</h1>
<p>${_("This page left intentionally blank. It is not used by edx.org but is left here for possible use by installations of Open edX.")}</p>
</section>
Loading