Commit c7e72c28 by Kyle Fiedler

merged heads

parents c423e17c 0807cf81
...@@ -55,10 +55,19 @@ assignments and exams. </p> ...@@ -55,10 +55,19 @@ assignments and exams. </p>
<h2> I just enrolled for the course. I have not received any form <h2> I just enrolled for the course. I have not received any form
of acknowledgement that I have enrolled.</h2> of acknowledgement that I have enrolled.</h2>
<p> You should receive a single activation e-mail. If you did not, <p> You should receive a single activation e-mail. If you did not, the
check your spam folder, or try to register again with your correct most common issues are:
e-mail address and a new username (most errors are from typos in <ul>
e-mail addresses).</p> <li> Typo in e-mail address
<li> Old browser. We recommend trying a modern version of Firefox or Chrome
<li> JavaScript disabled
<li> Activation e-mail in spam folder. Check spam folder.
<li> Non-unique username. Try adding a random string at the end.
</ul>
<p>If you run into issues, try recreating your account. There is no need
to do anything about the old account, if any. If it is not activated
through the link in the e-mail, it will disappear later.
<h2> How do I drop the course?</h2> <h2> How do I drop the course?</h2>
......
...@@ -127,7 +127,7 @@ $(function () { ...@@ -127,7 +127,7 @@ $(function () {
var plot = $.plot($grade_detail_graph, series, options); var plot = $.plot($grade_detail_graph, series, options);
var o = plot.pointOffset({x: ${overviewBarX} , y: ${totalScore}}); var o = plot.pointOffset({x: ${overviewBarX} , y: ${totalScore}});
$grade_detail_graph.append('<div style="position:absolute;left:' + (o.left - 12) + 'px;top:' + (o.top - 20) + 'px">${"{:.0%}".format(totalScore)}</div>'); $grade_detail_graph.append('<div style="position:absolute;left:' + (o.left - 12) + 'px;top:' + (o.top - 20) + 'px">${"{totalscore:.0%}".format(totalscore=totalScore)}</div>');
// //Rotate the x-axis labels // //Rotate the x-axis labels
// var rotateValue = "rotate(-60deg)"; // var rotateValue = "rotate(-60deg)";
......
...@@ -16,19 +16,19 @@ function goto_page(n) { ...@@ -16,19 +16,19 @@ function goto_page(n) {
if(n<10) { if(n<10) {
prefix="00"; prefix="00";
} }
$("#bookpage").attr("src","${ settings.BOOK_URL }p"+prefix+n+".jpg"); $("#bookpage").attr("src","${ settings.BOOK_URL }p"+prefix+n+".png");
}; };
function prev_page() { function prev_page() {
var newpage=page-1; var newpage=page-1;
if(newpage<1) newpage=1; if(newpage<0) newpage=0;
goto_page(newpage); goto_page(newpage);
log_event("book", {"type":"prevpage","new":page}); log_event("book", {"type":"prevpage","new":page});
} }
function next_page() { function next_page() {
var newpage=page+1; var newpage=page+1;
if(newpage>1764) newpage=1764; if(newpage>1008) newpage=1008;
goto_page(newpage); goto_page(newpage);
log_event("book", {"type":"nextpage","new":page}); log_event("book", {"type":"nextpage","new":page});
} }
...@@ -56,7 +56,7 @@ function next_page() { ...@@ -56,7 +56,7 @@ function next_page() {
</ul> </ul>
</nav> </nav>
<img id="bookpage" src="${ settings.BOOK_URL }p${ "%03i"%(page) }.jpg"> <img id="bookpage" src="${ settings.BOOK_URL }p${ "%03i"%(page) }.png">
</section> </section>
</section> </section>
</div> </div>
......
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