rindentation et correction pour la validit HTML/CSS
darcs-hash:20061115091251-f46e9-e4c56e67d1a8ebf2553d7820299f7522c70c3b7f.gz
This commit is contained in:
gdetrez
parent
f4b4826e22
commit
834ddfb647
8 changed files with 319 additions and 310 deletions
|
|
@ -130,7 +130,7 @@ class root:
|
|||
#
|
||||
def etatImprimante(self):
|
||||
try:
|
||||
return {"printer_state" : "<br />".join(crans.impression.etat_imprimante.etat())}
|
||||
return {"printer_state" : u"\n".join(crans.impression.etat_imprimante.etat())}
|
||||
except Exception, e:
|
||||
return {"printer_state" : 'Imprimante hors ligne'}
|
||||
etatImprimante.exposed = True
|
||||
|
|
|
|||
|
|
@ -24,21 +24,18 @@ ul#actionMenu li {
|
|||
#fileName {
|
||||
width:150px;
|
||||
text-align:center;
|
||||
//float:left;
|
||||
padding:50px 5px 5px 5px;
|
||||
//eight:20px;
|
||||
background: url(../images/pdf-icon.png) center top no-repeat;
|
||||
//margin-top:-30px;
|
||||
margin-bottom:10px;
|
||||
overflow:auto;
|
||||
}
|
||||
#actionNouvelleImpression {
|
||||
margin:1em 0;
|
||||
margin:1em 0;
|
||||
}
|
||||
#actionEtatImprimante {
|
||||
padding:0.4em;
|
||||
border: thin black solid;
|
||||
margin:1em 0;
|
||||
padding:0.4em;
|
||||
border: thin black solid;
|
||||
margin:1em 0;
|
||||
}
|
||||
|
||||
/* ******************************************* *
|
||||
|
|
@ -55,7 +52,6 @@ form#form_impression #preview {
|
|||
height:150px;
|
||||
padding:10px;
|
||||
background-color:#C0C0C0;
|
||||
|
||||
}
|
||||
|
||||
form#form_impression #rightColumn {
|
||||
|
|
@ -74,7 +70,6 @@ div#prix_placeholder {
|
|||
min-height:16px;
|
||||
padding:0;
|
||||
color:gray;
|
||||
|
||||
}
|
||||
div#prix_placeholder img {
|
||||
margin-right:2px;
|
||||
|
|
@ -95,8 +90,6 @@ form#form_impression>fieldset {
|
|||
form#form_impression .bouttons {
|
||||
text-align:right;
|
||||
}
|
||||
|
||||
|
||||
form#form_impression label.labelInput {
|
||||
display:block;
|
||||
width:4em;
|
||||
|
|
|
|||
|
|
@ -9,5 +9,6 @@
|
|||
//-->
|
||||
</script>
|
||||
<noscript>
|
||||
Cette page utilise javascript. Elle n'est pas supportée par votre navigateur.
|
||||
<p>Cette page utilise javascript. Elle n'est pas supportée par votre
|
||||
navigateur.</p>
|
||||
</noscript>
|
||||
|
|
|
|||
|
|
@ -65,9 +65,9 @@ function hideDetail(id){
|
|||
</div>
|
||||
#if $f.details.__len__() > 1
|
||||
<div id="facture$f.no" style="display:none;">
|
||||
<table cellspacing="0" border="0" id="facture$f.no" class="factureDetails">
|
||||
<table cellspacing="0" border="0" class="factureDetails">
|
||||
<tr>
|
||||
<th width="80%">Description</th>
|
||||
<th style="width:80%">Description</th>
|
||||
<th>Prix unitaire</th>
|
||||
<th>Quantité</th>
|
||||
<th>total</th>
|
||||
|
|
@ -85,6 +85,7 @@ function hideDetail(id){
|
|||
Total
|
||||
</td>
|
||||
<td class="tdTotalDetail">$f.montant €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#import crans.impression
|
||||
|
||||
<div id="globalDiv">
|
||||
<form id="form_impression" name="form_impression" onsubmit="Impression.popup();return false;">
|
||||
<form id="form_impression" name="form_impression" onsubmit="Impression.popup();return false;" action="index">
|
||||
<fieldset><legend>Options d'impression</legend>
|
||||
<div id="leftColumn">
|
||||
<div id="preview" onclick="Impression.settings.init();"></div>
|
||||
|
|
@ -10,21 +10,26 @@
|
|||
|
||||
<div id="rightColumn">
|
||||
<fieldset><legend>Type d'impression</legend>
|
||||
<label for="type_impression_couleur" class="labelRadio compact"><input type="radio" name="type_impression" id="type_impression_couleur" class="inputRadio" value="$crans.impression.IMPRESSION_COULEUR" checked="checked" onClick="Impression.settings.update(this);" /> Couleurs</label>
|
||||
<label for="type_impression_nb" class="labelRadio compact"><input type="radio" name="type_impression" id="type_impression_nb" class="inputRadio" value="$crans.impression.IMPRESSION_NB" onClick="Impression.settings.update(this);" />Noir et blanc</label>
|
||||
<label for="type_impression_couleur" class="labelRadio compact">
|
||||
<input type="radio" name="type_impression" id="type_impression_couleur" class="inputRadio" value="$crans.impression.IMPRESSION_COULEUR" checked="checked" onclick="Impression.settings.update(this);" />
|
||||
Couleurs
|
||||
</label>
|
||||
<label for="type_impression_nb" class="labelRadio compact"><input type="radio" name="type_impression" id="type_impression_nb" class="inputRadio" value="$crans.impression.IMPRESSION_NB" onclick="Impression.settings.update(this);" />
|
||||
Noir et blanc
|
||||
</label>
|
||||
</fieldset>
|
||||
|
||||
<fieldset><legend>Copies et papier</legend>
|
||||
|
||||
<label for="papier" class="labelInput">Papier:</label>
|
||||
<select name="papier" id="papier" class="selectOne" onChange="Impression.settings.update(this);">
|
||||
<select name="papier" id="papier" class="selectOne" onchange="Impression.settings.update(this);">
|
||||
#for type_papier in $crans.impression.PAPIER_VALEURS_POSSIBLES
|
||||
<option value="$type_papier">$crans.impression.LABELS[type_papier]</option>
|
||||
#end for
|
||||
</select>
|
||||
<br />
|
||||
<label for="agrafes" class="labelInput">Agrafes:</label>
|
||||
<select name="agrafes" id="agrafes" class="selectOne" onChange="Impression.settings.update(this);">
|
||||
<select name="agrafes" id="agrafes" class="selectOne" onchange="Impression.settings.update(this);">
|
||||
#for type_agrafes in $crans.impression.AGRAPHES_VALEURS_POSSIBLES
|
||||
<option value="$type_agrafes">$crans.impression.LABELS[type_agrafes]</option>
|
||||
#end for
|
||||
|
|
@ -32,12 +37,18 @@
|
|||
<br />
|
||||
|
||||
<label for="nb_copies" class="labelInput">Copies:</label>
|
||||
<input onKeyUp="Impression.settings.update(this);" type="text" name="nb_copies" id="nb_copies" class="inputText" size="10" maxlength="50" value="1" />
|
||||
<input onkeyup="Impression.settings.update(this);" type="text" name="nb_copies" id="nb_copies" class="inputText" size="10" maxlength="50" value="1" />
|
||||
</fieldset>
|
||||
|
||||
<fieldset><legend>Disposition</legend>
|
||||
<label for="disposition_recto" class="labelRadio compact"><input type="radio" name="disposition" id="disposition_recto" class="inputRadio" value="$crans.impression.IMPRESSION_RECTO" onClick="Impression.settings.update(this);" /> Recto</label>
|
||||
<label for="disposition_recto_verso" class="labelRadio compact"><input type="radio" name="disposition" id="disposition_recto_verso" class="inputRadio" value="$crans.impression.IMPRESSION_RECTO_VERSO" checked="checked" onClick="Impression.settings.update(this);" />Recto-verso</label>
|
||||
<label for="disposition_recto" class="labelRadio compact">
|
||||
<input type="radio" name="disposition" id="disposition_recto" class="inputRadio" value="$crans.impression.IMPRESSION_RECTO" onclick="Impression.settings.update(this);" />
|
||||
Recto
|
||||
</label>
|
||||
<label for="disposition_recto_verso" class="labelRadio compact">
|
||||
<input type="radio" name="disposition" id="disposition_recto_verso" class="inputRadio" value="$crans.impression.IMPRESSION_RECTO_VERSO" checked="checked" onclick="Impression.settings.update(this);" />
|
||||
Recto-verso
|
||||
</label>
|
||||
</fieldset>
|
||||
</div>
|
||||
|
||||
|
|
@ -75,19 +86,22 @@
|
|||
|
||||
<form method="post" action="./" enctype="multipart/form-data">
|
||||
<h2>Mes fichiers</h2>
|
||||
<select name="fileList" id="fileList"
|
||||
size="5">
|
||||
<div>
|
||||
<select name="fileList" id="fileList" size="5">
|
||||
#for $file in $fileList
|
||||
<option>$file</option>
|
||||
#end for
|
||||
</select>
|
||||
</div>
|
||||
<div class="buttons">
|
||||
<button name="submit" class="button" value="submit_chose">Choisir</button>
|
||||
</div>
|
||||
|
||||
<h2>Envoyer un fichier</h2>
|
||||
<input type="file" name="newFile" classe="file">
|
||||
<div>
|
||||
<input type="file" name="newFile" class="file" />
|
||||
<button name="submit" value="submit_send" class="button">Envoyer</button>
|
||||
</div>
|
||||
</form>
|
||||
<div class="clear"></div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -9,5 +9,6 @@
|
|||
//-->
|
||||
</script>
|
||||
<noscript>
|
||||
Cette page utilise javascript. Elle n'est pas supportée par votre navigateur.
|
||||
<p>Cette page utilise javascript. Elle n'est pas supportée par votre
|
||||
navigateur.</p>
|
||||
</noscript>
|
||||
|
|
|
|||
|
|
@ -43,9 +43,9 @@
|
|||
<div id="mainFooter"><hr />
|
||||
<h2 style="display:none;">Liens Cr@ns</h2>
|
||||
<ul>
|
||||
<li style="display:inline"><a href="http://www.crans.org/">Site du cr@ns</a>
|
||||
<li style="display:inline"><a href="http://wiki.crans.org/">wiki</a><br />
|
||||
<li style="display:inline"><a href="http://wiki/ContactsCrans">Contact Cr@ns</a><br />
|
||||
<li style="display:inline"><a href="http://www.crans.org/">Site du cr@ns</a></li>
|
||||
<li style="display:inline"><a href="http://wiki.crans.org/">wiki</a><br /></li>
|
||||
<li style="display:inline"><a href="http://wiki/ContactsCrans">Contact Cr@ns</a><br /></li>
|
||||
</ul>
|
||||
<div id="topContentMessage" style="font-style:italic;text-align:center;">
|
||||
<p>L'intranet est en version beta, aidez-nous à
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ Crans.messages.setMessage('$error.replace("\'","\\\'")', 'errorMessage')
|
|||
<dd>$adherent.prenom
|
||||
<span class="actions"><a href="#" onclick="return askForSurname('$adherent.prenom')">modifier</a></span>
|
||||
<div class="clear"></div>
|
||||
|
||||
</dd>
|
||||
#if $getVar('adherent.adresse', False)
|
||||
<dt>Adresse :</dt>
|
||||
|
|
@ -60,27 +59,26 @@ Crans.messages.setMessage('$error.replace("\'","\\\'")', 'errorMessage')
|
|||
<span class="actions"><a href="#" onclick="return askForTel('$adherent.telephone')">modifier</a></span>
|
||||
<div class="clear"></div>
|
||||
</dd>
|
||||
|
||||
#if $adherent.droits
|
||||
<dt>Droits :</dt>
|
||||
<dd>
|
||||
$adherent.droits
|
||||
</dd>
|
||||
#end if
|
||||
|
||||
|
||||
<dt>État administratif pour l'année $adherent.anneeScolaire :</dt>
|
||||
<dd>
|
||||
<dl>
|
||||
<dt>Cotisation : </dt>
|
||||
<dd>#if $adherent.cotisationOK
|
||||
<dd>
|
||||
#if $adherent.cotisationOK
|
||||
<span class="valide"> OK</span>
|
||||
#else
|
||||
<span class="invalide"> Non payée</span>
|
||||
#end if
|
||||
</dd>
|
||||
<dt>Carte d'étudiant : </dt>
|
||||
<dd>#if $adherent.carteOK
|
||||
<dd>
|
||||
#if $adherent.carteOK
|
||||
<span class="valide"> OK</span>
|
||||
#else
|
||||
<span class="invalide"> pas de carte d'étudiant</span>
|
||||
|
|
@ -88,10 +86,10 @@ Crans.messages.setMessage('$error.replace("\'","\\\'")', 'errorMessage')
|
|||
</dd>
|
||||
</dl>
|
||||
</dd>
|
||||
|
||||
<dt class="last">Changer mon mot de passe</dt>
|
||||
<dd class="last">
|
||||
<form action="changePasswordAdherent" name="changePasswordForm" method="POST">
|
||||
<form action="changePasswordAdherent" name="changePasswordForm" method="post">
|
||||
<div>
|
||||
<label class="textInputLabel" for="ancienPassword">Ancien mot de passe : </label>
|
||||
<input type="password" id="ancienPassword" name="ancienPassword"/><br />
|
||||
<label class="textInputLabel" for="nouveauPassword1">Nouveau mot de passe : </label>
|
||||
|
|
@ -100,16 +98,15 @@ Crans.messages.setMessage('$error.replace("\'","\\\'")', 'errorMessage')
|
|||
<label class="textInputLabel" for="nouveauPassword2">Confirmation : </label>
|
||||
<input type="password" id="nouveauPassword2" name="nouveauPassword2"/><br />
|
||||
<input type="submit" value="Modifier" />
|
||||
</div>
|
||||
</form>
|
||||
</dd>
|
||||
</dl>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- +++++++++++++++++++ Infos Mails +++++++++++++++++++ -->
|
||||
<div>
|
||||
<h2 class="mark"><a name="mailTab" id="mailTab"></a></h2>
|
||||
<form action="saveMailPrefs#mailTab" method="POST">
|
||||
<form action="saveMailPrefs#mailTab" method="post">
|
||||
<dl class="tabbed_page">
|
||||
<dt>Alias:</dt>
|
||||
<dd>
|
||||
|
|
@ -127,16 +124,19 @@ Crans.messages.setMessage('$error.replace("\'","\\\'")', 'errorMessage')
|
|||
<a href="#" onclick="return newAlias()">Nouvel alias</a>
|
||||
</span>
|
||||
<div class="clear"></div>
|
||||
|
||||
</dd>
|
||||
<dt>
|
||||
Greylisting:
|
||||
</dt>
|
||||
<dt> Greylisting: </dt>
|
||||
<dd>
|
||||
#if $mailInfos.contourneGreylist==True
|
||||
<label for="contourneGreylist" class="labelCheckbox"><input type="checkbox" name="contourneGreylist" id="contourneGreylist" class="inputCheckbox" value="oui" checked /> Contourner</label>
|
||||
<label for="contourneGreylist" class="labelCheckbox">
|
||||
<input type="checkbox" name="contourneGreylist" id="contourneGreylist" class="inputCheckbox" value="oui" checked="checked" />
|
||||
Contourner
|
||||
</label>
|
||||
#else
|
||||
<label for="contourneGreylist" class="labelCheckbox"><input type="checkbox" name="contourneGreylist" id="contourneGreylist" class="inputCheckbox" value="oui" /> Contourner</label>
|
||||
<label for="contourneGreylist" class="labelCheckbox">
|
||||
<input type="checkbox" name="contourneGreylist" id="contourneGreylist" class="inputCheckbox" value="oui" />
|
||||
Contourner
|
||||
</label>
|
||||
#end if
|
||||
<a class="textInputNote" href="http://wiki/CransTechnique/GreyListing?highlight=%28Greylist%29" target="_blanc">Plus d'infos</a><br />
|
||||
</dd>
|
||||
|
|
@ -145,13 +145,18 @@ Crans.messages.setMessage('$error.replace("\'","\\\'")', 'errorMessage')
|
|||
</dt>
|
||||
<dd>
|
||||
#if $mailInfos.rewriteMailHeaders==True
|
||||
<label for="rewriteMailHeaders" class="labelCheckbox"><input type="checkbox" name="rewriteMailHeaders" id="rewriteMailHeaders" class="contourneGreylist" value="oui" checked /> Réécriture des en-tête mails</label>
|
||||
<label for="rewriteMailHeaders" class="labelCheckbox">
|
||||
<input type="checkbox" name="rewriteMailHeaders" id="rewriteMailHeaders" class="contourneGreylist" value="oui" checked="checked" />
|
||||
Réécriture des en-tête mails
|
||||
</label>
|
||||
#else
|
||||
<label for="rewriteMailHeaders" class="labelCheckbox"><input type="checkbox" name="rewriteMailHeaders" id="rewriteMailHeaders" class="contourneGreylist" value="oui" /> Réécriture des en-tête mails</label>
|
||||
<label for="rewriteMailHeaders" class="labelCheckbox">
|
||||
<input type="checkbox" name="rewriteMailHeaders" id="rewriteMailHeaders" class="contourneGreylist" value="oui" />
|
||||
Réécriture des en-tête mails
|
||||
</label>
|
||||
#end if
|
||||
</dd>
|
||||
</dl>
|
||||
|
||||
#if $getVar('mailError', False)
|
||||
<ul class="tabbed_page">
|
||||
<li class="centrer last">
|
||||
|
|
@ -164,31 +169,29 @@ Crans.messages.setMessage('$error.replace("\'","\\\'")', 'errorMessage')
|
|||
<dd>
|
||||
<label for="forwarding_address" class="labelInput">
|
||||
<input type="text" name="forwarding_address" id="forwarding_address" class="inputText" value="$mailInfos.forwarding_address" />
|
||||
</label>
|
||||
<p class="textInputNote">Laisser vide pour désactiver le transfert</p><br />
|
||||
|
||||
</label>
|
||||
</dd>
|
||||
<dt>Tri des spams:</dt>
|
||||
<dd>
|
||||
<label for="spanTreatment_no" class="labelRadio">
|
||||
#if $mailInfos.spam.no
|
||||
<input type="radio" name="spanTreatment" id="spanTreatment_no" class="inputRadio" value="no" checked /> Aucun
|
||||
<input type="radio" name="spanTreatment" id="spanTreatment_no" class="inputRadio" value="no" checked="checked" /> Aucun
|
||||
#else
|
||||
<input type="radio" name="spanTreatment" id="spanTreatment_no" class="inputRadio" value="no" /> Aucun
|
||||
#end if
|
||||
</label><br />
|
||||
|
||||
<label for="spanTreatment_mark" class="labelRadio">
|
||||
#if $mailInfos.spam.mark
|
||||
<input type="radio" name="spanTreatment" id="spanTreatment_mark" class="inputRadio" value="mark" checked /> Marquer
|
||||
<input type="radio" name="spanTreatment" id="spanTreatment_mark" class="inputRadio" value="mark" checked="checked" /> Marquer
|
||||
#else
|
||||
<input type="radio" name="spanTreatment" id="spanTreatment_mark" class="inputRadio" value="mark" /> Marquer
|
||||
#end if
|
||||
</label><br />
|
||||
|
||||
<label for="spanTreatment_drop" class="labelRadio">
|
||||
#if $mailInfos.spam.drop
|
||||
<input type="radio" name="spanTreatment" id="spanTreatment_drop" class="inputRadio" value="drop" checked /> Supprimer
|
||||
<input type="radio" name="spanTreatment" id="spanTreatment_drop" class="inputRadio" value="drop" checked="checked" /> Supprimer
|
||||
#else
|
||||
<input type="radio" name="spanTreatment" id="spanTreatment_drop" class="inputRadio" value="drop" /> Supprimer
|
||||
#end if
|
||||
|
|
@ -198,15 +201,11 @@ Crans.messages.setMessage('$error.replace("\'","\\\'")', 'errorMessage')
|
|||
#end if
|
||||
<ul class="tabbed_page">
|
||||
<li class="centrer last">
|
||||
<input type="reset" value="Reset">
|
||||
<input type="submit" nom="mailSubmit" value="Soumettre">
|
||||
<input type="reset" value="Reset" />
|
||||
<input type="submit" name="mailSubmit" value="Soumettre" />
|
||||
</li>
|
||||
</ul>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue