Nombreuses modifs de forme (CSS, graphisme) et qq modifs de fond

.gitignore

@@ -1 +1,4 @@
 variables.php
+admin/.htaccess
+admin/.htpasswd
+admin/logs_studs.txt

.htaccess

@@ -1,4 +1,4 @@
-<IfModule mod_rewrite.c>
+#<IfModule mod_rewrite.c>
   RewriteEngine On
   
   RewriteCond %{REQUEST_FILENAME} -f [OR]
@@ -9,4 +9,4 @@
   RewriteRule ^([a-z0-9]{24})/admin$ adminstuds.php?sondage=$1
   # Pour le dernier j'ai honte, mais il y a trop de chose à modifier pour le moment :-)
   RewriteRule ^([a-z0-9]{24})/images/(.*)$ images/$2
-</IfModule>
+#</IfModule>

CHANGELOG

@@ -1,4 +1,11 @@
 Les dernières améliorations d'OpenSondage
+
+	Changelog du 21 juin 2011 (pyg@framasoft.net)
+	- très nombreuses modifications CSS
+	- modification adminstuds.php : ajout de classes aux formulaires et ajout de stripslashes à l'affichage (TODO: à généraliser)
+	- modification infos_sondages.php : simplification du tableau de choix, ajouts de CSS, ajouts de labels pour faciliter la selection
+	
+
 	Changelog version 0.6.7 (mai 2011)
 	- fork du projet STUdS (https://sourcesup.cru.fr/projects/studs/) de la version trunk du 15 mai 2011)
         - reprise par Simon Leblanc

admin/.htaccess

@@ -1,7 +1,12 @@
-AuthType basic
+authType      basic
-AuthName "Administration de STUDS"
+authName      "ADMIN OpenSondage"
-# replace with your server path here
+
-# added content to the .htpasswd file with
+authUserFile  /home/framatools/www/opensondage/admin/.htpasswd
-# htpasswd -mnb <admin_username> <admin_password>
+
-AuthUserFile /var/www/studs/admin/.htpasswd
+order         deny,allow
-Require valid-user
+
+# satisfy       all
+
+# allow from all
+
+require user studs

adminstuds.php

@@ -1133,7 +1133,7 @@ if ((isset($_POST["boutonnouveautitre"]) || isset($_POST["boutonnouveautitre_x"]
 }
 
 //Changer les commentaires du sondage
-echo _("Change the comments") .' :<br> <textarea name="nouveauxcommentaires" rows="7" cols="40">'.$dsondage->commentaires.'</textarea><br><input type="image" name="boutonnouveauxcommentaires" value="Changer les commentaires" src="images/accept.png" alt="Valider"><br><br>'."\n";
+echo _("Change the comments") .' :<br> <textarea name="nouveauxcommentaires" rows="7" cols="40">'.stripslashes($dsondage->commentaires).'</textarea><br><input type="image" name="boutonnouveauxcommentaires" value="Changer les commentaires" src="images/accept.png" alt="Valider"><br><br>'."\n";
 
 //Changer l'adresse de l'administrateur
 echo _("Change your email address") .' :<br> <input type="text" name="nouvelleadresse" size="40" value="'.$dsondage->mail_admin.'"> <input type="image" name="boutonnouvelleadresse" value="Changer votre adresse" src="images/accept.png" alt="Valider"><br>'."\n";
@@ -1181,7 +1181,7 @@ if (isset($_POST["suppressionsondage"])) {
 echo '</form>'."\n";
 
 if ($dsondage->format == "D" || $dsondage->format == "D+") {
-  echo '<form name="formulaire2" action="'.get_server_name().'exportpdf.php" method="POST" onkeypress="javascript:process_keypress(event)">'."\n";
+  echo '<form name="formulaire2" action="'.get_server_name().'exportpdf.php" method="POST" onkeypress="javascript:process_keypress(event)" class="formulaire2">'."\n";
   echo _("Generate the convocation letter (.PDF), choose the place to meet and validate") .'<br>';
   echo '<input type="text" name="lieureunion" size="100" value="" />';
   echo '<input type="hidden" name="sondage" value="$numsondageadmin" />';

apropos.php

@@ -71,6 +71,7 @@ echo '<div class=corps>'."\n";
 if (NOMAPPLICATION!="STUdS !") {
   echo '<b>Application d\'origine</b><br><br>'."\n";
   echo 'L\'application '.NOMAPPLICATION.' est une instance du logiciel <b><a href ="http://studs.u-strasbg.fr">STUdS !</a></b> d&eacute;velopp&eacute; &agrave; l\'Universit&eacute; de Strasbourg depuis 2008.<br><br>'."\n";
+  echo "Pour les besoins de Framadate, STUdS a fait l'objet d'un fork par l'équipe Framasoft. Les sources sont disponibles sur le Github <a href='https://github.com/leblanc-simon/OpenSondage'>OpenSondage</a>.<br/><br/>\n";
 }
 
 echo '<b>Licence Logicielle de '.NOMAPPLICATION.'</b><br><br>'."\n";

bandeaux.php

@@ -52,7 +52,7 @@ function logo ()
 #le bandeau principal
 function bandeau_tete()
 {
-  echo '<div class="bandeau"><p class="framamauve">Frama</p><p class="framorange">date</p></div>'."\n";
+  echo '<div class="bandeau"><a href="/" title="Accueil Framadate"><span class="framamauve">Frama</span><span class="framorange">date</span></a></div>'."\n";
 }
 
 
@@ -69,7 +69,7 @@ function liste_lang()
   
   $str = '';
   foreach ($ALLOWED_LANGUAGES as $k => $v ) {
-    $str .= '<a href="' . $_SERVER['PHP_SELF'] . '?lang=' . $k . '">' . $v . '</a>' . "\n" ;
+    $str .= '<a class="button small gray" href="' . $_SERVER['PHP_SELF'] . '?lang=' . $k . '">' . $v . '</a>' . "\n" ;
   }
   
   return $str;
@@ -126,13 +126,14 @@ function sur_bandeau_pied()
 function bandeau_pied()
 {
   //echo '<div class="bandeaupied">'. _("Universit&eacute; de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'</div>'."\n";
+  echo '<div class="separateur">&nbsp;</div>';
   echo '<div class="sousbandeau">' .
-       '<a href="' . get_server_name() . 'index.php">'. _("Home") .'</a>' .
+       '<a class="button small gray" href="' . get_server_name() . 'index.php">'. _("Home") .'</a>' .
-       '<a href="' . getUrlSondage('aqg259dth55iuhwm').'">'. _("Example") .'</a>' .
+       '<a class="button small gray" href="' . getUrlSondage('aqg259dth55iuhwm').'">'. _("Example") .'</a>' .
-       '<a href="' . get_server_name() . 'contacts.php">'. _("Contact") .'</a>' .
+       '<a class="button small gray" href="' . get_server_name() . 'contacts.php">'. _("Contact") .'</a>' .
        //'<a href="' . get_server_name() . 'sources/sources.php">'. _("Sources") .'</a>' . //not implemented
-       '<a href="' . get_server_name() . 'apropos.php">'. _("About") .'</a>' .
+       '<a class="button small gray" href="' . get_server_name() . 'apropos.php">'. _("About") .'</a>' .
-       '<a href="' . get_server_name() . 'admin/index.php">'. _("Admin") .'</a>' .
+       '<a class="button small gray" href="' . get_server_name() . 'admin/index.php">'. _("Admin") .'</a>' .
        '<span class="sousbandeau sousbandeaulangue">' .
        liste_lang() . '</span>'.
        '</div>' . "\n";
@@ -143,13 +144,14 @@ function bandeau_pied_mobile()
 {
   /*echo '<div class="surbandeaupiedmobile"></div>'."\n" .
        '<div class="bandeaupiedmobile">'. _("Universit&eacute; de Strasbourg. Creation: Guilhem BORGHESI. 2008-2009") .'</div>'."\n";*/
+       echo '<div class="separateur">&nbsp;</div>';
   echo '<div class="sousbandeau">' .
-       '<a href="' . get_server_name() . 'index.php">'. _("Home") .'</a>' .
+       '<a class="button small gray" href="' . get_server_name() . 'index.php">'. _("Home") .'</a>' .
-       '<a href="' . getUrlSondage('aqg259dth55iuhwm').'">'. _("Example") .'</a>' .
+       '<a class="button small gray" href="' . getUrlSondage('aqg259dth55iuhwm').'">'. _("Example") .'</a>' .
-       '<a href="' . get_server_name() . 'contacts.php">'. _("Contact") .'</a>' .
+       '<a class="button small gray" href="' . get_server_name() . 'contacts.php">'. _("Contact") .'</a>' .
        //'<a href="' . get_server_name() . 'sources/sources.php">'. _("Sources") .'</a>' . //not implemented
-       '<a href="' . get_server_name() . 'apropos.php">'. _("About") .'</a>' .
+       '<a class="button small gray" href="' . get_server_name() . 'apropos.php">'. _("About") .'</a>' .
-       '<a href="' . get_server_name() . 'admin/index.php">'. _("Admin") .'</a>' .
+       '<a class="button small gray" href="' . get_server_name() . 'admin/index.php">'. _("Admin") .'</a>' .
        '<span class="sousbandeau sousbandeaulangue">' .
        liste_lang() . '</span>'.
        '</div>' . "\n";

buttons.css

@@ -0,0 +1,244 @@
+/* button 
+---------------------------------------------- */
+.button {
+	display: inline-block;
+	zoom: 1; /* zoom and *display = ie7 hack for display:inline-block */
+	*display: inline;
+	vertical-align: baseline;
+	margin: 0 2px;
+	outline: none;
+	cursor: pointer;
+	text-align: center;
+	text-decoration: none;
+	font: 14px/100% Arial, Helvetica, sans-serif;
+	padding: .5em 2em .55em;
+	text-shadow: 0 1px 1px rgba(0,0,0,.3);
+	-webkit-border-radius: .5em; 
+	-moz-border-radius: .5em;
+	border-radius: .5em;
+	-webkit-box-shadow: 0 1px 2px rgba(0,0,0,.2);
+	-moz-box-shadow: 0 1px 2px rgba(0,0,0,.2);
+	box-shadow: 0 1px 2px rgba(0,0,0,.2);
+}
+.button:hover {
+	text-decoration: none;
+}
+.button:active {
+	position: relative;
+	top: 1px;
+}
+
+.bigrounded {
+	-webkit-border-radius: 2em;
+	-moz-border-radius: 2em;
+	border-radius: 2em;
+}
+.medium {
+	font-size: 12px;
+	padding: .4em 1.5em .42em;
+}
+.small {
+	font-size: 11px;
+	padding: .2em 1em .275em;
+}
+
+/* color styles 
+---------------------------------------------- */
+
+/* black */
+.black {
+	color: #d7d7d7;
+	border: solid 1px #333;
+	background: #333;
+	background: -webkit-gradient(linear, left top, left bottom, from(#666), to(#000));
+	background: -moz-linear-gradient(top,  #666,  #000);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#666666', endColorstr='#000000');
+}
+.black:hover {
+	background: #000;
+	background: -webkit-gradient(linear, left top, left bottom, from(#444), to(#000));
+	background: -moz-linear-gradient(top,  #444,  #000);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#444444', endColorstr='#000000');
+}
+.black:active {
+	color: #666;
+	background: -webkit-gradient(linear, left top, left bottom, from(#000), to(#444));
+	background: -moz-linear-gradient(top,  #000,  #444);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#000000', endColorstr='#666666');
+}
+
+/* gray */
+.gray {
+	color: #e9e9e9;
+	border: solid 1px #555;
+	background: #6e6e6e;
+	background: -webkit-gradient(linear, left top, left bottom, from(#888), to(#575757));
+	background: -moz-linear-gradient(top,  #888,  #575757);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#888888', endColorstr='#575757');
+}
+.gray:hover {
+	background: #616161;
+	background: -webkit-gradient(linear, left top, left bottom, from(#757575), to(#4b4b4b));
+	background: -moz-linear-gradient(top,  #757575,  #4b4b4b);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#757575', endColorstr='#4b4b4b');
+}
+.gray:active {
+	color: #afafaf;
+	background: -webkit-gradient(linear, left top, left bottom, from(#575757), to(#888));
+	background: -moz-linear-gradient(top,  #575757,  #888);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#575757', endColorstr='#888888');
+}
+
+/* white */
+.white {
+	color: #606060;
+	border: solid 1px #b7b7b7;
+	background: #fff;
+	background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#ededed));
+	background: -moz-linear-gradient(top,  #fff,  #ededed);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#ededed');
+}
+.white:hover {
+	background: #ededed;
+	background: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#dcdcdc));
+	background: -moz-linear-gradient(top,  #fff,  #dcdcdc);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#dcdcdc');
+}
+.white:active {
+	color: #999;
+	background: -webkit-gradient(linear, left top, left bottom, from(#ededed), to(#fff));
+	background: -moz-linear-gradient(top,  #ededed,  #fff);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ededed', endColorstr='#ffffff');
+}
+
+/* orange */
+.orange {
+	color: #fef4e9;
+	border: solid 1px #da7c0c;
+	background: #f78d1d;
+	background: -webkit-gradient(linear, left top, left bottom, from(#faa51a), to(#f47a20));
+	background: -moz-linear-gradient(top,  #faa51a,  #f47a20);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#faa51a', endColorstr='#f47a20');
+}
+.orange:hover {
+	background: #f47c20;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f88e11), to(#f06015));
+	background: -moz-linear-gradient(top,  #f88e11,  #f06015);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#f88e11', endColorstr='#f06015');
+}
+.orange:active {
+	color: #fcd3a5;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f47a20), to(#faa51a));
+	background: -moz-linear-gradient(top,  #f47a20,  #faa51a);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#f47a20', endColorstr='#faa51a');
+}
+
+/* red */
+.red {
+	color: #faddde;
+	border: solid 1px #980c10;
+	background: #d81b21;
+	background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317));
+	background: -moz-linear-gradient(top,  #ed1c24,  #aa1317);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed1c24', endColorstr='#aa1317');
+}
+.red:hover {
+	background: #b61318;
+	background: -webkit-gradient(linear, left top, left bottom, from(#c9151b), to(#a11115));
+	background: -moz-linear-gradient(top,  #c9151b,  #a11115);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#c9151b', endColorstr='#a11115');
+}
+.red:active {
+	color: #de898c;
+	background: -webkit-gradient(linear, left top, left bottom, from(#aa1317), to(#ed1c24));
+	background: -moz-linear-gradient(top,  #aa1317,  #ed1c24);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#aa1317', endColorstr='#ed1c24');
+}
+
+/* blue */
+.blue {
+	color: #d9eef7;
+	border: solid 1px #0076a3;
+	background: #0095cd;
+	background: -webkit-gradient(linear, left top, left bottom, from(#00adee), to(#0078a5));
+	background: -moz-linear-gradient(top,  #00adee,  #0078a5);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#00adee', endColorstr='#0078a5');
+}
+.blue:hover {
+	background: #007ead;
+	background: -webkit-gradient(linear, left top, left bottom, from(#0095cc), to(#00678e));
+	background: -moz-linear-gradient(top,  #0095cc,  #00678e);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#0095cc', endColorstr='#00678e');
+}
+.blue:active {
+	color: #80bed6;
+	background: -webkit-gradient(linear, left top, left bottom, from(#0078a5), to(#00adee));
+	background: -moz-linear-gradient(top,  #0078a5,  #00adee);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#0078a5', endColorstr='#00adee');
+}
+
+/* rosy */
+.rosy {
+	color: #fae7e9;
+	border: solid 1px #b73948;
+	background: #da5867;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f16c7c), to(#bf404f));
+	background: -moz-linear-gradient(top,  #f16c7c,  #bf404f);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#f16c7c', endColorstr='#bf404f');
+}
+.rosy:hover {
+	background: #ba4b58;
+	background: -webkit-gradient(linear, left top, left bottom, from(#cf5d6a), to(#a53845));
+	background: -moz-linear-gradient(top,  #cf5d6a,  #a53845);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf5d6a', endColorstr='#a53845');
+}
+.rosy:active {
+	color: #dca4ab;
+	background: -webkit-gradient(linear, left top, left bottom, from(#bf404f), to(#f16c7c));
+	background: -moz-linear-gradient(top,  #bf404f,  #f16c7c);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#bf404f', endColorstr='#f16c7c');
+}
+
+/* green */
+.green {
+	color: #e8f0de;
+	border: solid 1px #538312;
+	background: #64991e;
+	background: -webkit-gradient(linear, left top, left bottom, from(#7db72f), to(#4e7d0e));
+	background: -moz-linear-gradient(top,  #7db72f,  #4e7d0e);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#7db72f', endColorstr='#4e7d0e');
+}
+.green:hover {
+	background: #538018;
+	background: -webkit-gradient(linear, left top, left bottom, from(#6b9d28), to(#436b0c));
+	background: -moz-linear-gradient(top,  #6b9d28,  #436b0c);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#6b9d28', endColorstr='#436b0c');
+}
+.green:active {
+	color: #a9c08c;
+	background: -webkit-gradient(linear, left top, left bottom, from(#4e7d0e), to(#7db72f));
+	background: -moz-linear-gradient(top,  #4e7d0e,  #7db72f);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#4e7d0e', endColorstr='#7db72f');
+}
+
+/* pink */
+.pink {
+	color: #feeef5;
+	border: solid 1px #d2729e;
+	background: #f895c2;
+	background: -webkit-gradient(linear, left top, left bottom, from(#feb1d3), to(#f171ab));
+	background: -moz-linear-gradient(top,  #feb1d3,  #f171ab);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#feb1d3', endColorstr='#f171ab');
+}
+.pink:hover {
+	background: #d57ea5;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f4aacb), to(#e86ca4));
+	background: -moz-linear-gradient(top,  #f4aacb,  #e86ca4);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#f4aacb', endColorstr='#e86ca4');
+}
+.pink:active {
+	color: #f3c3d9;
+	background: -webkit-gradient(linear, left top, left bottom, from(#f171ab), to(#feb1d3));
+	background: -moz-linear-gradient(top,  #f171ab,  #feb1d3);
+	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#f171ab', endColorstr='#feb1d3');
+}

choix_autre.php

@@ -170,9 +170,11 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE
   echo '</tr></table>'."\n";
   echo'<br>'."\n";
   
-  echo '<table><tr>'."\n";
+  //echo '<table><tr>'."\n";
-  echo '<td>'. _("Next") .'</td><td><input type="image" name="fin_sondage_autre" value="Cr&eacute;er le sondage" src="images/next-32.png"></td>'."\n";
+  //echo '<td>'. _("Next") .'</td><td><input type="image" name="fin_sondage_autre" value="Cr&eacute;er le sondage" src="images/next-32.png"></td>'."\n";
-  echo '</tr></table>'."\n";
+  //echo '</tr></table>'."\n";
+  echo '<button name="fin_sondage_autre_x" value="'._('Next').'" type="submit" class="button green poursuivre"><strong>'. _('Next') . '</strong> </button>';
+  echo '<div style="clear:both"></div>';
   
   //test de remplissage des cases
   $testremplissage = '';
@@ -208,9 +210,13 @@ if (issetAndNoEmpty('titre', $_SESSION) === false || issetAndNoEmpty('nom', $_SE
     echo '<font color=#FF0000>'. _("Once you have confirmed the creation of your poll, you will be automatically redirected on the page of your poll. <br><br>Then, you will receive quickly an email contening the link to your poll for sending it to the voters.") .'</font>'."\n";
     echo '</div>'."\n";
     echo '<br>'."\n";
-    echo '<table>'."\n";
+    //echo '<table>'."\n";
-    echo '<tr><td>'. _("Create the poll") .'</td><td><input type="image" name="confirmecreation" value="Valider la cr&eacute;ation"i src="images/add.png"></td></tr>'."\n";
+    //echo '<tr><td>'. _("Create the poll") .'</td><td><input type="image" name="confirmecreation" value="Valider la cr&eacute;ation"i src="images/add.png"></td></tr>'."\n";
-    echo '</table>'."\n";
+    //echo '</table>'."\n";
+    
+    echo '<button name="confirmecreation" value="confirmecreation" type="submit" class="button green poursuivre"><strong>'. _('Make a poll') . '</strong> </button>';
+    echo '<div style="clear:both"></div>';
+    
   }
   
   //fin du formulaire et bandeau de pied

choix_date.php

@@ -60,7 +60,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION)
   logo();
   bandeau_tete();
   bandeau_titre(_("Error!"));
-  echo '<div class=corpscentre>'."\n";
+  echo '<div class=corpscentre corps>'."\n";
   print "<H2>" . _("You haven't filled the first section of the poll creation.") . " !</H2>"."\n";
   print _("Back to the homepage of ") . ' ' . '<a href="index.php">' . NOMAPPLICATION . '</a>.' . "\n";
   echo '<br><br><br>'."\n";
@@ -229,8 +229,11 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION)
   bandeau_titre(_("Poll dates (2 on 2)"));
   sous_bandeau_choix();
   
+  //ajout pyg pour la cohérence graphique
+  echo ' <div class="corps">';
+  
   //affichage de l'aide pour les jours
-  echo '<div class=bodydate>'."\n";
+  echo '<div class="bodydate">'."\n";
   echo _("Select your dates amoung the free days (green). The selected days are in blue.<br> You can unselect a day previously selected by clicking again on it.") ."\n";
   echo '</div>'."\n";
   
@@ -479,7 +482,8 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION)
     echo '<br>'."\n";
     echo '<H2>'. _("Selected days") .' :</H2>'."\n";
     //affichage de l'aide pour les jours
-    echo _("For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,<br>- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,<br>- \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes.") .'<br><br>'."\n";
+    //echo _("For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,<br>- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,<br>- \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes.") .'<br><br>'."\n";
+    echo _("For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)") .'<br><br>'."\n";
     echo '<table>'."\n";
     echo '<tr>'."\n";
     echo '<td></td>'."\n";
@@ -539,10 +543,15 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION)
     echo '<table>'."\n";
     echo '<tr>'."\n";
     echo '<td><input type=submit name="reset" value="'. _("Remove all days") .'"></td><td><input type=submit name="reporterhoraires" value="'. _("Copy hours of the first day") .'"></td><td><input type=submit name="resethoraires" value="'. _("Remove all hours") .'"></td></tr>'."\n";
-    echo'<tr><td><br></td></tr>'."\n";
+#    echo'<tr><td><br></td></tr>'."\n";
-    echo '<tr><td>'. _("Next") .'</td><td><input type=image name="choixheures" value="'. _("Next") .'" src="images/next-32.png"></td></tr>'."\n";
+#    echo '<tr><td>'. _("Next") .'</td><td><input type=image name="choixheures" value="'. _("Next") .'" src="images/next-32.png"></td></tr>'."\n";
     echo '</table>'."\n";
     
+    //patch vraiment crado : on donne le nom "choixheures_x" au bouton pour éviter d'avoir à cleaner le code
+    echo '<br><button name="choixheures_x" value="'. _("Next") .'" type="submit" class="button green poursuivre"><strong>'. _('Next') . '</strong> </button>';
+    echo '<div style="clear:both"></div>';
+    
+    
     //si un seul jour et aucunes horaires choisies, : message d'erreur
     if ((issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x')) && (count($_SESSION["totalchoixjour"])=="1" && $_POST["horaires0"][0]=="" && $_POST["horaires0"][1]=="" && $_POST["horaires0"][2]=="" && $_POST["horaires0"][3]=="" && $_POST["horaires0"][4]=="")) {
       echo '<table><tr><td colspan=3><font color=#FF0000>'. _("Enter more choices for the voters") .'</font><br></td></tr></table>'."\n";
@@ -553,7 +562,7 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION)
   //s'il n'y a pas d'erreur et que le bouton de creation est activé, on demande confirmation
   if (!$erreur  && (issetAndNoEmpty('choixheures') || issetAndNoEmpty('choixheures_x'))) {
     $taille_tableau=sizeof($_SESSION["totalchoixjour"])-1;
-    $jour_arret = $_SESSION["totalchoixjour"][$taille_tableau]+200000;
+    $jour_arret = $_SESSION["totalchoixjour"][$taille_tableau]+2592000;
     if ($_SESSION["langue"]=="EN") {
       $date_fin=date("l, F jS Y", $jour_arret);
     } else {
@@ -568,10 +577,17 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION)
     // echo'<p class=affichageexport>'."\n";
     // echo 'Pour finir la cr&eacute;ation du sondage, cliquez sur le bouton <img src="images/add-16.png" alt="ajout"> ci-dessous'."\n";
     // echo '</p>'."\n";
-    echo '<table>'."\n";
+
-    echo '<tr><td>'. _("Back to hours") .'</td><td></td><td><input type="image" name="retourhoraires" src="images/back-32.png"></td></tr>'."\n";
+    //echo '<table>'."\n";
-    echo'<tr><td>'. _("Create the poll") .'</td><td></td><td><input type="image" name="confirmation" value="Valider la cr&eacute;ation" src="images/add.png"></td></tr>'."\n";
+    //echo '<tr><td>'. _("Back to hours") .'</td><td></td><td><input type="image" name="retourhoraires" src="images/back-32.png"></td></tr>'."\n";
-    echo '</table>'."\n";
+    //echo'<tr><td>'. _("Create the poll") .'</td><td></td><td><input type="image" name="confirmation" value="Valider la cr&eacute;ation" src="images/add.png"></td></tr>'."\n";
+    //echo '</table>'."\n";
+    
+    echo '<br/><br/>';
+    // patch crado : on attribue les noms de boutons avec _x pour faire croire qu'on a cliqué sur une image
+    echo '<button name="retourhoraires_x" value="retourhoraires" type="submit" class="button red retour"><strong>'. _('Back to hours') . '</strong> </button>';
+    echo '<button name="confirmation_x" value="confirmation" type="submit" class="button green poursuivre"><strong>'. _('Create the poll') . '</strong> </button>';
+    echo '<div style="clear:both"></div>';
   }
   
   echo '</tr>'."\n";
@@ -580,8 +596,11 @@ if (!issetAndNoEmpty('nom', $_SESSION) && !issetAndNoEmpty('adresse', $_SESSION)
   //fin du formulaire et bandeau de pied
   echo '</form>'."\n";
   //bandeau de pied
-  echo '<br><br><br><br>'."\n";
+  //echo '<br><br><br><br>'."\n";
   echo '</div>'."\n";
+  
+  echo '</div>'; // ajout pyg pour cohérence graphique
+  
   bandeau_pied_mobile();
   echo '</body>'."\n";
   echo '</html>'."\n";

creation_sondage.php

@@ -118,7 +118,7 @@ function ajouter_sondage()
   $message_admin = sprintf($message_admin, getUrlSondage($sondage_admin, true));
   
   if (validateEmail($_SESSION['adresse'])) {
-    mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers);
+    mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("For sending to the polled users") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message_admin, $headers);
     mail ("$_SESSION[adresse]", "[".NOMAPPLICATION."][" . _("Author's message") . "] " . _("Poll") . " : ".stripslashes($_SESSION["titre"]), $message, $headers);
   }
   

fonctions.php

@@ -118,7 +118,7 @@ function print_header($js = false, $nom_sondage = '')
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
   if (empty($nom_sondage) === false) {
     echo '
-    <title>'.$nom_sondage.' - '.NOMAPPLICATION.'</title>';
+    <title>'.stripslashes($nom_sondage).' - '.NOMAPPLICATION.'</title>';
   } else {
     echo '
     <title>'.NOMAPPLICATION.'</title>';

index.php

@@ -57,7 +57,7 @@ echo '</head>'."\n";
 echo '<body>'."\n";
 
 //debut du formulaire
-echo '<form name=formulaire action="index.php" method="POST">'."\n";
+echo '<form name=formulaire action="infos_sondage.php" method="POST">'."\n";
 
 //bandeaux de tete
 logo();
@@ -66,15 +66,28 @@ bandeau_titre(_("Organiser des rendez-vous simplement, librement."));
 sous_bandeau();
 
 echo '<div class=corps>'."\n";
-echo '<p><b>'.NOMAPPLICATION.'<br>'. _("What is it about?") .'</b></p>';
+#echo '<p><b>'.NOMAPPLICATION.'<br>'. _("What is it about?") .'</b></p>';
-echo '<p>'. _("Making polls to schedule meetings or events, quickly and easily. <br> You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'</p>'."\n".'<br>'."\n";
+#echo '<p>'. _("Making polls to schedule meetings or events, quickly and easily. <br> You can also run polls to determine what will be your next meeting place, the meeting topic or anything like the country you would like to visit during your next holidays.") .'</p>'."\n".'<br>'."\n";
-echo '<div class="nouveau_sondage"><b>'. _("Make a poll") .'</b>' .
+#echo '<div class="nouveau_sondage"><b>'. _("Make a poll") .'</b>';
-     '<span>' .
+#     '<span>' .
-     '<a href="' . get_server_name() . 'infos_sondage.php"><img alt="' . _('Make a poll') . '" src="images/next-32.png" /></a>' .
+#     '<a href="' . get_server_name() . 'infos_sondage.php"><img alt="' . _('Make a poll') . '" src="images/next-32.png" /></a>' .
-     '</span></div>' . "\n";
+#     '</span>';
+#echo '</div>' . "\n";
 
 echo '<br>'."\n";
-echo '<br><br>'."\n";
+
+echo '<div class="index_date">';
+echo '<div><image class="opacity" src="images/date.png" onclick="document.formulaire.date.click()"/></div>';
+echo '<button id="date" name="choix_sondage" value="date" type="submit" class="button orange bigrounded"/><img src="images/calendar-32.png" alt="" /><strong>&nbsp;'. _('Schedule an event') . '</strong></button>';
+echo '</div>';
+
+echo '<div class="index_sondage">';
+echo '<div><image class="opacity" src="images/sondage2.png" onclick="document.formulaire.autre.click()" /></div>';
+echo '<button id="autre" name="choix_sondage" value="autre" type="submit" class="button blue bigrounded" /><img src="images/chart-32.png" alt="" /><strong>&nbsp;'. _('Make a poll') . '</strong></button>';
+echo '</div>';
+
+
+echo '<div style="clear:both;"></div>'."\n";
 echo '</div>'."\n";
 echo '</form>'."\n";
 //bandeau de pied

infos_sondage.php

@@ -47,7 +47,7 @@ if (file_exists('bandeaux_local.php')) {
 
 // On teste toutes les variables pour supprimer l'ensemble des warnings PHP
 // On transforme en entites html les données afin éviter les failles XSS
-$post_var = array('titre', 'nom', 'adresse', 'commentaires', 'studsplus', 'mailsonde', 'creation_sondage_date', 'creation_sondage_date_x', 'creation_sondage_autre', 'creation_sondage_autre_x',);
+$post_var = array('choix_sondage', 'poursuivre', 'titre', 'nom', 'adresse', 'commentaires', 'studsplus', 'mailsonde', 'creation_sondage_date', 'creation_sondage_date_x', 'creation_sondage_autre', 'creation_sondage_autre_x',);
 foreach ($post_var as $var) {
   if (isset($_POST[$var]) === true) {
     $$var = htmlentities($_POST[$var], ENT_QUOTES, 'UTF-8');
@@ -56,8 +56,9 @@ foreach ($post_var as $var) {
   }
 }
 
+
 // On initialise egalement la session car sinon bonjour les warning :-)
-$session_var = array('titre', 'nom', 'adresse', 'commentaires', 'mailsonde', 'studsplus', );
+$session_var = array('choix_sondage', 'titre', 'nom', 'adresse', 'commentaires', 'mailsonde', 'studsplus', );
 foreach ($session_var as $var) {
   if (issetAndNoEmpty($var, $_SESSION) === false) {
     $_SESSION[$var] = null;
@@ -73,7 +74,8 @@ $cocheplus = '';
 $cochemail = '';
 
 #tests
-if (issetAndNoEmpty("creation_sondage_date") || issetAndNoEmpty("creation_sondage_autre") || issetAndNoEmpty("creation_sondage_date_x") || issetAndNoEmpty("creation_sondage_autre_x")){
+if (issetAndNoEmpty("poursuivre")){
+  $_SESSION["choix_sondage"] = $choix_sondage;
   $_SESSION["titre"] = $titre;
   $_SESSION["nom"] = $nom;
   $_SESSION["adresse"] = $adresse;
@@ -111,6 +113,8 @@ if (issetAndNoEmpty("creation_sondage_date") || issetAndNoEmpty("creation_sondag
   
   // Si pas d'erreur dans l'adresse alors on change de page vers date ou autre
   if ($titre && $nom && $adresse && !$erreur_adresse && ! $erreur_injection_titre && ! $erreur_injection_commentaires && ! $erreur_injection_nom) {
+/*
+# pyg@framasoft.net : inutile.
     if ($creation_sondage_date !== null || $creation_sondage_date_x !== null) {
       header("Location:choix_date.php");
       exit();
@@ -120,6 +124,23 @@ if (issetAndNoEmpty("creation_sondage_date") || issetAndNoEmpty("creation_sondag
       header("Location:choix_autre.php");
       exit();
     }
+    
+    if ( $creation_sondage_autre_x !== null) {
+      header("Location:choix_autre.php");
+      exit();
+    }    
+*/    
+    if ( $poursuivre == "creation_sondage_date" ) {
+      header("Location:choix_date.php");
+      exit();
+    }    
+    
+    if ( $poursuivre == "creation_sondage_autre" ) {
+      header("Location:choix_autre.php");
+      exit();
+    }    
+    
+    
   }
 }
 
@@ -144,7 +165,7 @@ if(!check_table_sondage()) {
 }
 
 //debut du formulaire
-echo '<form name="formulaire" action="infos_sondage.php" method="POST" onkeypress="javascript:process_keypress(event)">'."\n";
+echo '<form name="formulaire" id="formulaire" action="infos_sondage.php" method="POST" onkeypress="javascript:process_keypress(event)">'."\n";
  
 echo '<div class=corps>'."\n";
 echo '<br>'. _("You are in the poll creation section. <br> Required fields cannot be left blank") .'<br><br>'."\n";
@@ -152,15 +173,15 @@ echo '<br>'. _("You are in the poll creation section. <br> Required fields canno
 //Affichage des différents champs textes a remplir
 echo '<table>'."\n";
 
-echo '<tr><td>'. _("Poll title *: ") .'</td><td><input type="text" name="titre" size="40" maxlength="80" value="'.$_SESSION["titre"].'"></td>'."\n";
+echo '<tr><td>'. _("Poll title *: ") .'</td><td><input type="text" name="titre" size="40" maxlength="80" value="'.stripslashes($_SESSION["titre"]).'"></td>'."\n";
-if (!$_SESSION["titre"] && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) {
+if (!$_SESSION["titre"] && issetAndNoEmpty("poursuivre") ) {
   print "<td><font color=\"#FF0000\">" . _("Enter a title") . "</font></td>"."\n";
 } elseif ($erreur_injection_titre) {
   print "<td><font color=\"#FF0000\">" . _("Characters < > and \" are not permitted") . "</font></td><br>"."\n";
 }
 
 echo '</tr>'."\n";
-echo '<tr><td>'. _("Comments: ") .'</td><td><textarea name="commentaires" rows="7" cols="40">'.$_SESSION["commentaires"].'</textarea></td>'."\n";
+echo '<tr><td>'. _("Comments: ") .'</td><td><textarea name="commentaires" rows="7" cols="40">'.stripslashes($_SESSION["commentaires"]).'</textarea></td>'."\n";
 
 if ($erreur_injection_commentaires) {
   print "<td><font color=\"#FF0000\">" . _("Characters < > and \" are not permitted") . "</font></td><br>"."\n";
@@ -170,12 +191,12 @@ echo '</tr>'."\n";
 echo '<tr><td>'. _("Your name*: ") .'</td><td>';
 
 if (isset($_SERVER['REMOTE_USER'])) {
-  echo '<input type="hidden" name="nom" size="40" maxlength="40" value="'.$_SESSION["nom"].'">'.$_SESSION["nom"].'</td>'."\n";
+  echo '<input type="hidden" name="nom" size="40" maxlength="40" value="'.$_SESSION["nom"].'">'.stripslashes($_SESSION["nom"]).'</td>'."\n";
 } else {
-  echo '<input type="text" name="nom" size="40" maxlength="40" value="'.$_SESSION["nom"].'"></td>'."\n";
+  echo '<input type="text" name="nom" size="40" maxlength="40" value="'.stripslashes($_SESSION["nom"]).'"></td>'."\n";
 }
 
-if (!$_SESSION["nom"] && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) {
+if (!$_SESSION["nom"] && issetAndNoEmpty("poursuivre")) {
   print "<td><font color=\"#FF0000\">" . _("Enter a name") . "</font></td>"."\n";
 } elseif ($erreur_injection_nom) {
   print "<td><font color=\"#FF0000\">" . _("Characters < > and \" are not permitted") . "</font></td><br>"."\n";
@@ -190,9 +211,9 @@ if (isset($_SERVER['REMOTE_USER'])) {
   echo '<input type="text" name="adresse" size="40" maxlength="64" value="'.$_SESSION["adresse"].'"></td>'."\n";
 }
 
-if (!$_SESSION["adresse"] && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) {
+if (!$_SESSION["adresse"] && issetAndNoEmpty("poursuivre")) {
   print "<td><font color=\"#FF0000\">" . _("Enter an email address") . " </font></td>"."\n";
-} elseif ($erreur_adresse && (issetAndNoEmpty('creation_sondage_date') || issetAndNoEmpty('creation_sondage_autre') || issetAndNoEmpty('creation_sondage_date_x') || issetAndNoEmpty('creation_sondage_autre_x'))) {
+} elseif ($erreur_adresse && issetAndNoEmpty("poursuivre")) {
   print "<td><font color=\"#FF0000\">" . _("The address is not correct! (You should enter a valid email address in order to receive the link to your poll)") . "</font></td>"."\n";
 }
 
@@ -204,7 +225,7 @@ echo '<script type="text/javascript">'."\n";
 echo 'document.formulaire.titre.focus();'."\n";
 echo '</script>'."\n";
 
-echo '<br>'. _("The fields marked with * are required!") .'<br><br>'."\n";
+#echo '<br>'. _("The fields marked with * are required!") .'<br><br>'."\n";
 
 #affichage du cochage par défaut
 if (!$_SESSION["studsplus"] && !issetAndNoEmpty('creation_sondage_date') && !issetAndNoEmpty('creation_sondage_autre') && !issetAndNoEmpty('creation_sondage_date_x') && !issetAndNoEmpty('creation_sondage_autre_x')) {
@@ -215,22 +236,32 @@ if ($_SESSION["studsplus"]=="+") {
   $cocheplus="checked";
 }
 
-echo '<input type=checkbox name=studsplus '.$cocheplus.'>'. _(" Voters can modify their vote themselves.") .'<br>'."\n";
+echo '<input type=checkbox name=studsplus '.$cocheplus.' id="studsplus"><label for="studsplus">'. _(" Voters can modify their vote themselves.") .'</label><br>'."\n";
 
 if ($_SESSION["mailsonde"]) {
   $cochemail="checked";
 }
 
-echo '<input type=checkbox name=mailsonde '.$cochemail.'>'. _(" To receive an email for each new vote.") .'<br>'."\n";
+echo '<input type=checkbox name=mailsonde '.$cochemail.' id="mailsonde"><label for="mailsonde">'. _(" To receive an email for each new vote.") .'</label><br>'."\n";
 
 //affichage des boutons pour choisir sondage date ou autre
-echo '<br><table >'."\n";
+if ($_POST['choix_sondage']=='date') {
-echo '<tr><td>'. _("Schedule an event") .'</td><td></td> '."\n";
+    $choix="creation_sondage_date";
-echo '<td><input type="image" name="creation_sondage_date" value="Trouver une date" src="images/calendar-32.png"></td></tr>'."\n";
+} elseif ($_POST['choix_sondage']=='autre') {
-echo '<tr><td>'. _("Make a choice") .'</td><td></td> '."\n";
+    $choix="creation_sondage_autre";
-echo '<td><input type="image" name="creation_sondage_autre" value="'. _('Make a poll') . '" src="images/chart-32.png"></td></tr>'."\n";
+}
-echo '</table>'."\n";
+echo '<input type="hidden" name="choix_sondage" value="'. $choix_sondage .'"/>';
-echo '<br><br><br>'."\n";
+echo '<br><button name="poursuivre" value="'. $choix .'" type="submit" class="button green poursuivre"><strong>'. _('Next') . '</strong> </button>';
+echo '<div style="clear:both"></div>';
+
+
+
+#echo '<br><table id="choix_sondage">'."\n";
+#echo '<tr><td><input type="image" name="creation_sondage_date" value="Trouver une date" src="images/calendar-32.png" id="creation_sondage_date"><label for="creation_sondage_date" style="cursor:pointer">'.  _("Schedule an event") .'</label></td></tr>'."\n";
+#echo '<tr><td><input type="image" name="creation_sondage_autre" value="'. _('Make a poll') . '" src="images/chart-32.png" id="creation_sondage_autre"><label for="creation_sondage_autre" style="cursor:pointer" onclick="document.formulaire.creation_sondage_autre.click()">'. _("Make a choice") .'</label></td></tr>'."\n";
+#echo '<tr><td><button name="creation_sondage_autre_x" value="creation_sondage_autre_x" type="submit" /><img src="images/chart-32.png" alt="Next page" /><strong>'. _('Make a poll') . '</strong> </button></td></tr>'."\n";
+#echo '</table>'."\n";
+#echo '<br><br><br>'."\n";
 echo '</div>'."\n";
 echo '</form>'."\n";
 //bandeau de pied

locale/en_GB/LC_MESSAGES/Studs.po

@@ -658,6 +658,15 @@ msgstr ""
 msgid "Your poll has been removed!"
 msgstr "Your poll has been removed!"
 
+#: studs.php:245
+msgid "Share URL"
+msgstr "Share URL"
+
+#: choix_date.php:490
+msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)"
+msgstr "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)"
+
+
 #~ msgid ""
 #~ "For each selected day, you can choose, or not, meeting hours in the "
 #~ "following format :<br>- empty,<br>- \"8h\", \"8H\" or \"8:00\" to give a "

locale/fr_FR/LC_MESSAGES/Studs.po

@@ -129,7 +129,7 @@ msgstr "STUdS n'est pas correctement installé, merci de vous référer au fichi
 
 #: infos_sondage.php:125
 msgid "You are in the poll creation section. <br> Required fields cannot be left blank"
-msgstr "Vous avez choisi de cr&eacute;er un nouveau sondage !<br> Merci de remplir les champs obligatoires."
+msgstr "Vous avez choisi de cr&eacute;er un nouveau sondage !<br> Merci de remplir les champs obligatoires, marqu&eacute;s d'une *."
 
 #: infos_sondage.php:130
 msgid "Poll title *: "
@@ -183,17 +183,17 @@ msgstr " Vous souhaitez recevoir un mail &agrave; chaque participation d'un sond
 
 #: infos_sondage.php:188
 msgid "Schedule an event"
-msgstr "Sondage pour choisir une date"
+msgstr "Cr&eacute;er un sondage spécial dates"
 
 #: infos_sondage.php:190
 msgid "Make a choice"
-msgstr "Autre sondage"
+msgstr "Autres sondages"
 
 #: infos_sondage.php:192
 #: index.php:72
 #: index.php:74
 msgid "Make a poll"
-msgstr "Cr&eacute;er un sondage"
+msgstr "Cr&eacute;er un sondage classique"
 
 #: choix_date.php:217
 msgid "Poll dates (2 on 2)"
@@ -211,6 +211,11 @@ msgstr "Jour retenus"
 msgid "For each selected day, you can choose, or not, meeting hours in the following format :<br>- empty,<br>- \"8h\", \"8H\" or \"8:00\" to give a meeting's start hour,<br>- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" to give a meeting's start and end hour,<br>- \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" for the same thing but with minutes."
 msgstr "Pour chacun des jours que vous avez s&eacute;lectionn&eacute;, vous avez la possibilit&eacute; de choisir ou non, des heures de r&eacute;union avec ce format :<br>- vide, si vous ne d&eacute;sirez pas mettre d'horaires particuliers,<br>- \"8h\", \"8H\" ou \"8:00\" pour proposer une heure de d&eacute;but de r&eacute;union,<br>- \"8-11\", \"8h-11h\", \"8H-11H\" ou \"8:00-11:00\" pour un cr&eacute;neau,<br>- \"8h15-11h15\", \"8H15-11H15\" ou \"8:15-11:15\" pour un cr&eacute;neau avec minutes."
 
+#: choix_date.php:490
+msgid "For each selected day, you can choose, or not, meeting hours (e.g.: \"8h\", \"8:30\", \"8\", \"evening\", etc.)"
+msgstr "Pour chacun des jours que vous avez s&eacute;lectionn&eacute;, vous avez la possibilit&eacute; de choisir ou non, des heures de r&eacute;union (par exemple : \"8h\", \"8:15\", \"8h-10h\", \"soir\")."
+
+
 #: choix_date.php:496
 msgid "Time"
 msgstr "Horaire"
@@ -327,7 +332,7 @@ msgstr "Merci de votre confiance."
 #: adminstuds.php:270
 #: adminstuds.php:314
 msgid "Make your polls"
-msgstr "Se Trouver &agrave; l'Universit&eacute; de Strasbourg"
+msgstr "Organiser des rendez-vous simplement, librement."
 
 #: studs.php:179
 #: adminstuds.php:884
@@ -366,7 +371,7 @@ msgstr "Auteur du sondage"
 #: adminstuds.php:328
 #: adminstuds.php:1012
 msgid "Comments"
-msgstr "Commentaires des sond&eacute;s"
+msgstr "Commentaire de l'auteur"
 
 #: studs.php:238
 msgid "If you want to vote in this poll, you have to give your name, choose the values that fit best for you<br>(without paying attention to the choices of the other voters) and validate with the plus button at the end of the line."
@@ -421,9 +426,13 @@ msgstr "Les meilleurs choix pour l'instant sont :"
 msgid "Comments of polled people"
 msgstr "Commentaires de sondés"
 
+#: studs.php:245
+msgid "Share URL"
+msgstr "URL a communiquer"
+
 #: studs.php:563
 msgid "Add a comment in the poll:"
-msgstr "Ajoutez un commentaire dans ce sondage :"
+msgstr "Ajoutez un commentaire à ce sondage :"
 
 #: studs.php:566
 #: adminstuds.php:1027

print.css

@@ -0,0 +1,10 @@
+.corps {
+    width: 100% !important;
+    overflow-x: none;
+}
+.sousbandeau {
+    display: none !important;
+}
+body {
+    background-color: none !important;
+}

studs.php

@@ -192,7 +192,7 @@ logo();
 bandeau_tete();
 bandeau_titre(_("Make your polls"));
 sous_bandeau();
-
+#print_r($_SESSION);
 if($err != 0) {
   bandeau_titre(_("Error!"));
 
@@ -217,6 +217,7 @@ if($err != 0) {
   }
   echo '</ul></div>';
 
+
   if(is_error(NO_POLL_ID) || is_error(NO_POLL)) {
     echo '<div class=corpscentre>'."\n";
     print "<H2>" . _("This poll doesn't exist !") . "</H2>"."\n";
@@ -231,14 +232,18 @@ if($err != 0) {
   }
 }
 
+echo '<div class="corps">'; //ajout pyg cohérence graphique
+echo '<div class="imprimer""><a href="javascript:print()" class="button white medium">Imprimer</a></div>';
 echo '<div class="presentationdate"> '."\n";
 
 //affichage du titre du sondage
 $titre=str_replace("\\","",$dsondage->titre);
-echo '<H2>'.$titre.'</H2>'."\n";
+echo '<H2>'.stripslashes($titre).'</H2>'."\n";
 
 //affichage du nom de l'auteur du sondage
-echo _("Initiator of the poll") .' : '.$dsondage->nom_admin.'<br><br>'."\n";
+echo _("Initiator of the poll") .' : '.stripslashes($dsondage->nom_admin).'<br>'."\n";
+echo 'Adresse : <code>http://'. $_SERVER['SERVER_NAME']."/".$_SESSION['numsondage'].'</code><br>'."\n";;
+
 
 //affichage des commentaires du sondage
 if ($dsondage->commentaires) {
@@ -398,7 +403,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") {
     for ($i=0; isset($toutsujet[$i]); $i++) {
       $heures=explode("@",$toutsujet[$i]);
       if (isset($heures[1]) === true) {
-        echo '<td class="heure">'.$heures[1].'</td>'."\n";
+        echo '<td class="heure">'.stripslashes($heures[1]).'</td>'."\n";
       } else {
 	echo '<td class="heure"></td>'."\n";
       }
@@ -414,7 +419,7 @@ if ($dsondage->format=="D"||$dsondage->format=="D+") {
   echo '<td></td>'."\n";
   
   for ($i=0; isset($toutsujet[$i]); $i++) {
-    echo '<td class="sujet">'.$toutsujet[$i].'</td>'."\n";
+    echo '<td class="sujet">'.stripslashes($toutsujet[$i]).'</td>'."\n";
   }
   
   echo '</tr>'."\n";
@@ -433,7 +438,7 @@ while ($data = $user_studs->FetchNextObject(false)) {
   
   // Le nom de l'utilisateur
   $nombase=str_replace("°","'",$data->nom);
-  echo $nombase.'</td>'."\n";
+  echo stripslashes($nombase).'</td>'."\n";
   
   // Les réponses qu'il a choisit
   $ensemblereponses = $data->reponses;
@@ -489,7 +494,7 @@ if (!isset($_SERVER['REMOTE_USER']) || !$user_mod) {
   echo '<tr>'."\n";
   echo '<td class="nom">'."\n";
   if (isset($_SESSION['nom'])) {
-    echo '<input type=hidden name="nom" value="'.$_SESSION['nom'].'">'.$_SESSION['nom']."\n";
+    echo '<input type=hidden name="nom" value="'.stripslashes($_SESSION['nom']).'">'.stripslashes($_SESSION['nom'])."\n";
   } else {
     echo '<input type=text name="nom" maxlength="64">'."\n";
   }
@@ -606,9 +611,9 @@ echo '<p class="affichageresultats">'."\n";
 
 // Affichage du meilleur choix
 if ($compteursujet == "1" && isset($meilleurecolonne)) {
-  print '<img src="images/medaille.png" alt="Meilleur choix"> ' . _('The best choice at this time is:') . "<b>$meilleursujet</b> " . _('with') . " <b>$meilleurecolonne </b>" . $vote_str . ".\n";
+  print '<img src="images/medaille.png" alt="Meilleur choix"> ' . _('The best choice at this time is:') . "<b>".stripslashes($meilleursujet)."</b> " . _('with') . " <b>$meilleurecolonne </b>" . $vote_str . ".\n";
 } elseif (isset($meilleurecolonne)) {
-  print '<img src="images/medaille.png" alt="Meilleur choix"> ' . _('The bests choices at this time are:') . " <b>$meilleursujet</b> " . _('with') . "  <b>$meilleurecolonne </b>" . $vote_str . ".\n";
+  print '<img src="images/medaille.png" alt="Meilleur choix"> ' . _('The bests choices at this time are:') . " <b>".stripslashes($meilleursujet)."</b> " . _('with') . "  <b>$meilleurecolonne </b>" . $vote_str . ".\n";
 }
 
 echo '</p>';
@@ -621,7 +626,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 '<div class="comment"><span class="usercomment">'.$dcomment->usercomment. ' :</span> <span class="comment">' . nl2br($dcomment->comment) . '</span></div>';
+    print '<div class="comment"><span class="usercomment">'.stripslashes($dcomment->usercomment). ' :</span> <span class="comment">' . stripslashes(nl2br($dcomment->comment)) . '</span></div>';
   }
 }
 
@@ -648,6 +653,9 @@ if ( ($dsondage->format == 'D' || $dsondage->format == 'D+') && $compteursujet==
 
 echo '</ul>';
 echo '<a name="bas"></a>'."\n";
+
+echo '</div>'; // ajout pyg cohérence graphique
+
 bandeau_pied_mobile();
 // Affichage du bandeau de pied
 echo '</body>'."\n";

style.css

@@ -44,6 +44,8 @@ du répertoire studs. Il contient toutes les mises en forme des fichiers PHP
 de Studs.
 */
 
+@import url('/buttons.css');
+@import url('print.css') print;
 body {
   margin:0;
   background: #F7FAFE;
@@ -178,7 +180,7 @@ div.bandeaupiedmobile{
 	position:static; 
 }
 /*les boutons se trouvant dans le sousbandeau*/
-div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a {
+/* div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a {
  	background-color: #3E779D;
         background: -moz-linear-gradient(center top , #3E779D, #65A9D7) repeat scroll 0 0 transparent;
 	height:16px;
@@ -196,11 +198,13 @@ div.sousbandeau a, div.sousbandeau span.sousbandeaulangue a {
 	box-shadow: 0 1px 0 #000000;
         text-shadow: 0 1px 0 rgba(0, 0, 0, 0.4);
 }
+*/
 span.sousbandeaulangue {
 	margin-left:6px;
-	margin-right:6px;
+	margin-right:20px;
 	float:right;
 }
+
 /*corps de la page index.php*/
 
 .corps {
@@ -216,11 +220,13 @@ span.sousbandeaulangue {
    /* position: static;
    right: 20px;
    top: 170px; */
-   width: 800px;
+   width: 70em;
+   overflow-x:auto;
    border: 3px solid #CCC;
    background-color: #fff;
    box-shadow: 5px 5px 5px #666;
-   
+   -moz-border-radius: 20px;
+   border-radius: 20px;
 }
 
 
@@ -298,7 +304,7 @@ div.presentationdate {
 	background-color: #FFF;
 }
 div.presentationdatefin {
-	width:40%;
+	width:60%;
 	padding:10px;
 	font-family:arial;
 	text-align:center;
@@ -306,8 +312,8 @@ div.presentationdatefin {
 	border-width:1px;
 	border-style:solid;
 	margin-top: 10px;
-	margin-left: 30%;
+	margin-left: 20%;
-    margin-right: 30%; 
+    margin-right: 20%; 
 	position:static;
 }
 /*cadre principal de studs.php*/
@@ -390,13 +396,14 @@ div.cadre td.mois {
 /*affichage du calendrier*/
 div.calendrier {
 	padding:10px;
-	background-color: #AAA;
+	background-color: #CCC;
 	width:490px;
 	font-size:12px;
 	font-family:arial;
-    margin-left: 30%;
+    margin-left: auto;
-    margin-right: 30%;
+    margin-right: auto;
 	position:static;
+	border-radius: 10px;
 }
 /*jour de la semaine dans calendrier*/
 div.calendrier td.joursemaine {
@@ -422,7 +429,7 @@ div.calendrier td.avant {
 	border: 2px;
 	font-family:arial;
 	font-size:13px;
-	background-color: #DDDDDD; 
+	background-color: #EEEEEE; 
 }
 /*jour libre dans calendrier*/
 div.calendrier td.libre {
@@ -436,7 +443,7 @@ div.calendrier td.choisi {
 	width:65px;
 	text-align: center;
 	border: 2px;
-	background-color: #0077DD; 
+	background-color: #54ADF7;
 }
 /* Le paragraphe de fin */
 p.affichageresultats{
@@ -484,7 +491,7 @@ div.titregestionadmin{
 
 /*les boutons pour deselectionner un jour deja choisi*/
 .OFF {
-    background-color: #0077DD;
+    background-color: #54ADF7;
 }
 
 div.nouveau_sondage a {
@@ -538,3 +545,33 @@ li.error {
 .formulaire2 input[name="lieureunion"] {
     width: 350px;
 }
+
+.index_date, .index_sondage {
+    float:left;
+    width:50%;
+    text-align:center;
+}
+
+
+.index_date .opacity, .index_sondage .opacity {
+    opacity: 0.6;
+}
+
+.index_date img:hover, .index_sondage img:hover {
+    opacity: 1;
+    cursor: pointer;
+}
+
+.poursuivre {
+    float: right;
+    margin-right: 50px;
+}
+
+.retour {
+    float: left;
+    margin-left: 50px;
+}
+
+.imprimer {
+    float:right;
+}