diff --git a/src/rideshare/templates/rideshare/ride_detail.html b/src/rideshare/templates/rideshare/ride_detail.html index 6e41af13..09383672 100644 --- a/src/rideshare/templates/rideshare/ride_detail.html +++ b/src/rideshare/templates/rideshare/ride_detail.html @@ -3,10 +3,39 @@ {% block content %} -{{ object.location }} + + + Back + + +
+ +
+
+

+ {{ object.seats }} + seats free, going from + {{ object.location }} + at + {{ object.when|date:"jS \o\f F \a\t H:i T" }} +

+
+
+ Description: +

+ {{ object.description|untrustedcommonmark }} +

+
+ +
+ -{{ object.datetime }} -{{ object.description }} {% endblock %} diff --git a/src/rideshare/templates/rideshare/ride_list.html b/src/rideshare/templates/rideshare/ride_list.html index 41ebf72c..ca022df6 100644 --- a/src/rideshare/templates/rideshare/ride_list.html +++ b/src/rideshare/templates/rideshare/ride_list.html @@ -2,17 +2,49 @@ {% block content %} + + +

+On this page participants of {{ camp.title }} can communicate about ridesharing to and from the festival. +

+ Create ride -
+ + + {% for ride in ride_list %} + + +
+ When + + Location + + Seats + +
+ {{ ride.when|date:"c" }} + + {{ ride.location }} + + {{ ride.seats }} + + + Details + - {{ ride.from_location }} at {{ ride.from_datetime}} +{% empty %} +
+ No rideshares yet! {% endfor %} +
{% endblock %} diff --git a/src/rideshare/urls.py b/src/rideshare/urls.py index e528e248..6f07621d 100644 --- a/src/rideshare/urls.py +++ b/src/rideshare/urls.py @@ -6,6 +6,7 @@ from .views import ( RideDetail, RideUpdate, RideDelete, + RideContactConfirm, ) app_name = 'rideshare' @@ -38,6 +39,11 @@ urlpatterns = [ RideDelete.as_view(), name='delete' ), + path( + 'confirm/', + RideContactConfirm.as_view(), + name='contact-confirm' + ), ]) ) ] diff --git a/src/rideshare/views.py b/src/rideshare/views.py index de0eaa03..f11eed0e 100644 --- a/src/rideshare/views.py +++ b/src/rideshare/views.py @@ -5,6 +5,7 @@ from django.views.generic import ( CreateView, UpdateView, DeleteView, + TemplateView, ) from django.http import HttpResponseRedirect @@ -41,3 +42,11 @@ class RideUpdate(LoginRequiredMixin, CampViewMixin, UpdateView): class RideDelete(LoginRequiredMixin, CampViewMixin, DeleteView): model = Ride + + +class RideContactConfirm(LoginRequiredMixin, CampViewMixin, DetailView): + model = Ride + template_name = "rideshare/ride_contact_confirm.html" + + +# class RideContact(View): diff --git a/src/templates/includes/menuitems.html b/src/templates/includes/menuitems.html index 401da54e..fe144075 100644 --- a/src/templates/includes/menuitems.html +++ b/src/templates/includes/menuitems.html @@ -5,7 +5,9 @@ Villages Sponsors Teams + {% if request.user.is_authenticated %} Rideshare + {% endif %} {% if request.user.is_staff %} Backoffice {% endif %}