diff options
Diffstat (limited to 'yaksh/templates')
| -rw-r--r-- | yaksh/templates/base.html | 1 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/design_course_session.html | 2 | ||||
| -rw-r--r-- | yaksh/templates/yaksh/design_questionpaper.html | 61 |
3 files changed, 35 insertions, 29 deletions
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html index e5d1a56..5fd53a1 100644 --- a/yaksh/templates/base.html +++ b/yaksh/templates/base.html @@ -62,6 +62,7 @@ <div class="header"> <h3><center>{% block pagetitle %}{% endblock pagetitle %}</center></h3> </div> + <h4><center>{% block subtitle %}{% endblock %}</center></h4> {% block content %} {% endblock %} </div> diff --git a/yaksh/templates/yaksh/design_course_session.html b/yaksh/templates/yaksh/design_course_session.html index c2f4b2b..2deb95f 100644 --- a/yaksh/templates/yaksh/design_course_session.html +++ b/yaksh/templates/yaksh/design_course_session.html @@ -18,6 +18,8 @@ <a href="{{URL_ROOT}}/exam/manage/courses/" class="btn btn-primary"> Back to Courses </a> +<br/> +<br/> <form action="{{URL_ROOT}}/exam/manage/courses/designcourse/{{course_id}}/" method="POST" id="design_course_form"> {% csrf_token %} <div class="tab-pane active" id="available-lesson-quiz"> diff --git a/yaksh/templates/yaksh/design_questionpaper.html b/yaksh/templates/yaksh/design_questionpaper.html index 791ac51..bf1f23e 100644 --- a/yaksh/templates/yaksh/design_questionpaper.html +++ b/yaksh/templates/yaksh/design_questionpaper.html @@ -15,9 +15,9 @@ select {% endblock %} {% block script %} - <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-1.9.1.min.js"></script> - <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap.js"></script> - <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap-tabs.js"></script> + <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-3.3.1.min.js"></script> + <script src="{{ URL_ROOT }}/static/yaksh/js/jquery-ui.js"></script> + <script src="{{ URL_ROOT }}/static/yaksh/js/bootstrap.min.js"></script> <script src="{{ URL_ROOT }}/static/yaksh/js/question_paper_creation.js"></script> {% endblock %} @@ -34,33 +34,36 @@ select {% csrf_token %} <input type=hidden name="is_active" id="is_active" value="{{ state }}"> <center><b>Manual mode to design the {{lang}} Question Paper</center><br> - <ul class="nav nav-tabs tabs" data-tabs="tabs"> - <li class="active" id="fixed-tab"> - <a href="#fixed-questions" id="fixed"> - STEP 1<br> - Add Fixed Questions - </a> - </li> - <li id="random-tab"> - <a href="#random-questions" id="random"> - STEP 2<br> - Add Random Questions - </a> - </li> - <li id="finish-tab"> - <a href="#finish" id="finished"> - STEP 3<br> - Finish - </a></li> -</ul> - + <div class = "tab-base"> + <ul class="nav nav-pills tabs"> + <li id="fixed-tab"> + <a data-toggle="tab" href="#fixed-questions" class = "nav-link active" id="fixed"> + STEP 1<br> + Add Fixed Questions + </a> + </li> + <li id="random-tab"> + <a data-toggle="tab" href="#random-questions" class = "nav-link" id="random"> + STEP 2<br> + Add Random Questions + </a> + </li> + <li id="finish-tab"> + <a data-toggle="tab" href="#finish" class = "nav-link" id="finished"> + STEP 3<br> + Finish + </a></li> + </ul> + </div> <div> <h3>Total Marks: <span id="total_marks" class="well"> {{ qpaper.total_marks }} </span></h3> </div> <div class="tab-content"> <!-- common to fixed and random questions --> <div class="row" id="selectors"> - <h5 style="padding-left: 20px;">Please select Question type and Marks</h5> + <div class = "col-md-8"> + <h5>Please select Question type and Marks</h5> + </div> <div class="col-md-6"> {{ filter_form.question_type }} </div> @@ -71,12 +74,12 @@ select <br><br> {% csrf_token %} <div class="tab-pane active" id="fixed-questions"> - <h4 style="padding-left: 20px;">Or</h4> + <h4>Or</h4> <!-- Search questions using tags --> - <h4 style="padding-left: 20px;">Search using Tags: </h4> + <h4>Search using Tags: </h4> + <span class="input-group-addon" id="basic-addon1">Search Questions: </span> <div class="col-md-14"> <div class="input-group"> - <span class="input-group-addon" id="basic-addon1">Search Questions </span> <input type="text" id="question_tags" name="question_tags" class="form-control" placeholder="Search using comma separated Tags"> <span class="input-group-btn"> @@ -118,7 +121,7 @@ select {% endif %} </div> <br /><br /> - <button id="add-fixed" name="add-fixed" class="btn small primary pull-right" type="submit">Add to paper</button> + <button id="add-fixed" name="add-fixed" class="btn small btn-primary pull-right" type="submit">Add to paper</button> </div> </div> <div class="col-md-6"> @@ -145,7 +148,7 @@ select </div> <!-- /.row --> <br> <div class="pull-right"> - <a class="btn btn-primary" id="fixed-next">Next ></a> + <a class="btn btn-info" id="fixed-next">Next ></a> </div> </div> <!-- /#fixed-questions --> |