diff --git a/app/view/backend/contrepartie.html b/app/view/backend/contrepartie.html
index eed4b98d101e4264ca170b66daefe1f3ded8d24d..21e26605ebbad774ecdea8c1abddc274896b9b57 100644
--- a/app/view/backend/contrepartie.html
+++ b/app/view/backend/contrepartie.html
@@ -14,7 +14,6 @@
<label for="quoi">Quoi</label>
<select id="quoi" name="quoi">
- <option value="piplome" <check if="{{ @contrepartie.quoi=='piplome' }}">selected</check> >piplome</option>
<option value="pishirt" <check if="{{ @contrepartie.quoi=='pishirt' }}">selected</check> >pishirt</option>
<option value="hoodie" <check if="{{ @contrepartie.quoi=='hoodie' }}">selected</check> >hoodie</option>
</select>
@@ -28,14 +27,6 @@
</repeat>
</select>
</span>
- <span id="quoi_pdf">
- <label for="url">Pdf</label>
- <select id="url" name="url">
- <repeat group="{{ @pdfs }}" value="{{ @pdf }}">
- <option value="{{ @pdf.id }}" <check if="{{ @contrepartie.taille==@pdf.id }}">selected</check> >{{ @pdf.pdf }} / {{ @pdf.nom }}</option>
- </repeat>
- </select>
- </span>
<br />
<label for="nom">Nom</label>
@@ -96,22 +87,12 @@
document.forms['f'].nom.focus();
function select_span() {
- if (document.forms['f'].quoi.value=='piplome') {
- $('#quoi_pdf').show();
- $('#quoi_taille').hide();
- } else {
- $('#quoi_pdf').hide();
- $('#quoi_taille').show();
- }
+ $('#quoi_taille').show();
select_taille();
}
function select_taille() {
- if (document.forms['f'].quoi.value=='piplome') {
- document.forms['f'].taille.value = document.forms['f'].url.value;
- } else {
- document.forms['f'].taille.value = document.forms['f'].size.value;
- }
+ document.forms['f'].taille.value = document.forms['f'].size.value;
}
window.onload = function() {
diff --git a/app/view/backend/contreparties.html b/app/view/backend/contreparties.html
index 84ace0e9c2afdfd09359af28b4d01e2650fa2665..aa358605ca4e8cc75881437bc31ed25a5973ba5a 100644
--- a/app/view/backend/contreparties.html
+++ b/app/view/backend/contreparties.html
@@ -8,14 +8,11 @@
<label for="texte">Id/Nom/Email/Adresse</label>
<input type="text" id="texte" name="texte" size="30" value="{{ @texte }}" />
-{{ @pibag }} / {{ @piplome }} / {{ @pishirt }} / {{ @hoodie }} / {{ @status }}
+{{ @pibag }} / {{ @pishirt }} / {{ @hoodie }} / {{ @status }}
<label for="pibag">Pibag
<input type="checkbox" name="pibag" id="pibag" value="1" <check if="{{ @pibag==1 }}">checked</check> />
</label>
- <label for="piplome">Piplôme
- <input type="checkbox" name="piplome" id="piplome" value="2" <check if="{{ @piplome==2 }}">checked</check> />
- </label>
<label for="pishirt">Pishirt
<input type="checkbox" name="pishirt" id="pishirt" value="4" <check if="{{ @pishirt==4 }}">checked</check> />
</label>
@@ -46,7 +43,7 @@
<th>Email</th>
<th>Date</th>
<th>Quoi</th>
- <th>Taille/Piplome</th>
+ <th>Taille</th>
<th>Adresse</th>
<th>Statut</th>
<th>Commentaire</th>
@@ -61,20 +58,12 @@
<td>{{ @row.datec }}</td>
<td>{{ @row.quoi }}</td>
<td>
- <check if="{{ @row.quoi=='piplome' }}">
+ <check if="{{ @row.quoi=='pibag' }}">
<true>
- <a href="{{ @PIPLOME_URL }}{{ @row.pdf_url }}.pdf">{{ @row.pdf_url }}</a>
- ({{ @row.pdf_nom }})
+
</true>
<false>
- <check if="{{ @row.quoi=='pibag' }}">
- <true>
-
- </true>
- <false>
- {{ @atailles[@row.taille] }}
- </false>
- </check>
+ {{ @atailles[@row.taille] }}
</false>
</check>
</td>
@@ -105,10 +94,6 @@
-
<span class="lien" onclick="canceled({{ @row.id }})">Annulé</span>
</check>
- <check if="{{ @row.quoi=='piplome' }}" >
- -
- <span class="lien" onclick="pdf({{ @row.pdf_id }})">PDF</span>
- </check>
</td>
</tr>
</repeat>
diff --git a/app/view/backend/contreparties_tableau.html b/app/view/backend/contreparties_tableau.html
index a86a681a4b70cb6bc93bd4a5aae1e37f15e10ef2..afc530c98b3b3051f67b6c9abf15b4d5e1d4e13c 100644
--- a/app/view/backend/contreparties_tableau.html
+++ b/app/view/backend/contreparties_tableau.html
@@ -18,11 +18,6 @@
<th>Fait</th>
</theader>
<tbody>
- <tr>
- <td>Piplômes</td>
- <td style="text-align:right;"><b> {{ @piplome_s1 }} </b></td>
- <td style="text-align:right;">{{ @piplome_s2 }} </td>
- </tr>
<tr>
<td>Pishirts</td>
<td style="text-align:right;"><b>{{ @pishirt_s1 }}</b></td>
diff --git a/app/view/backend/dons.html b/app/view/backend/dons.html
index 9d4dd9bce501868d923777498e083afcc2426129..d859222754a78b5cb7481abc5706435ac8962203 100644
--- a/app/view/backend/dons.html
+++ b/app/view/backend/dons.html
@@ -58,7 +58,6 @@
<th>Email</th>
<th>Don</th>
<th>Adresse</th>
- <th>PDF</th>
<th>Statut</th>
<th>Actions</th>
</theader>
@@ -76,7 +75,6 @@
{{ @row.codepostal }} {{ @row.ville }}<br />
{{ @row.pays }}
</td>
- <td><a href="{{ @piplome_url.@row.pdf }}.pdf">{{ @row.pdf }}</a></td>
<td class="inline">{{ @DONS_STATUTS[@row.status] }}</td>
<td>
<a href="{{ 'edit_support', 'id='.@row.id | alias }}">Editer</a>
@@ -87,8 +85,6 @@
</true>
<false>
<a href="{{ 'invalidate_support', 'id='.@row.id | alias }}">Invalider</a>
- -
- <a href="{{ 'regenerate_pdf', 'id='.@row.id | alias }}">Regénérer le PDF</a>
</false>
</check>
</td>
diff --git a/app/view/backend/fusion_user.html b/app/view/backend/fusion_user.html
index 68c239dbbaa98b74bedab04df5fd95349298edf1..4ec48ebded77cbd0ba67e3ffa24e56e1d48cefbf 100644
--- a/app/view/backend/fusion_user.html
+++ b/app/view/backend/fusion_user.html
@@ -22,7 +22,7 @@
<th>Id du parent</th>
<th>Date</th>
<th>Quoi</th>
- <th>Taille/Piplome</th>
+ <th>Taille</th>
<th>Statut</th>
<th>Commentaire</th>
</tr>
@@ -35,20 +35,12 @@
<td>{{ @row.datec }}</td>
<td>{{ @row.quoi }}</td>
<td>
- <check if="{{ @row.quoi=='piplome' }}">
+ <check if="{{ @row.quoi=='pibag' }}">
<true>
- <a href="{{ @PIPLOME_URL }}{{ @row.pdf_url }}.pdf">{{ @row.pdf_url }}</a>
- ({{ @row.pdf_nom }})
+
</true>
<false>
- <check if="{{ @row.quoi=='pibag' }}">
- <true>
-
- </true>
- <false>
- {{ @atailles[@row.taille] }}
- </false>
- </check>
+ {{ @atailles[@row.taille] }}
</false>
</check>
</td>
@@ -71,7 +63,6 @@
<th>Date</th>
<th>Don</th>
<th>Adresse</th>
- <th>PDF</th>
<th>Statut</th>
</thead>
<tbody>
@@ -80,7 +71,6 @@
<td>{{ @row.id }}</td>
<td class="inline">{{ @row.datec }}</td>
<td>{{ @row.somme }}</td>
- <td>{{ @row.pdf }}</td>
<td class="inline">{{ @row.status }}</td>
</tr>
</repeat>
diff --git a/app/view/backend/user.html b/app/view/backend/user.html
index 17908284eed3b89b123859ecad1e7c09a95ac027..d34069fd804d709b9b20634a01ce06563198c0c7 100644
--- a/app/view/backend/user.html
+++ b/app/view/backend/user.html
@@ -110,7 +110,7 @@
<th>Id du parent</th>
<th>Date</th>
<th>Quoi</th>
- <th>Taille/Piplome</th>
+ <th>Taille</th>
<th>Adresse</th>
<th>Statut</th>
<th>Actions</th>
@@ -123,22 +123,14 @@
<td>{{ @row.datec }}</td>
<td>{{ @row.quoi }}</td>
<td>
- <check if="{{ @row.quoi=='piplome' }}">
- <true>
- <a href="{{ @PIPLOME_URL }}{{ @row.pdf_url }}.pdf">{{ @row.pdf_url }}</a>
- ({{ @row.pdf_nom }})
- </true>
- <false>
- <check if="{{ @row.quoi=='pibag' }}">
- <true>
-
- </true>
- <false>
- {{ @TAILLES[@row.taille] }}
- </false>
- </check>
- </false>
- </check>
+ <check if="{{ @row.quoi=='pibag' }}">
+ <true>
+
+ </true>
+ <false>
+ {{ @TAILLES[@row.taille] }}
+ </false>
+ </check>
</td>
<td>
<check if="{{ @row.adresse_id != null }}">
@@ -169,10 +161,6 @@
-
<span class="lien" onclick="canceled({{ @row.id }})">Annulé</span>
</check>
- <check if="{{ @row.quoi=='piplome' }}" >
- -
- <span class="lien" onclick="pdf({{ @row.pdf_id }})">PDF</span>
- </check>
</td>
</tr>
</repeat>
@@ -194,7 +182,6 @@
<th>ID</th>
<th>Date</th>
<th>Don</th>
- <th>PDF</th>
<th>Statut</th>
<th>Actions</th>
</theader>
@@ -204,16 +191,6 @@
<td>{{ @row.id }}</td>
<td class="inline">{{ @row.datec }}</td>
<td>{{ @row.somme }}</td>
- <td>
- <check if="{{ @row.pdf == '' }}">
- <true>
- <a href="/cron/piplome/{{ @row.id }}">PDF</a>
- </true>
- <false>
- <a href="{{ PIPLOME_URL }}/{{ @row.pdf }}.pdf" target="_blank">PDF</a>
- </false>
- </check>
- </td>
<td class="inline">{{ @DONS_STATUTS[@row.status] }}</td>
<td>
<a href="{{ 'edit_support', 'id='.@row.id | alias }}">Editer</a>
@@ -243,22 +220,12 @@
document.forms['f'].nom.focus();
function select_span() {
- if (document.forms['f'].quoi.value=='piplome') {
- $('#quoi_pdf').show();
- $('#quoi_taille').hide();
- } else {
- $('#quoi_pdf').hide();
- $('#quoi_taille').show();
- }
+ $('#quoi_taille').show();
select_taille();
}
function select_taille() {
- if (document.forms['f'].quoi.value=='piplome') {
- document.forms['f'].taille.value = document.forms['f'].url.value;
- } else {
- document.forms['f'].taille.value = document.forms['f'].size.value;
- }
+ document.forms['f'].taille.value = document.forms['f'].size.value;
}
window.onload = function() {
diff --git a/app/view/campaign/donation.html b/app/view/campaign/donation.html
index 9f709bb38d4fb69463c5cfb6e48690f2285199d8..3d5b6e7466d8b37680051195ba15a2b15f1cb3b8 100644
--- a/app/view/campaign/donation.html
+++ b/app/view/campaign/donation.html
@@ -27,14 +27,6 @@
<div class="cadeaux">
<p>{{ _("En remerciement de votre don, vous obtiendrez :") }}</p>
- <div class="img" id="ipiplomepdf">
- <img src="static/images/piplomepdf.png">
- <p>{{ _("En 0 mois de dons.") }}</p>
- </div>
- <div class="img" id="ipiplomemail">
- <img src="static/images/piplomemail.png">
- <p>{{ _("En 0 mois de dons.") }}</p>
- </div>
<div class="img" id="ipibag">
<img src="static/images/pibag.png">
<p>{{ _("En 0 mois de dons.") }}</p>
@@ -48,11 +40,9 @@
<p>{{ _("En 0 mois de dons.") }}</p>
</div>
<br />
- <p id="piplomepdf" style="display:none">{{ _("1 000 décimales de π dans un certificat personnalisé, envoyé par email au format PDF") }}</p>
- <p id="piplomemail" style="display:none">{{ _("Votre pi-plôme en tirage original de qualité supérieure") }}</p>
- <p id="pibag">{{ _("Votre pi-plôme en tirage original et un pi-bag très pratique") }}</p>
- <p id="pishirt" style="display:none">{{ _("Votre pi-plôme en tirage original, un pi-bag très pratique et un splendide 'Pi-shirt' de La Quadrature du Net") }}</p>
- <p id="hoodie" style="display:none">{{ _("Votre pi-plôme en tirage original, un pi-bag très pratique, un splendide 'Pi-shirt' de La Quadrature du Net, ainsi qu'un magnifique 'hoodie' de La Quadrature du Net") }}</p>
+ <p id="pibag">{{ _("Un pi-bag très pratique") }}</p>
+ <p id="pishirt" style="display:none">{{ _("Un pi-bag très pratique et un splendide 'Pi-shirt' de La Quadrature du Net") }}</p>
+ <p id="hoodie" style="display:none">{{ _("Un pi-bag très pratique, un splendide 'Pi-shirt' de La Quadrature du Net, ainsi qu'un magnifique 'hoodie' de La Quadrature du Net") }}</p>
</div>
<div>
diff --git a/app/view/campaign/home.html b/app/view/campaign/home.html
index d12ae1983ffba7a11c873188469b643328eb8c99..d471d99595e64d9e907f2e1a79abbb1f5d537b09 100644
--- a/app/view/campaign/home.html
+++ b/app/view/campaign/home.html
@@ -125,10 +125,6 @@
<h3>{{ _("En remerciement de <br>votre don, vous recevrez :") }}</h3>
</div>
<div class="col-md-9 img-list">
- <div class="col-md-3">
- <img class="media-object" src="/static/img/piplome.svg" alt="">
- <div class="media-body">{{ _("Un πplome<br><small>(cumul de 42€)</small>") }}</div>
- </div>
<div class="col-md-3">
<img class="media-object" src="/static/img/pibag.svg" alt="">
<div class="media-body">{{ _("Un pibag<br><small>(cumul de 64€)</small>") }}</div>
diff --git a/app/view/user/contreparties.html b/app/view/user/contreparties.html
index 5e3a6f065e8f56de4bfd7436a1511bd2456a0351..b20bd56636a8d52a9cd2f786db857ab851947152 100644
--- a/app/view/user/contreparties.html
+++ b/app/view/user/contreparties.html
@@ -12,19 +12,12 @@
<repeat group="{{ @contreparties }}" value="{{ @contrepartie }}">
<tr>
<td>{{ @contrepartie.quoi }}
- <check if="{{ @contrepartie.quoi=='piplome' }}">
+ <check if="{{ @contrepartie.quoi=='pibag' }}">
<true>
- ({{ @contrepartie.taille }})
+
</true>
<false>
- <check if="{{ @contrepartie.quoi=='pibag' }}">
- <true>
-
- </true>
- <false>
- ({{ @atailles[@contrepartie.taille] }})
- </false>
- </check>
+ ({{ @atailles[@contrepartie.taille] }})
</false>
</check>
</td>
diff --git a/app/view/user/dons.html b/app/view/user/dons.html
index 51088ec7410cc8b6e93628d7006e58219ce7cbf1..d208174dd7c9a97314ef590b724210972e5ea0a4 100644
--- a/app/view/user/dons.html
+++ b/app/view/user/dons.html
@@ -28,7 +28,6 @@
<td>{{ _("Date") }}</td>
<td>{{ _("Type") }}</td>
<td>{{ _("Montant") }}</td>
- <td>{{ _("Pi-plôme") }}</td>
<td>{{ _("Action") }}</td>
</thead>
<repeat group="{{ @dons }}" value="{{ @don }}">
@@ -43,13 +42,7 @@
</false>
</check>
<td>{{ @don.somme }}</td>
- <check if="{{ @don.status!=102 }}">
- <true>
- <td><a href="{{ PIPLOME_URL.@don.pdf }}.pdf">{{ _("Voir le pi-plôme") }}</a></td>
- </true>
- <false>
- <td> </td>
- </false>
+ <td> </td>
</check>
<td><a href="/receipt/{{ @don.id }}">{{ _("Imprimer un reçu pour ce don") }}</a></td>
</tr>
diff --git a/app/view/user/infos.html b/app/view/user/infos.html
index d5db158c805949858704adf693eb3ff2304c208d..21241f0a41e207e37bb9e711dd6b64e3ce103115 100644
--- a/app/view/user/infos.html
+++ b/app/view/user/infos.html
@@ -88,39 +88,29 @@
</div>
<div id="admin_hoodie" style="display:none">
- <img src="/static/images/piplomemail.png"> <img src="/static/images/pibag.png"> <img src="/static/images/pishirt.png"> <img src="/static/images/hoodie.png"><br />
- {{ _("Votre pi-plôme en tirage original de qualité supérieure") }} +
+ <img src="/static/images/pibag.png"> <img src="/static/images/pishirt.png"> <img src="/static/images/hoodie.png"><br />
{{ _("Un splendide 'Pi-shirt' de La Quadrature du Net") }} +
{{ _("Un magnifique 'hoodie' de La Quadrature du Net") }}
<br /><p class="information">{{ _("Dans ce cas, merci de remplir les champs situés sur la partie gauche. Ces informations nous sont nécessaires pour l'envoi du colis.") }}</p>
</div>
<div id="admin_pishirt" style="display:none">
- <img src="/static/images/piplomemail.png"> <img src="/static/images/pibag.png"> <img src="/static/images/pishirt.png"><br />
- {{ _("Votre pi-plôme en tirage original de qualité supérieure") }} +
+ <img src="/static/images/pibag.png"> <img src="/static/images/pishirt.png"><br />
{{ _("Un splendide 'Pi-shirt' de La Quadrature du Net") }}
<br /><p class="information">{{ _("Dans ce cas, merci de remplir les champs situés sur la partie gauche. Ces informations nous sont nécessaires pour l'envoi du colis.") }}</p>
</div>
<div id="admin_pibag" style="display:none">
- <img src="/static/images/piplomemail.png"> <img src="/static/images/pibag.png"><br />
+ <img src="/static/images/pibag.png"><br />
{{ _("Un pi-bag de qualité supérieure") }}
<br /><p class="information">{{ _("Dans ce cas, merci de remplir les champs situés sur la partie gauche. Ces informations nous sont nécessaires pour l'envoi du colis.") }}</p>
</div>
- <div id="admin_piplome" style="display:none">
- <img src="/static/images/piplomemail.png"><br />
- {{ _("Votre pi-plôme en tirage original de qualité supérieure") }}
- <br /><p class="information">{{ _("Dans ce cas, merci de remplir les champs situés sur la partie gauche. Ces informations nous sont nécessaires pour l'envoi du colis.") }}</p>
- </div>
-
<div id="subform" style="display:none">
<br />
<p id="receive_main" class="small_labels">
<strong>{{ _("Recevoir ") }}</strong>
- <span id="receive_piplome"><input type="checkbox" name="receive_piplome" id="receive_piplome" checked />
- <label for="receive_piplome">{{ _("Le pi-plôme") }}</label></span>
<span id="receive_pibag"><input type="checkbox" name="receive_pibag" id="receive_pibag" checked />
<label for="receive_pibag">{{ _("Le pi-bag") }}</label></span>
<span id="receive_pishirt"><input type="checkbox" name="receive_pishirt" id="receive_pishirt" checked />
@@ -129,15 +119,6 @@
<label for="receive_hoodie">{{ _("Le hoodie") }}</label></span>
</p>
- <p id="admin_piplome_id"><label for="piplome_id">{{ _("Pi-plôme à imprimer:") }}</label>
- <select name="piplome_id" id="piplome_id">
- <repeat group="{{ @pdfs }}" value="{{ @pdf }}">
- <option value="{{ @pdf }}">{{ @pdf }}</option>
- </repeat>
- </select>
- <a id="visu_piplome" href="#" visu_url="{{ PIPLOME_URL }}">{{ _("Visualiser le pi-plôme sélectionné") }}</a>
- </p>
-
<p id="admin_taille"><label for="taille">{{ _("Coupe et taille du pi-shirt:") }}</label>
<select name="taille" id="taille">{{ Utils::eoption(@atailles, @taille) }}</select></p>
diff --git a/app/view/user/perso.html b/app/view/user/perso.html
index 524f8e4aca56325bacb16728f430fd4b6bcd1351..a026a5d48062cabef4d94fc85f506a5c2e02e08d 100644
--- a/app/view/user/perso.html
+++ b/app/view/user/perso.html
@@ -146,7 +146,6 @@
<th>{{ _("Date") }}</th>
<th>{{ _("Dons") }}</th>
<th>{{ _("Récurent") }}</th>
- <th>{{ _("Piplome") }}</th>
</tr>
<repeat group="{{ @historique }}" value="{{ @don }}">
<tr>
@@ -165,16 +164,6 @@
<true><td>{{ _("Oui (en erreur)") }}</td></true>
<false><td>{{ _("Non") }}</td></false>
</check>
- <td>
- <check if="{{ @don.pdf == '' }}">
- <true>
- <a href="/cron/piplome/{{ @don.id }}">{{ _("Générer") }}</a>
- </true>
- <false>
- <a href="{{ PIPLOME_URL }}{{ @don.pdf }}.pdf" target="_blank">{{ @pdfs[@don.pdf].decimale }}.pdf</a>
- </false>
- </check>
- </td>
</tr>
</repeat>
</table>
@@ -247,37 +236,6 @@
<form method="GET" action="{{ 'perso' | alias }}" name="contreparties">
<input type="hidden" name="validate" value="true">
<label></label>
- <check if="{{ @infos.cumul >= 42 }}">
- <div class="col-md-8 col-md-offset-2"><!-- piplome -->
- <div class="panel panel-default">
- <div class="panel-body c-panelcontrepartie">
- <div class="col-md-1">
- <input type="radio" name="quoi" id="quoi1" class="radio" checked <check if="{{ @infos.cumul < 42 }}">disabled</check> value="piplome">
- <label for="quoi1"></label>
- </div>
- <div class="col-md-3 text-center">
- <p>
- <img class="" src="/static/img/piplome.svg" alt="">
- </p>
- </div>
- <div class="col-md-8">
- <div class="form-group text-left">
- <label for="quoi1">
- <h3 class="text-left">{{ _("Piplôme")}}</h3>
- </label>
- <div class="text-left">
- <label for="piplome_id">{{ _("Titulaire du Piplôme")}}</label>
- <input type="text" class="form-control" id="piplome_id" name="piplome_id" value="" placeholder="Nom, prénom, pseudonyme, etc …">
- </div>
- </div>
- </div>
- <div class="c-prixcontrepartie">
- <p>42 €</p>
- </div>
- </div>
- </div>
- </div><!-- piplome -->
- </check>
<check if="{{ @infos.cumul >= 64 }}">
<div class="col-md-8 col-md-offset-2"><!-- Pibag -->
<div class="panel panel-default">
@@ -295,7 +253,6 @@
<div class="form-group text-left">
<label for="quoi2">
<h3 class="text-left">{{ _("Pibag")}}</h3>
- <h5>{{ _("Ainsi que le piplome.") }}</h5>
</label>
</div>
</div>
@@ -323,7 +280,7 @@
<div class="form-group text-left">
<label for="quoi3">
<h3 class="text-left">{{ _("Pi-Shirt")}}</h3>
- <h5>{{ _("Ainsi que le piplome et le pibag.") }}</h5>
+ <h5>{{ _("Ainsi que le pibag.") }}</h5>
</label>
<form class="text-left">
<div class="form-group text-left">
@@ -360,7 +317,7 @@
<div class="form-group text-left">
<label for="quoi4">
<h3 class="text-left">{{ _("Hoodie")}}</h3>
- <h5>{{ _("Ainsi que le pi-shirt, le piplome et le pibag.") }}</h5>
+ <h5>{{ _("Ainsi que le pi-shirt et le pibag.") }}</h5>
</label>
<form class="text-left">
<div class="form-group text-left">
@@ -424,16 +381,6 @@
</p>
<h3>{{ _("Récapitulatif :") }}</h3>
<ul class="list-unstyled">
- <check if="{{ in_array(@GET['quoi'], array('piplome', 'pibag', 'pishirt', 'hoodie')) }}">
- <li class="media">
- <div class="media-left">
- <img class="media-object" src="/static/img/piplome.svg" alt="">
- </div>
- <div class="media-body">
- {{ _("Un piplôme") }}
- </div>
- </li>
- </check>
<check if="{{ in_array(@GET['quoi'], array('pibag', 'pishirt', 'hoodie')) }}">
<li class="media">
<div class="media-left">
diff --git a/locales/en_US/LC_MESSAGES/messages.po b/locales/en_US/LC_MESSAGES/messages.po
index 126813a443b60d440b73b02b75cb91711a3a16e1..1d6c5a0f863575ce9577b5ad1a4258f6117a60cd 100644
--- a/locales/en_US/LC_MESSAGES/messages.po
+++ b/locales/en_US/LC_MESSAGES/messages.po
@@ -272,11 +272,6 @@ msgstr ""
"pledge (<strong>%%CUMUL%% €</strong>) to be fully used by La Quadrature "
"du Net."
-#: app/view/user/infos.html:92 app/view/user/infos.html:100
-#: app/view/user/infos.html:113 app/view/campaign/donation.html:52
-msgid "Votre pi-plôme en tirage original de qualité supérieure"
-msgstr "A genuine, high quality print of your pi-ploma."
-
#: app/view/user/infos.html:93 app/view/user/infos.html:101
msgid "Un splendide 'Pi-shirt' de La Quadrature du Net"
msgstr "A gorgeous 'Pi-shirt' from La Quadrature du Net"
@@ -302,10 +297,6 @@ msgstr "A high quality pi-bag"
msgid "Recevoir "
msgstr "Get."
-#: app/view/user/infos.html:123
-msgid "Le pi-plôme"
-msgstr "The pi-ploma"
-
#: app/view/user/infos.html:125
msgid "Le pi-bag"
msgstr "The pi-bag"
@@ -318,14 +309,6 @@ msgstr "The Pi-Shirt"
msgid "Le hoodie"
msgstr "The hoodie"
-#: app/view/user/infos.html:132
-msgid "Pi-plôme à imprimer:"
-msgstr "Print your own pi-ploma:"
-
-#: app/view/user/infos.html:138
-msgid "Visualiser le pi-plôme sélectionné"
-msgstr "Preview the selected pi-ploma"
-
#: app/view/user/infos.html:141
msgid "Coupe et taille du pi-shirt:"
msgstr "Cut and size of the pi-shirt:"
@@ -379,14 +362,6 @@ msgstr "Kind"
msgid "Montant"
msgstr "Amount"
-#: app/view/user/dons.html:31
-msgid "Pi-plôme"
-msgstr "Pi-ploma"
-
-#: app/view/user/dons.html:48
-msgid "Voir le pi-plôme"
-msgstr "Preview the pi-ploma"
-
#: app/view/user/dons.html:54
msgid "Imprimer un reçu pour ce don"
msgstr "Print a receipt for this donation"
@@ -452,10 +427,6 @@ msgstr "Pledges"
msgid "Récurent"
msgstr "Recurring"
-#: app/view/user/perso.html:142
-msgid "Piplome"
-msgstr "Pi-ploma"
-
#: app/view/user/perso.html:148
msgid "Oui"
msgstr "Yes"
@@ -492,30 +463,14 @@ msgstr ""
"To claim your counterparts, click on the pack of your liking, fill in a "
"postal address and valid."
-#: app/view/user/perso.html:245
-msgid "Piplôme"
-msgstr "Pi-ploma"
-
-#: app/view/user/perso.html:248
-msgid "Titulaire du Piplôme"
-msgstr "Pi-ploma's recipient"
-
#: app/view/user/perso.html:276
msgid "Pibag"
msgstr "Pi-bag"
-#: app/view/user/perso.html:277
-msgid "Ainsi que le piplome."
-msgstr "As well as the pi-ploma."
-
#: app/view/user/perso.html:304
msgid "Pi-Shirt"
msgstr "Pi-Shirt"
-#: app/view/user/perso.html:305
-msgid "Ainsi que le piplome et le pibag."
-msgstr "As well as the pi-ploma and the pi-bag."
-
#: app/view/user/perso.html:309 app/view/user/perso.html:346
msgid "Taille"
msgstr "Size"
@@ -525,8 +480,8 @@ msgid "Hoodie"
msgstr "Hoodie"
#: app/view/user/perso.html:342
-msgid "Ainsi que le pi-shirt, le piplome et le pibag."
-msgstr "As well as the pi-shirt, the pi-ploma and the pi-bag"
+msgid "Ainsi que le pi-shirt et le pibag."
+msgstr "As well as the pi-shirt and the pi-bag"
#: app/view/user/perso.html:365
msgid "Expedier à :"
@@ -540,10 +495,6 @@ msgstr "Ship to:"
msgid "Récapitulatif :"
msgstr "Recap:"
-#: app/view/user/perso.html:412
-msgid "Un piplôme"
-msgstr "A Pi-ploma"
-
#: app/view/user/perso.html:422
msgid "Un pibag"
msgstr "A Pi-bag"
@@ -924,24 +875,24 @@ msgid ""
msgstr "1.000 pi decimals, in a tailored certificate, sent by email in PDF."
#: app/view/campaign/donation.html:53
-msgid "Votre pi-plôme en tirage original et un pi-bag très pratique"
-msgstr "A genuine print of your piplome and a very convenient pi-bag"
+msgid "Un pi-bag très pratique"
+msgstr "A very convenient pi-bag"
#: app/view/campaign/donation.html:54
msgid ""
-"Votre pi-plôme en tirage original, un pi-bag très pratique et un splendide "
+"Un pi-bag très pratique et un splendide "
"'Pi-shirt' de La Quadrature du Net"
msgstr ""
-"A genuine print of your piplome, a very convenient pi-bag and a gorgeous Pi-"
+"A very convenient pi-bag and a gorgeous Pi-"
"Shirt from la Quadrature du Net"
#: app/view/campaign/donation.html:55
msgid ""
-"Votre pi-plôme en tirage original, un pi-bag très pratique, un splendide 'Pi-"
+"Un pi-bag très pratique, un splendide 'Pi-"
"shirt' de La Quadrature du Net, ainsi qu'un magnifique 'hoodie' de La "
"Quadrature du Net"
msgstr ""
-"A genuine print of your piplome, a very convenient pi-bag, a gorgeous Pi-"
+"A very convenient pi-bag, a gorgeous Pi-"
"Shirt from la Quadrature du Net as well as a hoodie."
#: app/view/campaign/donation.html:59
@@ -1034,10 +985,6 @@ msgstr "If you previously pledged, use your former email and passwords."
msgid "En remerciement de <br>votre don, vous recevrez :"
msgstr "AS a thank you for <br>your pledge, you'll get:"
-#: app/view/campaign/home.html:130
-msgid "Un πplome<br><small>(cumul de 30€)</small>"
-msgstr "A π:ploma<br><small>(total of 30&euro:)<?small>"
-
#: app/view/campaign/home.html:134
msgid "Un pibag<br><small>(cumul de 50€)</small>"
msgstr "A pibag<br><small>(total of 50&euro:)<?small>"
diff --git a/locales/fr_FR/LC_MESSAGES/messages.po b/locales/fr_FR/LC_MESSAGES/messages.po
index 5a2128ec3d89a771f549b9353673b5acd4a83630..15bb5357c39d8849aca5bc886a704a294dda2bdc 100644
--- a/locales/fr_FR/LC_MESSAGES/messages.po
+++ b/locales/fr_FR/LC_MESSAGES/messages.po
@@ -234,11 +234,6 @@ msgid ""
"intgralement La Quadrature du Net."
msgstr ""
-#: app/view/user/infos.html:92 app/view/user/infos.html:100
-#: app/view/user/infos.html:113 app/view/campaign/donation.html:52
-msgid "Votre pi-plme en tirage original de qualit suprieure"
-msgstr ""
-
#: app/view/user/infos.html:93 app/view/user/infos.html:101
msgid "Un splendide 'Pi-shirt' de La Quadrature du Net"
msgstr ""
@@ -262,10 +257,6 @@ msgstr ""
msgid "Recevoir "
msgstr ""
-#: app/view/user/infos.html:123
-msgid "Le pi-plme"
-msgstr ""
-
#: app/view/user/infos.html:125
msgid "Le pi-bag"
msgstr ""
@@ -278,14 +269,6 @@ msgstr ""
msgid "Le hoodie"
msgstr ""
-#: app/view/user/infos.html:132
-msgid "Pi-plme imprimer:"
-msgstr ""
-
-#: app/view/user/infos.html:138
-msgid "Visualiser le pi-plme slectionn"
-msgstr ""
-
#: app/view/user/infos.html:141
msgid "Coupe et taille du pi-shirt:"
msgstr ""
@@ -335,14 +318,6 @@ msgstr ""
msgid "Montant"
msgstr ""
-#: app/view/user/dons.html:31
-msgid "Pi-plme"
-msgstr ""
-
-#: app/view/user/dons.html:48
-msgid "Voir le pi-plme"
-msgstr ""
-
#: app/view/user/dons.html:54
msgid "Imprimer un reu pour ce don"
msgstr ""
@@ -408,10 +383,6 @@ msgstr ""
msgid "Rcurent"
msgstr ""
-#: app/view/user/perso.html:142
-msgid "Piplome"
-msgstr ""
-
#: app/view/user/perso.html:148
msgid "Oui"
msgstr ""
@@ -458,16 +429,12 @@ msgstr ""
msgid "Pibag"
msgstr ""
-#: app/view/user/perso.html:277
-msgid "Ainsi que le piplome."
-msgstr ""
-
#: app/view/user/perso.html:304
msgid "Pi-Shirt"
msgstr ""
#: app/view/user/perso.html:305
-msgid "Ainsi que le piplome et le pibag."
+msgid "Ainsi que le pibag."
msgstr ""
#: app/view/user/perso.html:309 app/view/user/perso.html:346
@@ -479,7 +446,7 @@ msgid "Hoodie"
msgstr ""
#: app/view/user/perso.html:342
-msgid "Ainsi que le pi-shirt, le piplome et le pibag."
+msgid "Ainsi que le pi-shirt et le pibag."
msgstr ""
#: app/view/user/perso.html:365
@@ -813,23 +780,6 @@ msgid ""
"format PDF"
msgstr ""
-#: app/view/campaign/donation.html:53
-msgid "Votre pi-plme en tirage original et un pi-bag trs pratique"
-msgstr ""
-
-#: app/view/campaign/donation.html:54
-msgid ""
-"Votre pi-plme en tirage original, un pi-bag trs pratique et un splendide 'Pi-"
-"shirt' de La Quadrature du Net"
-msgstr ""
-
-#: app/view/campaign/donation.html:55
-msgid ""
-"Votre pi-plme en tirage original, un pi-bag trs pratique, un splendide 'Pi-"
-"shirt' de La Quadrature du Net, ainsi qu'un magnifique 'hoodie' de La "
-"Quadrature du Net"
-msgstr ""
-
#: app/view/campaign/donation.html:59
msgid ""
"Vous voulez rcuprer vos contreparties ? <a href=\"/login/\">Connectez-"
@@ -915,10 +865,6 @@ msgstr ""
msgid "En remerciement de <br>votre don, vous recevrez :"
msgstr ""
-#: app/view/campaign/home.html:130
-msgid "Un πplome<br><small>(cumul de 30€)</small>"
-msgstr ""
-
#: app/view/campaign/home.html:134
msgid "Un pibag<br><small>(cumul de 50€)</small>"
msgstr ""
diff --git a/ref/v1/index.html b/ref/v1/index.html
index c37dc201dd52022b421ad0f2aeff6ce2a552e9e9..d6b80b19bce4c95ea7f4a0a7672eac6b38b43f48 100644
--- a/ref/v1/index.html
+++ b/ref/v1/index.html
@@ -357,45 +357,7 @@
<form method="POST" action="/add/contrepartie" name="contreparties">
<input type="hidden" name="csrf" value="3495005a5c15b4344b844e02d163fb64">
-
-
- <div class="col-md-8 col-md-offset-2"><!-- Piplôme -->
-
- <div class="panel panel-default">
- <div class="panel-body c-panelcontrepartie">
-
- <div class="col-md-1">
- <input type="checkbox" name="quoi" id="quoi1" class="" value="piplome">
- </div>
-
- <div class="col-md-3 text-center">
- <p>⟨dessin piplome⟩</p>
- </div>
-
- <div class="col-md-8">
- <div class="form-group text-left">
- <label for="quoi1">
- <h3 class="text-left">Piplôme</h3>
- </label>
- <form class="text-left">
- <div class="form-group text-left">
- <label for="piplome_id">Titulaire du Piplôme</label>
- <input type="text" class="form-control" id="piplome_id" name="piplome_id" value="" placeholder="Nom et prénom ou pseudonyme">
- </div>
- </form>
- </div>
- </div>
-
- <div class="c-prixcontrepartie">
- <p>30 euros</p>
- </div>
-
- </div>
- </div>
-
- </div><!-- / Piplôme -->
-
-
+
<div class="col-md-8 col-md-offset-2"><!-- Pibag -->
<div class="panel panel-default">
@@ -447,8 +409,8 @@
</label>
<form class="text-left">
<div class="form-group text-left">
- <label for="piplome_id">Taille</label>
- <select name="taille" class="form-control">
+ <label for="taille_tshirt">Taille</label>
+ <select id="taille_tshirt" name="taille" class="form-control">
<option value="7">Coupe Femme, Taille L</option>
<option value="6">Coupe Femme, Taille M</option>
<option value="5">Coupe Femme, Taille S</option>
@@ -495,8 +457,8 @@
</label>
<form class="text-left">
<div class="form-group text-left">
- <label for="piplome_id">Taille</label>
- <select name="taille" class="form-control">
+ <label for="taille_hoodie">Taille</label>
+ <select id="taille_hoodie" name="taille" class="form-control">
<option value="7">Coupe Femme, Taille L</option>
<option value="6">Coupe Femme, Taille M</option>
<option value="5">Coupe Femme, Taille S</option>
@@ -572,7 +534,6 @@
<img class="media-object" src="..." alt="⟨dessin pi-shirt⟩">
</div>
<div class="media-body">
- <p>Piplôme</p>
<p>Pi-bag</p>
<p>T-shirt taille M</p>
</div>
@@ -581,7 +542,7 @@
<form class="text-left">
<div class="form-group text-left">
- <label for="piplome_id"><h3>Un commentaire ?</h3></label>
+ <label for="commentaire"><h3>Un commentaire ?</h3></label>
<textarea class="form-control" id="commentaire" name="commentaire" placeholder="" row="3"></textarea>
</div>
</form>
@@ -618,7 +579,6 @@
<img class="media-object" src="..." alt="⟨dessin pi-shirt⟩">
</div>
<div class="media-body">
- <p>Piplôme</p>
<p>Pi-bag</p>
<p>T-shirt taille M</p>
</div>
diff --git a/www/static/js/admin.js b/www/static/js/admin.js
index 29d0edd4983053e121a5bcda693a4ddc3bf11f26..4565f1def31ce9e99be1af80e10aad8c19b67e79 100644
--- a/www/static/js/admin.js
+++ b/www/static/js/admin.js
@@ -24,12 +24,6 @@ function invalid(id) {
submit_form('f');
}
-function pdf(id) {
- set_field_value('f', 'action', 'pdf');
- set_field_value('f', 'id', id);
- submit_form('f');
-}
-
function add(id) {
set_field_value('ajout', 'id', id);
submit_form('ajout');
diff --git a/www/static/js/campaign.js b/www/static/js/campaign.js
index c41a23e97003f3c012419037d1cc2cf271462094..de08187e562630b80c514ee8092572ca7d7a31e4 100644
--- a/www/static/js/campaign.js
+++ b/www/static/js/campaign.js
@@ -13,12 +13,6 @@ function check_amount() {
if (val<5) {
console.log("OK 1");
$("#no_cado").show();
- } else if (val<30) {
- console.log("OK 2");
- $("#piplomepdf").show();
- } else if (val<50) {
- console.log("OK 3");
- $("#piplomemail").show();
} else if (val<100) {
console.log("OK 4");
$("#pibag").show();
@@ -31,13 +25,6 @@ function check_amount() {
}
// Display the image with a full opacity
- $("#ipiplomepdf img").css("opacity", "1");
- $("#ipiplomepdf p").css("opacity", "0");
- if (val >= 30 ) {
- console.log(val)
- $("#ipiplomemail img").css("opacity", "1");
- $("#ipiplomemail p").css("opacity", "0");
- }
if (val >= 50) {
console.log(val)
$("#ipibag img").css("opacity", "1");
@@ -55,11 +42,6 @@ function check_amount() {
}
// And with an almost transparency when we're going down
- if (val < 30 ) {
- console.log(val)
- $("#ipiplomemail img").css("opacity", "0.2");
- $("#ipiplomemail p").css("opacity", "1");
- }
if (val < 50) {
console.log(val)
$("#ipibag img").css("opacity", "0.2");
@@ -79,35 +61,29 @@ function check_amount() {
// Not let's update the number of month
if (val == 0) {
console.log(val == 0);
- var piplomemonth = 0;
var pibagmonth = 0;
var pishirtmonth = 0;
var hoodiemonth = 0;
}
else {
- var piplomemonth = Math.ceil(30/val);
var pibagmonth = Math.ceil(50/val);
var pishirtmonth = Math.ceil(100/val);
var hoodiemonth = Math.ceil(250/val);
}
// We want to replace -, Infinity, and NaN as well as numbers
- var piplomemail = $("#ipiplomemail p").text().replace(/-?(NaN|Infinity|[0-9]+)/, piplomemonth);
var pibag = $("#ipibag p").text().replace(/-?(NaN|Infinity|[0-9]+)/, pibagmonth);
var pishirt = $("#ipishirt p").text().replace(/-?(NaN|Infinity|[0-9]+)/, pishirtmonth);
var hoodie = $("#ihoodie p").text().replace(/-?(NaN|Infinity|[0-9]+)/, hoodiemonth);
if (val == 0) {
- $("#ipiplomemail p").hide();
$("#ipibag p").hide();
$("#ipishirt p").hide();
$("#ihoodie p").hide();
}
else {
- $("#ipiplomemail p").show();
$("#ipibag p").show();
$("#ipishirt p").show();
$("#ihoodie p").show();
}
- $("#ipiplomemail p").text(piplomemail);
$("#ipibag p").text(pibag);
$("#ipishirt p").text(pishirt);
$("#ihoodie p").text(hoodie);
diff --git a/www/static/js/perso.js b/www/static/js/perso.js
index 483d5929a5776ba5af557430880a9c2105317502..13daa6df137da5528699ad4e0210289266c98df8 100644
--- a/www/static/js/perso.js
+++ b/www/static/js/perso.js
@@ -7,30 +7,19 @@ Gestion des contreparties sur la page d'administration
*/
$("#a2 .cntrprt").click(function(e){
$('#a2 #receive_main').show();
- $('#a2 #receive_piplome').hide();
$('#a2 #receive_pibag').hide();
- $('#a2 #admin_piplome_id').hide();
$('#a2 #receive_pishirt').hide();
$('#a2 #admin_taille').hide();
$('#a2 #receive_hoodie').hide();
$('#a2 #admin_taille_h').hide();
switch ($(this).attr('id')) {
- case '30':
- $('#cadeaux').html($('#admin_piplome').html());
- $('#a2 #receive_piplome').show();
- $('#a2 #admin_piplome_id').show();
- break;
case '50':
$('#cadeaux').html($('#admin_pibag').html());
- $('#a2 #receive_piplome').show();
- $('#a2 #admin_piplome_id').show();
$('#a2 #receive_pibag').show();
$('#a2 #admin_pibag_id').show();
break;
case '100':
$('#cadeaux').html($('#admin_pishirt').html());
- $('#a2 #receive_piplome').show();
- $('#a2 #admin_piplome_id').show();
$('#a2 #receive_pibag').show();
$('#a2 #admin_pibag_id').show();
$('#a2 #receive_pishirt').show();
@@ -38,8 +27,6 @@ $("#a2 .cntrprt").click(function(e){
break;
case '250':
$('#cadeaux').html($('#admin_hoodie').html());
- $('#a2 #receive_piplome').show();
- $('#a2 #admin_piplome_id').show();
$('#a2 #receive_pibag').show();
$('#a2 #admin_pibag_id').show();
$('#a2 #receive_pishirt').show();
@@ -54,10 +41,3 @@ $("#a2 .cntrprt").click(function(e){
$('#a2 #contrepartie').val($(this).attr('id'));
$('#a2 #subform').show();
});
-
-$("#piplome_id").change(function(e){
- $("#visu_piplome").attr('href', $("#visu_piplome").attr('visu_url') + $(this).val() + '.pdf');
-});
-
-$("#piplome_id").change();
-