summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--testapp/production.py1
-rw-r--r--testapp/static/exam/js/add_question.js65
-rw-r--r--testapp/static/exam/js/edit_question.js70
-rw-r--r--testapp/static/exam/js/question.js68
-rw-r--r--testapp/static/exam/js/show_quiz.js2
5 files changed, 103 insertions, 103 deletions
diff --git a/testapp/production.py b/testapp/production.py
index 636785f..312e838 100644
--- a/testapp/production.py
+++ b/testapp/production.py
@@ -2,6 +2,7 @@ from testapp.settings import *
DEBUG=False
TEMPLATE_DEBUG=DEBUG
+from testapp.local import *
DATABASE_ENGINE = 'django.db.backends.mysql'
DATABASE_NAME = 'online_test'
diff --git a/testapp/static/exam/js/add_question.js b/testapp/static/exam/js/add_question.js
index a77e392..e001ee7 100644
--- a/testapp/static/exam/js/add_question.js
+++ b/testapp/static/exam/js/add_question.js
@@ -26,16 +26,16 @@ function setSelectionRange(input, selectionStart, selectionEnd)
{
if (input.setSelectionRange)
{
- input.focus();
- input.setSelectionRange(selectionStart, selectionEnd);
+ input.focus();
+ input.setSelectionRange(selectionStart, selectionEnd);
}
else if (input.createTextRange)
{
- var range = input.createTextRange();
- range.collapse(true);
- range.moveEnd('character', selectionEnd);
- range.moveStart('character', selectionStart);
- range.select();
+ var range = input.createTextRange();
+ range.collapse(true);
+ range.moveEnd('character', selectionEnd);
+ range.moveStart('character', selectionStart);
+ range.select();
}
}
@@ -43,31 +43,31 @@ function replaceSelection (input, replaceString)
{
if (input.setSelectionRange)
{
- var selectionStart = input.selectionStart;
- var selectionEnd = input.selectionEnd;
- input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd);
- if (selectionStart != selectionEnd)
- {
- setSelectionRange(input, selectionStart, selectionStart + replaceString.length);
- }
- else
- {
- setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length);
- }
+ var selectionStart = input.selectionStart;
+ var selectionEnd = input.selectionEnd;
+ input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd);
+ if (selectionStart != selectionEnd)
+ {
+ setSelectionRange(input, selectionStart, selectionStart + replaceString.length);
+ }
+ else
+ {
+ setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length);
+ }
}
else if (document.selection)
{
- var range = document.selection.createRange();
- if (range.parentElement() == input)
- {
- var isCollapsed = range.text == '';
- range.text = replaceString;
- if (!isCollapsed)
- {
- range.moveStart('character', -replaceString.length);
- range.select();
- }
- }
+ var range = document.selection.createRange();
+ if (range.parentElement() == input)
+ {
+ var isCollapsed = range.text == '';
+ range.text = replaceString;
+ if (!isCollapsed)
+ {
+ range.moveStart('character', -replaceString.length);
+ range.select();
+ }
+ }
}
}
@@ -97,7 +97,8 @@ function textareaformat()
setTimeout(document.getElementById('id_snippet'),0);
return false;
}
- });
+ });
+
$('#id_description').bind('focus', function( event ){
document.getElementById("id_description").rows=5;
document.getElementById("id_description").cols=40;
@@ -121,21 +122,21 @@ function textareaformat()
document.getElementById("id_test").rows=1;
document.getElementById("id_test").cols=40;
});
+
$('#id_options').bind('focus', function( event ){
document.getElementById("id_options").rows=5;
document.getElementById("id_options").cols=40;
});
-
$('#id_options').bind('blur', function( event ){
document.getElementById("id_options").rows=1;
document.getElementById("id_options").cols=40;
});
+
$('#id_snippet').bind('focus', function( event ){
document.getElementById("id_snippet").rows=5;
document.getElementById("id_snippet").cols=40;
$('#id_snippet').val("");
});
-
$('#id_snippet').bind('blur', function( event ){
document.getElementById("id_snippet").rows=1;
document.getElementById("id_snippet").cols=40;
diff --git a/testapp/static/exam/js/edit_question.js b/testapp/static/exam/js/edit_question.js
index 2cf304c..a5d4e2b 100644
--- a/testapp/static/exam/js/edit_question.js
+++ b/testapp/static/exam/js/edit_question.js
@@ -50,16 +50,16 @@ function setSelectionRange(input, selectionStart, selectionEnd)
{
if (input.setSelectionRange)
{
- input.focus();
- input.setSelectionRange(selectionStart, selectionEnd);
+ input.focus();
+ input.setSelectionRange(selectionStart, selectionEnd);
}
else if (input.createTextRange)
{
- var range = input.createTextRange();
- range.collapse(true);
- range.moveEnd('character', selectionEnd);
- range.moveStart('character', selectionStart);
- range.select();
+ var range = input.createTextRange();
+ range.collapse(true);
+ range.moveEnd('character', selectionEnd);
+ range.moveStart('character', selectionStart);
+ range.select();
}
}
@@ -67,31 +67,31 @@ function replaceSelection (input, replaceString)
{
if (input.setSelectionRange)
{
- var selectionStart = input.selectionStart;
- var selectionEnd = input.selectionEnd;
- input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd);
- if (selectionStart != selectionEnd)
- {
- setSelectionRange(input, selectionStart, selectionStart + replaceString.length);
- }
- else
- {
- setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length);
- }
+ var selectionStart = input.selectionStart;
+ var selectionEnd = input.selectionEnd;
+ input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd);
+ if (selectionStart != selectionEnd)
+ {
+ setSelectionRange(input, selectionStart, selectionStart + replaceString.length);
+ }
+ else
+ {
+ setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length);
+ }
}
else if (document.selection)
{
- var range = document.selection.createRange();
- if (range.parentElement() == input)
- {
- var isCollapsed = range.text == '';
- range.text = replaceString;
- if (!isCollapsed)
- {
- range.moveStart('character', -replaceString.length);
- range.select();
- }
- }
+ var range = document.selection.createRange();
+ if (range.parentElement() == input)
+ {
+ var isCollapsed = range.text == '';
+ range.text = replaceString;
+ if (!isCollapsed)
+ {
+ range.moveStart('character', -replaceString.length);
+ range.select();
+ }
+ }
}
}
@@ -104,7 +104,7 @@ function data(showContent,showHideDiv,a,summary)
{
con.style.display = "none"
ele.style.display = "none";
- atag.text = summary;
+ atag.text = summary;
}
else
{
@@ -179,17 +179,17 @@ function catchTab(item,e)
{
if(navigator.userAgent.match("Gecko"))
{
- c=e.which;
+ c=e.which;
}
else
{
- c=e.keyCode;
+ c=e.keyCode;
}
if(c==9)
{
- replaceSelection(item,String.fromCharCode(9));
- setTimeout("document.getElementById('"+item.id+"').focus();",0);
- return false;
+ replaceSelection(item,String.fromCharCode(9));
+ setTimeout("document.getElementById('"+item.id+"').focus();",0);
+ return false;
}
}
diff --git a/testapp/static/exam/js/question.js b/testapp/static/exam/js/question.js
index dc37ea4..cb6807e 100644
--- a/testapp/static/exam/js/question.js
+++ b/testapp/static/exam/js/question.js
@@ -13,16 +13,16 @@ function setSelectionRange(input, selectionStart, selectionEnd)
{
if (input.setSelectionRange)
{
- input.focus();
- input.setSelectionRange(selectionStart, selectionEnd);
+ input.focus();
+ input.setSelectionRange(selectionStart, selectionEnd);
}
else if (input.createTextRange)
{
- var range = input.createTextRange();
- range.collapse(true);
- range.moveEnd('character', selectionEnd);
- range.moveStart('character', selectionStart);
- range.select();
+ var range = input.createTextRange();
+ range.collapse(true);
+ range.moveEnd('character', selectionEnd);
+ range.moveStart('character', selectionStart);
+ range.select();
}
}
@@ -30,31 +30,31 @@ function replaceSelection (input, replaceString)
{
if (input.setSelectionRange)
{
- var selectionStart = input.selectionStart;
- var selectionEnd = input.selectionEnd;
- input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd);
- if (selectionStart != selectionEnd)
- {
- setSelectionRange(input, selectionStart, selectionStart + replaceString.length);
- }
- else
- {
- setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length);
- }
+ var selectionStart = input.selectionStart;
+ var selectionEnd = input.selectionEnd;
+ input.value = input.value.substring(0, selectionStart)+ replaceString + input.value.substring(selectionEnd);
+ if (selectionStart != selectionEnd)
+ {
+ setSelectionRange(input, selectionStart, selectionStart + replaceString.length);
+ }
+ else
+ {
+ setSelectionRange(input, selectionStart + replaceString.length, selectionStart + replaceString.length);
+ }
}
else if (document.selection)
{
- var range = document.selection.createRange();
- if (range.parentElement() == input)
- {
- var isCollapsed = range.text == '';
- range.text = replaceString;
- if (!isCollapsed)
- {
- range.moveStart('character', -replaceString.length);
- range.select();
- }
- }
+ var range = document.selection.createRange();
+ if (range.parentElement() == input)
+ {
+ var isCollapsed = range.text == '';
+ range.text = replaceString;
+ if (!isCollapsed)
+ {
+ range.moveStart('character', -replaceString.length);
+ range.select();
+ }
+ }
}
}
@@ -62,17 +62,17 @@ function catchTab(item,e)
{
if(navigator.userAgent.match("Gecko"))
{
- c=e.which;
+ c=e.which;
}
else
{
- c=e.keyCode;
+ c=e.keyCode;
}
if(c==9)
{
- replaceSelection(item,String.fromCharCode(9));
- setTimeout("document.getElementById('"+item.id+"').focus();",0);
- return false;
+ replaceSelection(item,String.fromCharCode(9));
+ setTimeout("document.getElementById('"+item.id+"').focus();",0);
+ return false;
}
}
diff --git a/testapp/static/exam/js/show_quiz.js b/testapp/static/exam/js/show_quiz.js
index 2e6e2de..c58feaa 100644
--- a/testapp/static/exam/js/show_quiz.js
+++ b/testapp/static/exam/js/show_quiz.js
@@ -38,6 +38,4 @@ function confirm_edit(frm)
}
else
return true;
-
-
}