- 
-
+
-
-
- Your password has been changed successfully.
-Redirecting ...
-+
+
+
+
+ Your password has been changed successfully.
+Redirecting ...
+{% endblock content %} diff --git a/yaksh/templates/registration/password_reset_complete.html b/yaksh/templates/registration/password_reset_complete.html index bc9245f..d606db9 100644 --- a/yaksh/templates/registration/password_reset_complete.html +++ b/yaksh/templates/registration/password_reset_complete.html @@ -1,13 +1,15 @@ {% extends "base.html" %} -{% block pagetitle %} - + + {% endblock %} {% block content %} +
Your password has been reset.
diff --git a/yaksh/templates/registration/password_reset_confirm.html b/yaksh/templates/registration/password_reset_confirm.html index 49563ac..110a82c 100644 --- a/yaksh/templates/registration/password_reset_confirm.html +++ b/yaksh/templates/registration/password_reset_confirm.html @@ -1,14 +1,16 @@ {% extends "base.html" %} -{% block pagetitle %} - + + {% endblock %} {% block content %} +Reset Password
{% if validlink %}Please enter your new password twice so we can verify you typed it in correctly
. diff --git a/yaksh/templates/registration/password_reset_done.html b/yaksh/templates/registration/password_reset_done.html index 8f259c7..a6f30a0 100644 --- a/yaksh/templates/registration/password_reset_done.html +++ b/yaksh/templates/registration/password_reset_done.html @@ -1,18 +1,22 @@ {% extends "base.html" %} -{% block pagetitle %} - + + {% endblock %} {% block content %} +Password reset successful
-
+
+Go to Login {% endblock %} diff --git a/yaksh/templates/registration/password_reset_form.html b/yaksh/templates/registration/password_reset_form.html index de05df9..fd2220f 100644 --- a/yaksh/templates/registration/password_reset_form.html +++ b/yaksh/templates/registration/password_reset_form.html @@ -1,21 +1,39 @@ {% extends "base.html" %} -{% block pagetitle %} - + + {% endblock %} {% block content %} +
-
{% endblock content %}
--
cgit
From 93eb0c0d3346dc7de466263a66ead29660f2518f Mon Sep 17 00:00:00 2001
From: adityacp
Date: Fri, 20 Dec 2019 12:21:12 +0530
Subject: Change in moderator dashboard templates
- Add paginator template for pagination
- Change moderator dashboard, edit profile and complete template
---
yaksh/templates/yaksh/complete.html | 25 +--
yaksh/templates/yaksh/editprofile.html | 56 +++++--
yaksh/templates/yaksh/login.html | 170 ++++++++-------------
yaksh/templates/yaksh/moderator_dashboard.html | 203 +++++++++++++------------
yaksh/templates/yaksh/paginator.html | 33 ++++
yaksh/templates/yaksh/profile_updated.html | 35 ++---
yaksh/templates/yaksh/register.html | 99 ++++++------
7 files changed, 323 insertions(+), 298 deletions(-)
create mode 100644 yaksh/templates/yaksh/paginator.html
(limited to 'yaksh')
diff --git a/yaksh/templates/yaksh/complete.html b/yaksh/templates/yaksh/complete.html
index a3324a6..03dc4c1 100644
--- a/yaksh/templates/yaksh/complete.html
+++ b/yaksh/templates/yaksh/complete.html
@@ -1,19 +1,15 @@
{% extends "base.html" %}
{% block nav %}
-
{% if module_id and not paper.question_paper.quiz.is_trial %}
{% endif %}
-
+
+
{% if module_id and not paper.question_paper.quiz.is_trial %} @@ -68,7 +69,7 @@ {% endif %} {% else %} - Home + Home {% endif %}
{% endblock content %}
diff --git a/yaksh/templates/yaksh/editprofile.html b/yaksh/templates/yaksh/editprofile.html
index d654359..df6d328 100644
--- a/yaksh/templates/yaksh/editprofile.html
+++ b/yaksh/templates/yaksh/editprofile.html
@@ -1,13 +1,49 @@
{% extends template %}
-{% block pagetitle %} Please fill in the following details {% endblock %}
+{% block title %} Edit Profile {% endblock %}
{% block main %}
-
+
+
diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html
index c1477c7..464a8dd 100644
--- a/yaksh/templates/yaksh/login.html
+++ b/yaksh/templates/yaksh/login.html
@@ -1,12 +1,13 @@
{% extends "base.html" %}
+{% load static %}
{% block title %} Login {% endblock %}
{% block nav %}
{% endblock %}
@@ -30,14 +31,18 @@
{% for field in form %}
{% for error in field.errors %}
Password reset successful
+
Instruction for setting new password has been mailed to your registered email address
++Go to Login {% endblock %} diff --git a/yaksh/templates/registration/password_reset_form.html b/yaksh/templates/registration/password_reset_form.html index de05df9..fd2220f 100644 --- a/yaksh/templates/registration/password_reset_form.html +++ b/yaksh/templates/registration/password_reset_form.html @@ -1,21 +1,39 @@ {% extends "base.html" %} -{% block pagetitle %} - + + {% endblock %} {% block content %} +
Email will be send to the registered email address
- +Enter your registered email address to reset your password
+
+
+
+
+
+
+
+
+ Forgot Password?
+
+
+
+
+
-
-
+
{% endblock %}
{% block content %}
+{% if module_id and not paper.question_paper.quiz.is_trial %}
@@ -52,7 +48,12 @@
{{message}}
+
+ {{message}} +
+{% if module_id and not paper.question_paper.quiz.is_trial %} @@ -68,7 +69,7 @@ {% endif %} {% else %} - Home + Home {% endif %}
+
+
+ +
{% endblock main %}
diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html
index 4b3b222..c1477c7 100644
--- a/yaksh/templates/yaksh/login.html
+++ b/yaksh/templates/yaksh/login.html
@@ -1,124 +1,82 @@
{% extends "base.html" %}
-
+{% block title %} Login {% endblock %}
{% block nav %}
-My Profile
+ +
-
{% endblock %}
{% block content %}
-
-
-
- 2500+ Students in 350+ Institutions across 16+ states in India are using YAKSH
-
-
+
-
-Go to Login +Go to Login {% endblock %} diff --git a/yaksh/templates/registration/password_reset_form.html b/yaksh/templates/registration/password_reset_form.html index fd2220f..eeca8f2 100644 --- a/yaksh/templates/registration/password_reset_form.html +++ b/yaksh/templates/registration/password_reset_form.html @@ -1,12 +1,13 @@ {% extends "base.html" %} -{% block title %} -Forgot Password -{% endblock %} +{% load static %} + +{% block title %} Forgot Password {% endblock %} + {% block nav %} {% endblock %} @@ -26,8 +27,12 @@ Forgot Password {{ form }}
- - Cancel + + + Cancel +
-
Online Test Interface for conducting online programming quiz.
-
-
+ -
-
-
- Define fairly complicated programming problems and have users - solve the problem. - -
- Immediate verification of code solution. - -
- Supports pretty much arbitrary programming questions in Python, C, C++ and - simple Bash and uses "test cases" to test the implementations of the students. - -
- Supports simple multiple choice questions and File uploads. - -
- Since it runs on your Python, you could technically test any Python based library. - -
- Scales to over 500+ simultaneous users. - -
+
+
{% endblock %}
diff --git a/yaksh/templates/registration/password_reset_confirm.html b/yaksh/templates/registration/password_reset_confirm.html
index 110a82c..ef2d1f2 100644
--- a/yaksh/templates/registration/password_reset_confirm.html
+++ b/yaksh/templates/registration/password_reset_confirm.html
@@ -1,15 +1,17 @@
{% extends "base.html" %}
+{% load static %}
+
{% block title %} Forgot Password {% endblock %}
{% block nav %}
{% endblock %}
-{% block content %}
+{% block content %}
+
{% endblock content %}
{% block footer %}
-
+
-
-
+
+ Log in to Your Account
+
+
-
+
-
-
-
About Us
-
-
- History
- -At FOSSEE, Nishanth had implemented a nice django based app to test for multiple-choice questions. Prabhu Ramachandran was inspired by a programming contest that he saw at PyCon APAC 2011. Chris Boesch, who administered the contest, used a nice web application Singpath that he had built on top of GAE that basically checked your Python code, live. This made it fun and interesting.
-Prabhu wanted an implementation that was not tied to GAE and hence wrote the initial cut of what is now 'Yaksh'. The idea being that anyone can use this to test students programming skills and not have to worry about grading their answers manually and instead do so on their machines.
-The application has since been refactored and maintained by FOSSEE Developers.
- -Contact
-For further information and support you can contact - Python Team at FOSSEE: pythonsupport@fossee.in
- -License
-This is distributed under the terms of the BSD license. Copyright information is at the bottom of this file.
- -Authors
-FOSSEE Developers
- Copyright (c) 2011-{% now "Y" %} FOSSEE
Reset Password
{% if validlink %} @@ -17,7 +19,7 @@ {% else %}This reset link is no longer valid!
diff --git a/yaksh/templates/registration/password_reset_done.html b/yaksh/templates/registration/password_reset_done.html index a6f30a0..036d691 100644 --- a/yaksh/templates/registration/password_reset_done.html +++ b/yaksh/templates/registration/password_reset_done.html @@ -1,11 +1,12 @@ {% extends "base.html" %} +{% load static %} {% block title %} Forgot Password {% endblock %} {% block nav %} {% endblock %} @@ -17,6 +18,6 @@ Instruction for setting new password has been mailed to your registered email address-Go to Login +Go to Login {% endblock %} diff --git a/yaksh/templates/registration/password_reset_form.html b/yaksh/templates/registration/password_reset_form.html index fd2220f..eeca8f2 100644 --- a/yaksh/templates/registration/password_reset_form.html +++ b/yaksh/templates/registration/password_reset_form.html @@ -1,12 +1,13 @@ {% extends "base.html" %} -{% block title %} -Forgot Password -{% endblock %} +{% load static %} + +{% block title %} Forgot Password {% endblock %} + {% block nav %} {% endblock %} @@ -26,8 +27,12 @@ Forgot Password {{ form }}
- - Cancel + + + Cancel +
-
+
{{ error|escape }}
{% endfor %}
{% endfor %}
{% for error in form.non_field_errors %}
-
+
{{ error|escape }}
{% endfor %}
@@ -49,10 +54,12 @@