summaryrefslogtreecommitdiff
path: root/yaksh/templates
diff options
context:
space:
mode:
Diffstat (limited to 'yaksh/templates')
-rw-r--r--yaksh/templates/base.html6
-rw-r--r--yaksh/templates/exam.html5
-rw-r--r--yaksh/templates/manage.html16
-rw-r--r--yaksh/templates/user.html24
-rw-r--r--yaksh/templates/yaksh/complete.html3
-rw-r--r--yaksh/templates/yaksh/login.html6
-rw-r--r--yaksh/templates/yaksh/quit.html3
7 files changed, 34 insertions, 29 deletions
diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html
index 3302482..08c4f70 100644
--- a/yaksh/templates/base.html
+++ b/yaksh/templates/base.html
@@ -53,15 +53,17 @@
{% endblock %}
</div>
</div>
+ <div class="container">
<footer class="footer" id="footer_div">
- <div class="logged_user_info" align="center">
+ <div class="logged_user_info" align="center" >
{% block info %}
{% endblock %}
- </div>
+ </div>
<div class="container">
<p align="center">Developed by FOSSEE group, IIT Bombay</p>
</div>
</footer>
+ </div>
</body>
</html>
diff --git a/yaksh/templates/exam.html b/yaksh/templates/exam.html
index 6589bb5..a6766b7 100644
--- a/yaksh/templates/exam.html
+++ b/yaksh/templates/exam.html
@@ -12,7 +12,10 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="#"> Yaksh </a>
+ <a class="navbar-brand" href="#">
+ <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_crane.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px">
+ </img>
+ </a>
</div>
<div class= "collapse navbar-collapse" id="navbar">
<form id="logout" action="{{URL_ROOT}}/exam/quit/{{ paper.attempt_number }}/{{ paper.question_paper.id }}/" method="post" class="pull-right">
diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html
index d87076d..ac9b26d 100644
--- a/yaksh/templates/manage.html
+++ b/yaksh/templates/manage.html
@@ -8,18 +8,20 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="{{ URL_ROOT }}/exam/manage/"> Online Test </a>
+ <a class="navbar-brand navbar-left" href="{{ URL_ROOT }}/exam/manage/">
+ <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px"></img>
+ </a>
</div>
<div id="navbar" class="collapse navbar-collapse">
- <ul class="nav navbar-nav">
+ <ul class="nav navbar-nav navbar-right">
<li><a href="{{ URL_ROOT }}/exam/manage/questions">Questions</a></li>
- <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
- <li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
<li><a href="{{ URL_ROOT }}/exam/manage/courses">Courses</a></li>
- <li><a href="{{ URL_ROOT }}/exam/viewprofile">My Profile</a></li>
- <li><a href="{{ URL_ROOT }}/exam/reset/changepassword">Change Password</a></li>
+ <li><a href="{{ URL_ROOT }}/exam/manage/monitor">Monitor</a></li>
+ <li><a href="{{ URL_ROOT }}/exam/manage/gradeuser">Grade User</a></li>
<li><a href="{{ URL_ROOT }}/exam/manage/grader"> Grader </a></li>
- <li><a style='cursor:pointer' onClick='location.replace("{{URL_ROOT}}/exam/logout/");'>Log out</a></li>
+ <li><a href="{{ URL_ROOT }}/exam/reset/changepassword">Change Password</a></li>
+ <li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
+ <li><a href="{{URL_ROOT}}/exam/logout/" id="logout">Logout</a></li>
</ul>
</div><!-- /.navbar -->
</div><!-- /.container -->
diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html
index 83aea13..e1b129f 100644
--- a/yaksh/templates/user.html
+++ b/yaksh/templates/user.html
@@ -11,12 +11,18 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a class="navbar-brand" href="{{ URL_ROOT }}/exam/manage/"> Yaksh </a>
+
+ <a class="navbar-brand navbar-left" href="{{ URL_ROOT }}/exam/manage/">
+ <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_banner.png" alt="YAKSH" style="margin-top: -3px; margin-left:-15px">
+ </img>
+ </a>
</div>
<div class= "collapse navbar-collapse" id="navbar">
<ul class="nav navbar-nav navbar-right">
+ <li><a href="{{ URL_ROOT }}/exam/quizzes/enrolled/"> Enrolled Courses </a></li>
+ <li><a href="{{ URL_ROOT }}/exam/reset/changepassword"> Change Password </a></li>
<li><a href="{{ URL_ROOT }}/exam/viewprofile"> {{ user.get_full_name.title }} </a></li>
- <li><a style='cursor:pointer' id='logout' onClick='location.replace("{{URL_ROOT}}/exam/logout/");'> <span class="glyphicon glyphicon-log-out">Logout </span></a></li>
+ <li><a href="{{URL_ROOT}}/exam/logout/" id="logout">Logout</a></li>
</ul>
</div><!-- /.navbar -->
</div><!-- /.container -->
@@ -24,24 +30,12 @@
{% endblock %}
{% block content %}
<div class="row">
- <div class="col-sm-3 col-md-2 sidebar">
- <ul class="nav nav-sidebar">
- <li><a href="{{ URL_ROOT }}/exam/quizzes"> Home </a></li>
- <li><a href="{{ URL_ROOT }}/exam/quizzes/enrolled/"> Enrolled Courses </a></li>
- <li><a href="{{ URL_ROOT }}/exam/viewprofile"> Profile </a></li>
- <li><a href="{{ URL_ROOT }}/exam/reset/changepassword"> Change Password </a></li>
- </ul>
- </div>
- <div class="col-sm-8 col-sm-offset-3 col-md-9 col-md-offset-2 main">
- <div class="row">
{% block main %}
{% endblock %}
- </div>
- </div>
</div>
{% endblock %}
{% if user %}
{% block info %}
- <h5>{{user.get_full_name|title}}({{user.profile.roll_number}}) Logged in as {{user.username}}</h5>
+ <h5><b>{{user.get_full_name|title}}</b> with Roll no. <b>{{user.profile.roll_number}}</b> is logged in as <b>{{user.username}}</b></h5>
{% endblock %}
{% endif %}
diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index 45284c4..f0852f3 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
-{% block pagetitle %}Online Test{% endblock %}
+{% block pagetitle %}<img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png"
+width="80" alt="YAKSH"></img>{% endblock %}
{% block content %}
{% csrf_token %}
{% if paper.questions_answered.all or paper.questions_unanswered.all %}
diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html
index f40b12f..9c377b9 100644
--- a/yaksh/templates/yaksh/login.html
+++ b/yaksh/templates/yaksh/login.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
-{% block pagetitle %}YAKSH {% endblock %}
+{% block pagetitle %}<img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png" width="100" alt="YAKSH">
+</img>{% endblock %}
{% block content %}
<div class="row">
@@ -39,7 +40,8 @@
<br/>
<p><b>Fork us at:</b>
<a class = "btn btn-social-icon btn-github"
- href ="https://github.com/fossee/online_test">
+ href ="https://github.com/fossee/online_test"
+ style="color:black">
<span class="fa fa-github" style="font-size:48px"></span>
</p>
diff --git a/yaksh/templates/yaksh/quit.html b/yaksh/templates/yaksh/quit.html
index d18b790..ef5e6a4 100644
--- a/yaksh/templates/yaksh/quit.html
+++ b/yaksh/templates/yaksh/quit.html
@@ -1,6 +1,7 @@
{% extends "base.html" %}
-{% block pagetitle %} Yaksh Online Test {% endblock %}
+{% block pagetitle %} <img src="{{ URL_ROOT }}/static/yaksh/images/yaksh_text.png"
+width="80" alt="YAKSH"></img> {% endblock %}
{% block content %}
<center><table class="table table-bordered" >
<caption> Submission Status </caption>