From cece4e140006d412c2ce953faf7a9886fdb20397 Mon Sep 17 00:00:00 2001 From: komalsheth286 Date: Mon, 26 Sep 2016 11:10:12 +0530 Subject: DO attend link added --- website/templates/abstract-details.html | 56 +-------- website/templates/base.html | 204 +++----------------------------- website/templates/cfp.html | 88 ++------------ website/templates/user-register.html | 3 +- website/templates/view-abstracts.html | 53 --------- website/views.py | 4 +- 6 files changed, 32 insertions(+), 376 deletions(-) diff --git a/website/templates/abstract-details.html b/website/templates/abstract-details.html index 9a175b2..32ab1a1 100755 --- a/website/templates/abstract-details.html +++ b/website/templates/abstract-details.html @@ -7,10 +7,7 @@ {{ user.get_full_name|default:user.username }} - - - @@ -41,7 +38,7 @@ {% else %}

@@ -86,56 +83,7 @@ - + {% endblock %} diff --git a/website/templates/base.html b/website/templates/base.html index 3e46e81..7bb2315 100755 --- a/website/templates/base.html +++ b/website/templates/base.html @@ -8,6 +8,7 @@ + @@ -22,7 +23,7 @@

DECEMBER 10 & 11

Attend - Call for Proposal + Call for Proposal {% endblock %} @@ -40,7 +41,7 @@

About

To be announced

- - +

@@ -396,7 +253,7 @@

Write to Us

Feel free to send us an email if you have any questions.

@@ -465,49 +323,25 @@ - - - - \ No newline at end of file diff --git a/website/templates/cfp.html b/website/templates/cfp.html index 7e3ab3b..80bfbaa 100755 --- a/website/templates/cfp.html +++ b/website/templates/cfp.html @@ -7,10 +7,7 @@ Call for Proposal - - - @@ -59,6 +56,13 @@

Thank You for your submission. Your proposal has been saved successfully and is under review. You can check the status of submission here !

{% endif %} + {% if registration_complete %} + + +

Thank You for your registration. You can now log in by clicking here !

+

+ + {% endif %} {% if user and not user.is_anonymous and not login_required %} {% if user.is_superuser %} View Proposals @@ -111,85 +115,7 @@ - - - - {% endblock %} - - - - - - - - - - - - \ No newline at end of file diff --git a/website/templates/user-register.html b/website/templates/user-register.html index dffce77..c27b294 100755 --- a/website/templates/user-register.html +++ b/website/templates/user-register.html @@ -64,10 +64,11 @@

{% csrf_token %} {% for field in form %} - {{ field.errors }} +

{{ field.label}} {% if field.field.required %} * {% endif %} {{ field }}

+ {{ field.errors }} {% endfor %}
diff --git a/website/templates/view-abstracts.html b/website/templates/view-abstracts.html index 5f7685a..913c929 100755 --- a/website/templates/view-abstracts.html +++ b/website/templates/view-abstracts.html @@ -9,10 +9,7 @@ View Proposals - - - @@ -147,56 +144,6 @@ You have not submitted any proposal. To submit proposal click -

Write to Us

Feel free to send us an email if you have any questions.

Contact Us

Address: 1234 Somewhere Road • Nashville, TN 00000 • USA
Phone: (000) 000-0000 x 0000
Email

- Visit SciPy.in/ 2009/ - 2010/ - 2011/ - 2012/ - 2013/ - 2014/ - 2015 -

- --> {% endblock %} diff --git a/website/views.py b/website/views.py index 82a7ea5..8bc81ff 100755 --- a/website/views.py +++ b/website/views.py @@ -44,8 +44,8 @@ def userregister(request): else: form.save() context['registration_complete'] = True - form = UserLoginForm() - context['form'] = form + # form = UserLoginForm() + # context['form'] = form return render_to_response('cfp.html', context) else: context.update(csrf(request)) -- cgit