Commit d90c67cc authored by N. Peraldi's avatar N. Peraldi

Merge branch 'master' into...

Merge branch 'master' into 12-formulaire-adhesion-individu-pointer-vers-la-page-adullact-de-helloasso

# Conflicts:
#	contact.php
parents 048b86e0 7da2dd86
...@@ -94,13 +94,11 @@ if (isset($_POST)) { ...@@ -94,13 +94,11 @@ if (isset($_POST)) {
} }
} }
} }
get_header(); get_header();
?> ?>
<div class="wrap"> <div class="wrap">
<div id="primary" class="content-area"> <div id="primary" class="content-area">
<main id="main" class="site-main" role="main"> <main id="main" class="site-main" role="main">
...@@ -183,13 +181,10 @@ get_header(); ...@@ -183,13 +181,10 @@ get_header();
for ($a = 0; $a < count($liste); $a++) { for ($a = 0; $a < count($liste); $a++) {
$mot = createNameClass($liste[$a][0]); $mot = createNameClass($liste[$a][0]);
if (!isWordIn($mot, $resultList)) { if (!isWordIn($mot, $resultList)) {
$resultList[] = $mot; $resultList[] = $mot;
} }
} }
return $resultList; return $resultList;
} }
...@@ -201,7 +196,6 @@ get_header(); ...@@ -201,7 +196,6 @@ get_header();
return true; return true;
} }
} }
return false; return false;
} }
...@@ -275,6 +269,9 @@ get_header(); ...@@ -275,6 +269,9 @@ get_header();
<?php tryToShowError("first selection"); ?> <?php tryToShowError("first selection"); ?>
</p> </p>
<div id="link">
<a href="contact.php" id="linkRedirection" title="Page par défaut">Valider</a>
</div>
<div id="link"> <div id="link">
<a href="contact.php" id="linkRedirection">Texte</a> <a href="contact.php" id="linkRedirection">Texte</a>
</div> </div>
...@@ -316,11 +313,11 @@ get_header(); ...@@ -316,11 +313,11 @@ get_header();
$classInTreatment = $actualClass; $classInTreatment = $actualClass;
?> ?>
<option class="<?php echo $classInTreatment ?>" value="none" name="optionSelect2">--- <option class="<?php echo $classInTreatment ?>" value="none" name="optionSelect2">
---
</option> </option>
<?php <?php
} }
//la tranche pour la cotisation //la tranche pour la cotisation
$tranch = $classInTreatment . "-T" . $counter; $tranch = $classInTreatment . "-T" . $counter;
...@@ -330,7 +327,6 @@ get_header(); ...@@ -330,7 +327,6 @@ get_header();
name="optionSelect2"><?php echo $actualLine[1] ?></option> name="optionSelect2"><?php echo $actualLine[1] ?></option>
<?php <?php
$counter += 1; $counter += 1;
} }
?> ?>
...@@ -362,13 +358,12 @@ get_header(); ...@@ -362,13 +358,12 @@ get_header();
$id = "PCOT-" . $classInTreatment . "-T" . $counter; $id = "PCOT-" . $classInTreatment . "-T" . $counter;
?> ?>
<p id="<?php echo $id ?>" class="PCOT">Montant de la cotisation : <?php echo $actualLine[2] ?> <p id="<?php echo $id ?>" class="PCOT">Montant de la cotisation
: <?php echo $actualLine[2] ?>
</p> </p>
<?php <?php
$counter += 1; $counter += 1;
} }
?> ?>
...@@ -379,42 +374,57 @@ get_header(); ...@@ -379,42 +374,57 @@ get_header();
</div> </div>
<div id="informationsCollectivite"> <div id="informationsCollectivite">
<h3>Informations obligatoires :</h3> <h3>Coordonnées :</h3>
<p>Les champs portant une astérisque
<abbr class="adullact-abbr" title="Champ obligatoire">*</abbr>
sont obligatoires
</p>
<label for="nomCollectivite">Nom de la collectivité :</label> <label for="nomCollectivite">
<abbr class="adullact-abbr" title="Champ obligatoire">*</abbr>
Nom de la collectivité :
</label>
<input type="text" name="nomCollectivite" id="nomCollectivite" required="" <input type="text" name="nomCollectivite" id="nomCollectivite" required=""
value="<?php tryToEcho("nomCollectivite"); ?>"><br> value="<?php tryToEcho("nomCollectivite"); ?>"><br>
<?php tryToShowError("nom"); ?> <?php tryToShowError("nom"); ?>
<label for="adresseCollectivite">Adresse :</label> <label for="adresseCollectivite">
<abbr class="adullact-abbr" title="Champ obligatoire">*</abbr>
Adresse :</label>
<input type="text" name="adresseCollectivite" id="adresseCollectivite" required="" <input type="text" name="adresseCollectivite" id="adresseCollectivite" required=""
value="<?php tryToEcho("adresseCollectivite"); ?>"><br> value="<?php tryToEcho("adresseCollectivite"); ?>"><br>
<?php tryToShowError("adresse"); ?> <?php tryToShowError("adresse"); ?>
<label for="codePostalCollectivite">Code postal :</label> <label for="codePostalCollectivite">
<abbr class="adullact-abbr" title="Champ obligatoire">*</abbr>
Code postal :</label>
<input type="text" name="codePostalCollectivite" id="codePostalCollectivite" required="" <input type="text" name="codePostalCollectivite" id="codePostalCollectivite" required=""
value="<?php tryToEcho("codePostalCollectivite"); ?>"><br> value="<?php tryToEcho("codePostalCollectivite"); ?>"><br>
<?php tryToShowError("CP"); ?> <?php tryToShowError("CP"); ?>
<label for="villeCollectivite">Ville :</label> <label for="villeCollectivite">
<abbr class="adullact-abbr" title="Champ obligatoire">*</abbr>
Ville :</label>
<input type="text" name="villeCollectivite" id="villeCollectivite" required="" <input type="text" name="villeCollectivite" id="villeCollectivite" required=""
value="<?php tryToEcho("villeCollectivite"); ?>"><br> value="<?php tryToEcho("villeCollectivite"); ?>"><br>
<?php tryToShowError("ville"); ?> <?php tryToShowError("ville"); ?>
<label for="telCollectivite">Téléphone :</label> <label for="telCollectivite">Téléphone :</label>
<input type="tel" name="telCollectivite" id="telCollectivite" <input type="tel" name="telCollectivite" id="telCollectivite" required=""
value="<?php tryToEcho("telCollectivite"); ?>"><br> value="<?php tryToEcho("telCollectivite"); ?>"><br>
<?php tryToShowError("tel"); ?> <?php tryToShowError("tel"); ?>
<label for="siteCollectivite">Site internet :</label> <label for="siteCollectivite">Site internet :</label>
<input type="url" name="siteCollectivite" id="siteCollectivite" <input type="url" name="siteCollectivite" id="siteCollectivite" required=""
value="<?php tryToEcho("siteCollectivite"); ?>"><br> value="<?php tryToEcho("siteCollectivite"); ?>"><br>
<?php tryToShowError("site"); ?> <?php tryToShowError("site"); ?>
<label for="periodeAdhesionCollectivite">Période d'adhésion :</label>
<label for="periodeAdhesionCollectivite">
<abbr class="adullact-abbr" title="Champ obligatoire">*</abbr>
Période d'adhésion :</label>
<select name="periodeAdhesionCollectivite" id="periodeAdhesionCollectivite" required=""> <select name="periodeAdhesionCollectivite" id="periodeAdhesionCollectivite" required="">
<option class="optionPeriod" value="" selected>---</option> <option class="optionPeriod" value="" selected>---</option>
<?php generateDates(); ?> <?php generateDates(); ?>
...@@ -426,18 +436,28 @@ get_header(); ...@@ -426,18 +436,28 @@ get_header();
<h3>Informations relatives à Chorus Pro</h3> <h3>Informations relatives à Chorus Pro</h3>
<label for="siretCollectivite">SIRET :</label> <label for="siretCollectivite">
<abbr class="adullact-abbr" title="Champ obligatoire">*</abbr>
SIRET :
</label>
<input type="number" name="siretCollectivite" id="siretCollectivite" required="" <input type="number" name="siretCollectivite" id="siretCollectivite" required=""
value="<?php tryToEcho("siretCollectivite"); ?>"><br> value="<?php tryToEcho("siretCollectivite"); ?>"><br>
<?php tryToShowError("siret"); ?> <?php tryToShowError("siret"); ?>
<label for="numeroEngagementCollectivite">N° d'engagement :</label> <label for="numeroEngagementCollectivite">
<input type="text" name="numeroEngagementCollectivite" id="numeroEngagementCollectivite" required="" <abbr class="adullact-abbr" title="Champ obligatoire">*</abbr>
N° d'engagement :
</label>
<input type="text" name="numeroEngagementCollectivite" id="numeroEngagementCollectivite"
required=""
value="<?php tryToEcho("numeroEngagementCollectivite"); ?>"><br> value="<?php tryToEcho("numeroEngagementCollectivite"); ?>"><br>
<?php tryToShowError("numeroEngagement"); ?> <?php tryToShowError("numeroEngagement"); ?>
<label for="codeCollectivite">Code :</label> <label for="codeCollectivite">
<abbr class="adullact-abbr" title="Champ obligatoire">*</abbr>
Code :
</label>
<input type="text" name="codeCollectivite" id="codeCollectivite" required="" <input type="text" name="codeCollectivite" id="codeCollectivite" required=""
value="<?php tryToEcho("codeCollectivite"); ?>"><br> value="<?php tryToEcho("codeCollectivite"); ?>"><br>
<?php tryToShowError("code"); ?> <?php tryToShowError("code"); ?>
...@@ -455,10 +475,6 @@ get_header(); ...@@ -455,10 +475,6 @@ get_header();
</script> </script>
</main> </main>
</div> </div>
</div> </div>
<?php
get_footer();
?> <?php get_footer(); ?>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment