diff options
author | King | 2014-12-04 15:23:18 +0530 |
---|---|---|
committer | King | 2014-12-04 15:23:18 +0530 |
commit | f1be9a363fc8d1d6fa64f8d9192b743339077274 (patch) | |
tree | f63c995ccf59205e26b9f73aa394707aa5f590bf /certificate | |
parent | 3f3d272abd98cb090dc47ec284a54519dc49411e (diff) | |
parent | 1b536f5b8967ae3018bb927a2e55f3ac90aa4f99 (diff) | |
download | certificate-generator-f1be9a363fc8d1d6fa64f8d9192b743339077274.tar.gz certificate-generator-f1be9a363fc8d1d6fa64f8d9192b743339077274.tar.bz2 certificate-generator-f1be9a363fc8d1d6fa64f8d9192b743339077274.zip |
Merge pull request #1 from FOSSEE/UIDesign
UI changes
Diffstat (limited to 'certificate')
-rw-r--r-- | certificate/templates/base.html | 54 | ||||
-rw-r--r-- | certificate/templates/download.html | 60 | ||||
-rw-r--r-- | certificate/templates/verify.html | 40 | ||||
-rw-r--r-- | 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 @@ <head> <title> {% block title %} - FOSSEE Project + FOSSEE Certificates {% endblock %} </title> - {% block css %} - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css"> - {% endblock %} - </head> - <body> - <div id="page-wrapper"> - <div id="content-wrapper"> - {% block content %} - {% endblock %} - </div> <!-- /#content-wrapper --> - - <div id="footer-wrapper" class="container"> - <div class="pull-left"> - ©2014 <a href="http://fossee.in" target="_blank">fossee.in</a> - </div> - <div class="pull-right"> - Developed at IIT Bombay - </div> - </div> <!-- /#footer-wrapper --> - </div> <!-- /#page-wrapper --> - - {% block js %} - <script src="https://code.jquery.com/jquery-1.11.0.min.js"></script> - <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script> + {% block css %} + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css"> + {% endblock %} + {% block js %} + <script src="https://code.jquery.com/jquery-1.11.0.min.js"></script> + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script> + {% endblock %} {% block javascript %} <!-- overide with custom javascript --> {% endblock %} - {% endblock %} + </head> + <body> + <div class="container-full"> + + <div class="row"> + + <div class="col-lg-12 text-center v-center"> + + <h1>FOSSEE</h1> + <hr> + <br><br> + {% block content %} + {% endblock %} + </div> + + </div> <!-- /row --> + <hr> + <br> + </div> <!-- /container full --> </body> </html> + 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 %} - <form action="" method="post"> - - {% csrf_token %} - {{error}} - <center> - <table class=span1 align='left'> - Email: <input type=text id="email" name=email> - <br> - <input type="radio" name="type" id="P" value="P" checked="True">Participant - <input type="radio" name="type" id="A" value="A">Paper - <input type="radio" name="type" id="W" value="W">Workshop - {% if user_papers %} + <div class="modal fade" id="invalidModal" tabindex="-1" role="dialog" aria-labelledby="invalidModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> + <h4 class="modal-title" id="invalidModalLabel">Invalid Email ID</h4> + </div> + <div class="modal-body"> + Email ID you entered is not registered. Please use the Email ID which you used while registering for the conference. + </div> + </div> + </div> + </div> + <form class="col-lg-12" action="" method="post"> + {% csrf_token %} + {{ error }} + <div class="input-group" style="width:340px;text-align:center;margin:0 auto;"> + <input style="width:450;" class="form-control input-lg" placeholder="Enter the email address you used for registration" type="text" id="email" name=email> + <span class="input-group-btn"><button class="btn btn-lg btn-primary" type="submit">Get Certificate</button></span> + </div> + <hr> + <p>Please choose the appropriate one</p> + <input type="radio" name="type" id="P" value="P" checked="True">Participant + <input type="radio" name="type" id="A" value="A">Speaker + <input type="radio" name="type" id="W" value="W">Workshop + <hr> + <br> + <center> + {% if user_papers %} <br><br> <span><h3>Papers presented</h3><span> {% for user in user_papers %} @@ -27,12 +44,10 @@ <br> <input type="radio" name="workshop" value="{{ user.workshops }}">{{ user.workshops }} {% endfor %} - {% endif %} - </table> - </center> - - <center><a href="{% url 'certificate:download' %}" class="btn" >Clear</a><button class="btn" type="submit">Get Certificate</button></center> - </form> + {% endif %} + </center> + </form> + <center><h4>Problem in downloading certificate ? write to us at <a href="mailto:info@fossee.in">info[at]fossee[dot]in</a></h4> {% endblock %} {% block javascript %} @@ -51,4 +66,13 @@ $('#email').val(email); }); </script> +<script> +notreg = {{ notregistered }} +$( document ).ready(function() { + if(notreg == 1) + { + $("#invalidModal").modal(); + } +}); +</script> {% 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 %} + <div class="modal fade" id="invalidModal" tabindex="-1" role="dialog" aria-labelledby="invalidModalLabel" aria-hidden="true"> + <div class="modal-dialog"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">Close</span></button> + <h4 class="modal-title" id="invalidModalLabel">Invalid Serial Number</h4> + </div> + <div class="modal-body"> + Sorry ! The serial number you entered seems to be invalid. Please try again ! + </div> + </div> + </div> + </div> + <p>Enter the serial number you received while scanning the QR code on certificate.</p> + <hr> <form action="" method="post"> - {{detail}} + {{ detail }} {% csrf_token %} - <center><table class=span1> - Serial Number: <input type=text name=serial_no> - </table></center> - <center><a href="{% url 'certificate:verify' %}" class="btn" >Clear</a><button class="btn" type="submit">Submit</button></center> + <div class="input-group" style="width:340px;text-align:center;margin:0 auto;"> + <input class="form-control input-lg" placeholder="Enter the serial number" type="text" name=serial_no> + <span class="input-group-btn"><button class="btn btn-lg btn-primary" type="submit">Verify</button></span> + </div> </form> + <hr> + <center><h4>Problem in verfying details ? write to us at <a href="mailto:info@fossee.in">info[at]fossee[dot]in</a></h4> {% endblock %} + +{% block javascript %} +<script> +invalid_serial = {{ invalidserial }} +$( document ).ready(function() { + if(invalid_serial == 1) + { + $("#invalidModal").modal(); + } +}); +</script> +{% endblock %} + diff --git a/certificate/views.py b/certificate/views.py index a28c184..5f642a5 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 paper = certificate.paper |