Skip to content

E
edx-platform
Commit ce6b8419 by Kyle Fiedler
Options

merge

parents 9a527344 07f328f6
Showing with 132 additions and 23 deletions
copyright.html 0 → 100644
<%inherit file="marketing.html" />
<header class="announcement home">
<div class="anouncement-wrapper">
<nav>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<h1> Licensing Information </h1>
<table><tr><td> Videos and Ungraded Exercises </td> <td> <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a><br />The videos on this page are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</td></tr>
<tr><td>Graded Exercises</td><td>Graded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</td></tr>
<tr><td>Textbook</td><td>Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work. </td></tr>
<tr><td>Student-generated content</td><td>Due to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT. </td></tr>
<tr><td>Source Code</td><td>Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter. </td></tr>
</table>
<p>MIT and MITx are trademarks of the Massachusetts Instititute of
Technology, and may not be used without permission.
</section>
honor.html 0 → 100644
<%inherit file="marketing.html" />
<header class="announcement home">
<div class="anouncement-wrapper">
<nav>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<h1> Honor Code </h1>
<ul>
<li> I agree to not engage in any activities that would dishonestly improve my results, or improve or hurt those of others.
<l1> I agree to never post answers to problems.
<li> I agree to maintain only one account.
</ul>
</section>
main.html
......@@ -6,6 +6,7 @@
<link rel="stylesheet" href="/static/lib/jquery.treeview.css" type="text/css" media="all" />
<link rel="stylesheet" href="/static/css/application.css" type="text/css" media="all" />
<link href="/static/css/jquery-ui-1.8.16.custom.css" rel="stylesheet" type="text/css"/>
<link href="/static/css/print.css" rel="stylesheet" type="text/css" media="print"/>
<script type="text/javascript" src="/static/lib/jquery-1.6.2.min.js"></script>
<script type="text/javascript" src="/static/lib/jquery-ui-1.8.16.custom.min.js"></script>
......@@ -13,6 +14,7 @@
<script type="text/javascript" src="/static/lib/jquery.treeview.js"></script>
<script type="text/javascript" src="/static/js/video_player.js"></script>
<script type="text/javascript" src="/static/js/schematic.js"></script>
<script type="text/javascript" src="/static/js/cktsim.js"></script>
<!-- Warning: Do not upgrade FancyBox. V2.0 is under a non-free CC license -->
<script type="text/javascript" src="/static/lib/fancybox/jquery.fancybox-1.3.4.js"></script>
......
marketing.html
......@@ -38,12 +38,12 @@
<footer>
<!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
<div class="footer-wrapper">
<p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a></p>
<p> Copyright (c). 2011. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p>
<ul>
<li><a href="#">Terms of service</a></li>
<li><a href="#">Privacy Policy</a></li>
<li><a href="#">Honor Code</a></li>
<li><a href="/t/tos.html">Terms of service</a></li>
<li><a href="/t/privacy.html">Privacy Policy</a></li>
<li><a href="/t/honor.html">Honor Code</a></li>
</ul>
</div>
</footer>
......
privacy.html 0 → 100644
<%inherit file="marketing.html" />
<header class="announcement home">
<div class="anouncement-wrapper">
<nav>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<h1> Privacy Policy </h1>
</section>
schematicinput.html
<span>
<input type="hidden" class="schematic" height="${height}" width="${width}" name="input_${id}" id="input_${id}" value="" />
<div id="hidden_${id}" style="display:none">
${value}
</div>
<input type="hidden" class="schematic" height="${height}" width="${width}" parts="${parts}" analyses="${analyses}" name="input_${id}" id="input_${id}" value="" initial_value=""/>
<div id="value_${id}" style="display:none">${value}</div>
<div id="initial_value_${id}" style="display:none">${initial_value}</div>
<script>
$("#input_${id}").attr("value",$("#hidden_${id}").text())
$("#input_${id}").attr("value",$("#value_${id}").text());
$("#input_${id}").attr("initial_value",$("#initial_value_${id}").text());
</script>
<span id="answer_${id}"></span>
% if state == 'unsubmitted':
......
seq_module.js
......@@ -30,6 +30,10 @@ var ${ id }loc = -1;
function ${ id }goto(i) {
log_event("seq_goto", {'old':${id}loc, 'new':i,'id':'${id}'});
postJSON('/modx/sequential/${ id }/goto_position',
{'position' : i });
if (${ id }loc!=-1)
${ id }destroy_functions[ ${ id }loc ]();
$('#seq_content').html(${ id }contents[i]);
......@@ -72,5 +76,5 @@ $(function() {
}
$('#${ id }next').click(function(eo) { ${ id }next();});
$('#${ id }prev').click(function(eo) { ${ id }prev();});
${ id }goto(1);
${ id }goto( ${ position } );
});
simplewiki_base.html
......@@ -84,7 +84,7 @@
if (wiki_article is not UNDEFINED):
baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
else:
baseURL = reverse("wiki_view", args=[""])
baseURL = reverse("wiki_view", args=["/"])
%>
<ul class="action">
......@@ -113,14 +113,14 @@
<div id="wiki_create_form">
<%
theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')+'/_create/'"
theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')"
if (wiki_article is not UNDEFINED):
baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
baseURL = reverse("wiki_create", args=[wiki_article.get_url()])
else:
baseURL = reverse("wiki_view", args=[""])
baseURL = reverse("wiki_create", args=["/"])
%>
<form method="GET" onsubmit="this.action='${baseURL + "/' + " + theaction};">
<form method="GET" onsubmit="this.action='${baseURL + "' + " + theaction};">
<div>
<label for="id_wiki_article_name">Title of article</label>
......
simplewiki_searchresults.html
......@@ -16,11 +16,7 @@
<%block name="wiki_body">
%for article in wiki_search_results:
%if article is not UNDEFINED:
<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()}</a><br/>
%else:
<a href="${reverse("wiki_view", args=[''])}">/</a><br/>
%endif
<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()}</a><br/>
%endfor
%if not wiki_search_results:
......
staticbook.html
......@@ -16,7 +16,7 @@ function goto_page(n) {
if(n<10) {
prefix="00";
}
$("#bookpage").attr("src","/static/book/small-p"+prefix+n+".jpg");
$("#bookpage").attr("src","/static/book/p"+prefix+n+".jpg");
};
function prev_page() {
......@@ -56,7 +56,7 @@ function next_page() {
</ul>
</nav>
<img id="bookpage" src="/static/book/small-p${ "%03i"%(page) }.jpg">
<img id="bookpage" src="/static/book/p${ "%03i"%(page) }.jpg">
</section>
</section>
</div>
......
tos.html 0 → 100644
<%inherit file="marketing.html" />
<header class="announcement home">
<div class="anouncement-wrapper">
<nav>
<a class="modal login" href="#login">Log In</a>
</nav>
<section>
<h1>MITx</h1>
<h2>An MIT Education Anywhere. For free.</h2>
</section>
</div>
</header>
<section class="index-content">
<h1> Terms of Service </h1>
<table><tr><td> Videos and Ungraded Exercises </td> <td> <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img alt="Creative Commons License" style="border-width:0" src="http://i.creativecommons.org/l/by-sa/3.0/80x15.png" /></a><br />The videos on this page are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</td></tr>
<tr><td>Graded Exercises</td><td>Graded exercises are All Rights Reserved until the due date. Past the due date, they are licensed under a <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Creative Commons Attribution-ShareAlike 3.0 Unported License</a>.</td></tr>
<tr><td>Textbook</td><td>Textbook is All Rights Reserved Elsevier. We are using it with permission. We apologize for the inclusion of proprietary work. </td></tr>
<tr><td>Student-generated content</td><td>Due to privacy concerns, all forum posts, wiki etc, and other student-created works are All Rights Reserved until released otherwise by MIT. </td></tr>
<tr><td>Source Code</td><td>Source code is All Rights Reserved during the beta offering. We expect to release it under a free and open license shortly thereafter. </td></tr>
</table>
<p>MIT and MITx are trademarks of the Massachusetts Instititute of
Technology, and may not be used without permission.
</section>
video_init.js
......@@ -30,7 +30,7 @@ function good() {
ajax_video=good;
loadNewVideo(streams["1.0"], ${ video_time });
loadNewVideo(streams["1.0"], ${ position });
function add_speed(key, stream) {
var id = 'speed_' + stream;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment