summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--yaksh/templates/exam.html28
-rw-r--r--yaksh/templates/yaksh/complete.html16
-rw-r--r--yaksh/templates/yaksh/question.html19
-rw-r--r--yaksh/templates/yaksh/quit.html16
-rw-r--r--yaksh/templates/yaksh/show_video.html31
5 files changed, 37 insertions, 73 deletions
diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 29ad167..51c2eca 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -24,8 +24,7 @@
{% endif %}
<span class="fa fa-power-off"></span></button></span>
</form>
-
- </div>
+ </div>
</div><!-- /.navbar -->
</div><!-- /.container -->
</nav><!-- /.navbar -->
@@ -57,7 +56,7 @@
{% endif %}
{% endif %}
{% if qid in paper.get_questions_answered %}
- <a class=" btn btn-outline-success " style="background-color:#B4B8BA;" href="#" data-toggle="tooltip"
+ <a class=" btn btn-outline-light " style="background-color:#B4B8BA;" href="#" data-toggle="tooltip"
onclick="call_skip('{{ URL_ROOT }}/exam/{{ question.id }}/skip/{{ qid.id }}/{{ paper.attempt_number }}/{{ module.id }}/{{ paper.question_paper.id }}/{{course.id}}/')"
title="{{ qid.description }}">{{ forloop.counter }}</a>
{% endif %}
@@ -112,26 +111,3 @@
</div>
{% endblock %}
-
-{% block footer %}
- <!--footer-->
- <footer class="container-fluid yakshsidebarfooter text-center">
- <div class="row justify-content-center">
- <div class="col-sm-5 ">
- {% if user %}
- {% block info %}
- <b>{{user.get_full_name|title}}</b> with Roll no. <b>{{user.profile.roll_number}}</b> is logged in as <b>{{user.username}}</b>
- {% endblock %}
- {% endif %}
- </div>
- <div class="col-sm-2">
- |
- </div>
- <div class="col-sm-4 text-left">
- <b>Any Queries?</b> Email : info@fossee.in
- </div>
- </div>
- </footer>
- <!--footer end-->
-{% endblock %}
-
diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index cced41c..f753933 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -1,11 +1,15 @@
{% extends "base.html" %}
-{% block pagetitle %}
-<div class="yakshnav fixed-top" style=" padding-top: 0.5%;padding-bottom: 0.5%;">
- <a class="navbar-brand" href="{{ URL_ROOT }}/exam/" >
- <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
- </img>
- </a>
+{% block nav %}
+<div class="container-fluid yakshnav">
+ <nav class="navbar fixed-top navbar-expand-lg yakshheading yakshnav">
+ <div class="container">
+ <a class="navbar-brand">
+ <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px">
+ </img>
+ </a>
+ </div><!-- /.container -->
+ </nav><!-- /.navbar -->
</div>
{% endblock %}
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index da77702..5a408c5 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -122,8 +122,8 @@ question_type = "{{ question.type }}"
<div class="card ">
<div class="col-md-12 bg-light">
<div class="row align-items-center ">
- <div class="col yakshheading"> {{ question.summary }} </div>
- <div class="col-md-4 ml-auto yakshwell text-center">
+ <div class="col-md-6 yakshheading"> {{ question.summary }} </div>
+ <div class="col-md-3 ml-auto yakshwell text-center">
{% if question.type == "mcq" %}
SINGLE CORRECT CHOICE
{% elif question.type == "mcc" %}
@@ -147,8 +147,19 @@ question_type = "{{ question.type }}"
ARRANGE THE OPTIONS IN CORRECT ORDER
{% endif %}
</div>
- <div class="col-md-1 ml-auto text-center">
- <span class="badge badge-warning">{{ question.points }}</span><br>Marks
+ <div class="col-md-2 ml-auto text-center">
+ <div class="row">
+ <div class="col-md-6">
+ <h5>
+ <span class="badge badge-warning">
+ {{ question.points }} Marks
+ </span>
+ </h5>
+ </div>
+<!-- <div class="col-md-6">
+ <h5>Marks</h5>
+ </div> -->
+ </div>
</div>
</div>
</div>
diff --git a/yaksh/templates/yaksh/quit.html b/yaksh/templates/yaksh/quit.html
index 3d22746..af7d494 100644
--- a/yaksh/templates/yaksh/quit.html
+++ b/yaksh/templates/yaksh/quit.html
@@ -1,11 +1,15 @@
{% extends "base.html" %}
-{% block pagetitle %}
-<div class="yakshnav fixed-top" style=" padding-top: 0.5%;padding-bottom: 0.5%;">
- <a class="navbar-brand" href="{{ URL_ROOT }}/exam/" >
- <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
- </img>
- </a>
+{% block nav %}
+<div class="container-fluid yakshnav">
+ <nav class="navbar fixed-top navbar-expand-lg yakshheading yakshnav">
+ <div class="container">
+ <a class="navbar-brand">
+ <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px">
+ </img>
+ </a>
+ </div><!-- /.container -->
+ </nav><!-- /.navbar -->
</div>
{% endblock %}
diff --git a/yaksh/templates/yaksh/show_video.html b/yaksh/templates/yaksh/show_video.html
index 9f92bc3..9d24b44 100644
--- a/yaksh/templates/yaksh/show_video.html
+++ b/yaksh/templates/yaksh/show_video.html
@@ -94,37 +94,6 @@
{% if learning_module.html_data%}
{% endif %}
</div>
- <div class="yakshwell col-md-3">
- <div class="bg-light">
- {% if learning_module.get_learning_units %}
- <center><h4>Units in this module</h4></center><hr>
- {% for unit in learning_module.get_learning_units %}
- <div class="row justify-content-center">
- <span class="col-sm-2 yakshgreen">
- {% if unit.type == "quiz" %}
- {% if unit.quiz.is_exercise %}
- <span class="fa fa-pencil"></span>
- {% else %}
- <span class="fa fa-puzzle-piece"></span>
- {% endif %}
- {% else %}
- <span class="fa fa-book"></span>
- {% endif %}
- </span>
- <span class="col-sm-7">
- {% if unit.type == "quiz" %}
- {{unit.quiz.description}}
- {% else %}
- {{unit.lesson.name}}
- {% endif %}
- </span>
- </div>
- {% endfor %}
- {% else %}
- <center><h3>No Lessons/Quizzes Found</h3></center>
- {% endif %}
- </div>
- </div>
</div>
<div class="yakshwell text-center">
{% if first_unit %}
generated by cgit (git 2.34.1) at 2024-12-21 05:56:44 +0000