summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorprathamesh2016-11-01 09:24:20 +0530
committerprathamesh2016-11-01 09:24:20 +0530
commit3b66e5fb8af12ce756f34966bb684373062551dd (patch)
tree9805cf1a680c275397e7009d8dea20f800f06153
parentd231fbd10c087f721f1fd8a576b4c40a84e0a5a0 (diff)
downloadonline_test-3b66e5fb8af12ce756f34966bb684373062551dd.tar.gz
online_test-3b66e5fb8af12ce756f34966bb684373062551dd.tar.bz2
online_test-3b66e5fb8af12ce756f34966bb684373062551dd.zip
modified profile and password reset/change templates
-rw-r--r--yaksh/templates/register/password_change_done.html5
-rw-r--r--yaksh/templates/register/password_change_form.html4
-rw-r--r--yaksh/templates/register/password_reset_complete.html3
-rw-r--r--yaksh/templates/register/password_reset_confirm.html4
-rw-r--r--yaksh/templates/register/password_reset_done.html3
-rw-r--r--yaksh/templates/register/password_reset_form.html4
-rw-r--r--yaksh/templates/yaksh/view_profile.html19
7 files changed, 11 insertions, 31 deletions
diff --git a/yaksh/templates/register/password_change_done.html b/yaksh/templates/register/password_change_done.html
index fef07d1..14df20c 100644
--- a/yaksh/templates/register/password_change_done.html
+++ b/yaksh/templates/register/password_change_done.html
@@ -1,7 +1,6 @@
{% extends "base.html" %}
-{% block title %}Password change successful{% endblock %}
-{% block pagetitle %}Online Test {% endblock %}
+{% block pagetitle %}Password change successful{% endblock %}
{% block script %}
<script type="text/javascript">
window.setTimeout(function()
@@ -13,4 +12,4 @@
{% block content %}
<h3>Your password has been changed successfully.</h3>
<h4>Redirecting ...</h4>
-{% endblock %} \ No newline at end of file
+{% endblock %}
diff --git a/yaksh/templates/register/password_change_form.html b/yaksh/templates/register/password_change_form.html
index 48292f8..b618410 100644
--- a/yaksh/templates/register/password_change_form.html
+++ b/yaksh/templates/register/password_change_form.html
@@ -1,8 +1,6 @@
{% extends "base.html" %}
<!DOCTYPE html>
-{% block title %} Change Password {% endblock %}
-
-{% block pagetitle %} Online Test {% endblock %}
+{% block pagetitle %} Change Password {% endblock %}
{% block content %}
<form action="" method="post" >
diff --git a/yaksh/templates/register/password_reset_complete.html b/yaksh/templates/register/password_reset_complete.html
index 0801d3b..0c1bae2 100644
--- a/yaksh/templates/register/password_reset_complete.html
+++ b/yaksh/templates/register/password_reset_complete.html
@@ -1,6 +1,5 @@
{% extends "base.html" %}
-{% block title %}Password reset complete{% endblock %}
-{% block pagetitle %} Online Test {% endblock %}
+{% block pagetitle %}Password reset complete{% endblock %}
{% block content %}
<p>Your password has been reset. </p>
<p><a href="{{ login_url }}">Log in</a></p>
diff --git a/yaksh/templates/register/password_reset_confirm.html b/yaksh/templates/register/password_reset_confirm.html
index 5566499..1b0a1b7 100644
--- a/yaksh/templates/register/password_reset_confirm.html
+++ b/yaksh/templates/register/password_reset_confirm.html
@@ -1,7 +1,5 @@
{% extends "base.html" %}
-{% block title %}Reset Password{% endblock %}
-{% block pagetitle %} Online Test {% endblock %}
-{% block formtitle %} Reset password {% endblock %}
+{% block pagetitle %}Reset Password{% endblock %}
{% block content %}
{% if validlink %}
diff --git a/yaksh/templates/register/password_reset_done.html b/yaksh/templates/register/password_reset_done.html
index ace3cc9..1ac7b60 100644
--- a/yaksh/templates/register/password_reset_done.html
+++ b/yaksh/templates/register/password_reset_done.html
@@ -1,4 +1,3 @@
{% extends "base.html" %}
{% block title %}Password reset successful{% endblock %}
-{% block pagetitle %} Online Test {% endblock %}
-{% block formtitle %} Instruction for setting new password has been mailed to your registered email address {% endblock %}
+{% block pagetitle %} Instruction for setting new password has been mailed to your registered email address {% endblock %}
diff --git a/yaksh/templates/register/password_reset_form.html b/yaksh/templates/register/password_reset_form.html
index 0dbaf09..0444584 100644
--- a/yaksh/templates/register/password_reset_form.html
+++ b/yaksh/templates/register/password_reset_form.html
@@ -1,7 +1,5 @@
{% extends "base.html" %}
-{% block title %} Forgot Password {% endblock %}
-{% block pagetitle %} Online Test {% endblock %}
-{% block formtitle %} Email will be send to the registered email address {% endblock %}
+{% block pagetitle %} Email will be send to the registered email address {% endblock %}
{% block content %}
<form action="" method="post">
{% csrf_token %}
diff --git a/yaksh/templates/yaksh/view_profile.html b/yaksh/templates/yaksh/view_profile.html
index be15d14..becd205 100644
--- a/yaksh/templates/yaksh/view_profile.html
+++ b/yaksh/templates/yaksh/view_profile.html
@@ -1,21 +1,12 @@
{% extends "base.html" %}
-{% block title %} View Profile {% endblock %}
-
-{% block pagetitle %} Online Test {% endblock %}
-{% block css %}
-<link rel="stylesheet" media="all" type="text/css" href="{{ URL_ROOT }}/static/yaksh/css/base.css" />
-
-{% endblock %}
+{% block pagetitle %} My Profile {% endblock %}
{% block content %}
<ul>
- <a href="{{ URL_ROOT }}/exam/editprofile/">Edit Profile</a>
- <a href="{{ URL_ROOT }}/exam/">Back to Home</a>
+ <a class="btn btn-primary" href="{{ URL_ROOT }}/exam/editprofile/">Edit Profile</a>
+ <a class="btn btn-primary" href="{{ URL_ROOT }}/exam/">Back to Home</a>
</ul>
-<div class="span14">
- <center>
- <h2>Your Profile Information</h2>
- <table class="span1">
+ <table class="table">
<tr>
<th><label for="id_first_name"><h5>First name:</h5></label></th>
<th><label for="id_first_name"><h5>{{ user.first_name }}</h5></label></th>
@@ -45,6 +36,4 @@
<th><label for="id_position"><h5>{{ user.profile.position }}</h5></label></th>
</tr>
</table>
- </center>
-</div>
{% endblock %}