Skip to content

E
edx-platform
Commit 933b95ac by Kyle Fiedler
Options

merge

parents edea8b4e 64ce159a
Showing with 597 additions and 183 deletions
Lab2A.html 0 → 120000
../data/problems/Lab2A.html
\ No newline at end of file
accordion.html
<%!
from django.core.urlresolvers import reverse
%>
<%def name="make_chapter(chapter)">
<h3><a href="#">${chapter['name']}</a></h3>
......@@ -9,16 +13,12 @@
% endif
>
<a href='/courseware/${format_string(course_name)}/${format_string(chapter['name'])}/${format_string(section['name'])}'>
<a href="${reverse('courseware_section', args=format_url_params([course_name, chapter['name'], section['name']]))}">
<p>${section['name']}</p>
<p class="subtitle">
${section['format']}
% if 'time' in section and section['time']!="":
(${int(section['time'])/60} min)
% endif
% if 'due' in section and section['due']!="":
due ${section['due']}
% endif
......
courseware.html
......@@ -23,7 +23,7 @@
});
</script>
<%include file="navigation.html" />
<%include file="navigation.html" args="active_page='courseware'" />
<section class="main-content">
<div class="course-wrapper">
......
create_account.html
......@@ -20,7 +20,7 @@
</li>
<li>
<label>Public Name* <span class="ui-icon ui-icon-help" id="spinner_nick" style="display:inline-block;"></span></label>
<label>Username (public)* <span class="ui-icon ui-icon-help" id="spinner_nick" style="display:inline-block;"></span></label>
<input name="username" id="ca_username" type="text" required />
<div style="display:none" id="sregion_nick">Nickname you'd like to use on forums. We recommend some variant of your real name (e.g. first name, last initial), but we allow you to be fully anonymous as well. </div>
......@@ -28,7 +28,7 @@
<li>
<label>Full name <span class="ui-icon ui-icon-help" id="spinner_name" style="display:inline-block;"></span></label>
<label>Full name* <span class="ui-icon ui-icon-help" id="spinner_name" style="display:inline-block;"></span></label>
<input name="name" id="ca_name" type="text" />
<div style="display:none" id="sregion_name">If you would like us to give you a certificate of completion at the end, we need your full legal name, as you would like it to appear on the certificate (e.g. &quot;John Smith, Jr&quot;). Otherwise, feel free to leave it blank. </div>
......
help.html
<%inherit file="main.html" />
<%include file="navigation.html" />
<%include file="navigation.html" args="active_page='help'"/>
<section class="help main-content">
<h1>Help</h1>
<p> If you need help, first try <a href="/discussion">asking a question in the forums</a> and in the IRC channel (irc.mitx.org, channel #6002). As the semester starts, we will add a Frequently Asked Questions section.</p>
<p> If you need help:
<ul>
<li> Ask on the <a href="/discussion">discussion forums</a>
<li> Ask in the IRC channel (irc.mitx.mit.edu, channel #6002)]
<li> Check the <a href="/info">course handouts.</a>
</ul>
<p> If you can't solve your problems with self-help, we have several e-mail addresses set up:</p>
<p> If you can't solve your problems with self-help, we have several
e-mail addresses set up:</p>
<dl>
<dt> technical@mitx.mit.edu</dt>
......@@ -20,5 +26,6 @@
<dd> Suggestions</dd>
</dl>
<p> Please bear in mind that while we read them, we do not expect to have time to respond to all e-mails.</p>
<p> Please bear in mind that while we read them, we do not expect to
have time to respond to all e-mails.</p>
</section>
info.html
<%inherit file="main.html" />
<%include file="navigation.html" />
<%include file="navigation.html" args="active_page='info'" />
<section class="main-content">
<div class="info-wrapper">
......
main.html
......@@ -45,8 +45,8 @@
<footer>
<!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
<p> Copyright &copy; 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a></p>
<p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a>
</p>
<ul>
<li><a href="#feedback_div" rel="leanModal">Feedback</a></li>
<li><a href="#calculator_div" rel="leanModal">Calculator</a></li>
......@@ -73,8 +73,17 @@
<input id="calculator_button" type=button value="=&gt;">
<input type="text" id="calculator_output" readonly>
<p>Supported suffixes: %kMGTcmunp</p>
<p>Supported operations: ^ * / + - || ()</p>
<table> <tr><td align="right">Suffixes</td><td>&nbsp;:&nbsp;</td><td align="left"> %kMGTcmunp</td></tr>
<tr><td align="right">Operations</td><td>&nbsp;:&nbsp;</td><td align="left"> ^ * / + - ()</td></tr>
<tr><td align="right">Functions</td><td>&nbsp;:&nbsp;</td><td align="left"> sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs </td></tr>
<tr><td align="right">Constants</td><td>&nbsp;:&nbsp;</td><td align="left"> e</td></tr>
<!--p> Unsupported: ||, j </p
Students won't know what parallel means at this time.
Complex numbers aren't well tested in the courseware, so we would prefer to not expose them.
If you read the comments in the source, feel free to use them. If you run into a bug, please
let us know. But we can't officially support them right now.
-->
</table>
</div>
<script>
......
marketing.html
......@@ -89,7 +89,7 @@ function postJSON(url, data, callback) {
<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 &copy; 2011. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p>
<p> Copyright &copy; 2012. MIT. <a href="/t/copyright.html">Some rights reserved.</a></p>
<ul>
<li><a href="/t/tos.html">Terms of Service</a></li>
......
navigation.html
<%page args="active_page" />
<div class="header-wrapper">
<header>
<h1><em>MITx</em></h1>
<nav>
<nav class="${active_page}">
<h2><a href="/courseware">Circuits and Electronics</a></h2>
<ul class="coursenav">
<li><a href="/courseware">Courseware</a></li>
<li><a href="/info">Course Info</a></li>
<li><a href="/book">Textbook</a></li>
<li><a href="/discussion">Discussion</a></li>
<li><a href="/wiki">Wiki</a></li>
<li><a href="/profile">Profile</a></li>
<li class="courseware"><a href="/courseware">Courseware</a></li>
<li class="info"><a href="/info">Course Info</a></li>
<li class="book"><a href="/book">Textbook</a></li>
<li class="discussion"><a href="/discussion">Discussion</a></li>
<li class="wiki"><a href="/wiki">Wiki</a></li>
<li class="profile"><a href="/profile">Profile</a></li>
</ul>
</nav>
</header>
......
privacy.html
......@@ -2,6 +2,189 @@
<section class="privacy-policy">
<div>
<h1> Privacy Policy </h1>
<h1>Privacy Policy</h1>
<h2>Confidentiality &amp; Security of Personally
Identifiable Information</h2>
<p>We care about the confidentiality and security of your personal
information. We will use commercially reasonable efforts to keep your
Personally Identifiable Information private and will not share it with third
parties, except as set forth in this Privacy Policy. However, no method of
transmitting or storing electronic data is ever completely secure, and we
cannot guarantee that such information will never be accessed, used, or
released in a manner that is inconsistent with this policy. </p>
<p>This Privacy Policy only applies to information that we collect
through the Site and does not apply to information that we may collect
from you in other ways (for example, this policy does not apply to
information that you may provide to us over the phone, by fax or
through conventional mail). In addition, please note that this policy
does not apply to your educational records -- those records are protected
by the Family Educational Rights and Privacy Act (&quot;FERPA&quot;)
with which we are committed to comply.</p>
<h2>Usernames and Postings </h2>
<p>Comments or other information posted by you to our forums,
wikis, or other areas of the Site designed for public communications may be
viewed and downloaded by others who visit the Site. For this reason, we
encourage you to use an anonymous username, and to not post any personally
identifiable information to those forums (or other public areas).</p>
<h2>What You Consent to by Using Our Site</h2>
<p>Please understand that by submitting any Personally Identifiable
Information to us, you consent and agree that we may collect, use and
disclose such Personally Identifiable Information in accordance with
this Privacy Policy and our TOS, and as permitted or required by
law. If you do not agree with these terms, then please do not provide
any Personally Identifiable Information to us. As used herein,
&quot;Personally Identifiable Information&quot; means your full name,
email address and your student identification number. If you refuse,
or if you choose not to provide us with any required Personally
Identifiable Information, we may not be able to provide you with the
services that can be offered on our Site.</p>
<h2>What Information We Collect </h2>
<p>We collect information, including Personally Identifiable
Information, when you sign up for a User Account, participate in
online courses, send us email messages and/or participate in our
public forums. We collect information about student performance and
patterns of learning. We track information indicating, among other
things, which pages of our Site were visited, the order in which they
were visited, when they were visited, and which hyperlinks and other
user interface controls were used.</p>
<p>We may log the IP address, operating system and browser software
used by each user of the Site, and we may be able to determine from an
IP address a user's Internet Service Provider and the geographic
location of his or her point of connectivity. Various web analysis
tools are used to collect this information. Some of the information is
collected through cookies (a small text file placed on your
computer). You should be able to control how and whether cookies will
be accepted by your web browser. Most browsers offer instructions on
how to reset the browser to reject cookies in the &quot;Help&quot;
section of the toolbar. If you reject our cookies, many functions and
conveniences of this Site may not work properly.</p>
<p>Among other things, we may use the information that you provide
(including your Personally Identifiable Information) in connection
with the following:</p>
<ul>
<li>To help us improve <i>MITx</i> offerings, both individually
(e.g. by course staff when working with a student) and in
aggregate, and to individualize the experience and to evaluate
the access and use of the Site and the impact of <i>MITx</i> on
the worldwide educational community.
</li>
<li>For purposes of scientific research, particularly, for
example, in the areas of cognitive science and education. </li>
<li>For the purpose for which you specifically provided
the personal information, for example to respond to a specific inquiry or
provide you the specific course and/or services you select. </li>
<li>To track both individual and aggregate attendance,
progress and completion of an online course, and to analyze statistics on
student performance and how students learn. </li>
<li>To monitor and detect violations of the Honor Code, the
Terms of Service, as well as other misuses and potential misuses of the
site. </li>
<li>To publish information gathered about <i>MITx</i>
access, use, impact, and student performance but only as non-personally
identifiable data.</li>
<li>To send you updates about online courses offered by <i>MITx</i>
or other MIT events or to send you email messages about Site maintenance
or updates.</li>
<li>To archive this information and/or use it for future
communications with you.</li>
<li>As otherwise described to you at the point of
collection. </li>
</ul>
<h2>Sharing with Third Parties</h2>
<p>We may share the information we collect with third parties
as follows:</p>
<ul>
<li> With service providers or
contractors that perform certain functions on our behalf, including processing
information that you provide to us on the Site, operating the Site or portions
of it, or in connection with other aspects of <i>MITx</i> services. These
service providers and contractors will be obligated to keep your information
confidential.</p>
<li> With all users and other visitors
to the Site, to the extent that you submit post comments or other information
to a portion of the Site designed for public communications. As provided in the
Terms of Service, we may provide those postings to students in future offerings
of the course, either within the context of the forums, the courseware, or
otherwise, for marketing purposes, or in any other way. If we do use your postings,
we will use them without your real name and e-mail (except with explicit
permission), but we may use your username. </p>
<li>To connect you to other users of the web site. For instance, we
may recommend specific study partners, or connect potential student
mantees and mentors. In such cases, we may use all information
collected to determine who to connect you to, but we will only connect
you by username, and not disclose your real name or e-mail address to
your contact. </p>
<li> To respond to subpoenas, court orders, or other legal process, in
response to a request for cooperation from law enforcement or another
government agency, to investigate, prevent, or take action regarding
illegal activities, suspected fraud, or to enforce our user agreement
or privacy policy, or to protect our rights or the rights of
others.</p>
<li> As otherwise described to you at the point of collection or
pursuant to your consent. For example, from time to time, we may ask
your permission to use your Personally Identifiable Information in
other ways. In the future, <i>MITx</i> may have an alumni association,
resume book, etc. We may offer services where it is possible to
verify <i>MITx</i> credentials. </p>
<li> For integration with third party services. Videos and other
content may be hosted on YouTube and other web sites not controlled
by <i>MITx</i>. We may provide links and other integration with social
networks, and other sites. Those web sites are guided by their own
privacy policies. </p>
</ul>
<h2>Personalization and Pedagogical Improvements</h2>
<p>Our goal is to provide current and future visitors with the best
possible educational experience. To further this goal, we sometimes
present different users with different versions of course materials
and software. We do this to personalize the experience to the
individual learner (assess the learner's level of ability and learning
style, and present materials best suited to the learner), to evaluate
the effectiveness of our course materials, to improve our
understanding of the learning process, and to otherwise improve the
effectiveness of our offerings. We may publish or otherwise publicize
results from this process, but only as non-personally-identifiable
data. </p>
<h2>Changing Our Privacy Policy</h2>
<p>Please note that we review our privacy practices from time to time,
and that these practices are subject to change. Any change, update, or
modification will be effective immediately upon posting on our
Site. We will notify you of any material change to this Privacy Policy
by posting a notice on our Site's homepage for a reasonable period of
time following such update, and by changing the effective date
(located at the bottom of this page). Be sure to return to this page
periodically to ensure familiarity with the most current version of
this Privacy Policy. </p>
<h2>Privacy Concerns</h2>
<p>If you have privacy concerns, or have disclosed data you would
prefer to keep private, please contact us
at <a href="mailto:privacy@mitx.mit.edu">privacy@mitx.mit.edu</a>. </p>
</div>
</section>
profile.html
<%inherit file="main.html" />
<%include file="navigation.html" />
<section class="main-content">
<div class="profile-wrapper">
<section class="course-info">
<h1>Course Progress</h1>
<ol>
% for hw in homeworks:
<li>
<h2>${ hw['chapter'] }</h2>
<div class="scores">
<h3>${ hw['section'] }</h3>
<ul>
% for score in hw['scores']:
<li>${ score[0] }/${ score[1] }</li>
% endfor
</ul>
</div>
</li>
% endfor
</ol>
</section>
<section class="user-info">
<h1>${name}</h1>
<ul>
<li>Forum name: <strong>${username}</strong></li>
<li>E-mail: <strong>${email}</strong></li>
<li>
Location: <div id="location_sub">${location}</div><div id="description"></div> <a href="#" id="change_location">Change</a>
</li>
<li>
Language: <div id="language_sub">${language}</div> <a href="#" id="change_language">Change</a>
</li>
</ul>
<!-- <div><a class="modal" href="#change_password_pop">Reset password</a></div> -->
<div id="change_password_pop">
<h2>Password change</h2>
<p>We'll e-mail you a password reset link at ${email}. Follow
the link in the confirmation email to change your
password.</p>
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
<input type="submit" id="pwd_reset_button" value="Reset Password" />
</div>
</section>
</div>
</section>
<%!
from django.core.urlresolvers import reverse
%>
<%block name="headextra">
<script type="text/javascript" src="${ settings.LIB_URL }flot/jquery.flot.min.js"></script>
<script type="text/javascript" src="${ settings.LIB_URL }flot/jquery.flot.stack.js"></script>
<script language="javascript" type="text/javascript" src="${ settings.LIB_URL }flot/jquery.flot.symbol.js"></script>
<script>
<%include file="profile_graphs.js"/>
</script>
<script>
var loc=true; // Activate on clicks? Not if already clicked.
......@@ -124,5 +77,93 @@ $(function() {
});
});
});
</script>
</%block>
<%include file="navigation.html" args="active_page='profile'" />
<section class="main-content">
<div class="profile-wrapper">
<section class="course-info">
<h1>Course Progress</h1>
<div id="grade-detail-graph" style="width:650px;height:200px;"></div>
<ol>
<%
lastChapter = None
%>
% for hw in homeworks:
<li>
%if hw['chapter'] != lastChapter:
<h2><a href="${reverse('courseware_chapter', args=format_url_params([hw['course'], hw['chapter']])) }">
${ hw['chapter'] }</a></h2>
<% lastChapter = hw['chapter'] %>
%else:
<h2>-</h2>
%endif
<div class="scores">
<h3><a href="${reverse('courseware_section', args=format_url_params([hw['course'], hw['chapter'], hw['section']])) }">
<%
earned = hw['section_total'][0]
total = hw['section_total'][1]
percentageString = "{0:.0%}".format( float(earned)/total) if earned > 0 else ""
%>
${ hw['section'] }</a> ${"({0}/{1}) {2}".format( earned, total, percentageString )}</h3>
${hw['subtitle']}
% if 'due' in hw and hw['due']!="":
due ${hw['due']}
% endif
<ul>
%if len(hw['scores']) > 0:
%if hw['graded']:
Problem Scores:
%else:
Practice Scores:
%endif
% for score in hw['scores']:
<li>${ score[0] }/${ score[1] }</li>
% endfor
%endif
</ul>
</div>
</li>
% endfor
</ol>
</section>
<section class="user-info">
<h1>${name}</h1>
<ul>
<li>Forum name: <strong>${username}</strong></li>
<li>E-mail: <strong>${email}</strong></li>
<li>
Location: <div id="location_sub">${location}</div><div id="description"></div> <a href="#" id="change_location">Change</a>
</li>
<li>
Language: <div id="language_sub">${language}</div> <a href="#" id="change_language">Change</a>
</li>
</ul>
<!-- <div><a class="modal" href="#change_password_pop">Reset password</a></div> -->
<div id="change_password_pop">
<h2>Password change</h2>
<p>We'll e-mail you a password reset link at ${email}. Follow
the link in the confirmation email to change your
password.</p>
<input id="id_email" type="hidden" name="email" maxlength="75" value="${email}" />
<input type="submit" id="pwd_reset_button" value="Reset Password" />
</div>
</section>
</div>
</section>
profile_graphs.js 0 → 100644
<%!
import json
%>
$(function () {
function showTooltip(x, y, contents) {
$('<div id="tooltip">' + contents + '</div>').css( {
position: 'absolute',
display: 'none',
top: y + 5,
left: x + 5,
border: '1px solid #fdd',
padding: '2px',
'background-color': '#fee',
opacity: 0.90
}).appendTo("body").fadeIn(200);
}
/* -------------------------------- Grade detail graph -------------------------------- */
var colors = [$.color.parse("#E8B800"), $.color.parse("#A0CEFA"), $.color.parse("#BD3738"), $.color.parse("#429A2E")];
//var colors = [$.color.parse("#1B2045"), $.color.parse("#557a00"), $.color.parse("#F5600"), $.color.parse("#FEBA2C")];
//var colors = [$.color.parse("#E7C856"), $.color.parse("#CD462E"), $.color.parse("#B01732"), $.color.parse("#41192A")];
//var colors = [$.color.parse("#434F5E"), $.color.parse("#BEF731"), $.color.parse("#FB5455"), $.color.parse("#44C4B7")];
//var colors = [$.color.parse("#147A7D"), $.color.parse("#C0C900"), $.color.parse("#C9005B"), $.color.parse("#FCF9A5")];
var series = [];
var ticks = []; //These are the indices and x-axis labels for the data
var bottomTicks = []; //Labels on the bottom
var detail_tooltips = {}; //This an dictionary mapping from 'section' -> array of detail_tooltips
var droppedScores = []; //These are the datapoints to indicate assignments which aren't factored into the total score
detail_tooltips['Dropped Scores'] = [];
<%
tickIndex = 1
sectionSpacer = 0.5
sectionIndex = 0
%>
%for section in grade_summary:
%if 'subscores' in section: ##This is for sections like labs or homeworks, with several smaller components and a total
series.push({label: "${section['category']}",
data: ${ json.dumps( [[i + tickIndex, score['percentage']] for i,score in enumerate(section['subscores'])] ) },
color: colors[${sectionIndex}].toString(),
});
ticks = ticks.concat( ${ json.dumps( [[i + tickIndex, str(i + 1)] for i,score in enumerate(section['subscores'])] ) } );
bottomTicks.push( [ ${tickIndex + len(section['subscores'])/2}, "${section['category']}" ] );
detail_tooltips["${section['category']}"] = ${ json.dumps([score['summary'] for score in section['subscores']] ) };
droppedScores = droppedScores.concat(${ json.dumps( [[tickIndex + index, 0.05] for index in section['dropped_indices']]) });
<% dropExplanation = "The lowest {0} {1} scores are dropped".format( len(section['dropped_indices']), section['category'] ) %>
detail_tooltips['Dropped Scores'] = detail_tooltips['Dropped Scores'].concat( ${json.dumps( [dropExplanation] * len(section['dropped_indices']) )} );
<% tickIndex += len(section['subscores']) + sectionSpacer %>
##Now put on the aggregate score
series.push({label: "${section['category']} Total",
data: [[${tickIndex}, ${section['totalscore']['score']}]],
color: colors[${sectionIndex}].toString(),
});
ticks = ticks.concat( [ [${tickIndex}, "Total"] ] );
detail_tooltips["${section['category']} Total"] = [ "${section['totalscore']['summary']}" ];
<% tickIndex += 1 + sectionSpacer %>
%else: ##This is for sections like midterm or final, which have no smaller components
series.push({label: "${section['category']}",
data: [[${tickIndex}, ${section['totalscore']['score']}]],
color: colors[${sectionIndex}].toString(),
});
%if section['category'] == "Midterm":
bottomTicks = bottomTicks.concat( [ [${tickIndex}, "${section['category']}"] ] );
%else:
ticks = ticks.concat( [ [${tickIndex}, "${section['category']}"] ] );
%endif
detail_tooltips["${section['category']}"] = [ "${section['totalscore']['summary']}" ];
<% tickIndex += 1 + sectionSpacer %>
%endif
<%sectionIndex += 1 %>
%endfor
//Alwasy be sure that one series has the xaxis set to 2, or the second xaxis labels won't show up
series.push( {label: 'Dropped Scores', data: droppedScores, points: {symbol: "cross", show: true, radius: 3}, bars: {show: false}, color: "red", xaxis: 2} );
var options = {
series: {lines: {show: false, steps: false },
bars: {show: true, barWidth: 0.6, align: 'center', lineWidth: 1},},
xaxis: {tickLength: 0, min: 0.0, max: ${tickIndex - sectionSpacer}},
xaxes: [{ticks: ticks}, {ticks: bottomTicks}],
yaxis: {ticks: [[1, "100%"], [0.87, "A 87%"], [0.7, "B 70%"], [0.6, "C 60%"], [0, "0%"]], min: 0.0, max: 1.0, labelWidth: 50},
grid: { hoverable: true, clickable: true, borderWidth: 1,
markings: [ {yaxis: {from: 0.87, to: 1 }, color: "#EBFFD5"}, {yaxis: {from: 0.7, to: 0.87 }, color: "#E6FFFF"},
{yaxis: {from: 0.6, to: 0.7 }, color: "#FFF2E3"}, ] },
legend: {show: false},
};
if ($("#grade-detail-graph").length > 0) {
$.plot($("#grade-detail-graph"), series, options);
}
var previousPoint = null;
$("#grade-detail-graph").bind("plothover", function (event, pos, item) {
$("#x").text(pos.x.toFixed(2));
$("#y").text(pos.y.toFixed(2));
if (item) {
if (previousPoint != item.dataIndex) {
previousPoint = item.dataIndex;
$("#tooltip").remove();
if (item.series.label in detail_tooltips) {
var series_tooltips = detail_tooltips[item.series.label];
if (item.dataIndex < series_tooltips.length) {
var x = item.datapoint[0].toFixed(2), y = item.datapoint[1].toFixed(2);
showTooltip(item.pageX, item.pageY, series_tooltips[item.dataIndex]);
}
}
}
} else {
$("#tooltip").remove();
previousPoint = null;
}
});
});
sass/_discussion-answers.scss 0 → 100644
div.answer-controls {
@extend div.question-controls;
display: inline-block;
margin-top: 20px;
margin-bottom: 0;
div.answer-sort {
@extend div.question-sort;
}
div.answer-count {
@extend div.question-count;
}
}
div.answer-block {
@extend div.question-header;
border-top: #ddd 1px solid;
display: inline-block;
float: left;
margin: 20px 0;
padding-top: 20px;
width: 100%;
img.answer-img-accept {
margin: 10px 0px 10px 16px;
}
div.answer-container {
@extend div.question-container;
div.answer-content {
@extend div.question-content;
div.answer-body {
@extend div.question-body;
}
}
}
div.meta-bar {
div.answer-actions {
@extend div.question-actions;
}
}
}
sass/_discussion-questions.scss
......@@ -10,7 +10,7 @@ div.question-controls {
div.question-count {
margin-right: flex-gutter();
width: flex-grid(5.5,9);
width: flex-grid(5,9);
h1 {
margin-top: 0;
......@@ -19,7 +19,7 @@ div.question-controls {
div.question-sort {
vertical-align: bottom;
width: flex-grid(3.5,9);
width: flex-grid(4,9);
nav {
@include border-radius(35px);
......@@ -28,11 +28,15 @@ div.question-controls {
float: right;
font-size: 16px;
margin: 3px 0;
padding: 0 20px;
padding:0px 20px 5px;
a {
color: darken(#F6EFD4, 50%);
&.on span{
font-weight: bold;
}
&:before {
content: '|';
color: darken(#F6EFD4, 10%);
......
sass/_question-view.scss
......@@ -176,9 +176,9 @@ div.question-header {
&:first-child {
border-top: 0;
}
&:only-of-type {
border: 0;
}
// &:only-of-type {
// border: 0;
// }
}
form.post-comments {
......
sass/application.scss
......@@ -15,7 +15,7 @@
@import "wiki-basic-html", "wiki-create", "wiki";
@import "activation";
@import "help";
@import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" ;
@import "askbot-original", "discussion", "discussion-questions", "discussion-tags", "question-view" , "discussion-answers";
// left over
// @import "theme";
......
simplewiki_base.html
......@@ -73,7 +73,7 @@
<%block name="wiki_head"/>
</%block>
<%include file="navigation.html" />
<%include file="navigation.html" args="active_page='wiki'" />
<section class="main-content">
<div class="wiki-wrapper">
......
staticbook.html
......@@ -34,7 +34,7 @@ function next_page() {
}
</script>
<%include file="navigation.html" />
<%include file="navigation.html" args="active_page='book'" />
<section class="main-content">
<div class="book-wrapper">
......
tos.html
......@@ -3,13 +3,13 @@
<section class="tos">
<div>
<h1>MITx Terms of Service</h1>
<h1><i>MITx</i> Terms of Service</h1>
<p>Welcome to MITx. You must read and agree to these Terms of Service
(&quot;TOS&quot;), MITx&rsquo;s <a href="/t/privacy.html">Privacy
<p>Welcome to <i>MITx</i>. You must read and agree to these Terms of Service
(&quot;TOS&quot;), <i>MITx</i>&rsquo;s <a href="/t/privacy.html">Privacy
Policy</a>, and <a href="/t/honor.html">Honor Code</a> prior to
registering for this Site or using any portion of this site
(&ldquo;Site&rdquo;) , including accessing any course materials, chat
(&ldquo;Site&rdquo;), including accessing any course materials, chat
room, mailing list, or other electronic service. These TOS, the
Privacy Policy and the Honor Code are agreements (the
&ldquo;Agreements&rdquo;) between you and the Massachusetts Institute
......@@ -17,7 +17,7 @@ of Technology (&ldquo;MIT&rdquo;). If you do not understand or do not
agree to be bound by the terms of the Agreements, please immediately
exit this site. </p>
<p>MITx reserves the right to modify these TOS at any time and will
<p><i>MITx</i> reserves the right to modify these TOS at any time and will
publish notice of any such modifications online on the
Site <a href="/t/tos.html">Terms of Service page</a> for a reasonable
period of time following such modifications, and by changing the
......@@ -25,13 +25,12 @@ effective date of these TOS. By continuing to access the Site
after notice of such modifications has been published, you signify
your agreement to be bound by them. </p>
<h2>Description of MITx </h2>
<h2>Description of <i>MITx</i> </h2>
<p>MITx offers online courses, professor-to-student and
student-to-student interactivity, individual assessment of a
student&rsquo;s work, and the opportunity for students who demonstrate
their mastery of subjects to earn a certificate or credential awarded
by MITx. </p>
<p><i>MITx</i> offers online courses that include opportunities for
professor-to-student and student-to-student interactivity, individual
assessment of a student's work, and for students who demonstrate their
mastery of subjects, a certificate or credential. </p>
<h2>Rules for Online Conduct</h2>
......@@ -39,32 +38,34 @@ by MITx. </p>
for your User Postings. &ldquo;User Postings&rdquo; include all
content submitted, posted, published or distributed on the Site by you
or other users of the Site, including but not limited to all forum
posts, notes, questions, and comments. You agree that you will use the
Site in compliance with these TOS and all applicable local, state,
national, and international laws, rules and regulations, including any
laws regarding the transmission of technical data exported from your
country of residence and all United States export control laws.
posts, wiki edits, notes, questions, comments, videos, and file
uploads. You agree that you will use the Site in compliance with these
TOS, the <a href="/t/honor.html">Honor Code</a>, and all applicable
local, state, national, and international laws, rules and regulations,
including copyright laws and any laws regarding the transmission of
technical data exported from your country of residence and all United
States export control laws.
<p>As a condition of your use of the Services, you will not use the
Site in any manner that could damage, disable, overburden, or impair
any MITx server, or the network(s) connected to any MITx server, or
interfere with any other party&#39;s use and enjoyment of the
Site in any manner intended to damage, disable, overburden, or impair
any <i>MITx</i> server, or the network(s) connected to any <i>MITx</i>
server, or interfere with any other party's use and enjoyment of the
Site. You may not attempt to gain unauthorized access to the Site,
other accounts, computer systems or networks connected to any MITx
server through hacking, password mining or any other means. You may
not obtain or attempt to obtain any materials or information through
any means not intentionally made available through the Site. </p>
other accounts, computer systems or networks connected to
any <i>MITx</i> server through hacking, password mining or any other
means. You may not obtain or attempt to obtain any materials or
information stored on the Site, its servers, or associated computers
through any means not intentionally made available through the
Site. </p>
<h2>The following list of items is strictly prohibited on the Site:</h2>
<ol>
<li>Content that defames or threatens others
<li>Harassing statements or content
<li>Content that defames, harasses, or threatens others
<li>Content that discusses illegal activities with the intent to commit them.
<li>Content that infringes another&#39;s intellectual property,
including, but not limited to, copyrights, trademarks, or trade
secrets
<li>Any inappropriate, profane, pornographic, defamatory, obscene,
indecent, or unlawful content
including, but not limited to, copyrights, or trademarks
<li>Any inappropriate, profane, pornographic, obscene, indecent, or
unlawful content
<li>Advertising or any form of commercial solicitation
<li>Political content or content related to partisan political
activities
......@@ -100,7 +101,7 @@ information to keep it accurate and current. </p>
<p>We consider the confidentiality and security of your information to
be of the utmost importance. Please see
our <a href="/t/privacy.html">Privacy Policy</a> for more information
about what information about you MITx collects and how MITx uses that
about what information about you <i>MITx</i> collects and how <i>MITx</i> uses that
information.</p>
<h2>Your Right to Use Content on the Site</h2>
......@@ -109,7 +110,7 @@ information.</p>
Site is protected by United States copyright. The texts, exams and
other instructional materials provided with the courses offered on
this Site are for your personal use in connection with those courses
only. MIT is planning to make MITx course content and software
only. MIT is planning to make <i>MITx</i> course content and software
infrastructure available under open source licenses that will help
create a vibrant ecosystem of contributors and further MIT&rsquo;s
goal of making education accessible and affordable to the world. </p>
......@@ -118,40 +119,41 @@ goal of making education accessible and affordable to the world. </p>
information on the Site are used with the permission of third parties
and use of that information is subject to certain rules and
conditions, which will be posted along with the information. By using
this Site you agree to abide by all such terms and conditions. Due to
privacy concerns, student-created content, including all forum posts,
is all Rights Reserved until released under other terms by MITx. </p>
this Site you agree to abide by all such rules and conditions. Due to
privacy concerns, User Postings shall be licensed to <i>MITx</i> with
the terms discussed below. </p>
<h2>USER POSTINGS</h2>
<h2>User Postings</h2>
<p><strong>User Postings Representations and Warranties.</strong> By
uploading and publishing your User Postings, you affirm, represent,
and warrant that you are the creator and owner of or have the
necessary licenses, rights, consents, and permissions to use and to
authorize MIT and MITx&rsquo;s Users to use and distribute your User
Postings as necessary to exercise the licenses granted by you in these
TOS and in the manner contemplated by MITx. You, and not MITx, are
solely responsible for your User Postings and the consequences of
posting or publishing them.</p>
<p><strong>Limited License Grant to MIT.</strong> By submitting or distributing
User Postings through the Site, you hereby grant to MIT a worldwide,
non-exclusive, transferable, assignable, fully paid-up, royalty-free,
perpetual, irrevocable right and license to host, transfer, display,
perform, reproduce, modify, distribute and re-distribute, relicense,
and otherwise exploit your User Postings, in whole or in part, in any
form, and in any media formats and through any media channels (now
known or hereafter developed).</p>
<p><strong>Limited License Grant to MITx Users.</strong> By submitting
or distributing User Postings through the Site, you hereby grant to
each User of the Site a non-exclusive license to access and use your
User Postings in connection with their use of the Site for their own
personal purposes. </p>
<h2>Use of MITx and MIT Names, Trademarks and Service Marks</h2>
<p>&ldquo;MITx,&rdquo; &quot;MIT&quot;, &quot;Massachusetts Institute
creating your User Postings, you affirm, represent, and warrant that
you are the creator and owner of or have the necessary licenses,
rights, consents, and permissions to reproduce and publish the posted
information, and to authorize MIT and <i>MITx</i>'s Users to
reproduce, modify, publish, and otherwise use that infomation and
distribute your User Postings as necessary to exercise the licenses
granted by you below. You, and not <i>MITx</i>, are solely responsible
for your User Postings and the consequences of posting or publishing
them.</p>
<p><strong>Limited License Grant to MIT.</strong> By submitting or
distributing User Postings to the Site, you hereby grant to MIT a
worldwide, non-exclusive, transferable, assignable, fully paid-up,
royalty-free, perpetual, irrevocable right and license to host,
transfer, display, perform, reproduce, modify, distribute and
re-distribute, relicense, and otherwise exploit your User Postings, in
whole or in part, in any form, and in any media formats and through
any media channels (now known or hereafter developed).</p>
<p><strong>Limited License Grant to <i>MITx</i> Users.</strong> By
submitting or distributing User Postings to the Site, you hereby grant
to each User of the Site a non-exclusive license to access and use
your User Postings in connection with their use of the Site for their
own personal purposes. </p>
<h2>Use of <i>MITx</i> and MIT Names, Trademarks and Service Marks</h2>
<p>&ldquo;<i>MITx</i>,&rdquo; &quot;MIT&quot;, &quot;Massachusetts Institute
of Technology&quot;, and its logos and seal are trademarks of the
Massachusetts Institute of Technology. You may not use MIT&rsquo;s
names or logos, or any variations thereof, without prior written
......@@ -181,16 +183,13 @@ incorporated herein by reference.</p>
<h2>Disclaimer of Warranty / Indemnification/Limitation of Liabilities</h2>
<p>THE SITE, INCLUDING, WITHOUT LIMITATION, ALL SERVICES, CONTENT,
FUNCTIONS AND MATERIALS PROVIDED ON OR THROUGH THE SITE AND ANY
INFORMATION THEREIN ARE PROVIDED &quot;AS IS&quot; WITHOUT WARRANTY OF
ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION, THE
IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR USE FOR A
PARTICULAR PURPOSE, TITLE OR NONINFRINGEMENT AND MIT HEREBY DISCLAIMS
ANY AND ALL SUCH WARRANTIES, EXPRESS OR IMPLIED. MIT does not warrant
the Site will operate in an uninterrupted or error-free manner or that
the Site is free of viruses or other harmful components. Use of
information obtained from or through this Site is at your own
<p>THE SITE IS PROVIDED &quot;AS IS&quot; AND &quot;AS AVAILABLE&quot;
WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING
WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS
FOR USE FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. MIT does not
warrant the Site will operate in an uninterrupted or error-free manner
or that the Site is free of viruses or other harmful components. Use
of information obtained from or through this Site is at your own
risk. Your access to or download of information, materials, or data
through the Site or any reference sites is at your own discretion and
risk and that you will be solely responsible for any damage to your
......@@ -207,8 +206,8 @@ indecent or objectionable, and you agree to waive, and hereby do
waive, any legal or equitable rights or remedies you have or may have
against MIT with respect thereto. MIT does not endorse any User
Postings or any opinion, recommendation or advice expressed
therein. MITx has no obligation to monitor any User Postings or
any other user communications through the Site. However, MITx reserves
therein. <i>MITx</i> has no obligation to monitor any User Postings or
any other user communications through the Site. However, <i>MITx</i> reserves
the right to review User Postings and to edit or remove, in whole or
in part, such User Postings in its sole discretion. If notified by a
User or a content owner of a User Posting that allegedly does not
......@@ -220,23 +219,18 @@ reserves the right to do at any time and without notice. </p>
hyperlinks to sites maintained or controlled by others. MIT is not
responsible for and does not routinely screen, approve, review or
endorse the contents of or use of any of the products or services that
may be offered at these sites. MIT does MIT make any warranty or
representation regarding any linked third party web sites or the
information or materials appearing thereon or any of the products or
services described thereon. Hyperlinks do not imply that MIT is
affiliated or associated with, the linked-third party site. If
you decide to access linked third party web sites, you do so at your
own risk.</p>
may be offered at these sites. If you decide to access linked third
party web sites, you do so at your own risk.</p>
<strong>
<p>YOU AGREE THAT MIT WILL NOT BE LIABLE TO YOU FOR ANY LOSS OR
DAMAGES, EITHER ACTUAL OR CONSEQUENTIAL, ARISING OUT OF OR RELATING TO
THESETOS, OR TO YOUR (OR ANY THIRD PARTY&#39;S) USE OR INABILITY TO
USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE SITE, OR TO YOUR
RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH THE SITE WHETHER
BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW, EXCEPT ONLY IN THE
CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO THE EXTENT THAT
APPLICABLE LAW REQUIRES SUCH LIABILITY. </p>
THESE TERMS OF SERVICE, OR TO YOUR (OR ANY THIRD PARTY&#39;S) USE OR
INABILITY TO USE THE SITE, OR TO YOUR PLACEMENT OF CONTENT ON THE
SITE, OR TO YOUR RELIANCE UPON INFORMATION OBTAINED FROM OR THROUGH
THE SITE WHETHER BASED IN CONTRACT, TORT, STATUTORY OR OTHER LAW,
EXCEPT ONLY IN THE CASE OF DEATH OR PERSONAL INJURY WHERE AND ONLY TO
THE EXTENT THAT APPLICABLE LAW REQUIRES SUCH LIABILITY. </p>
<p>IN PARTICULAR, MIT WILL HAVE NO LIABILTY FOR ANY CONSEQUENTIAL,
INDIRECT, PUNITIVE, SPECIAL, EXEMPLARY OR INCIDENTAL DAMAGES, WHETHER
......
video.html
% if name != None:
<h1> ${name} </h1>
% endif
<div class="video-wrapper">
<div class="video-player">
<div id="ytapiplayer">
......
video_init.js
......@@ -9,8 +9,7 @@ if (swfobject.hasFlashPlayerVersion("10.1")){
"ytapiplayer", "640", "385", "8", null, null, params, atts);
} else {
//end of this URL may need &origin=http://..... once pushed to production to prevent XSS
$("#html5_player").attr("src", "http://www.youtube.com/embed/" + streams["1.0"] + "?enablejsapi=1&controls=0");
$("#html5_player").attr("src", "http://www.youtube.com/embed/" + streams["1.0"] + "?enablejsapi=1&controls=0&origin=" + document.domain);
$("#html5_player").show();
var tag = document.createElement('script');
......
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