diff options
Diffstat (limited to 'testapp/yaksh_app/templates')
6 files changed, 7 insertions, 43 deletions
diff --git a/testapp/yaksh_app/templates/yaksh_app/add_question.html b/testapp/yaksh_app/templates/yaksh_app/add_question.html index bc0fd4c..4b2d097 100644 --- a/testapp/yaksh_app/templates/yaksh_app/add_question.html +++ b/testapp/yaksh_app/templates/yaksh_app/add_question.html @@ -9,15 +9,8 @@ {% endblock %} {% block script %} -<<<<<<< HEAD:testapp/exam/templates/exam/add_question.html -<script type="text/javascript" src="{{ URL_ROOT }}/static/exam/js/jquery-1.4.2.min.js"></script> -<script src="{{ URL_ROOT }}/static/exam/js/add_question.js"></script> -======= -<script type="text/javascript" src="{{ URL_ROOT }}/static/yaksh_app/js/min.js"></script> -<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script> -<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script> +<script type="text/javascript" src="{{ URL_ROOT }}/static/yaksh_app/js/jquery-1.4.2.min.js"></script> <script src="{{ URL_ROOT }}/static/yaksh_app/js/add_question.js"></script> ->>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/add_question.html {% endblock %} {% block onload %} onload='javascript:textareaformat();' {% endblock %} diff --git a/testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html b/testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html index 44b37ba..049abbe 100644 --- a/testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html +++ b/testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html @@ -8,14 +8,8 @@ <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" /> {% endblock %} {% block script %} -<<<<<<< HEAD:testapp/exam/templates/exam/add_questionpaper.html -<script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script> -<script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script> -======= -<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script> -<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script> +<script src="/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script> <script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script> ->>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/add_questionpaper.html {% endblock %} {% block manage %} diff --git a/testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html b/testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html index 8a82fa0..f9c222a 100644 --- a/testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html +++ b/testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html @@ -14,14 +14,8 @@ select </style> {% endblock %} {% block script %} -<<<<<<< HEAD:testapp/exam/templates/exam/automatic_questionpaper.html -<script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script> -<script src="{{ URL_ROOT }}/static/exam/js/add_questionpaper.js"></script> -======= -<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script> -<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script> +<script src="/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script> <script src="{{ URL_ROOT }}/static/yaksh_app/js/add_questionpaper.js"></script> ->>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/automatic_questionpaper.html {% endblock %} {% block manage %} diff --git a/testapp/yaksh_app/templates/yaksh_app/edit_question.html b/testapp/yaksh_app/templates/yaksh_app/edit_question.html index c95ce60..7aad7de 100644 --- a/testapp/yaksh_app/templates/yaksh_app/edit_question.html +++ b/testapp/yaksh_app/templates/yaksh_app/edit_question.html @@ -7,14 +7,8 @@ <link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh_app/css/autotaggit.css" /> {% endblock %} {% block script %} -<<<<<<< HEAD:testapp/exam/templates/exam/edit_question.html -<script src="{{ URL_ROOT }}/static/exam/js/edit_question.js"></script> -<script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script> -======= <script src="{{ URL_ROOT }}/static/yaksh_app/js/edit_question.js"></script> -<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script> -<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script> ->>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/edit_question.html +<script src="/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script> {% endblock %} {% block onload %} onload = 'javascript:textareaformat();' {% endblock %} diff --git a/testapp/yaksh_app/templates/yaksh_app/question.html b/testapp/yaksh_app/templates/yaksh_app/question.html index 6a26527..8b43fff 100644 --- a/testapp/yaksh_app/templates/yaksh_app/question.html +++ b/testapp/yaksh_app/templates/yaksh_app/question.html @@ -10,16 +10,9 @@ {% endblock %} {% block script %} -<<<<<<< HEAD:testapp/exam/templates/exam/question.html -<script src="/static/exam/js/jquery-1.4.2.min.js" type="text/javascript"></script> -<script src="{{ URL_ROOT }}/static/exam/js/question.js"></script> -<script src="{{ URL_ROOT }}/static/exam/js/bootstrap-modal.js"></script> -======= -<script src="/static/taggit_autocomplete_modified/jquery.min.js" type="text/javascript"></script> -<script src="/static/taggit_autocomplete_modified/jquery.autocomplete.js" type="text/javascript"></script> +<script src="/static/yaksh_app/js/jquery-1.4.2.min.js" type="text/javascript"></script> <script src="{{ URL_ROOT }}/static/yaksh_app/js/question.js"></script> <script src="{{ URL_ROOT }}/static/yaksh_app/js/bootstrap-modal.js"></script> ->>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/question.html <script> var time_left = {{ time_left }} diff --git a/testapp/yaksh_app/templates/yaksh_app/showquestions.html b/testapp/yaksh_app/templates/yaksh_app/showquestions.html index f0b53bc..0c8f9a4 100644 --- a/testapp/yaksh_app/templates/yaksh_app/showquestions.html +++ b/testapp/yaksh_app/templates/yaksh_app/showquestions.html @@ -4,13 +4,9 @@ {% block subtitle %}List of Questions {% endblock %} {% block script %} -<<<<<<< HEAD:testapp/exam/templates/exam/showquestions.html -<script src="{{ URL_ROOT }}/static/exam/js/min.js"></script> -<script src="{{ URL_ROOT }}/static/exam/js/show_question.js"></script> -<script src="{{ URL_ROOT }}/static/exam/js/question_filter.js"></script> -======= +<script src="{{ URL_ROOT }}/static/yaksh_app/js/min.js"></script> <script src="{{ URL_ROOT }}/static/yaksh_app/js/show_question.js"></script> ->>>>>>> Change app name to yaksh:testapp/yaksh_app/templates/yaksh_app/showquestions.html +<script src="{{ URL_ROOT }}/static/yaksh_app/js/question_filter.js"></script> {% endblock %} {% block manage %} |