From 234cf831861045796a7bcf4e08a46b0c38016f75 Mon Sep 17 00:00:00 2001 From: adityacp Date: Wed, 23 Mar 2016 11:14:47 +0530 Subject: EditProfile, ChangePassword, StudentsEnrollment facility --- yaksh/templates/manage.html | 2 + .../registration/password_change_done.html | 16 ++++++++ .../registration/password_change_form.html | 18 ++++++++ yaksh/templates/user.html | 2 + yaksh/templates/yaksh/course_detail.html | 31 ++++++++++++-- yaksh/templates/yaksh/editprofile.html | 21 ++++++++++ yaksh/templates/yaksh/password_changed.html | 15 +++++++ yaksh/templates/yaksh/profile_updated.html | 15 +++++++ yaksh/templates/yaksh/view_profile.html | 48 ++++++++++++++++++++++ 9 files changed, 165 insertions(+), 3 deletions(-) create mode 100644 yaksh/templates/registration/password_change_done.html create mode 100644 yaksh/templates/registration/password_change_form.html create mode 100644 yaksh/templates/yaksh/editprofile.html create mode 100644 yaksh/templates/yaksh/password_changed.html create mode 100644 yaksh/templates/yaksh/profile_updated.html create mode 100644 yaksh/templates/yaksh/view_profile.html (limited to 'yaksh/templates') diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html index 11e2187..a10291b 100644 --- a/yaksh/templates/manage.html +++ b/yaksh/templates/manage.html @@ -30,6 +30,8 @@
  • Grade User
  • Monitor
  • Courses
    • +
  • My Profile
    • +
  • Change Password
    • diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index dbb7b73..60834e6 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -24,7 +24,7 @@
    -   {{ request.username }}
    +   {{ request.username }}
    Enroll Reject
    diff --git a/yaksh/templates/yaksh/login.html b/yaksh/templates/yaksh/login.html index d679748..dfeac1e 100644 --- a/yaksh/templates/yaksh/login.html +++ b/yaksh/templates/yaksh/login.html @@ -14,7 +14,7 @@
    {{ form.as_table }}
    -
        
    +
        

    Forgot Password?

    New User? Sign-Up
    diff --git a/yaksh/templates/yaksh/question.html b/yaksh/templates/yaksh/question.html index 1fb70b8..e542fe9 100644 --- a/yaksh/templates/yaksh/question.html +++ b/yaksh/templates/yaksh/question.html @@ -116,11 +116,9 @@ function call_skip(url)

    Online Test

    -
    -
    -
    You have {{ paper.questions_left }} question(s) left in {{ paper.question_paper.quiz.description }}
    +
    Hi {{ paper.user.first_name.title}} {{ paper.user.last_name.title}}
    +

    + You have {{ paper.questions_left }} question(s) left in {{ paper.question_paper.quiz.description }}
    -- cgit From 4334a36d3a329416b4e99f493f5ed5dc8d455123 Mon Sep 17 00:00:00 2001 From: adityacp Date: Mon, 4 Apr 2016 14:46:40 +0530 Subject: user profile display for moderators changes --- yaksh/templates/yaksh/course_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index 60834e6..0c37375 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -24,7 +24,7 @@
    -   {{ request.username }} +   {{ request.username }}
    Enroll Reject
    -- cgit From edfedff384eac5dfbb2258cb1c51399862a5fd36 Mon Sep 17 00:00:00 2001 From: adityacp Date: Mon, 11 Apr 2016 17:30:10 +0530 Subject: changes in forms.py, views.py, template --- yaksh/templates/yaksh/course_detail.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index 0c37375..c771cc7 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -24,7 +24,8 @@
    -   {{ request.username }} +   +  {{ request.username }}
    Enroll Reject
    @@ -46,7 +47,8 @@
    -  {{ rejected.username }} +   +  {{ rejected.username }}
    Enroll
    @@ -71,7 +73,8 @@
    -  {{ enrolled.username }} +   +  {{ enrolled.username }}
    Reject
    -- cgit From 975e74ab737cfc5d9c5375931170cdc9ecb75b40 Mon Sep 17 00:00:00 2001 From: adityacp Date: Mon, 18 Apr 2016 19:09:22 +0530 Subject: changes for profile edit --- yaksh/templates/manage.html | 4 ++-- yaksh/templates/user.html | 4 ++-- yaksh/templates/yaksh/editprofile.html | 8 +++++--- yaksh/templates/yaksh/view_profile.html | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html index a10291b..a4564f9 100644 --- a/yaksh/templates/manage.html +++ b/yaksh/templates/manage.html @@ -10,7 +10,7 @@ {% endblock %} - + {% block css %} @@ -30,7 +30,7 @@
  • Grade User
  • Monitor
  • Courses
    • -
  • My Profile
    • +
  • My Profile
  • Change Password
      • diff --git a/yaksh/templates/user.html b/yaksh/templates/user.html index 936601e..4074656 100644 --- a/yaksh/templates/user.html +++ b/yaksh/templates/user.html @@ -13,8 +13,8 @@ {% endblock %} - - + + {% block css %} {% endblock %} diff --git a/yaksh/templates/yaksh/editprofile.html b/yaksh/templates/yaksh/editprofile.html index f04f8fb..75be563 100644 --- a/yaksh/templates/yaksh/editprofile.html +++ b/yaksh/templates/yaksh/editprofile.html @@ -6,8 +6,10 @@ {% block formtitle %} Please fill in the following details {% endblock %} {% block content %} - -
      +{% if msg %} +
      Your profile does not exist. Please fill in your details
      +{% endif %} + {% csrf_token %}
      @@ -15,7 +17,7 @@
      -
      +
      {% endblock content %} diff --git a/yaksh/templates/yaksh/view_profile.html b/yaksh/templates/yaksh/view_profile.html index 3233510..69dac5a 100644 --- a/yaksh/templates/yaksh/view_profile.html +++ b/yaksh/templates/yaksh/view_profile.html @@ -9,7 +9,7 @@ {% endblock %} {% block content %}
      -- cgit From ab5d550709322739629fffb7e7a3335ec1a6623c Mon Sep 17 00:00:00 2001 From: adityacp Date: Thu, 21 Apr 2016 18:52:29 +0530 Subject: final changes in edit profile --- yaksh/templates/yaksh/editprofile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/editprofile.html b/yaksh/templates/yaksh/editprofile.html index 75be563..cdccfc0 100644 --- a/yaksh/templates/yaksh/editprofile.html +++ b/yaksh/templates/yaksh/editprofile.html @@ -12,7 +12,7 @@
      {% csrf_token %}
      - +
      {{ form.as_table }}
      -- cgit From 3d49dc17e96fa2726c60942a44d8571d353542d4 Mon Sep 17 00:00:00 2001 From: adityacp Date: Fri, 22 Apr 2016 11:30:02 +0530 Subject: profile form name changes --- yaksh/templates/yaksh/view_profile.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/yaksh/view_profile.html b/yaksh/templates/yaksh/view_profile.html index 69dac5a..be15d14 100644 --- a/yaksh/templates/yaksh/view_profile.html +++ b/yaksh/templates/yaksh/view_profile.html @@ -13,8 +13,8 @@ Back to Home
    -

    Your Profile Information

    +

    Your Profile Information

    -- cgit From 3be13f4868a881cbe591e9eb686872875272ac1d Mon Sep 17 00:00:00 2001 From: adityacp Date: Fri, 22 Apr 2016 17:15:21 +0530 Subject: added jquery file in base.html and manage.html --- yaksh/templates/base.html | 2 +- yaksh/templates/manage.html | 2 +- yaksh/templates/yaksh/course_detail.html | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'yaksh/templates') diff --git a/yaksh/templates/base.html b/yaksh/templates/base.html index d3e4f91..83db7ff 100644 --- a/yaksh/templates/base.html +++ b/yaksh/templates/base.html @@ -17,7 +17,7 @@ {% block css %} {% endblock %} - + {% block script %} {% endblock %} diff --git a/yaksh/templates/manage.html b/yaksh/templates/manage.html index a4564f9..4b9e2ba 100644 --- a/yaksh/templates/manage.html +++ b/yaksh/templates/manage.html @@ -15,7 +15,7 @@ {% block css %} {% endblock %} - + {% block script %} {% endblock %} diff --git a/yaksh/templates/yaksh/course_detail.html b/yaksh/templates/yaksh/course_detail.html index c771cc7..7169667 100644 --- a/yaksh/templates/yaksh/course_detail.html +++ b/yaksh/templates/yaksh/course_detail.html @@ -8,7 +8,6 @@ {% endblock %} {% block script %} - {% endblock %} {% block manage %} -- cgit