cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity

cleaning UGLY django template style

Browse source 
and moving some template files
This commit is contained in:
Qwann 2017-02-11 16:21:13 +01:00
parent 5d35112c87
commit 924a289a78
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gestioncof/petits_cours_views.py
View file

@ -101,7 +101,7 @@ def _finalize_traitement(request, demande, proposals, proposed_for,
'style="width:99%; height: 90px;">' 'style="width:99%; height: 90px;">'
'</textarea>' '</textarea>'
}) })
return render(request, "traitement_demande_petit_cours.html", return render(request, "gestioncof/traitement_demande_petit_cours.html",
{"demande": demande, {"demande": demande,
"unsatisfied": unsatisfied, "unsatisfied": unsatisfied,
"proposals": proposals, "proposals": proposals,
@ -211,7 +211,8 @@ def _traitement_other(request, demande, redo):
unsatisfied.append(matiere) unsatisfied.append(matiere)
proposals = proposals.items() proposals = proposals.items()
proposed_for = proposed_for.items() proposed_for = proposed_for.items()
return render(request, "traitement_demande_petit_cours_autre_niveau.html", return render(request,
"gestiocof/traitement_demande_petit_cours_autre_niveau.html",
{"demande": demande, {"demande": demande,
"unsatisfied": unsatisfied, "unsatisfied": unsatisfied,
"proposals": proposals, "proposals": proposals,
@ -277,7 +278,8 @@ def _traitement_post(request, demande):
demande.traitee_par = request.user demande.traitee_par = request.user
demande.processed = datetime.now() demande.processed = datetime.now()
demande.save() demande.save()
return render(request, "traitement_demande_petit_cours_success.html", return render(request,
"gestioncof/traitement_demande_petit_cours_success.html",
{"demande": demande, {"demande": demande,
"redo": redo, "redo": redo,
}) })

14
gestioncof/templates/traitement_demande_petit_cours.html → gestioncof/templates/gestioncof/traitement_demande_petit_cours.html
View file

@ -30,14 +30,16 @@
<h4>Mails pour les membres proposés :</h4> <h4>Mails pour les membres proposés :</h4>
{% for proposeduser, mail in proposed_mails %} {% for proposeduser, mail in proposed_mails %}
<h5>Pour {{ proposeduser }}:</h5> <h5>Pour {{ proposeduser }}:</h5>
{% for part in mail %} {% with object=mail.0 content=mail.1 %}
<pre>{{ part }}</pre> <pre>{{ object }}</pre>
{% endfor %} <pre>{{ content }}</pre>
{% endwith %}
{% endfor %} {% endfor %}
<h4>Mail pour l'auteur de la demande :</h4> <h4>Mail pour l'auteur de la demande :</h4>
{% for part in mainmail %} {% with object=mainmail.0 content=mainmail.1 %}
<pre style="margin-top: 15px;">{{ part|safe }}</pre> <pre style="margin-top: 15px;">{{ object }}</pre>
{% endfor %} <pre style="margin-top: 15px;">{{ content|safe }}</pre>
{% endwith %}
<input type="hidden" name="attribdata" value="{{ attribdata }}" /> <input type="hidden" name="attribdata" value="{{ attribdata }}" />
{% if redo %}<input type="hidden" name="redo" value="1" />{% endif %} {% if redo %}<input type="hidden" name="redo" value="1" />{% endif %}
<input class="btn btn-primary pull-right" type="submit" value="Valider le {% if redo %}re{% endif %}traitement de la demande" /> <input class="btn btn-primary pull-right" type="submit" value="Valider le {% if redo %}re{% endif %}traitement de la demande" />

0
gestioncof/templates/traitement_demande_petit_cours_autre_niveau.html → gestioncof/templates/gestioncof/traitement_demande_petit_cours_autre_niveau.html
View file

0
gestioncof/templates/traitement_demande_petit_cours_success.html → gestioncof/templates/gestioncof/traitement_demande_petit_cours_success.html
View file