diff --git a/css/style.css b/css/style.css index 5207d21..ba6bb1f 100644 --- a/css/style.css +++ b/css/style.css @@ -487,6 +487,15 @@ table.results > tbody > tr:hover > td .glyphicon { border:none; background:transparent; } + +#selected-days legend .input-group-addon:last-of-type { + padding-top: 0; + padding-bottom: 0; +} +#selected-days legend { + height: 33px; +} + /* create_classic_poll.php */ .md-a-img { text-decoration:none !important; diff --git a/js/app/date_poll.js b/js/app/date_poll.js index ada78bc..bd83b84 100644 --- a/js/app/date_poll.js +++ b/js/app/date_poll.js @@ -214,16 +214,12 @@ $(document).ready(function () { newDateFields(); }); - // Button "Remove a day" + // Button "Remove the current day" - $('#remove-a-day').on('click', function () { - $selected_days.find('fieldset:last').remove(); - var nb_days = $selected_days.find('fieldset').length; - $('#day' + (nb_days - 1)).focus(); - if (nb_days == 1) { - $removeaday_and_copyhours.addClass('disabled'); + $(document).on('click', '.remove-day', function () { + if ($('#days_container').find('fieldset').length > 1) { + $(this).parents('fieldset').remove(); } - submitDaysAvalaible(); }); // Add an range of dates diff --git a/locale/br.json b/locale/br.json index 2c96c2d..27d2555 100644 --- a/locale/br.json +++ b/locale/br.json @@ -259,6 +259,7 @@ "Copy hours of the first day": "Eilañ eurioù an devezh kentañ war an devezhioù all", "Remove a day": "Dilemel an devezh diwezhañ", "Add a day": "Ouzhpennañ un devezh", + "Remove this day": "BR_Supprimer ce jour", "Remove all days": "Dilemel an holl zevezhioù", "Remove all hours": "Dilemel an holl eurioù" }, diff --git a/locale/de.json b/locale/de.json index 9c75e7f..c463747 100644 --- a/locale/de.json +++ b/locale/de.json @@ -265,6 +265,7 @@ "Copy hours of the first day": "Uhrzeiten des ersten Tags kopieren", "Remove a day": "Einen Tag entfernen", "Add a day": "Einen Tag hinzufügen", + "Remove this day": "DE_Supprimer ce jour", "Remove all days": "Alle Tage entfernen", "Remove all hours": "Alle Uhrzeiten entfernen" }, diff --git a/locale/en.json b/locale/en.json index 9882f0d..f6f03c9 100644 --- a/locale/en.json +++ b/locale/en.json @@ -265,6 +265,7 @@ "Copy hours of the first day": "Copy times from the first day", "Remove a day": "Remove a day", "Add a day": "Add a day", + "Remove this day": "Remove this day", "Remove all days": "Remove all days", "Remove all hours": "Remove all times" }, diff --git a/locale/es.json b/locale/es.json index f7aa298..fdc2aee 100644 --- a/locale/es.json +++ b/locale/es.json @@ -265,6 +265,7 @@ "Copy hours of the first day": "Copiar los horarios del primer día en los otros días", "Remove a day": "Borrar el último día", "Add a day": "Añadir un día", + "Remove this day": "ES_Supprimer ce jour", "Remove all days": "Borrar todos los días", "Remove all hours": "Borrar todos los horarios" }, diff --git a/locale/fr.json b/locale/fr.json index 0500106..2458b29 100644 --- a/locale/fr.json +++ b/locale/fr.json @@ -265,6 +265,7 @@ "Copy hours of the first day": "Reporter les horaires du premier jour sur les autres jours", "Remove a day": "Supprimer le dernier jour", "Add a day": "Ajouter un jour", + "Remove this day": "Supprimer ce jour", "Remove all days": "Effacer tous les jours", "Remove all hours": "Effacer tous les horaires" }, diff --git a/locale/it.json b/locale/it.json index 6f951dd..4456fd5 100644 --- a/locale/it.json +++ b/locale/it.json @@ -265,6 +265,7 @@ "Copy hours of the first day": "Copiare gli orari del primo giorno", "Remove a day": "Eliminare l'ultimo giorno", "Add a day": "Aggiungere un giorno", + "Remove this day": "IT_Supprimer ce jour", "Remove all days": "Cancellare tutti i giorni", "Remove all hours": "Cancellare tutti gli orari" }, diff --git a/locale/oc.json b/locale/oc.json index ed6d384..e5dd926 100644 --- a/locale/oc.json +++ b/locale/oc.json @@ -265,6 +265,7 @@ "Copy hours of the first day": "Reportar los oraris del primièr jorn suls autres jorns", "Remove a day": "Suprimir lo darrièr jorn", "Add a day": "Ajustar un jorn", + "Remove this day": "OC_Supprimer ce jour", "Remove all days": "Suprimir totes los jorns", "Remove all hours": "Suprimir totes los oraris" }, diff --git a/tpl/create_date_poll_step_2.tpl b/tpl/create_date_poll_step_2.tpl index 7253a19..cb2398e 100644 --- a/tpl/create_date_poll_step_2.tpl +++ b/tpl/create_date_poll_step_2.tpl @@ -36,49 +36,60 @@

{__('Step 2 date', 'For each selected day, you can choose, or not, meeting hours (e.g.: "8h", "8:30", "8h-10h", "evening", etc.)')}

- {foreach $choices as $i=>$choice} - {if $choice->getName()} - {$day_value = $choice->getName()|date_format:$date_format['txt_date']} - {else} - {$day_value = ''} - {/if} -
-
- - +
+ {foreach $choices as $i=>$choice} + {if $choice->getName()} + {$day_value = $choice->getName()|date_format:$date_format['txt_date']} + {else} + {$day_value = ''} + {/if} +
+
+ + -
- - -
- ({__('Date', 'dd/mm/yyyy')}) - +
+
+ + +
+
+
+ +
+ + ({__('Date', 'dd/mm/yyyy')}) + + + {foreach $choice->getSlots() as $j=>$slot} +
+ + +
+ {/foreach} - {foreach $choice->getSlots() as $j=>$slot}
- - -
- {/foreach} - -
-
- - +
+ + +
-
-
- {/foreach} +
+ {/foreach} +