klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-09 19:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

WIP: Move to Jinja2

Browse Source
This commit is contained in:
Skia
2016-02-01 17:35:55 +01:00
parent abb8dc0c5e
commit 03bc0973fe
38 changed files with 261 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/views/__init__.py
View File

@ -7,10 +7,10 @@ from django.views.generic.base import View
from core.models import Group
def forbidden(request):
return render(request, "core/403.html")
return render(request, "core/403.jinja")
def not_found(request):
return render(request, "core/404.html")
return render(request, "core/404.jinja")
class CanEditPropMixin(View):

10
core/views/page.py
View File

@ -11,6 +11,7 @@ from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin
class PageListView(ListView):
model = Page
template_name = 'core/page_list.jinja'
def get_context_data(self, **kwargs):
context = super(PageListView, self).get_context_data(**kwargs)
@ -18,6 +19,7 @@ class PageListView(ListView):
class PageView(CanViewMixin, DetailView):
model = Page
template_name = 'core/page_detail.jinja'
def get_object(self):
self.page = Page.get_page_by_full_name(self.kwargs['page_name'])
@ -36,7 +38,7 @@ class PageView(CanViewMixin, DetailView):
class PageHistView(CanViewMixin, DetailView):
model = Page
template_name_suffix = '_hist'
template_name = 'core/page_hist.jinja'
def get_object(self):
self.page = Page.get_page_by_full_name(self.kwargs['page_name'])
@ -44,7 +46,7 @@ class PageHistView(CanViewMixin, DetailView):
class PageRevView(CanViewMixin, DetailView):
model = Page
template_name = 'core/page_detail.html'
template_name = 'core/page_detail.jinja'
def get_object(self):
self.page = Page.get_page_by_full_name(self.kwargs['page_name'])
@ -67,7 +69,7 @@ class PageRevView(CanViewMixin, DetailView):
class PagePropView(CanEditPropMixin, UpdateView):
model = Page
form_class = PagePropForm
template_name_suffix = '_prop'
template_name = 'core/page_prop.jinja'
def get_object(self):
page_name = self.kwargs['page_name']
@ -97,7 +99,7 @@ class PagePropView(CanEditPropMixin, UpdateView):
class PageEditView(CanEditMixin, UpdateView):
model = PageRev
fields = ['title', 'content',]
template_name_suffix = '_edit'
template_name = 'core/pagerev_edit.jinja'
def get_object(self):
self.page = Page.get_page_by_full_name(self.kwargs['page_name'])

4
core/views/site.py
View File

@ -4,7 +4,7 @@ from django.db import models
def index(request, context=None):
if context == None:
return render(request, "core/index.html", {'title': 'Bienvenue!'})
return render(request, "core/index.jinja", {'title': 'Bienvenue!'})
else:
return render(request, "core/index.html", context)
return render(request, "core/index.jinja", context)

27
core/views/user.py
View File

@ -16,7 +16,7 @@ def login(request):
Needs to be improve with correct handling of form exceptions
"""
return views.login(request, template_name="core/login.html")
return views.login(request, template_name="core/login.jinja")
def logout(request):
"""
@ -28,21 +28,21 @@ def password_change(request):
"""
Allows a user to change its password
"""
return views.password_change(request, template_name="core/password_change.html", post_change_redirect=reverse("core:password_change_done"))
return views.password_change(request, template_name="core/password_change.jinja", post_change_redirect=reverse("core:password_change_done"))
def password_change_done(request):
"""
Allows a user to change its password
"""
return views.password_change_done(request, template_name="core/password_change_done.html")
return views.password_change_done(request, template_name="core/password_change_done.jinja")
def password_reset(request):
"""
Allows someone to enter an email adresse for resetting password
"""
return views.password_reset(request,
template_name="core/password_reset.html",
email_template_name="core/password_reset_email.html",
template_name="core/password_reset.jinja",
email_template_name="core/password_reset_email.jinja",
post_reset_redirect="core:password_reset_done",
)
@ -50,7 +50,7 @@ def password_reset_done(request):
"""
Confirm that the reset email has been sent
"""
return views.password_reset_done(request, template_name="core/password_reset_done.html")
return views.password_reset_done(request, template_name="core/password_reset_done.jinja")
def password_reset_confirm(request, uidb64=None, token=None):
"""
@ -58,7 +58,7 @@ def password_reset_confirm(request, uidb64=None, token=None):
"""
return views.password_reset_confirm(request, uidb64=uidb64, token=token,
post_reset_redirect="core:password_reset_complete",
template_name="core/password_reset_confirm.html",
template_name="core/password_reset_confirm.jinja",
)
def password_reset_complete(request):
@ -66,7 +66,7 @@ def password_reset_complete(request):
Confirm the password has sucessfully been reset
"""
return views.password_reset_complete(request,
template_name="core/password_reset_complete.html",
template_name="core/password_reset_complete.jinja",
)
@ -86,7 +86,7 @@ def register(request):
else:
form = RegisteringForm()
context['form'] = form.as_p()
return render(request, "core/register.html", context)
return render(request, "core/register.jinja", context)
class UserView(CanViewMixin, DetailView):
"""
@ -95,12 +95,14 @@ class UserView(CanViewMixin, DetailView):
model = User
pk_url_kwarg = "user_id"
context_object_name = "profile"
template_name = "core/user_detail.jinja"
class UserListView(ListView):
"""
Displays the user list
"""
model = User
template_name = "core/user_list.jinja"
class UserUpdateProfileView(CanEditMixin, UpdateView):
"""
@ -108,7 +110,7 @@ class UserUpdateProfileView(CanEditMixin, UpdateView):
"""
model = User
pk_url_kwarg = "user_id"
template_name = "core/user_edit.html"
template_name = "core/user_edit.jinja"
fields = ('first_name', 'last_name', 'nick_name', 'email', 'date_of_birth', )
class UserUpdatePropView(CanEditPropMixin, UpdateView):
@ -117,11 +119,12 @@ class UserUpdatePropView(CanEditPropMixin, UpdateView):
"""
model = User
pk_url_kwarg = "user_id"
template_name = "core/user_prop.html"
template_name = "core/user_prop.jinja"
form_class = UserPropForm
context_object_name = "profile"
class UserToolsView(TemplateView):
"""
Displays the logged user's tools
"""
template_name = "core/user_tools.html"
template_name = "core/user_tools.jinja"