Chapril/date.chapril.org-framadate
Chapril/date.chapril.org-framadate
24
1
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'framasoft' of github.com:leblanc-simon/OpenSondage into framasoft

Browse Source
This commit is contained in:
Simon Leblanc 2011-10-03 01:58:42 +02:00
commit 02ad5abd9a
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
print.css
View File

@ -42,6 +42,23 @@ div.cadre tr.ajout_reponse {
display:none; display:none;
} }
table {
page-break-inside:auto
}
tr {
page-break-inside:avoid;
page-break-after:auto;
}
thead {
display:table-header-group;
}
tfoot {
display:table-footer-group;
}
div.addcomment { div.addcomment {
display:none; display:none;
} }

13
studs.php
View File

@ -173,8 +173,8 @@ if (!is_error(NO_POLL) && (isset($_POST["boutonp"]) || isset($_POST["boutonp_x"]
if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") { if ($dsondage->mailsonde || /* compatibility for non boolean DB */ $dsondage->mailsonde=="yes" || $dsondage->mailsonde=="true") {
$headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit";
mail ("$dsondage->mail_admin", mail ("$dsondage->mail_admin",
"[".NOMAPPLICATION."] "._("Poll's participation")." : ".htmlspecialchars_decode($dsondage->titre, ENT_QUOTES)."", "[".NOMAPPLICATION."] "._("Poll's participation")." : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8')."",
htmlspecialchars_decode("\"$nom\" ", ENT_QUOTES). html_entity_decode("\"$nom\" ", ENT_QUOTES, 'UTF-8').
_("has filled a line.\nYou can find your poll at the link") . " :\n\n". _("has filled a line.\nYou can find your poll at the link") . " :\n\n".
getUrlSondage($numsondage)." \n\n" . getUrlSondage($numsondage)." \n\n" .
_("Thanks for your confidence.") . "\n". NOMAPPLICATION, _("Thanks for your confidence.") . "\n". NOMAPPLICATION,
@ -266,7 +266,7 @@ echo _("If you want to vote in this poll, you have to give your name, choose the
echo '</div>'."\n"; echo '</div>'."\n";
// Debut de l'affichage des resultats du sondage // Debut de l'affichage des resultats du sondage
echo '<table class="resultats">'."\n"; echo '<table class="resultats">'."\n".'<thead>';
//On récupere les données et les sujets du sondage //On récupere les données et les sujets du sondage
$nblignes = $user_studs->RecordCount(); $nblignes = $user_studs->RecordCount();
@ -308,7 +308,7 @@ if ($testmodifier) {
if ($dsondage->mailsonde=="yes") { if ($dsondage->mailsonde=="yes") {
$headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit"; $headers="From: ".NOMAPPLICATION." <".ADRESSEMAILADMIN.">\r\nContent-Type: text/plain; charset=\"UTF-8\"\nContent-Transfer-Encoding: 8bit";
mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : $dsondage->titre", "\"$data->nom\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers); mail ("$dsondage->mail_admin", "[".NOMAPPLICATION."] " . _("Poll's participation") . " : ".html_entity_decode($dsondage->titre, ENT_QUOTES, 'UTF-8'), "\"".html_entity_decode($data->nom, ENT_QUOTES, 'UTF-8')."\""."" . _("has filled a line.\nYou can find your poll at the link") . " :\n\n".getUrlSondage($numsondage)." \n\n" . _("Thanks for your confidence.") . "\n".NOMAPPLICATION,$headers);
} }
} }
@ -426,6 +426,8 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") {
echo '</tr>'."\n"; echo '</tr>'."\n";
} }
echo '</thead>'."\n".'<tbody>'."\n";
//Usager pré-authentifié dans la liste? //Usager pré-authentifié dans la liste?
$user_mod = false; $user_mod = false;
@ -532,6 +534,8 @@ for ($i=0; $i < $nbcolonnes; $i++) {
} }
} }
echo '</tbody>'."\n".'<tfoot>'."\n";
// Affichage des différentes sommes des colonnes existantes // Affichage des différentes sommes des colonnes existantes
echo '<tr>'."\n"; echo '<tr>'."\n";
echo '<td align="right">'. _("Addition") .'</td>'."\n"; echo '<td align="right">'. _("Addition") .'</td>'."\n";
@ -563,6 +567,7 @@ for ($i=0; $i < $nbcolonnes; $i++) {
} }
echo '</tr>'."\n"; echo '</tr>'."\n";
echo '</tfoot>'."\n";
echo '</table>'."\n"; echo '</table>'."\n";
echo '</div>'."\n"; echo '</div>'."\n";