From 1b536f5b8967ae3018bb927a2e55f3ac90aa4f99 Mon Sep 17 00:00:00 2001 From: hardythe1 Date: Thu, 4 Dec 2014 15:01:55 +0530 Subject: UI changes --- certificate/templates/base.html | 54 +++++++++++++++++---------------- certificate/templates/download.html | 60 ++++++++++++++++++++++++++----------- certificate/templates/verify.html | 40 +++++++++++++++++++++---- certificate/views.py | 12 +++++--- 4 files changed, 113 insertions(+), 53 deletions(-) diff --git a/certificate/templates/base.html b/certificate/templates/base.html index 09bc0aa..bf0dd98 100644 --- a/certificate/templates/base.html +++ b/certificate/templates/base.html @@ -2,36 +2,38 @@ {% block title %} - FOSSEE Project + FOSSEE Certificates {% endblock %} - {% block css %} - - {% endblock %} - - -
-
- {% block content %} - {% endblock %} -
- - -
- - {% block js %} - - + {% block css %} + + {% endblock %} + {% block js %} + + + {% endblock %} {% block javascript %} {% endblock %} - {% endblock %} + + +
+ +
+ +
+ +

FOSSEE

+
+

+ {% block content %} + {% endblock %} +
+ +
+
+
+
+ diff --git a/certificate/templates/download.html b/certificate/templates/download.html index 829c2e8..232a9f5 100644 --- a/certificate/templates/download.html +++ b/certificate/templates/download.html @@ -1,18 +1,35 @@ {% extends 'base.html' %} {% block content %} -
- - {% csrf_token %} - {{error}} -
- - Email: -
- Participant - Paper - Workshop - {% if user_papers %} + + + {% csrf_token %} + {{ error }} +
+ + +
+
+

Please choose the appropriate one

+ Participant +   Speaker +   Workshop +
+
+
+ {% if user_papers %}

Papers presented

{% for user in user_papers %} @@ -27,12 +44,10 @@
{{ user.workshops }} {% endfor %} - {% endif %} -
-
- -
Clear
-
+ {% endif %} + + +

Problem in downloading certificate ? write to us at info[at]fossee[dot]in

{% endblock %} {% block javascript %} @@ -51,4 +66,13 @@ $('#email').val(email); }); + {% endblock %} diff --git a/certificate/templates/verify.html b/certificate/templates/verify.html index 856ae36..8b215c7 100644 --- a/certificate/templates/verify.html +++ b/certificate/templates/verify.html @@ -1,12 +1,42 @@ {% extends 'base.html' %} {% block content %} + +

Enter the serial number you received while scanning the QR code on certificate.

+
- {{detail}} + {{ detail }} {% csrf_token %} -
- Serial Number: -
-
Clear
+
+ + +
+
+

Problem in verfying details ? write to us at info[at]fossee[dot]in

{% endblock %} + +{% block javascript %} + +{% endblock %} + diff --git a/certificate/views.py b/certificate/views.py index ddab500..da0b439 100644 --- a/certificate/views.py +++ b/certificate/views.py @@ -23,7 +23,8 @@ def download(request): if type == 'P': user = Scilab_participant.objects.filter(email=email) if not user: - return HttpResponse('Entered email is not registered') + context["notregistered"] = 1 + return render_to_response('download.html', context, context_instance=ci) else: user = user[0] elif type == 'A': @@ -33,7 +34,8 @@ def download(request): else: user = Scilab_speaker.objects.filter(email=email) if not user: - return HttpResponse('Entered email is not registered') + context["notregistered"] = 1 + return render_to_response('download.html', context, context_instance=ci) if len(user) > 1: context['user_papers'] = user context['v'] = 'paper' @@ -48,7 +50,8 @@ def download(request): else: user = Scilab_workshop.objects.filter(email=email) if not user: - return HttpResponse('Entered email is not registered') + context["notregistered"] = 1 + return render_to_response('download.html', context, context_instance=ci) print user if len(user) > 1: context['workshops'] = user @@ -93,7 +96,8 @@ def verify(request): try: certificate = Certificate.objects.get(serial_no=serial_no) except Certificate.DoesNotExist: - return HttpResponse('Invalid Serial Number') + context["invalidserial"] = 1 + return render_to_response('verify.html', context, context_instance=ci) else: name = certificate.name purpose, year, type = _get_detail(serial_no) -- cgit