Skip to content

E
edx-platform
Commit 5e9c2965 by Ernie Park
Options

merging html5 video stuff in

parents a1cb0b0a 333d76e9
Showing with 638 additions and 177 deletions
.DS_Store
No preview for this file type
accordion_init.js
$("#accordion").accordion({active:${ active_chapter }}); $("#accordion").accordion({
active: ${ active_chapter },
autoHeight: false
});
$('.ui-accordion').bind('accordionchange', function(event, ui) { $('.ui-accordion').bind('accordionchange', function(event, ui) {
var event_data = {'newheader':ui.newHeader.text(), var event_data = {'newheader':ui.newHeader.text(),
......
index.html
...@@ -2,9 +2,6 @@ ...@@ -2,9 +2,6 @@
<script> <script>
$(function() { $(function() {
/* Set up FancyBox pop-ups */ /* 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 // TODO: Clean up as per http://stackoverflow.com/questions/169506/obtain-form-input-fields-using-jquery
...@@ -107,8 +104,8 @@ $(function() { ...@@ -107,8 +104,8 @@ $(function() {
<center> <center>
<table> <table>
<tr><td align=right><big><a id="inline" href="#enroll">Enroll &gt;&gt;</a><br><br><br> <tr><td align=right><big><a class="modal" 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> <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;"> <div style="width:300px; float:center;">
Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris Taught by Anant Agarwal, with Gerald Sussman, Piotr Mitros, and Chris
Terman, "6.002 Circuits and Electronics" is an an on-line adaption of Terman, "6.002 Circuits and Electronics" is an an on-line adaption of
......
login.html
...@@ -11,6 +11,6 @@ ...@@ -11,6 +11,6 @@
</form> </form>
</td></tr></table> </td></tr></table>
<div align=center> <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>
</div> </div>
main.html
...@@ -28,13 +28,12 @@ ...@@ -28,13 +28,12 @@
<script> <script>
$(function() { $(function() {
// Set up FancyBox pop-ups // Set up FancyBox pop-ups
$("a#inline").fancybox({ $("a.modal").fancybox({
'hideOnContentClick': false 'hideOnContentClick': false
}); });
}); });
</script> </script>
<%block name="headextra"/> <%block name="headextra"/>
</head> </head>
...@@ -45,21 +44,46 @@ $(function() { ...@@ -45,21 +44,46 @@ $(function() {
<%block name="bodyextra"/> <%block name="bodyextra"/>
<footer> <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. --> <!-- Template based on a design from http://www.dotemplate.com/ - Donated $10 (pmitros) so we don't need to include credit. -->
</p> <p> Copyright (c). 2011. MIT. <a href=http://creativecommons.org/licenses/by-sa/3.0/>Some rights reserved.</a></p>
<div style="display:none"><div id="feedback_div">Found a bug? Got an <ul>
idea for improving our system? Let us know. <li><a href="#feedback_div" class="modal">Feedback</a></li>
<br> Subject: <br><input id="feedback_subject" size=40> <li><a href="#calculator_div" class="modal">Calculator</a></li>
<br> Feedback: <br><textarea id="feedback_message" cols="40" rows="5"> <li><a href="/s/help.html">Help</a></li>
</textarea> <li><a href="/logout">Log out</a></li>
<br> <input id="feedback_button" type="button" value="Submit"> </ul>
</footer>
<script>$(function() { <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(){ $("#feedback_button").click(function(){
postJSON("/send_feedback", {"subject":$("#feedback_subject").attr("value"), postJSON("/send_feedback", {"subject":$("#feedback_subject").attr("value"),
"url":document.URL, "url":document.URL,
...@@ -70,32 +94,18 @@ idea for improving our system? Let us know. ...@@ -70,32 +94,18 @@ idea for improving our system? Let us know.
$("#feedback_div").html("Feedback submitted. Thank you"); $("#feedback_div").html("Feedback submitted. Thank you");
}); });
}); });
});</script> });
</div></div>
<div style="display:none"><div id="calculator_div"> // Calculator
<input id="calculator_input" > <input id="calculator_button" type=button value="=&gt;"> $(function() {
<input id="calculator_output" readonly>
<script>$(function() {
$("#calculator_button").click(function(){ $("#calculator_button").click(function(){
$.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")}, $.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
function(data){ function(data){
$("#calculator_output").attr("value",data.result); $("#calculator_output").attr("value",data.result);
}); });
}); });
});</script> });
<br> </script>
Supported operations: ^ * / + - || ()
<br>
Supported suffixes: %kMGTcmunp
</div></div>
<ul>
<li><a href="/s/help.html">Help</a></li>
<li><a href="/logout">Log out</a></li>
</ul>
</footer>
</body> </body>
</html> </html>
problem.js
...@@ -5,6 +5,7 @@ function ${ id }_load() { ...@@ -5,6 +5,7 @@ function ${ id }_load() {
update_schematics(); update_schematics();
$('#check_${ id }').click(function() { $('#check_${ id }').click(function() {
$("input.schematic").each(function(index,element){ element.schematic.update_value(); });
var submit_data={}; var submit_data={};
$.each($("[id^=input_${ id }_]"), function(index,value){ $.each($("[id^=input_${ id }_]"), function(index,value){
submit_data[value.id]=value.value; submit_data[value.id]=value.value;
...@@ -36,7 +37,7 @@ function ${ id }_load() { ...@@ -36,7 +37,7 @@ function ${ id }_load() {
$('#show_${ id }').click(function() { $('#show_${ id }').click(function() {
postJSON('/modx/problem/${ id }/problem_show', {}, function(data) { postJSON('/modx/problem/${ id }/problem_show', {}, function(data) {
for (var key in data) { for (var key in data) {
$("#answer_${ id }_"+key).text(data[key]); $("#answer_"+key).text(data[key]);
} }
}); });
...@@ -44,6 +45,7 @@ function ${ id }_load() { ...@@ -44,6 +45,7 @@ function ${ id }_load() {
}); });
$('#save_${ id }').click(function() { $('#save_${ id }').click(function() {
$("input.schematic").each(function(index,element){ element.schematic.update_value(); });
var submit_data={}; var submit_data={};
$.each($("[id^=input_${ id }_]"), function(index,value){ $.each($("[id^=input_${ id }_]"), function(index,value){
submit_data[value.id]=value.value;}); submit_data[value.id]=value.value;});
......
profile.html
...@@ -45,9 +45,8 @@ $(function() { ...@@ -45,9 +45,8 @@ $(function() {
} }
}); });
$('#change_password').click(function(){ $('#change_password').click(function(){
$('#inline').trigger('click'); $('.modal').trigger('click');
log_event("profile", {"type":"password_show"}); log_event("profile", {"type":"password_show"});
}); });
...@@ -75,10 +74,9 @@ $(function() { ...@@ -75,10 +74,9 @@ $(function() {
<li>E-mail: ${email}</li> <li>E-mail: ${email}</li>
<li>Location: ${location}</li> <li>Location: ${location}</li>
<li>Language: ${language}</li> <li>Language: ${language}</li>
<li>Password: ********</li>
</ul> </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 --> <!-- hidden trigger for password -->
<div id="change_password_pop"> <div id="change_password_pop">
......
sass/_base-extends.scss
...@@ -30,3 +30,83 @@ ...@@ -30,3 +30,83 @@
border: 1px solid darken(#888, 20%); border: 1px solid darken(#888, 20%);
} }
} }
.content {
@include box-sizing(border-box);
display: table-cell;
padding: $body-line-height;
vertical-align: top;
width: grid-width(9);
}
.sidebar {
@include box-shadow( inset -1px 0 0 #f6f6f6);
background: #e3e3e3;
border-right: 1px solid #d3d3d3;
display: table-cell;
font-family: $body-font-family;
text-shadow: 0 1px 0 #f1f1f1;
vertical-align: top;
width: grid-width(3);
position: relative;
h3 {
@include box-shadow(0 1px 0 #eee);
background: none;
border: none;
border-bottom: 1px solid #d3d3d3;
color: #000;
font-weight: normal;
margin: 0;
overflow: hidden;
a {
@include transition();
color: lighten($text-color, 10%);
display: block;
font-size: $body-font-size;
padding: 7px 7px 7px 30px;
text-decoration: none;
&:hover {
@include box-shadow(0 1px 0 #fff);
background: #efefef;
}
}
span.ui-icon {
background-image: url(images/ui-icons_454545_256x240.png);
}
&.active {
@include box-shadow(none);
background: none;
border: 0;
border-bottom: 1px solid #bbb;
color: #000;
font-weight: bold;
a {
color: #000;
}
}
}
}
.topbar {
background: #F6EFD4;
border-bottom: 1px solid darken(#F6EFD4, 10%);
margin: (-$body-line-height) (-$body-line-height) $body-line-height;
font-size: 12px;
text-shadow: 0 1px 0 #fff;
@extend .clearfix;
a {
text-transform: uppercase;
color: darken(#F6EFD4, 80%);
&:hover {
color: darken(#F6EFD4, 60%);
}
}
}
sass/_courseware.scss
...@@ -3,17 +3,12 @@ div.course-wrapper { ...@@ -3,17 +3,12 @@ div.course-wrapper {
width: 100%; width: 100%;
div#accordion { div#accordion {
@include box-shadow( inset -1px 0 0 #f6f6f6); @extend .sidebar;
background: #e3e3e3;
border-right: 1px solid #d3d3d3;
display: table-cell;
font-family: $body-font-family;
overflow: hidden;
text-shadow: 0 1px 0 #f1f1f1;
vertical-align: top;
width: grid-width(3);
h3 { h3 {
overflow: hidden;
margin: 0;
&:last-child { &:last-child {
@include box-shadow(none); @include box-shadow(none);
} }
...@@ -26,34 +21,13 @@ div.course-wrapper { ...@@ -26,34 +21,13 @@ div.course-wrapper {
color: lighten($text-color, 10%); color: lighten($text-color, 10%);
} }
&.ui-state-default {
@include box-shadow(0 1px 0 #eee);
background: none;
border: none;
border-bottom: 1px solid #d3d3d3;
font-weight: normal;
span.ui-icon {
background-image: url(images/ui-icons_454545_256x240.png);
}
}
&.ui-state-hover { &.ui-state-hover {
border: none; border: none;
border-bottom: 1px solid #d3d3d3; border-bottom: 1px solid #d3d3d3;
} }
&.ui-state-active { &.ui-state-active {
@include box-shadow(none); @extend .active;
background: none;
border: 0;
border-bottom: 1px solid #bbb;
color: #000;
font-weight: bold;
a {
color: #000;
}
} }
} }
} }
...@@ -124,6 +98,7 @@ div.course-wrapper { ...@@ -124,6 +98,7 @@ div.course-wrapper {
margin-bottom: $body-line-height; margin-bottom: $body-line-height;
li { li {
border: none;
cursor: pointer; cursor: pointer;
display: table-cell; display: table-cell;
min-width: 30px; min-width: 30px;
...@@ -135,7 +110,7 @@ div.course-wrapper { ...@@ -135,7 +110,7 @@ div.course-wrapper {
div.video-wrapper { div.video-wrapper {
float: left; float: left;
width: 640px; width: 640px;
min-height: 500px; min-height: 620px;
section { section {
ul { ul {
...@@ -145,6 +120,8 @@ div.course-wrapper { ...@@ -145,6 +120,8 @@ div.course-wrapper {
margin-top: 5px; margin-top: 5px;
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
border: 0;
padding: 0;
div { div {
&:empty { &:empty {
...@@ -183,9 +160,13 @@ div.course-wrapper { ...@@ -183,9 +160,13 @@ div.course-wrapper {
li { li {
margin-bottom: 8px; margin-bottom: 8px;
cursor: pointer; cursor: pointer;
border: 0;
padding: 0;
color: #666;
&.current { &.current {
background-color: #f3f3f3; background-color: #f3f3f3;
color: #333;
} }
&:hover { &:hover {
......
sass/_textbook.scss
...@@ -2,17 +2,9 @@ div.book-wrapper { ...@@ -2,17 +2,9 @@ div.book-wrapper {
display: table; display: table;
ul#booknav { ul#booknav {
@include box-shadow( inset -1px 0 0 #f6f6f6); @extend .sidebar;
@include box-sizing(border-box); @include box-sizing(border-box);
background: #e3e3e3;
border-right: 1px solid #d3d3d3;
font-family: $body-font-family;
padding: $body-line-height; padding: $body-line-height;
text-shadow: 0 1px 0 #f6f6f6;
vertical-align: top;
width: grid-width(3);
min-width: 240px;
display: table-cell;
li { li {
ul { ul {
...@@ -29,9 +21,7 @@ div.book-wrapper { ...@@ -29,9 +21,7 @@ div.book-wrapper {
display: table-cell; display: table-cell;
nav { nav {
background: #F6EFD4; @extend .topbar;
border-bottom: 1px solid darken(#F6EFD4, 10%);
margin: (-$body-line-height) (-$body-line-height) $body-line-height;
ul { ul {
@extend .clearfix; @extend .clearfix;
...@@ -45,17 +35,6 @@ div.book-wrapper { ...@@ -45,17 +35,6 @@ div.book-wrapper {
&.next { &.next {
float: right; float: right;
} }
a {
font-size: 12px;
text-transform: uppercase;
color: darken(#F6EFD4, 80%);
text-shadow: 0 1px 0 #fff;
&:hover {
color: darken(#F6EFD4, 60%);
}
}
} }
} }
} }
......
sass/_wiki-create.scss 0 → 100644
form#wiki_revision {
label {
display: block;
margin-bottom: 7px ;
}
textarea {
@include box-sizing(border-box);
margin-bottom: 20px;
min-height: 300px;
width: 100%;
}
input[type="text"] {
width: 50%;
}
input[type="submit"] {
display: block;
margin-top: 20px;
}
}
sass/_wiki.scss 0 → 100644
div.wiki-wrapper {
display: table;
width: 100%;
div#wiki_panel {
@extend .sidebar;
overflow: auto;
input[type="button"] {
@extend h3;
color: lighten($text-color, 10%);
@include transition();
font-size: $body-font-size;
margin: 0 !important;
padding: 7px 7px 7px 30px;
text-align: left;
width: 100%;
&:hover {
@include box-shadow(0 1px 0 #fff);
background: #efefef;
}
}
ul {
li {
&.create-article {
position: relative;
h3 {
position: relative;
&:before {
background: blue url(images/ui-icons_454545_256x240.png) -32px -16px no-repeat;
display: block;
position: absolute;
top: 0;
right: 0;
width: 16px;
height: 16px;
}
&:hover {
&:before {
background-image: url(images/ui-icons_454545_256x240.png) -64px -16px no-repeat;
}
}
}
}
}
}
div#wiki_create_form {
@extend .clearfix;
padding: 15px;
background: #d6d6d6;
border-bottom: 1px solid #bbb;
input[type="text"] {
margin-bottom: 6px;
display: block;
width: 100%;
@include box-sizing(border-box);
}
ul {
li {
float: left;
&#cancel {
float: right;
margin-top: 10px;
}
}
}
}
}
section.wiki-body {
@extend .content;
header {
@extend .topbar;
p {
float: left;
padding: 15px;
margin-bottom: 0;
color: darken(#F6EFD4, 55%);
line-height: 1em;
}
ul {
float: right;
li {
float: left;
input[type="button"] {
@include box-shadow(inset 1px 0 0 lighten(#f6efd4, 5%));
@include border-radius(0);
@include transition();
background: darken(#F6EFD4, 5%);
border: 0;
border-left: 1px solid darken(#f6efd4, 20%);
color: darken(#F6EFD4, 80%);
text-shadow: none;
font-weight: normal;
font-size: 12px;
text-transform: uppercase;
letter-spacing: 1px;
padding: 15px;
margin: 0;
&:hover {
background: none;
}
}
}
}
}
h1.wiki-title {
font-weight: bold;
padding-bottom: 10px;
margin-bottom: 20px;
border-bottom: 1px solid #ccc;
}
p {
line-height: 1.6em;
}
}
}
sass/application.scss
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
@import "courseware"; @import "courseware";
@import "textbook"; @import "textbook";
@import "profile"; @import "profile";
@import "wiki-create", "wiki";
// left over // left over
@import "theme"; @import "theme";
......
schematicinput.html 0 → 100644
<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>
<script>
$("#input_${id}").attr("value",$("#hidden_${id}").text())
</script>
<span id="answer_${id}"></span>
% if state == 'unsubmitted':
<span class="ui-icon ui-icon-bullet" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'correct':
<span class="ui-icon ui-icon-check" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'incorrect':
<span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'incomplete':
<span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
% endif
</span>
simplewiki_base.html
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
<%block name="title"><title>${"wiki_title"}</title></%block> <%block name="title"><title>${"wiki_title"}</title></%block>
<%block name="headextra"> <%block name="headextra">
<link rel="stylesheet" media="screen,print" href="/static/simplewiki/css/base.css" /> <!-- <link rel="stylesheet" media="screen,print" href="/static/simplewiki/css/base.css" /> -->
<link rel="stylesheet" media="print" href="/static/simplewiki/css/base_print.css" /> <!-- <link rel="stylesheet" media="print" href="/static/simplewiki/css/base_print.css" /> -->
<link rel="stylesheet" href="/static/simplewiki/css/autosuggest_inquisitor.css" /> <!-- <link rel="stylesheet" href="/static/simplewiki/css/autosuggest_inquisitor.css" /> -->
<link rel="stylesheet" href="/static/css/local.css" type="text/css" media="all" /> <!-- <link rel="stylesheet" href="/static/css/local.css" type="text/css" media="all" /> -->
<script type="text/javascript" src="/static/simplewiki/js/bsn.AutoSuggest_c_2.0.js"></script> <script type="text/javascript" src="/static/simplewiki/js/bsn.AutoSuggest_c_2.0.js"></script>
<%! <%!
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
%> %>
<script type="text/javascript"> <script type="text/javascript">
function set_related_article_id(s) { function set_related_article_id(s) {
document.getElementById('wiki_related_input_id').value = s.id; document.getElementById('wiki_related_input_id').value = s.id;
document.getElementById('wiki_related_input_submit').disabled=false; document.getElementById('wiki_related_input_submit').disabled=false;
...@@ -36,104 +36,142 @@ ...@@ -36,104 +36,142 @@
x(); x();
} }
%endif %endif
</script> </script>
<script type="text/x-mathjax-config"> <script type="text/x-mathjax-config">
MathJax.Hub.Config({ MathJax.Hub.Config({
tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]], tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
displayMath: [ ['$$','$$'], ["\\[","\\]"]]} displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
}); });
</script> <script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script> </script> <script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
<script> <script>
$(function(){ $(function(){
$.ajaxSetup ({ $.ajaxSetup ({
// Disable caching of AJAX responses // Disable caching of AJAX responses
cache: false cache: false
}); });
$(".div_wiki_circuit").each(function(d,e) { $(".div_wiki_circuit").each(function(d,e) {
id = $(this).attr("id"); id = $(this).attr("id");
name = id.substring(17); name = id.substring(17);
//alert(name); //alert(name);
$("#"+id).load("/edit_circuit/"+name); $("#"+id).load("/edit_circuit/"+name);
f=this; f=this;
}); });
$("#wiki_create_form").hide();
$("#create-article").click(function() {
$("#wiki_create_form").slideToggle();
$(this).parent().toggleClass("active");
});
update_schematics();});
</script>
update_schematics();});
</script>
<%block name="wiki_head"/>
</%block>
<%block name="bodyextra"> <%block name="bodyextra">
<%block name="wiki_head"/>
</%block>
<%include file="navigation.html" /> <%include file="navigation.html" />
<section class="main-content"> <section class="main-content">
<h1><%block name="wiki_page_title"/></h1> <div class="wiki-wrapper">
<hr />
<%block name="wiki_panel"> <%block name="wiki_panel">
<div id="wiki_panel"> <div id="wiki_panel">
<div class="wiki_box"> <%
<div class="wiki_box_header"> if (wiki_article is not UNDEFINED):
<div class="wiki_box_corner"></div> baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
<div class="wiki_box_bar"></div> else:
baseURL = reverse("wiki_view", args=[""])
%>
<ul class="action">
<li>
<div class="wiki_box_title">Search</div>
<form method="POST" action='${reverse("wiki_search_articles", args=[""])}'>
<div style="display:none">
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
</div> </div>
<div class="wiki_box_contents" style="position: relative;"> <input type="text" name="value" id="wiki_search_input" style="width: 72%" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/>
<input type="submit" id="wiki_search_input_submit" value=Go! style="width: 20%" />
</form>
</li>
<li>
<input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=["wiki_articleget_url"])}'" value="Random article" class="button" />
</li>
<li class="create-article">
<h3>
<a href="#" id="create-article"/>Create Article</a>
</h3>
<div style="border: 2px outset #CCC; width: 250px; padding: 10px; background-color: #FFF; position: absolute; right: 100px; top: -80px; display: none; color: #000;" id="wiki_create_form"> <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, '')+'/_create/'"
if (wiki_article is not UNDEFINED): if (wiki_article is not UNDEFINED):
baseURL = reverse("wiki_view", args=[wiki_article.get_url()]) baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
else: else:
baseURL = reverse("wiki_view", args=[""]) baseURL = reverse("wiki_view", args=[""])
%> %>
<form method="GET" onsubmit="this.action='${baseURL + "/' + " + theaction};"> <form method="GET" onsubmit="this.action='${baseURL + "/' + " + theaction};">
<h2>Create article</h2>
<p> <div>
<label for="id_wiki_article_name">Title of article</label> <label for="id_wiki_article_name">Title of article</label>
<input type="text" name="wiki_article_name" id="id_wiki_article_name" /><br/> <input type="text" name="wiki_article_name" id="id_wiki_article_name" /><br/>
<label for="id_wiki_article_is_child">Create as a child of current article</label> <!-- <label for="id_wiki_article_is_child">Create as a child of current article</label> -->
<input type="checkbox" name="wiki_article_is_child" id="id_wiki_artcile_is_child" disabled="true" ${ 'checked="checked"' if wiki_article is not UNDEFINED else ""}> <!-- <input type="checkbox" name="wiki_article_is_child" id="id_wiki_artcile_is_child" disabled="true" ${ 'checked="checked"' if wiki_article is not UNDEFINED else ""}> -->
</p> </div>
<p>
<input type="button" class="button" value="Cancel" style="display: inline-block; margin-right: 2px;" onclick="document.getElementById('wiki_create_form').style.display='none';" /> <ul>
<input type="submit" class="button" value="Next &gt;" style="display: inline-block; margin-right: 2px; font-weight: bold;" />
</p> <li>
<input type="submit" class="button" value="Create" style="display: inline-block; margin-right: 2px; font-weight: bold;" />
</li>
</ul>
</form> </form>
</div> </div>
<p> </li>
</ul>
%if wiki_article is not UNDEFINED: </div>
<input type="button" onclick="javascript:location.href='${reverse("wiki_view", args=[wiki_article.get_url()])}'" value="View" style="width: 100%;" class="button" /><br /> </%block>
<input type="button" onclick="javascript:location.href='${reverse("wiki_edit", args=[wiki_article.get_url()])}'" value="Edit" style="width: 100%;" class="button" ${'disabled="true"' if not wiki_write else ""}/><br />
<input type="button" onclick="javascript:location.href='${reverse("wiki_history", args=[wiki_article.get_url(),1])}'" value="History" style="width: 100%;" class="button" /> <section class="wiki-body">
%endif <header>
<input type="button" onclick="document.getElementById('wiki_create_form').style.display='block';" value="Create article" style="width: 100%; margin-bottom: 2px;" class="button" />
<input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=["wiki_articleget_url"])}'" value="Random article" style="width: 100%; margin-bottom: 2px;" class="button" />
</p>
%if wiki_article is not UNDEFINED: %if wiki_article is not UNDEFINED:
%if wiki_article.locked: %if wiki_article.locked:
<p><strong>This article has been locked</strong></p> <p><strong>This article has been locked</strong></p>
%endif %endif
<p> <p>Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}</p>
<i>Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}</i>
</p>
%endif %endif
</div>
<div class="wiki_box_footer">
<div class="wiki_box_corner"></div>
<div class="wiki_box_bar"></div>
</div>
</div>
</div> %if wiki_article is not UNDEFINED:
<ul>
</%block> <li>
<input type="button" onclick="javascript:location.href='${reverse("wiki_view", args=[wiki_article.get_url()])}'" value="View" />
</li>
<li>
<input type="button" onclick="javascript:location.href='${reverse("wiki_edit", args=[wiki_article.get_url()])}'" value="Edit" ${'disabled="true"' if not wiki_write else ""}/>
</li>
<li>
<input type="button" onclick="javascript:location.href='${reverse("wiki_history", args=[wiki_article.get_url(),1])}'" value="History" class="button" />
</li>
</ul>
%endif
</header>
<h1 class="wiki-title"><%block name="wiki_page_title"/></h1>
<%block name="wiki_body"/> <%block name="wiki_body"/>
</section>
</div>
</section> </section>
</%block> </%block>
simplewiki_base.html.orig 0 → 100644
##This file is based on the template from the SimpleWiki source which carries the GPL license
<%inherit file="main.html"/>
<%block name="title"><title>${"wiki_title"}</title></%block>
<%block name="headextra">
<!-- <link rel="stylesheet" media="screen,print" href="/static/simplewiki/css/base.css" /> -->
<!-- <link rel="stylesheet" media="print" href="/static/simplewiki/css/base_print.css" /> -->
<!-- <link rel="stylesheet" href="/static/simplewiki/css/autosuggest_inquisitor.css" /> -->
<!-- <link rel="stylesheet" href="/static/css/local.css" type="text/css" media="all" /> -->
<script type="text/javascript" src="/static/simplewiki/js/bsn.AutoSuggest_c_2.0.js"></script>
<%!
from django.core.urlresolvers import reverse
%>
<script type="text/javascript">
function set_related_article_id(s) {
document.getElementById('wiki_related_input_id').value = s.id;
document.getElementById('wiki_related_input_submit').disabled=false;
}
%if wiki_article is not UNDEFINED:
var x = window.onload;
window.onload = function(){
var options = {
script: "${reverse("search_related", args=[wiki_article.get_url()] )}/?self=${wiki_article.pk}&",
json: true,
varname: "query",
maxresults: 35,
callback: set_related_article_id,
noresults: "Nothing found!"
};
var as = new AutoSuggest('wiki_related_input', options);
if (typeof x == 'function')
x();
}
%endif
</script>
<script type="text/x-mathjax-config">
MathJax.Hub.Config({
tex2jax: {inlineMath: [ ['$','$'], ["\\(","\\)"]],
displayMath: [ ['$$','$$'], ["\\[","\\]"]]}
});
</script> <script type="text/javascript" src="/static/lib/mathjax/MathJax.js?config=TeX-AMS_HTML-full"></script>
<script>
$(function(){
$.ajaxSetup ({
// Disable caching of AJAX responses
cache: false
});
$(".div_wiki_circuit").each(function(d,e) {
id = $(this).attr("id");
name = id.substring(17);
//alert(name);
$("#"+id).load("/edit_circuit/"+name);
f=this;
});
$("#wiki_create_form").hide();
$("#create-article").click(function() {
$("#wiki_create_form").slideToggle();
$(this).parent().toggleClass("active");
});
update_schematics();});
</script>
<%block name="bodyextra">
<%block name="wiki_head"/>
</%block>
<%include file="navigation.html" />
<section class="main-content">
<div class="wiki-wrapper">
<%block name="wiki_panel">
<div id="wiki_panel">
<%
if (wiki_article is not UNDEFINED):
baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
else:
baseURL = reverse("wiki_view", args=[""])
%>
<ul class="action">
<li>
<div class="wiki_box_title">Search</div>
<form method="POST" action='${reverse("wiki_search_articles", args=[""])}'>
<div style="display:none">
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
</div>
<input type="text" name="value" id="wiki_search_input" style="width: 72%" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/>
<input type="submit" id="wiki_search_input_submit" value=Go! style="width: 20%" />
</form>
</li>
<li>
<input type="button" onclick="javascript:location.href='${reverse("wiki_random", args=["wiki_articleget_url"])}'" value="Random article" class="button" />
</li>
<li class="create-article">
<h3>
<a href="#" id="create-article"/>Create Article</a>
</h3>
<div id="wiki_create_form">
<%
theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')+'/_create/'"
if (wiki_article is not UNDEFINED):
baseURL = reverse("wiki_view", args=[wiki_article.get_url()])
else:
baseURL = reverse("wiki_view", args=[""])
%>
<form method="GET" onsubmit="this.action='${baseURL + "/' + " + theaction};">
<div>
<label for="id_wiki_article_name">Title of article</label>
<input type="text" name="wiki_article_name" id="id_wiki_article_name" /><br/>
<!-- <label for="id_wiki_article_is_child">Create as a child of current article</label> -->
<!-- <input type="checkbox" name="wiki_article_is_child" id="id_wiki_artcile_is_child" disabled="true" ${ 'checked="checked"' if wiki_article is not UNDEFINED else ""}> -->
</div>
<ul>
<li>
<input type="submit" class="button" value="Create" style="display: inline-block; margin-right: 2px; font-weight: bold;" />
</li>
</ul>
</form>
</div>
</li>
</ul>
</div>
</%block>
<section class="wiki-body">
<header>
%if wiki_article is not UNDEFINED:
%if wiki_article.locked:
<p><strong>This article has been locked</strong></p>
%endif
<p>Last modified: ${wiki_article.modified_on.strftime("%b %d, %Y, %I:%M %p")}</p>
%endif
%if wiki_article is not UNDEFINED:
<ul>
<li>
<input type="button" onclick="javascript:location.href='${reverse("wiki_view", args=[wiki_article.get_url()])}'" value="View" />
</li>
<li>
<input type="button" onclick="javascript:location.href='${reverse("wiki_edit", args=[wiki_article.get_url()])}'" value="Edit" ${'disabled="true"' if not wiki_write else ""}/>
</li>
<li>
<input type="button" onclick="javascript:location.href='${reverse("wiki_history", args=[wiki_article.get_url(),1])}'" value="History" class="button" />
</li>
</ul>
%endif
</header>
<h1 class="wiki-title"><%block name="wiki_page_title"/></h1>
<%block name="wiki_body"/>
</section>
</div>
</section>
</%block>
simplewiki_create.html
...@@ -5,17 +5,15 @@ ...@@ -5,17 +5,15 @@
<%block name="wiki_page_title"> <%block name="wiki_page_title">
Create article Create article
</%block> </%block>
<%block name="wiki_body"> <%block name="wiki_body">
<form method="POST" id="wiki_revision"> <form method="POST" id="wiki_revision">
<div style="display:none"> <div style="display:none">
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/> <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
</div> </div>
<table id="wiki_revision_table">
${ wiki_form } ${ wiki_form }
<tr>
<td colspan="2" align="right">
<input type="submit" value="Create article" /></td> <input type="submit" value="Create article" /></td>
</tr>
</table>
</form> </form>
</%block> </%block>
simplewiki_edit.html
...@@ -11,12 +11,9 @@ ${ wiki_article.title } ...@@ -11,12 +11,9 @@ ${ wiki_article.title }
<div style="display:none"> <div style="display:none">
<input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/> <input type="hidden" name="csrfmiddlewaretoken" value="${csrf_token}"/>
</div> </div>
<table id="wiki_revision_table">
${wiki_form} ${wiki_form}
<tr>
<td colspan="2" align="right">
<input type="submit" value="Edit article" /></td> <input type="submit" value="Edit article" /></td>
</tr>
</table>
</form> </form>
</%block> </%block>
simplewiki_error.html
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%!
from django.core.urlresolvers import reverse
%>
<%block name="wiki_page_title"> <%block name="wiki_page_title">
Oops... Oops...
</%block> </%block>
......
simplewiki_history.html
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%!
from django.core.urlresolvers import reverse
%>
<%block name="wiki_page_title"> <%block name="wiki_page_title">
${ wiki_article.title } ${ wiki_article.title }
</%block> </%block>
......
simplewiki_searchresults.html
...@@ -2,6 +2,10 @@ ...@@ -2,6 +2,10 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%!
from django.core.urlresolvers import reverse
%>
<%block name="wiki_page_title"> <%block name="wiki_page_title">
%if wiki_search_query: %if wiki_search_query:
Search results for ${wiki_search_query | h} Search results for ${wiki_search_query | h}
...@@ -12,7 +16,7 @@ ...@@ -12,7 +16,7 @@
<%block name="wiki_body"> <%block name="wiki_body">
%for article in wiki_search_results: %for article in wiki_search_results:
%if article.get_url: %if article is not UNDEFINED:
<a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()}</a><br/> <a href="${reverse("wiki_view", args=[article.get_url()])}">${article.get_url()}</a><br/>
%else: %else:
<a href="${reverse("wiki_view", args=[''])}">/</a><br/> <a href="${reverse("wiki_view", args=[''])}">/</a><br/>
...@@ -20,6 +24,6 @@ ...@@ -20,6 +24,6 @@
%endfor %endfor
%if not wiki_search_results: %if not wiki_search_results:
No articles were found! No articles matching <b>${wiki_search_query if wiki_search_query is not UNDEFINED else ""} </b>!
%endif %endif
</%block> </%block>
simplewiki_updateprogressbar.html
##This file is based on the template from the SimpleWiki source which carries the GPL license ##This file is based on the template from the SimpleWiki source which carries the GPL license
##This file has been converted to Mako, but not tested. It is because uploads are disabled for the wiki. If they are reenabled, this may contain bugs.
<%! <%!
from django.template.defaultfilters import filesizeformat from django.template.defaultfilters import filesizeformat
%> %>
......
simplewiki_view.html
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
<%inherit file="simplewiki_base.html"/> <%inherit file="simplewiki_base.html"/>
<%block name="wiki_page_title"> <%block name="wiki_page_title">
${ wiki_article.title } ${ wiki_article.title }
</%block> </%block>
<%block name="wiki_body">
<div id="wiki_article"> <%block name="wiki_body">
<div id="wiki_article">
${ wiki_article.current_revision.contents_parsed| n} ${ wiki_article.current_revision.contents_parsed| n}
</div> </div>
</%block> </%block>
textinput.html 0 → 100644
<span>
<input type="text" name="input_${id}" id="input_${id}" value="${value}" />
<span id="answer_${id}"></span>
% if state == 'unsubmitted':
<span class="ui-icon ui-icon-bullet" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'correct':
<span class="ui-icon ui-icon-check" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'incorrect':
<span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
% elif state == 'incomplete':
<span class="ui-icon ui-icon-close" style="display:inline-block;" id="status_${id}"></span>
% endif
</span>
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