From 385971456e6cbdab055263d717023c5cb17ab72a Mon Sep 17 00:00:00 2001 From: piernov Date: Sat, 28 Feb 2015 21:57:08 +0100 Subject: [PATCH] Rename *.mak to *.mako for consistency --- jm2l/templates/Errors/{404.mak => 404.mako} | 0 jm2l/templates/Profil/{Sejour.mak => Sejour.mako} | 0 jm2l/templates/index_profil.mako | 2 +- jm2l/templates/jm2l.mako | 2 +- jm2l/views.py | 6 +++--- 5 files changed, 5 insertions(+), 5 deletions(-) rename jm2l/templates/Errors/{404.mak => 404.mako} (100%) rename jm2l/templates/Profil/{Sejour.mak => Sejour.mako} (100%) diff --git a/jm2l/templates/Errors/404.mak b/jm2l/templates/Errors/404.mako similarity index 100% rename from jm2l/templates/Errors/404.mak rename to jm2l/templates/Errors/404.mako diff --git a/jm2l/templates/Profil/Sejour.mak b/jm2l/templates/Profil/Sejour.mako similarity index 100% rename from jm2l/templates/Profil/Sejour.mak rename to jm2l/templates/Profil/Sejour.mako diff --git a/jm2l/templates/index_profil.mako b/jm2l/templates/index_profil.mako index 6e0f27c..87667a4 100644 --- a/jm2l/templates/index_profil.mako +++ b/jm2l/templates/index_profil.mako @@ -1,6 +1,6 @@ <%inherit file="jm2l:templates/layout.mako"/> <%namespace name="profil" file="jm2l:templates/Profil/Profil.mako"/> -<%namespace name="sejour" file="jm2l:templates/Profil/Sejour.mak"/> +<%namespace name="sejour" file="jm2l:templates/Profil/Sejour.mako"/> <%namespace name="intendance" file="jm2l:templates/Logistique/Logistique.mako"/> <% from pyramid.security import authenticated_userid diff --git a/jm2l/templates/jm2l.mako b/jm2l/templates/jm2l.mako index fc2043b..7ee2700 100644 --- a/jm2l/templates/jm2l.mako +++ b/jm2l/templates/jm2l.mako @@ -1,6 +1,6 @@ <%inherit file="jm2l:templates/layout.mako"/> <%namespace name="profil" file="jm2l:templates/Profil/Profil.mako"/> -<%namespace name="sejour" file="jm2l:templates/Profil/Sejour.mak"/> +<%namespace name="sejour" file="jm2l:templates/Profil/Sejour.mako"/> <%namespace name="intendance" file="jm2l:templates/Logistique/Logistique.mako"/> <%namespace name="intervention" file="jm2l:templates/Interventions/Interventions.mako"/> <%namespace name="h" file="jm2l:templates/helpers.mako"/> diff --git a/jm2l/views.py b/jm2l/views.py index d11372c..e3485ae 100644 --- a/jm2l/views.py +++ b/jm2l/views.py @@ -1058,7 +1058,7 @@ def link_role_entity(request): @notfound_view_config() def notfound(reason, request): request.response.status = 404 - return render_to_response('jm2l:templates/Errors/404.mak', { "reason":reason }, + return render_to_response('jm2l:templates/Errors/404.mako', { "reason":reason }, request=request) @@ -1066,5 +1066,5 @@ def notfound(reason, request): def forbidden(reason, request): #return Response('forbidden') request.response.status = 404 - return render_to_response('jm2l:templates/Errors/404.mak', { "reason":reason }, - request=request) \ No newline at end of file + return render_to_response('jm2l:templates/Errors/404.mako', { "reason":reason }, + request=request)