Merge branch 'bugfix' into 'master'

Bugfix

- champ horaire ajouté à la bonne taille
- titre meilleur choix
- retouches css
- fix déplacement du formulaire de vote au scroll (mais toujours un problème à la navigation clavier)

See merge request !15

adminstuds.php

@@ -84,7 +84,7 @@ function send_mail_admin() {
     global $email_admin;
     global $poll_title;
     global $numsondageadmin;
-	global $smtp_allowed;
+    global $smtp_allowed;
         if($smtp_allowed==true){
             if(!isset($_SESSION["mail_admin_sent"])) {
                 Utils::sendEmail( $email_admin,
@@ -839,11 +839,11 @@ if (substr($dsondage->format, 0, 1)=="D") {
 
         // Current date
         $current = $toutsujet[$i];//format date@hour. ex : 2020292820@10:00
-		$horoCur = explode("@",$current); //horoCur[0] = date, horoCur[1] = hour
+        $horoCur = explode("@",$current); //horoCur[0] = date, horoCur[1] = hour
-		if (isset($toutsujet[$i+1])){
+        if (isset($toutsujet[$i+1])){
-			$next = $toutsujet[$i+1];
+            $next = $toutsujet[$i+1];
-			$horoNext = explode("@",$next); 
+            $horoNext = explode("@",$next);
-		}		
+        }
         $border[$i] = false;
         $radio_title[$i] = strftime($date_format['txt_short'],$horoCur[0]);
 
@@ -1169,6 +1169,7 @@ echo $tr_addition.'
 
 if ($compteursujet == 1) {
     echo '
+        <div class="col-sm-12"><h3>' . _("Best choice") . '</h3></div>
         <div class="col-sm-6 col-sm-offset-3 alert alert-success">
             <p><span class="glyphicon glyphicon-star text-warning"></span> ' . _("The best choice at this time is:") . '</p>
             ' . $meilleursujet . '
@@ -1176,6 +1177,7 @@ if ($compteursujet == 1) {
         </div>'."\n";
 } elseif ($compteursujet > 1) {
     echo '
+        <div class="col-sm-12"><h3>' . _("Best choices") . '</h3></div>
         <div class="col-sm-6 col-sm-offset-3 alert alert-success">
             <p><span class="glyphicon glyphicon-star text-warning"></span> ' . _("The bests choices at this time are:") . '</p>
             ' . $meilleursujet . '

css/style.css

@@ -156,8 +156,13 @@ caption {
 
 /* Tableau du sondage */
 #tableContainer {
+    overflow-x:hidden;
+    margin:5px auto;
+}
+
+#tableContainer:focus,
+#tableContainer:hover {
     overflow-x:auto;
-    margin:20px auto;
 }
 
 table.results {

js/core.js

@@ -103,7 +103,7 @@ $(document).ready(function() {
 
         // HTML code of the new hour
         var new_hour_html =
-            '<div class="col-md-2">'+
+            '<div class="col-sm-2">'+
                 last_hour.html().replace(re_label, hour_text+' '+(hj+2))
                               .replace(re_id,'"d'+di+'-h'+(hj+1)+'"')
                               .replace(/value="(.*?)"/g, 'value=""')+
@@ -405,7 +405,7 @@ $(document).ready(function() {
 // Vote form moving to the top or to the bottom
 $(window).scroll(function() {
     var $table_offset = $('.results thead').offset();
-    if(($table_offset == undefined || $(window).scrollTop() > $table_offset.top) && ($('table.results').height() > $(window).height())) {
+    if(($table_offset == undefined || $(window).scrollTop() > $table_offset.top+150) && ($('table.results').height()-150 > $(window).height())) {
         $('#addition').before($('#vote-form'));
         $('#tableContainer').after($('.scroll-buttons'));
     } else {

locale/de_DE/LC_MESSAGES/Studs.po

@@ -301,6 +301,12 @@ msgstr "Die Wahl speichern"
 msgid "Addition"
 msgstr "Hinzufügen"
 
+msgid "Best choice"
+msgstr "Bste Wahl"
+
+msgid "Best choices"
+msgstr "Besten Wahlen"
+
 msgid "The best choice at this time is:"
 msgstr "Die beste Wahl ist derzeit:"
 

locale/en_GB/LC_MESSAGES/Studs.po

@@ -307,6 +307,12 @@ msgstr "Save the choices"
 msgid "Addition"
 msgstr "Addition"
 
+msgid "Best choice"
+msgstr "Best choices"
+
+msgid "Best choices"
+msgstr "Best choices"
+
 msgid "The best choice at this time is:"
 msgstr "The best choice at this time is:"
 

locale/fr_FR/LC_MESSAGES/Studs.po

@@ -307,6 +307,12 @@ msgstr "Enregister les choix"
 msgid "Addition"
 msgstr "Somme"
 
+msgid "Best choice"
+msgstr "Meilleur choix"
+
+msgid "Best choices"
+msgstr "Meilleurs choix"
+
 msgid "The best choice at this time is:"
 msgstr "Le meilleur choix pour l'instant est :"
 

studs.php

@@ -333,11 +333,11 @@ if ($dsondage->format=="D"||$dsondage->format=="D+"||$dsondage->format=="D-") {
 
         // Current date
         $current = $toutsujet[$i];
-		$horoCur = explode("@",$current); //horoCur[0] = date, horoCur[1] = hour
+        $horoCur = explode("@",$current); //horoCur[0] = date, horoCur[1] = hour
-		if (isset($toutsujet[$i+1])){
+        if (isset($toutsujet[$i+1])){
-			$next = $toutsujet[$i+1];
+            $next = $toutsujet[$i+1];
-			$horoNext = explode("@",$next); 
+            $horoNext = explode("@",$next);
-		}
+        }
 
         $border[$i] = false;
         $radio_title[$i] = strftime($date_format['txt_short'],$horoCur[0]);
@@ -645,6 +645,7 @@ echo $tr_addition.'
 
 if ($compteursujet == 1) {
     echo '
+        <div class="col-sm-12"><h3>' . _("Best choice") . '</h3></div>
         <div class="col-sm-6 col-sm-offset-3 alert alert-success">
             <p><span class="glyphicon glyphicon-star text-warning"></span> ' . _("The best choice at this time is:") . '</p>
             ' . $meilleursujet . '
@@ -652,6 +653,7 @@ if ($compteursujet == 1) {
         </div>'."\n";
 } elseif ($compteursujet > 1) {
     echo '
+        <div class="col-sm-12"><h3>' . _("Best choices") . '</h3></div>
         <div class="col-sm-6 col-sm-offset-3 alert alert-success">
             <p><span class="glyphicon glyphicon-star text-warning"></span> ' . _("The bests choices at this time are:") . '</p>
             ' . $meilleursujet . '