From 385971456e6cbdab055263d717023c5cb17ab72a Mon Sep 17 00:00:00 2001 From: piernov Date: Sat, 28 Feb 2015 21:57:08 +0100 Subject: Rename *.mak to *.mako for consistency --- jm2l/templates/Errors/404.mak | 65 -------------- jm2l/templates/Errors/404.mako | 65 ++++++++++++++ jm2l/templates/Profil/Sejour.mak | 172 -------------------------------------- jm2l/templates/Profil/Sejour.mako | 172 ++++++++++++++++++++++++++++++++++++++ jm2l/templates/index_profil.mako | 2 +- jm2l/templates/jm2l.mako | 2 +- jm2l/views.py | 6 +- 7 files changed, 242 insertions(+), 242 deletions(-) delete mode 100644 jm2l/templates/Errors/404.mak create mode 100644 jm2l/templates/Errors/404.mako delete mode 100644 jm2l/templates/Profil/Sejour.mak create mode 100644 jm2l/templates/Profil/Sejour.mako diff --git a/jm2l/templates/Errors/404.mak b/jm2l/templates/Errors/404.mak deleted file mode 100644 index 6379cd4..0000000 --- a/jm2l/templates/Errors/404.mak +++ /dev/null @@ -1,65 +0,0 @@ - - - - - Page Not Found - - - - - -

Page non trouvée

- % if reason: -

${reason}

- % else: -

Sorry, but the page you were trying to view does not exist.

- % endif - - - diff --git a/jm2l/templates/Errors/404.mako b/jm2l/templates/Errors/404.mako new file mode 100644 index 0000000..6379cd4 --- /dev/null +++ b/jm2l/templates/Errors/404.mako @@ -0,0 +1,65 @@ + + + + + Page Not Found + + + + + +

Page non trouvée

+ % if reason: +

${reason}

+ % else: +

Sorry, but the page you were trying to view does not exist.

+ % endif + + + diff --git a/jm2l/templates/Profil/Sejour.mak b/jm2l/templates/Profil/Sejour.mak deleted file mode 100644 index 3fcd647..0000000 --- a/jm2l/templates/Profil/Sejour.mak +++ /dev/null @@ -1,172 +0,0 @@ -<%def name="sejour_wrapper(Places)"> - - ##Je viens aux JM2L 2015 -
- Arrivée -
- J'arrive - - le - - , - - - à - - - <% - context._kwargs['postpone_js'].append( "$('#Arrival\\\\:Place').select2({width:'resolve'});" % jsitem ) - context._kwargs['postpone_js'].append( "$('#Arrival\\\\:Day').select2({width:'resolve'});" % jsitem ) - context._kwargs['postpone_js'].append( "$('#Arrival\\\\:Confidence').select2({width:'resolve'});" % jsitem ) - context._kwargs['postpone_js'].append( "$('#Arrival\\\\:Hour').select2({width:'resolve'});" % jsitem ) - %> - ## -
-

-

- Je vais avoir besoin:   (Cochez les cases correspondantes) - -
    -
  • -
    • -
  • -
    • -
  • -
    • -
  • -
    - - -
    -
    • -
-
-

-
- -
- Départ -
- Je repars - - le - - , - - à - - - <% - context._kwargs['postpone_js'].append( "$('#Departure\\\\:Place').select2({width:'resolve'});" % jsitem ) - context._kwargs['postpone_js'].append( "$('#Departure\\\\:Day').select2({width:'resolve'});" % jsitem ) - context._kwargs['postpone_js'].append( "$('#Departure\\\\:Confidence').select2({width:'resolve'});" % jsitem ) - context._kwargs['postpone_js'].append( "$('#Departure\\\\:Hour').select2({width:'resolve'});" % jsitem ) - %> - - ## - -
-

-

- Je vais avoir besoin:   (Cochez les cases correspondantes) -
    -
  • -
    • -
  • -
    • -
  • -
    • -
  • -
    - - -
    -
    • -
-
-

-
- diff --git a/jm2l/templates/Profil/Sejour.mako b/jm2l/templates/Profil/Sejour.mako new file mode 100644 index 0000000..3fcd647 --- /dev/null +++ b/jm2l/templates/Profil/Sejour.mako @@ -0,0 +1,172 @@ +<%def name="sejour_wrapper(Places)"> + + ##Je viens aux JM2L 2015 +
+ Arrivée +
+ J'arrive + + le + + , + + + à + + + <% + context._kwargs['postpone_js'].append( "$('#Arrival\\\\:Place').select2({width:'resolve'});" % jsitem ) + context._kwargs['postpone_js'].append( "$('#Arrival\\\\:Day').select2({width:'resolve'});" % jsitem ) + context._kwargs['postpone_js'].append( "$('#Arrival\\\\:Confidence').select2({width:'resolve'});" % jsitem ) + context._kwargs['postpone_js'].append( "$('#Arrival\\\\:Hour').select2({width:'resolve'});" % jsitem ) + %> + ## +
+

+

+ Je vais avoir besoin:   (Cochez les cases correspondantes) + +
    +
  • +
    • +
  • +
    • +
  • +
    • +
  • +
    + + +
    +
    • +
+
+

+
+ +
+ Départ +
+ Je repars + + le + + , + + à + + + <% + context._kwargs['postpone_js'].append( "$('#Departure\\\\:Place').select2({width:'resolve'});" % jsitem ) + context._kwargs['postpone_js'].append( "$('#Departure\\\\:Day').select2({width:'resolve'});" % jsitem ) + context._kwargs['postpone_js'].append( "$('#Departure\\\\:Confidence').select2({width:'resolve'});" % jsitem ) + context._kwargs['postpone_js'].append( "$('#Departure\\\\:Hour').select2({width:'resolve'});" % jsitem ) + %> + + ## + +
+

+

+ Je vais avoir besoin:   (Cochez les cases correspondantes) +
    +
  • +
    • +
  • +
    • +
  • +
    • +
  • +
    + + +
    +
    • +
+
+

+
+ 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) -- cgit v1.2.3-70-g09d2