From ef8eaafd275cac53b4c6c012b75dea3193163ea6 Mon Sep 17 00:00:00 2001 From: FramaJosephK Date: Tue, 18 Nov 2014 18:38:00 +0100 Subject: [PATCH] Ajout d'horaires en taille sm + titre meilleur choix --- adminstuds.php | 14 ++++++++------ css/style.css | 7 ++++++- js/core.js | 4 ++-- locale/en_GB/LC_MESSAGES/Studs.mo | Bin 16928 -> 17035 bytes locale/en_GB/LC_MESSAGES/Studs.po | 6 ++++++ locale/fr_FR/LC_MESSAGES/Studs.mo | Bin 18710 -> 18822 bytes locale/fr_FR/LC_MESSAGES/Studs.po | 6 ++++++ studs.php | 12 +++++++----- 8 files changed, 35 insertions(+), 14 deletions(-) diff --git a/adminstuds.php b/adminstuds.php index 1af9393..3c3f017 100644 --- a/adminstuds.php +++ b/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 - if (isset($toutsujet[$i+1])){ - $next = $toutsujet[$i+1]; - $horoNext = explode("@",$next); - } + $horoCur = explode("@",$current); //horoCur[0] = date, horoCur[1] = hour + if (isset($toutsujet[$i+1])){ + $next = $toutsujet[$i+1]; + $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 ' +

' . _("Best choice") . '

' . _("The best choice at this time is:") . '

' . $meilleursujet . ' @@ -1176,6 +1177,7 @@ if ($compteursujet == 1) {
'."\n"; } elseif ($compteursujet > 1) { echo ' +

' . _("Best choices") . '

' . _("The bests choices at this time are:") . '

' . $meilleursujet . ' diff --git a/css/style.css b/css/style.css index f22af14..f3bb307 100644 --- a/css/style.css +++ b/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 { diff --git a/js/core.js b/js/core.js index f371c6a..dd4a4aa 100644 --- a/js/core.js +++ b/js/core.js @@ -103,7 +103,7 @@ $(document).ready(function() { // HTML code of the new hour var new_hour_html = - '
'+ + '
'+ 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 { diff --git a/locale/en_GB/LC_MESSAGES/Studs.mo b/locale/en_GB/LC_MESSAGES/Studs.mo index d4623e0ba7e674c6584a38444feb92f2c73df9b7..54aba0404469a72aa4860252b777e5c624b05758 100644 GIT binary patch delta 4524 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 diff --git a/locale/en_GB/LC_MESSAGES/Studs.po b/locale/en_GB/LC_MESSAGES/Studs.po index e01b3ab..4510ab9 100644 --- a/locale/en_GB/LC_MESSAGES/Studs.po +++ b/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:" diff --git a/locale/fr_FR/LC_MESSAGES/Studs.mo b/locale/fr_FR/LC_MESSAGES/Studs.mo index 006378a3beae041d84ae1719f4184b67d7527cf0..dd5ee79dc0a111d3d6cf041b384e39755ff1bf7c 100644 GIT binary patch delta 4532 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 diff --git a/locale/fr_FR/LC_MESSAGES/Studs.po b/locale/fr_FR/LC_MESSAGES/Studs.po index 66aa4fc..62302fe 100644 --- a/locale/fr_FR/LC_MESSAGES/Studs.po +++ b/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 :" diff --git a/studs.php b/studs.php index 9918083..6ec461a 100644 --- a/studs.php +++ b/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 - if (isset($toutsujet[$i+1])){ - $next = $toutsujet[$i+1]; - $horoNext = explode("@",$next); - } + $horoCur = explode("@",$current); //horoCur[0] = date, horoCur[1] = hour + if (isset($toutsujet[$i+1])){ + $next = $toutsujet[$i+1]; + $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 ' +

' . _("Best choice") . '

' . _("The best choice at this time is:") . '

' . $meilleursujet . ' @@ -652,6 +653,7 @@ if ($compteursujet == 1) {
'."\n"; } elseif ($compteursujet > 1) { echo ' +

' . _("Best choices") . '

' . _("The bests choices at this time are:") . '

' . $meilleursujet . '