Mirrors/framadate
1
0
Fork 0
mirror of https://framagit.org/framasoft/framadate/framadate synced 2026-07-18 00:55:03 +00:00
Code Issues Projects Releases Wiki Activity

support line break in comment (poll and user)

Browse source
This commit is contained in:
Simon Leblanc 2011-05-22 02:39:49 +02:00
parent d43e818c11
commit 2bfca20c1a
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
adminstuds.php
View file

@ -224,7 +224,7 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) {
echo '<br><br>'. _("Add a start hour (optional)") .' : <br><br>'."\n";
echo '<select name="nouvelleheuredebut"> '."\n";
echo '<OPTION VALUE="vide"></OPTION>'."\n";
for ($i = 7; $i < 22; $i++) {
for ($i = 0; $i < 24; $i++) {
echo '<OPTION VALUE="'.$i.'">'.$i.' H</OPTION>'."\n";
}
echo '</SELECT>'."\n";
@ -238,7 +238,7 @@ if (isset($_POST["ajoutsujet"]) || isset($_POST["ajoutsujet_x"])) {
echo '<br><br>'. _("Add a end hour (optional)") .' : <br><br>'."\n";
echo '<select name="nouvelleheurefin"> '."\n";
echo '<OPTION VALUE="vide"></OPTION>'."\n";
for ($i = 7; $i < 22; $i++) {
for ($i = 0; $i < 24; $i++) {
echo '<OPTION VALUE="'.$i.'">'.$i.' H</OPTION>'."\n";
}
echo '</SELECT>'."\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";

4
studs.php
View file

@ -244,7 +244,7 @@ echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'<br><br>'."\n";
if ($dsondage->commentaires) {
echo _("Comments") .' :<br>'."\n";
$commentaires = $dsondage->commentaires;
$commentaires=str_replace("\\","",$commentaires);
$commentaires=nl2br(str_replace("\\","",$commentaires));
echo $commentaires;
echo '<br>'."\n";
}
@ -621,7 +621,7 @@ $comment_user=$connect->Execute($sql, array($numsondage));
if ($comment_user->RecordCount() != 0) {
print "<br><b>" . _("Comments of polled people") . " :</b><br>\n";
while($dcomment = $comment_user->FetchNextObject(false)) {
print $dcomment->usercomment . ' : ' . $dcomment->comment . '<br />';
print '<div class="comment"><span class="usercomment">'.$dcomment->usercomment. ' :</span> <span class="comment">' . nl2br($dcomment->comment) . '</span></div>';
}
}

8
style.css
View file

@ -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;