summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorankitjavalkar2019-02-25 15:29:10 +0530
committerankitjavalkar2019-02-27 15:35:08 +0530
commit2880788d3743dd5c45b363ee80a2a4d4742d1253 (patch)
treef12615cac6ec3a4c6346866e58d8df4eafac28ef
parented05c25abc3a09152c6cf5196034cfefb6ec4fa6 (diff)
downloadonline_test-2880788d3743dd5c45b363ee80a2a4d4742d1253.tar.gz
online_test-2880788d3743dd5c45b363ee80a2a4d4742d1253.tar.bz2
online_test-2880788d3743dd5c45b363ee80a2a4d4742d1253.zip
Remove commented code and inline styling
-rw-r--r--yaksh/static/yaksh/css/yakshcustom.css4
-rw-r--r--yaksh/templates/exam.html8
-rw-r--r--yaksh/templates/yaksh/complete.html2
-rw-r--r--yaksh/templates/yaksh/question.html3
-rw-r--r--yaksh/templates/yaksh/quit.html2
5 files changed, 10 insertions, 9 deletions
diff --git a/yaksh/static/yaksh/css/yakshcustom.css b/yaksh/static/yaksh/css/yakshcustom.css
index a9b4349..8bd0147 100644
--- a/yaksh/static/yaksh/css/yakshcustom.css
+++ b/yaksh/static/yaksh/css/yakshcustom.css
@@ -139,6 +139,10 @@ html {
min-height: 100%;
}
+.question-nav-bg {
+ background-color:#B4B8BA;
+}
+
.yaksh {
font-size: 15px;
font-family: 'Dosis', sans-serif;
diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 51c2eca..d439c64 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -8,7 +8,7 @@
<span class="navbar-toggler-icon" style="color: white"></span>
</button>
<a class="navbar-brand">
- <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px">
+ <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
</img>
</a>
<div class="collapse navbar-collapse col-md-6" id="myNavbar">
@@ -56,15 +56,15 @@
{% endif %}
{% endif %}
{% if qid in paper.get_questions_answered %}
- <a class=" btn btn-outline-light " style="background-color:#B4B8BA;" href="#" data-toggle="tooltip"
+ <a class="btn btn-outline-light question-nav-bg" 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 %}
{% else %}
{% if qid.id == question.id %}
- <a class="active btn btn-outline-success " data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a>
+ <a class="active btn btn-outline-success" data-toggle="tooltip" title="{{ qid.description|striptags }}">{{ forloop.counter }}</a>
{% elif 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-success question-nav-bg" 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>
{% else %}
diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index f753933..a3324a6 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -5,7 +5,7 @@
<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 src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
</img>
</a>
</div><!-- /.container -->
diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html
index 5a408c5..8be9341 100644
--- a/yaksh/templates/yaksh/question.html
+++ b/yaksh/templates/yaksh/question.html
@@ -156,9 +156,6 @@ question_type = "{{ question.type }}"
</span>
</h5>
</div>
-<!-- <div class="col-md-6">
- <h5>Marks</h5>
- </div> -->
</div>
</div>
</div>
diff --git a/yaksh/templates/yaksh/quit.html b/yaksh/templates/yaksh/quit.html
index af7d494..dd06ff9 100644
--- a/yaksh/templates/yaksh/quit.html
+++ b/yaksh/templates/yaksh/quit.html
@@ -5,7 +5,7 @@
<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 src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH">
</img>
</a>
</div><!-- /.container -->