diff options
24 files changed, 160 insertions, 156 deletions
diff --git a/workshop_app/forms.py b/workshop_app/forms.py index 8ca23ce..78b98ad 100644 --- a/workshop_app/forms.py +++ b/workshop_app/forms.py @@ -1,5 +1,5 @@ from django import forms -import datetime +from django.utils import timezone from .models import ( Profile, User, Workshop, WorkshopType, RequestedWorkshop, BookedWorkshop, ProposeWorkshopDate @@ -101,14 +101,11 @@ class UserRegistrationForm(forms.Form): new_profile.position = cleaned_data["position"] new_profile.phone_number = cleaned_data["phone_number"] new_profile.activation_key = generate_activation_key(new_user.username) - new_profile.key_expiry_time = datetime.datetime.strftime( - datetime.datetime.now() + \ - datetime.timedelta(days=3), - "%Y-%m-%d %H:%M:%S" - ) - + new_profile.key_expiry_time = timezone.now() + \ + timezone.timedelta(days=3) new_profile.save() - return u_name, pwd, new_profile.activation_key + key = Profile.objects.get(user=new_user).activation_key + return u_name, pwd, key class UserLoginForm(forms.Form): """Creates a form which will allow the user to log into the system.""" diff --git a/workshop_app/models.py b/workshop_app/models.py index 3ebe4ae..d709e16 100644 --- a/workshop_app/models.py +++ b/workshop_app/models.py @@ -30,7 +30,7 @@ class Profile(models.Model): )]) position = models.CharField(max_length=32, choices=position_choices) is_email_verified = models.BooleanField(default=False) - activation_key = models.CharField(max_length=150, blank=True, null=True) + activation_key = models.CharField(max_length=255, blank=True, null=True) key_expiry_time = models.DateTimeField(blank=True, null=True) def __str__(self): diff --git a/workshop_app/send_mails.py b/workshop_app/send_mails.py index 11d3e23..a8ada76 100644 --- a/workshop_app/send_mails.py +++ b/workshop_app/send_mails.py @@ -273,7 +273,7 @@ def send_email( request, call_on, workshop_date, workshop_title)) try: - send_mail("FOSSEE Workshop booking rejected for{0}" + send_mail("FOSSEE Workshop booking rejected for {0}" .format(workshop_date), message, EMAIL_HOST_USER, [request.user.email], fail_silently=False) except Exception: diff --git a/workshop_app/templates/workshop_app/activation.html b/workshop_app/templates/workshop_app/activation.html index 01a85bc..1262e22 100644 --- a/workshop_app/templates/workshop_app/activation.html +++ b/workshop_app/templates/workshop_app/activation.html @@ -11,10 +11,10 @@ <a class="navbar-brand" href="#">SiteName</a> </div> <ul class="nav navbar-nav navbar-right"> - {% if user.profile.is_email_verified %} - <li><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile</a></li> + {% if request.user.profile.is_email_verified %} + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile</a></li> {% endif %} - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> @@ -25,6 +25,7 @@ <div class="container"> <div class="jumbotron"> <p>{{ status }}</p> + {{ request.user.profile.activation_key }} </div> </div> {% else %} diff --git a/workshop_app/templates/workshop_app/booking.html b/workshop_app/templates/workshop_app/booking.html index dd9f1e9..13af37c 100644 --- a/workshop_app/templates/workshop_app/booking.html +++ b/workshop_app/templates/workshop_app/booking.html @@ -18,7 +18,7 @@ function sendData(d){ var check_count; //For queue - var URL = "{{ URL_ROOT }}/workshop_booking/book_workshop/"; + var URL = "{{ URL_ROOT }}/book_workshop/"; c = d + ',0'; $.ajax({ url: URL, @@ -62,7 +62,7 @@ } function booking_confirmed(d){ - var URL = "{{ URL_ROOT }}/workshop_booking/book_workshop/"; + var URL = "{{ URL_ROOT }}/book_workshop/"; $.ajax({ url: URL, @@ -89,13 +89,13 @@ <a class="navbar-brand" href="#">Coordinator Profile</a> </div> <ul class="nav navbar-nav"> - <li class="active"><a href="{{ URL_ROOT}}/workshop_booking/book/">Book</a></li> - <li><a href="{{ URL_ROOT}}/workshop_booking/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/propose_workshop/">Propose a Workshop</a></li> + <li class="active"><a href="{{ URL_ROOT}}/book/">Book</a></li> + <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> </ul> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/create_workshop.html b/workshop_app/templates/workshop_app/create_workshop.html index f98d7a1..2977a58 100644 --- a/workshop_app/templates/workshop_app/create_workshop.html +++ b/workshop_app/templates/workshop_app/create_workshop.html @@ -18,14 +18,14 @@ <a class="navbar-brand" href="#">Instructor Profile</a> </div> <ul class="nav navbar-nav"> - <li ><a href="{{ URL_ROOT }}/workshop_booking/manage/">Manage</a></li> - <li class="active"><a href="{{ URL_ROOT }}/workshop_booking/create_workshop/">Create Workshop</a></li> - <li ><a href="{{ URL_ROOT }}/workshop_booking/view_workshoptype_list/">View Workshop List</a></li> - <li ><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> + <li ><a href="{{ URL_ROOT }}/manage/">Manage</a></li> + <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> + <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/edit_profile.html b/workshop_app/templates/workshop_app/edit_profile.html index f8928e6..414b931 100644 --- a/workshop_app/templates/workshop_app/edit_profile.html +++ b/workshop_app/templates/workshop_app/edit_profile.html @@ -12,21 +12,21 @@ </div> {% if request.user.profile.position == 'instructor' %} <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/workshop_booking/manage/">Manage</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_workshoptype_list/">View Workshop List</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li> + <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> {% else %} <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/workshop_booking/book/">Book</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/book/">Book</a></li> + <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> </ul> {% endif %} <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/how_to_participate.html b/workshop_app/templates/workshop_app/how_to_participate.html index 1661cf0..0d8cc6f 100644 --- a/workshop_app/templates/workshop_app/how_to_participate.html +++ b/workshop_app/templates/workshop_app/how_to_participate.html @@ -16,11 +16,11 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/workshop_booking/">Booking</a> + <a class="navbar-brand" href="{{URL_ROOT}}/">Booking</a> </div> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> + <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> + <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html index f304624..ed34e4e 100644 --- a/workshop_app/templates/workshop_app/index.html +++ b/workshop_app/templates/workshop_app/index.html @@ -37,7 +37,7 @@ </form> </div> - <h4 style="margin-left: 27%; color: grey;">If not Registered yet, <br> please <a href="{{ URL_ROOT}}/workshop_booking/register/" target="_blank">register here.</a></h4> + <h4 style="margin-left: 27%; color: grey;">If not Registered yet, <br> please <a href="{{ URL_ROOT}}/register/" target="_blank">register here.</a></h4> <br><br> </div> @@ -48,21 +48,21 @@ <div class="icons col-sm-12"> <figure class="item" style="margin-left: 10%;"> - <a href="{{ URL_ROOT }}/workshop_booking/view_workshoptype_details/" style="color: #6D5847;"> + <a href="{{ URL_ROOT }}/view_workshoptype_details/" style="color: #6D5847;"> <img class="caption-img" src="{{ URL_ROOT }}/static/workshop_app/img/list.png" > <figcaption class="caption">Course List</figcaption> </a> </figure> <figure class="item" style="margin-left: 15%;"> - <a href="{{ URL_ROOT }}/workshop_booking/benefits/" style="color: #6D5847;"> + <a href="{{ URL_ROOT }}/benefits/" style="color: #6D5847;"> <img class="caption-img" src="{{ URL_ROOT }}/static/workshop_app/img/bnft.png" > <figcaption class="caption" >Benefits</figcaption> </a> </figure> <figure class="item" style="margin-left: 15%;"> - <a href="{{ URL_ROOT }}/workshop_booking/faq/" style="color: #6D5847;"> + <a href="{{ URL_ROOT }}/faq/" style="color: #6D5847;"> <img class="caption-img" src="{{ URL_ROOT }}/static/workshop_app/img/faq.png" > <figcaption class="caption" >FAQs</figcaption> </a> diff --git a/workshop_app/templates/workshop_app/login.html b/workshop_app/templates/workshop_app/login.html index 022badd..47f5827 100644 --- a/workshop_app/templates/workshop_app/login.html +++ b/workshop_app/templates/workshop_app/login.html @@ -8,12 +8,12 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT }}/workshop_booking/">Booking</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/">Booking</a> </div> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> + <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> + <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/logout.html b/workshop_app/templates/workshop_app/logout.html index 580fb3f..5dd9587 100644 --- a/workshop_app/templates/workshop_app/logout.html +++ b/workshop_app/templates/workshop_app/logout.html @@ -8,12 +8,12 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT }}/workshop_booking/">Booking</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/">Booking</a> </div> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> + <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> + <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> </div> </nav> @@ -24,7 +24,7 @@ <div class="container" align="center"> <br> <h3>You have logged out successfully.</h3> - <h4>If you want to Login again please <a href="{{ URL_ROOT}}/workshop_booking/login/">click here</a></h4> + <h4>If you want to Login again please <a href="{{ URL_ROOT}}/login/">click here</a></h4> <br> </div> diff --git a/workshop_app/templates/workshop_app/manage.html b/workshop_app/templates/workshop_app/manage.html index ee0b575..e210e5e 100644 --- a/workshop_app/templates/workshop_app/manage.html +++ b/workshop_app/templates/workshop_app/manage.html @@ -7,14 +7,14 @@ <a class="navbar-brand" href="#">Instructor Profile</a> </div> <ul class="nav navbar-nav"> - <li class="active"><a href="{{ URL_ROOT }}/workshop_booking/manage/">Manage</a></li> - <li ><a href="{{ URL_ROOT }}/workshop_booking/create_workshop/">Create Workshop</a></li> - <li ><a href="{{ URL_ROOT }}/workshop_booking/view_workshoptype_list/">View Workshop List</a></li> - <li ><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> + <li class="active"><a href="{{ URL_ROOT }}/manage/">Manage</a></li> + <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> + <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> @@ -37,7 +37,7 @@ }); function sendData(d){ - var URL = "{{ URL_ROOT }}/workshop_booking/my_workshops/" + var URL = "{{ URL_ROOT }}/my_workshops/" console.log(d); $.ajax({ url: URL, diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html index 3785eca..275a0a0 100644 --- a/workshop_app/templates/workshop_app/my_workshops.html +++ b/workshop_app/templates/workshop_app/my_workshops.html @@ -20,7 +20,7 @@ }); function sendData(d){ - var URL = "{{ URL_ROOT }}/workshop_booking/my_workshops/" + var URL = "{{ URL_ROOT }}/my_workshops/" console.log(d); $.ajax({ url: URL, @@ -41,27 +41,30 @@ {% block header %} <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> + {% if request.user.profile.position == 'instructor' %} <div class="navbar-header"> - <a class="navbar-brand" href="#">WebSiteName</a> + <a class="navbar-brand" href="#">Instructor Profile</a> </div> - {% if request.user.profile.position == 'instructor' %} <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/workshop_booking/manage/">Manage</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_workshoptype_list/">View Workshop List</a></li> - <li class="active"><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li> + <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> {% else %} + <div class="navbar-header"> + <a class="navbar-brand" href="{{URL_ROOT}}/book/">Coordinator Profile</a> + </div> <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/workshop_booking/book/">Book</a></li> - <li class="active"><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/book/">Book</a></li> + <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> </ul> {% endif %} <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/profile_updated.html b/workshop_app/templates/workshop_app/profile_updated.html index 6373172..c90e176 100644 --- a/workshop_app/templates/workshop_app/profile_updated.html +++ b/workshop_app/templates/workshop_app/profile_updated.html @@ -12,19 +12,19 @@ </div> <ul class="nav navbar-nav"> {% if request.user.profile.position == 'instructor' %} - <li><a href="{{ URL_ROOT }}/workshop_booking/manage/">Manage</a> + <li><a href="{{ URL_ROOT }}/manage/">Manage</a> </li> - <li><a href="{{ URL_ROOT }}/workshop_booking/create_workshop/">Create Workshop</a></li> + <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> {% else %} - <li><a href="{{ URL_ROOT }}/workshop_booking/book/">Book</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/book/">Book</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> {% endif %} - <li><a href="{{ URL_ROOT }}/workshop_booking/view_workshoptype_list/">View Workshop Details</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop Details</a></li> + <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html index 44000d3..697fe63 100644 --- a/workshop_app/templates/workshop_app/propose_workshop.html +++ b/workshop_app/templates/workshop_app/propose_workshop.html @@ -26,16 +26,16 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT}}/workshop_booking/book/">WebSiteName</a> + <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Coordinator Profile</a> </div> <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/workshop_booking/book/">Book</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> - <li class="active"><a href="{{ URL_ROOT }}/workshop_booking/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/book/">Book</a></li> + <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> + <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> </ul> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/register.html b/workshop_app/templates/workshop_app/register.html index 4164c40..6e688d5 100644 --- a/workshop_app/templates/workshop_app/register.html +++ b/workshop_app/templates/workshop_app/register.html @@ -8,12 +8,12 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT }}/workshop_booking/">Booking</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/">Booking</a> </div> <ul class="nav navbar-nav navbar-right"> - <li class="active"><a href="{{ URL_ROOT }}/workshop_booking/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> + <li class="active"><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> + <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/registeration_error.html b/workshop_app/templates/workshop_app/registeration_error.html index 8a48114..ad1e73b 100644 --- a/workshop_app/templates/workshop_app/registeration_error.html +++ b/workshop_app/templates/workshop_app/registeration_error.html @@ -8,6 +8,6 @@ <div class="container" > <br> <h1>Error Occurred While registration</h1> - <h3>Please try to <a href="{{ URL_ROOT }}/workshop_booking/register/"> register again</a> using different username or email and see to it that you fill all the fields.</h3> + <h3>Please try to <a href="{{ URL_ROOT }}/register/"> register again</a> using different username or email and see to it that you fill all the fields.</h3> </div> {% endblock %}
\ No newline at end of file diff --git a/workshop_app/templates/workshop_app/view_benefits.html b/workshop_app/templates/workshop_app/view_benefits.html index 7e970ce..9b56244 100644 --- a/workshop_app/templates/workshop_app/view_benefits.html +++ b/workshop_app/templates/workshop_app/view_benefits.html @@ -16,11 +16,11 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/workshop_booking/">Booking</a> + <a class="navbar-brand" href="{{URL_ROOT}}/">Booking</a> </div> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> + <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> + <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/view_faq.html b/workshop_app/templates/workshop_app/view_faq.html index c608bd8..77ec095 100644 --- a/workshop_app/templates/workshop_app/view_faq.html +++ b/workshop_app/templates/workshop_app/view_faq.html @@ -18,11 +18,11 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/workshop_booking/">Booking</a> + <a class="navbar-brand" href="{{URL_ROOT}}/">Booking</a> </div> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> + <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> + <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/view_profile.html b/workshop_app/templates/workshop_app/view_profile.html index 23df8ed..751cc0b 100644 --- a/workshop_app/templates/workshop_app/view_profile.html +++ b/workshop_app/templates/workshop_app/view_profile.html @@ -7,27 +7,30 @@ {% block header %} <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> + {% if request.user.profile.position == 'instructor' %} <div class="navbar-header"> - <a class="navbar-brand" href="#">WebSiteName</a> + <a class="navbar-brand" href="#">Instructor Profile</a> </div> - {% if request.user.profile.position == 'instructor' %} <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/workshop_booking/manage/">Manage</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_workshoptype_list/">View Workshop List</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li> + <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> {% else %} + <div class="navbar-header"> + <a class="navbar-brand" href="{{URL_ROOT}}/book/">Coordinator Profile</a> + </div> <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/workshop_booking/book/">Book</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a> - <li><a href="{{ URL_ROOT }}/workshop_booking/propose_workshop/">Propose a Workshop</a></li></li> + <li><a href="{{ URL_ROOT }}/book/">Book</a></li> + <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li></li> </ul> {% endif %} <ul class="nav navbar-nav navbar-right"> - <li class="active"><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li class="active"><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> @@ -68,6 +71,6 @@ </tr> </table> <br> - <a class="btn btn-primary pull-right" href="{{ URL_ROOT }}/workshop_booking/edit_profile/">Edit Profile</a> + <a class="btn btn-primary pull-right" href="{{ URL_ROOT }}/edit_profile/">Edit Profile</a> </div> {% endblock %} diff --git a/workshop_app/templates/workshop_app/view_workshoptype_details.html b/workshop_app/templates/workshop_app/view_workshoptype_details.html index e488158..0cb989e 100644 --- a/workshop_app/templates/workshop_app/view_workshoptype_details.html +++ b/workshop_app/templates/workshop_app/view_workshoptype_details.html @@ -16,11 +16,11 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/workshop_booking/">Booking</a> + <a class="navbar-brand" href="{{URL_ROOT}}/">Booking</a> </div> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> + <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> + <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> </div> </nav> diff --git a/workshop_app/templates/workshop_app/view_workshoptype_list.html b/workshop_app/templates/workshop_app/view_workshoptype_list.html index 16ee38e..dddd119 100644 --- a/workshop_app/templates/workshop_app/view_workshoptype_list.html +++ b/workshop_app/templates/workshop_app/view_workshoptype_list.html @@ -14,19 +14,19 @@ </div> <ul class="nav navbar-nav"> {% if request.user.profile.position == 'instructor'%} - <li><a href="{{ URL_ROOT }}/workshop_booking/manage/">Manage</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/create_workshop/">Create Workshop</a></li> + <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li> + <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> {% else %} - <li><a href="{{ URL_ROOT }}/workshop_booking/book/">Book</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/book/">Book</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> {% endif %} - <li class="active"><a href="{{ URL_ROOT }}/workshop_booking/view_workshoptype_list/">View Workshop List</a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/my_workshops/">My Workshops</a></li> + <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/workshop_booking/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> - <li><a href="{{ URL_ROOT }}/workshop_booking/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> </ul> </div> </nav> @@ -61,7 +61,7 @@ <td>{{ w.workshoptype_duration }}</td> <td><button class="btn btn-default btn-sm" class="accordion-toggle" data-toggle="collapse" href="#collapseOne{{ forloop.counter }}">View Workshop Details</button></td> {% if request.user.profile.position == 'coordinator' %} - <td><button class="btn btn-default btn-sm" ><a href="{{ URL_ROOT }}/workshop_booking/book/">Book</a></button></td> + <td><button class="btn btn-default btn-sm" ><a href="{{ URL_ROOT }}/book/">Book</a></button></td> {% endif %} </tr> diff --git a/workshop_app/views.py b/workshop_app/views.py index 11bd003..270902e 100644 --- a/workshop_app/views.py +++ b/workshop_app/views.py @@ -44,16 +44,16 @@ def index(request): form = UserLoginForm() if user.is_authenticated(): if user.groups.filter(name='instructor').count() > 0: - return redirect('/workshop_booking/manage/') - return redirect('/workshop_booking/book/') + return redirect('/manage/') + return redirect('/book/') elif request.method == "POST": form = UserLoginForm(request.POST) if form.is_valid(): user = form.cleaned_data login(request, user) if user.groups.filter(name='instructor').count() > 0: - return redirect('/workshop_booking/manage/') - return redirect('/workshop_booking/book/') + return redirect('/manage/') + return redirect('/book/') return render(request, "workshop_app/index.html", {"form": form}) @@ -68,8 +68,8 @@ def user_login(request): user = request.user if user.is_authenticated(): if user.groups.filter(name='instructor').count() > 0: - return redirect('/workshop_booking/manage/') - return redirect('/workshop_booking/book/') + return redirect('/manage/') + return redirect('/book/') if request.method == "POST": form = UserLoginForm(request.POST) @@ -77,8 +77,8 @@ def user_login(request): user = form.cleaned_data login(request, user) if user.groups.filter(name='instructor').count() > 0: - return redirect('/workshop_booking/manage/') - return redirect('/workshop_booking/book/') + return redirect('/manage/') + return redirect('/book/') else: return render(request, 'workshop_app/login.html', {"form": form}) else: @@ -96,7 +96,7 @@ def activate_user(request, key): try: user = Profile.objects.get(activation_key=key) except: - return redirect('/workshop_booking/register/') + return redirect('/register/') if user.is_email_verified: status = "Your email is already verified" @@ -112,7 +112,7 @@ def activate_user(request, key): status = "Your account has been activated" else: logout(request) - return redirect('/workshop_booking/logout/') + return redirect('/logout/') return render(request, 'workshop_app/activation.html', {"status": status}) @@ -150,7 +150,7 @@ def book(request): if user.is_authenticated(): if is_email_checked(user): if user.groups.filter(name='instructor').count() > 0: - return redirect('/workshop_booking/manage/') + return redirect('/manage/') workshop_details = Workshop.objects.all() @@ -227,7 +227,7 @@ def book(request): else: return render(request, "workshop_app/activation.html") else: - return redirect('/workshop_booking/login/') + return redirect('/login/') @login_required @@ -383,9 +383,9 @@ def manage(request): {"workshop_occurence_list": workshops} ) - return redirect('/workshop_booking/book/') + return redirect('/book/') else: - return redirect('/workshop_booking/login/') + return redirect('/login/') @login_required @@ -624,7 +624,7 @@ def my_workshops(request): return render(request, 'workshop_app/my_workshops.html', {"workshop_occurences": workshop_occurences}) else: - return redirect('/workshop_booking/login/') + return redirect('/login/') @login_required @@ -634,7 +634,7 @@ def propose_workshop(request): user = request.user if is_email_checked(user): if is_instructor(user): - return redirect('/workshop_booking/manage/') + return redirect('/manage/') else: if request.method == 'POST': form = ProposeWorkshopDateForm(request.POST) @@ -643,7 +643,7 @@ def propose_workshop(request): form_data.proposed_workshop_coordinator = user form_data.proposed_workshop_coordinator.save() form_data.save() - return redirect('/workshop_booking/my_workshops/') + return redirect('/my_workshops/') else: form = ProposeWorkshopDateForm() return render( @@ -712,7 +712,7 @@ def create_workshop(request): form_data.workshop_instructor = user form_data.workshop_instructor.save() form_data.save() - return redirect('/workshop_booking/manage/') + return redirect('/manage/') else: form = CreateWorkshop() return render( @@ -720,7 +720,7 @@ def create_workshop(request): {"form": form } ) else: - return redirect('/workshop_booking/book/') + return redirect('/book/') @login_required @@ -747,7 +747,7 @@ def view_workshoptype_list(request): {'workshoptype': workshoptype} ) else: - return redirect('/workshop_booking/activate_user/') + return redirect('/activate_user/') def view_workshoptype_details(request): diff --git a/workshop_portal/urls.py b/workshop_portal/urls.py index bec0310..1b212f7 100644 --- a/workshop_portal/urls.py +++ b/workshop_portal/urls.py @@ -24,25 +24,25 @@ js_info_dict = { urlpatterns = [ - url(r'^workshop_booking/$', views.index, name='index'), - url(r'^workshop_booking/admin/', admin.site.urls), - url(r'^workshop_booking/register/$', views.user_register), - url(r'^workshop_booking/activate_user/(?P<key>.+)$', views.activate_user), - url(r'^workshop_booking/login/$', views.user_login), - url(r'^workshop_booking/logout/$', views.user_logout), - url(r'^workshop_booking/view_profile/$', views.view_profile), - url(r'^workshop_booking/edit_profile/$', views.edit_profile), - url(r'^workshop_booking/book/$', views.book), - url(r'^workshop_booking/book_workshop/$', views.book_workshop), - url(r'^workshop_booking/my_workshops/$', views.my_workshops), - url(r'^workshop_booking/benefits/$', views.benefits), - url(r'^workshop_booking/how_to_participate/$', views.how_to_participate), - url(r'^workshop_booking/faq/$', views.faq), - url(r'^workshop_booking/manage/$', views.manage), - url(r'^workshop_booking/view_workshoptype_list/$', views.view_workshoptype_list), - url(r'^workshop_booking/view_workshoptype_details/$', views.view_workshoptype_details), - url(r'^workshop_booking/create_workshop/$', views.create_workshop), - url(r'^workshop_booking/propose_workshop/$', views.propose_workshop), - url(r'^workshop_booking/jsi18n/$', django.views.i18n.javascript_catalog, js_info_dict), + url(r'^$', views.index, name='index'), + url(r'^admin/', admin.site.urls), + url(r'^register/$', views.user_register), + url(r'^activate_user/(?P<key>.+)$', views.activate_user), + url(r'^login/$', views.user_login), + url(r'^logout/$', views.user_logout), + url(r'^view_profile/$', views.view_profile), + url(r'^edit_profile/$', views.edit_profile), + url(r'^book/$', views.book), + url(r'^book_workshop/$', views.book_workshop), + url(r'^my_workshops/$', views.my_workshops), + url(r'^benefits/$', views.benefits), + url(r'^how_to_participate/$', views.how_to_participate), + url(r'^faq/$', views.faq), + url(r'^manage/$', views.manage), + url(r'^view_workshoptype_list/$', views.view_workshoptype_list), + url(r'^view_workshoptype_details/$', views.view_workshoptype_details), + url(r'^create_workshop/$', views.create_workshop), + url(r'^propose_workshop/$', views.propose_workshop), + url(r'^jsi18n/$', django.views.i18n.javascript_catalog, js_info_dict), ] |