diff options
| author | prathamesh | 2021-03-23 14:57:23 +0530 |
|---|---|---|
| committer | prathamesh | 2021-03-23 14:57:23 +0530 |
| commit | fc070aeab4322cfe34f6074ae1fc07db42be0fe6 (patch) | |
| tree | 589bcd30c7d00e5d060e1161fa8583e84f6c3f99 /grades | |
| parent | f5224d8d1866122ad2ecfb3118ffd724c4dd3cf8 (diff) | |
| parent | 6fda19daaa06482b8eb52eeb62f9b0a15d0a3da6 (diff) | |
| download | online_test-fc070aeab4322cfe34f6074ae1fc07db42be0fe6.tar.gz online_test-fc070aeab4322cfe34f6074ae1fc07db42be0fe6.tar.bz2 online_test-fc070aeab4322cfe34f6074ae1fc07db42be0fe6.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into add-test-cases-for-QRcode-based-upload
Diffstat (limited to 'grades')
| -rw-r--r-- | grades/templates/add_grades.html | 15 | ||||
| -rw-r--r-- | grades/templates/grading_systems.html | 6 |
2 files changed, 15 insertions, 6 deletions
diff --git a/grades/templates/add_grades.html b/grades/templates/add_grades.html index 198eb4b..29da212 100644 --- a/grades/templates/add_grades.html +++ b/grades/templates/add_grades.html @@ -1,9 +1,14 @@ {% extends "manage.html" %} +{% load static %} {% load custom_filters %} {% block title %} Add/Edit Grading {% endblock %} {% block pagetitle %} Add/Edit Grading {% endblock %} -{% block main %} -<html> +{% block script %} + <script type="text/javascript" src="{% static 'yaksh/js/tinymce/js/tinymce/tinymce.min.js' %}"></script> + <script type="text/javascript" src="{% static 'yaksh/js/add_grades.js' %}"></script> +{% endblock %} +{% block content %} +<div class="container-fluid"> <div class="row"> <div class="col-md-8"> <ul class="nav nav-pills" id="course_tabs"> @@ -26,6 +31,7 @@ </div> </div> <hr> +<div class="container"> <a href="{% url 'grades:grading_systems'%}" class="btn btn-primary btn-lg"> View Grading Systems </a> @@ -84,7 +90,6 @@ {{ hidden }} {% endfor %} <b><u>Grade Range {{forloop.counter}}.</u></b> - <div class="container"> <div class="row"> {% for field in form.visible_fields %} <div class="col-sm-3"> @@ -95,7 +100,6 @@ </div> {% endfor %} </div> - </div> {% endfor %} </div> </table> @@ -109,5 +113,6 @@ {% endif %} <br><br> </form> -</html> +</div> +</div> {% endblock %} diff --git a/grades/templates/grading_systems.html b/grades/templates/grading_systems.html index 46b3d30..841b1ad 100644 --- a/grades/templates/grading_systems.html +++ b/grades/templates/grading_systems.html @@ -1,8 +1,9 @@ {% extends "manage.html" %} {% block title %} View Grading Systems {% endblock %} {% block pagetitle %} View Grading Systems {% endblock %} -{% block main %} +{% block content %} <html> +<div class="container-fluid"> <div class="row"> <div class="col-md-8"> <ul class="nav nav-pills" id="course_tabs"> @@ -25,6 +26,7 @@ </div> </div> <hr> + <div class="container"> <a href="{% url 'grades:add_grade' %}" class="btn btn-success btn-lg"> <span class=" fa fa-plus-circle"></span> Add a Grading System </a> @@ -95,5 +97,7 @@ {% endfor %} </table> {% endif %} + </div> +</div> </html> {% endblock %} |