# HG changeset patch # User nishanth # Date 1271065443 -19800 # Node ID bef53aaf90850ae012a05bc4fb13ce4dc73db954 # Parent b06f0fefbd2052b22e6d5e3ca19af30b43066404 phew finally IRC came to rescue. fixed a bug that took most of my time. diff -r b06f0fefbd20 -r bef53aaf9085 reg/site/urls.py --- a/reg/site/urls.py Mon Apr 12 13:53:57 2010 +0530 +++ b/reg/site/urls.py Mon Apr 12 15:14:03 2010 +0530 @@ -11,7 +11,7 @@ (r'^password_change/$', reg_views.change_password), (r'^event/create/$', reg_views.create_event), (r'^event/view/(\w+)/$', reg_views.view_event), - (r'^event/register/(\w+)/$', reg_views), + (r'^event/register/(\w+)/$', reg_views.user_register), (r'^event/feedback/open/(\w+)/$', reg_views.open_feedback), (r'^event/feedback/close/(\w+)/$', reg_views.close_feedback), (r'^event/registration/open/(\w+)/$', reg_views.open_registration), diff -r b06f0fefbd20 -r bef53aaf9085 reg/views.py --- a/reg/views.py Mon Apr 12 13:53:57 2010 +0530 +++ b/reg/views.py Mon Apr 12 15:14:03 2010 +0530 @@ -21,7 +21,7 @@ user = request.user events = Event.objects.all()[:10] - return render_to_response('index.html', {'user':user, 'events':events}) + return render_to_response('index.html', {'user':user}) def user_login(request): """ get the user object from e-mail and then check for password. diff -r b06f0fefbd20 -r bef53aaf9085 templates/base.html --- a/templates/base.html Mon Apr 12 13:53:57 2010 +0530 +++ b/templates/base.html Mon Apr 12 15:14:03 2010 +0530 @@ -4,19 +4,147 @@ {% block title %} Workshop App {% endblock %} - + + +
-Home | -{% if user.is_authenticated %} - Welcome {{user.get_full_name}} | - My Profile | - Logout -{% else %} - Login | - Register -{% endif %} + +