Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed some style for the courseware, fixed the footer links and fixed the modal window

Browse Source
This commit is contained in:
Kyle Fiedler
2012-01-09 16:56:22 -05:00
parent 8b29b15351
commit 61a713f2c2
8 changed files with 72 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.sass-cache/d71392d31c3b10df78042d13a0384e71b83fa11e/_courseware.scssc
View File

Binary file not shown.

7
accordion_init.js
View File

@@ -1,7 +1,10 @@
$("#accordion").accordion({active:${ active_chapter }});
$("#accordion").accordion({
active:${ active_chapter },
autoHeight: false
});
$('.ui-accordion').bind('accordionchange', function(event, ui) {
var event_data = {'newheader':ui.newHeader.text(),
'oldheader':ui.oldHeader.text()};
log_event('accordion', event_data);
});
});

7
index.html
View File

@@ -2,9 +2,6 @@
<script>
$(function() {
/* Set up FancyBox pop-ups */
$("a#inline").fancybox({
'hideOnContentClick': false
});
// TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
@@ -107,8 +104,8 @@ $(function() {
<center>
<table>
<tr><td align=right><big><a id="inline" href="#enroll">Enroll &gt;&gt;</a><br><br><br>
<a id="inline" href="#login">Log In &gt;&gt;</a></big></td><td><div style="width:50px; float:center;"></div></td><td>
<tr><td align=right><big><a class="modal" href="#enroll">Enroll &gt;&gt;</a><br><br><br>
<a class="modal" href="#login">Log In &gt;&gt;</a></big></td><td><div style="width:50px; float:center;"></div></td><td>
<div style="width:300px; float:center;">
Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris
Terman, "6.002 Circuits and Electronics" is an an on-line adaption of

2
login.html
View File

@@ -11,6 +11,6 @@
</form>
</td></tr></table>
<div align=center>
<div id="lost_password"><a id="inline" href="#pwd_reset">Lost password?</a></div>
<div id="lost_password"><a class="modal" href="#pwd_reset">Lost password?</a></div>
</div>
</div>

106
main.html
View File

@@ -28,13 +28,12 @@
<script>
$(function() {
// Set up FancyBox pop-ups
$("a#inline").fancybox({
$("a.modal").fancybox({
'hideOnContentClick': false
});
});
</script>
<%block name="headextra"/>
</head>
@@ -45,57 +44,68 @@ $(function() {
<%block name="bodyextra"/>
<footer>
<p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a> Please give us <a id="inline"
href="#feedback_div">feedback</a>. Try our <a id="inline"
href="#calculator_div">calculator</a>.
<!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
</p>
<div style="display:none"><div id="feedback_div">Found a bug? Got an
idea for improving our system? Let us know.
<br> Subject: <br><input id="feedback_subject" size=40>
<br> Feedback: <br><textarea id="feedback_message" cols="40" rows="5">
</textarea>
<br> <input id="feedback_button" type="button" value="Submit">
<script>$(function() {
$("#feedback_button").click(function(){
postJSON("/send_feedback", {"subject":$("#feedback_subject").attr("value"),
"url":document.URL,
"message":$("#feedback_message").attr("value")},
function(data){
$("#feedback_subject").attr("value","");
$("#feedback_message").attr("value","");
$("#feedback_div").html("Feedback submitted. Thank you");
});
});
});</script>
</div></div>
<div style="display:none"><div id="calculator_div">
<input id="calculator_input" > <input id="calculator_button" type=button value="=&gt;">
<input id="calculator_output" readonly>
<script>$(function() {
$("#calculator_button").click(function(){
$.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
function(data){
$("#calculator_output").attr("value",data.result);
});
});
});</script>
<br>
Supported operations: ^ * / + - || ()
<br>
Supported suffixes: %kMGTcmunp
</div></div>
<!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
<p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a></p>
<ul>
<li><a href="#feedback_div" class="modal">Feedback</a></li>
<li><a href="#calculator_div" class="modal">Calculator</a></li>
<li><a href="/s/help.html">Help</a></li>
<li><a href="/logout">Log out</a></li>
</ul>
</footer>
<div style="display:none">
<div id="feedback_div">
Found a bug? Got an idea for improving our system? Let us know.
<form>
<ol>
<li><label>Subject:</label> <input id="feedback_subject" size=40></li>
<li><label>Feedback: </label><textarea id="feedback_message" cols="40" rows="5"></textarea></li>
<li><input id="feedback_button" type="button" value="Submit"></li>
</ol>
</form>
</div>
</div>
<div style="display:none">
<div id="calculator_div">
<input id="calculator_input" >
<input id="calculator_button" type=button value="=&gt;">
<input id="calculator_output" readonly>
<p>Supported operations: ^ * / + - || ()</p>
<p>Supported suffixes: %kMGTcmunp</p>
</div>
</div>
<script>
// Feedback form
$(function() {
$("#feedback_button").click(function(){
postJSON("/send_feedback", {"subject":$("#feedback_subject").attr("value"),
"url":document.URL,
"message":$("#feedback_message").attr("value")},
function(data){
$("#feedback_subject").attr("value","");
$("#feedback_message").attr("value","");
$("#feedback_div").html("Feedback submitted. Thank you");
});
});
});
// Calculator
$(function() {
$("#calculator_button").click(function(){
$.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
function(data){
$("#calculator_output").attr("value",data.result);
});
});
});
</script>
</body>
</html>

6
profile.html
View File

@@ -45,9 +45,8 @@ $(function() {
}
});
$('#change_password').click(function(){
$('#inline').trigger('click');
$('.modal').trigger('click');
log_event("profile", {"type":"password_show"});
});
@@ -75,10 +74,9 @@ $(function() {
<li>E-mail: ${email}</li>
<li>Location: ${location}</li>
<li>Language: ${language}</li>
<li>Password: ********</li>
</ul>
<!-- <div><a href="#change_password_pop">Reset password</a></div> -->
<!-- <div><a class="modal" href="#change_password_pop">Reset password</a></div> -->
<!-- hidden trigger for password -->
<div id="change_password_pop">

3
sass/_courseware.scss
View File

@@ -14,6 +14,9 @@ div.course-wrapper {
width: grid-width(3);
h3 {
overflow: hidden;
margin: 0;
&:last-child {
@include box-shadow(none);
}

2
simplewiki_base.html
View File

@@ -136,4 +136,4 @@ update_schematics();});
<%block name="wiki_body"/>
</section>
</%block>
</%block>