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
This commit is contained in:
JosephK 2014-11-18 18:44:49 +01:00
commit 514369387b
10 changed files with 41 additions and 14 deletions

View File

@ -1169,6 +1169,7 @@ echo $tr_addition.'
if ($compteursujet == 1) { if ($compteursujet == 1) {
echo ' echo '
<div class="col-sm-12"><h3>' . _("Best choice") . '</h3></div>
<div class="col-sm-6 col-sm-offset-3 alert alert-success"> <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> <p><span class="glyphicon glyphicon-star text-warning"></span> ' . _("The best choice at this time is:") . '</p>
' . $meilleursujet . ' ' . $meilleursujet . '
@ -1176,6 +1177,7 @@ if ($compteursujet == 1) {
</div>'."\n"; </div>'."\n";
} elseif ($compteursujet > 1) { } elseif ($compteursujet > 1) {
echo ' echo '
<div class="col-sm-12"><h3>' . _("Best choices") . '</h3></div>
<div class="col-sm-6 col-sm-offset-3 alert alert-success"> <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> <p><span class="glyphicon glyphicon-star text-warning"></span> ' . _("The bests choices at this time are:") . '</p>
' . $meilleursujet . ' ' . $meilleursujet . '

View File

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

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

Binary file not shown.

View File

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

View File

@ -645,6 +645,7 @@ echo $tr_addition.'
if ($compteursujet == 1) { if ($compteursujet == 1) {
echo ' echo '
<div class="col-sm-12"><h3>' . _("Best choice") . '</h3></div>
<div class="col-sm-6 col-sm-offset-3 alert alert-success"> <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> <p><span class="glyphicon glyphicon-star text-warning"></span> ' . _("The best choice at this time is:") . '</p>
' . $meilleursujet . ' ' . $meilleursujet . '
@ -652,6 +653,7 @@ if ($compteursujet == 1) {
</div>'."\n"; </div>'."\n";
} elseif ($compteursujet > 1) { } elseif ($compteursujet > 1) {
echo ' echo '
<div class="col-sm-12"><h3>' . _("Best choices") . '</h3></div>
<div class="col-sm-6 col-sm-offset-3 alert alert-success"> <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> <p><span class="glyphicon glyphicon-star text-warning"></span> ' . _("The bests choices at this time are:") . '</p>
' . $meilleursujet . ' ' . $meilleursujet . '