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

Ajout d'horaires en taille sm + titre meilleur choix

Browse Source
This commit is contained in:
FramaJosephK 2014-11-18 18:38:00 +01:00
parent 4654929746
commit ef8eaafd27
8 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
adminstuds.php
View File

@ -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 . '

7
css/style.css
View File

@ -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 {

4
js/core.js
View File

@ -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 {

BIN
locale/en_GB/LC_MESSAGES/Studs.mo
View File

Binary file not shown.

6
locale/en_GB/LC_MESSAGES/Studs.po
View File

@ -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:"

BIN
locale/fr_FR/LC_MESSAGES/Studs.mo
View File

Binary file not shown.

6
locale/fr_FR/LC_MESSAGES/Studs.po
View File

@ -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 :"

2
studs.php
View File

@ -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 . '