diff --git a/adminstuds.php b/adminstuds.php index d63b673..ac921b0 100644 --- a/adminstuds.php +++ b/adminstuds.php @@ -224,7 +224,7 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { echo '

'. _("Add a start hour (optional)") .' :

'."\n"; echo ''."\n"; @@ -238,7 +238,7 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) { echo '

'. _("Add a end hour (optional)") .' :

'."\n"; echo ''."\n"; @@ -463,7 +463,7 @@ if (isset($_POST["ajoutercolonne_x"]) && ($dsondage->format == "D" || $dsondage- } } - if($_POST["nouvelleheuredebut"] == "vide" || ($_POST["nouvelleheuredebut"] && $_POST["nouvelleheurefin"] && (($_POST["nouvelleheuredebut"] < $_POST["nouvelleheurefin"]) || (($_POST["nouvelleheuredebut"] == $_POST["nouvelleheurefin"]) && ($_POST["nouvelleminutedebut"] < $_POST["nouvelleminutefin"]))))) { + if($_POST["nouvelleheuredebut"] == "vide" || (isset($_POST["nouvelleheuredebut"]) && isset($_POST["nouvelleheurefin"]) && (($_POST["nouvelleheuredebut"] < $_POST["nouvelleheurefin"]) || (($_POST["nouvelleheuredebut"] == $_POST["nouvelleheurefin"]) && ($_POST["nouvelleminutedebut"] < $_POST["nouvelleminutefin"]))))) { $erreur_ajout_date = false; } else { $erreur_ajout_date = "yes"; diff --git a/studs.php b/studs.php index 43badfe..3090bc4 100644 --- a/studs.php +++ b/studs.php @@ -244,7 +244,7 @@ echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'

'."\n"; if ($dsondage->commentaires) { echo _("Comments") .' :
'."\n"; $commentaires = $dsondage->commentaires; - $commentaires=str_replace("\\","",$commentaires); + $commentaires=nl2br(str_replace("\\","",$commentaires)); echo $commentaires; echo '
'."\n"; } @@ -621,7 +621,7 @@ $comment_user=$connect->Execute($sql, array($numsondage)); if ($comment_user->RecordCount() != 0) { print "
" . _("Comments of polled people") . " :
\n"; while($dcomment = $comment_user->FetchNextObject(false)) { - print $dcomment->usercomment . ' : ' . $dcomment->comment . '
'; + print '
'.$dcomment->usercomment. ' : ' . nl2br($dcomment->comment) . '
'; } } diff --git a/style.css b/style.css index e7fe05d..8d87f4d 100644 --- a/style.css +++ b/style.css @@ -373,6 +373,14 @@ p.affichageresultats{ font-size:13px; } +div.comment{ + width:100%; +} + +div.comment span.usercomment{ + font-weight:bold; +} + a.affichageexport{ text-align: center; font-family:arial;