Merge branch 'feature/confirmation-on-column-deletion' into 'develop'

Demande de confirmation lors de la supression d'une colonne.



See merge request !119

js/app/studs.js

@@ -45,6 +45,16 @@ $(document).ready(function () {
       $(this).next().removeClass('startunchecked');
     });
 
+    $('.remove-column').on('click', function(e){
+        var confirmTranslation = $(this).data('remove-confirmation');
+        if (confirm(confirmTranslation)) {
+            return true;
+        } else {
+            e.stopPropagation();
+            return false
+        }
+    });
+
     var form = $('#comment_form');
     form.submit(function(event) {
         event.preventDefault();

locale/de.json

@@ -209,6 +209,7 @@
         "Back to the poll": "Zurück zur Umfrage",
         "Add a column": "Spalte hinzufügen",
         "Remove the column": "Spalte entfernen",
+        "Confirm removal of the column.": "DE_Confirmer la supression de cette colonne.",
         "Column removed": "Spalte entfernt",
         "Choice added": "Alternative hinzugefügt",
         "Confirm removal of all votes of the poll": "Bestätigen Sie die Entfernung aller Wertungen aus der Umfrage",

locale/en.json

@@ -209,6 +209,7 @@
     "Back to the poll": "Back to the poll",
     "Add a column": "Add a column",
     "Remove the column": "Remove column",
+    "Confirm removal of the column.": "Confirm removal of the column.",
     "Column removed": "Column deleted",
     "Choice added": "Choice added",
     "Confirm removal of all votes of the poll": "Confirm removal of all votes",

locale/es.json

@@ -209,6 +209,7 @@
     "Back to the poll": "Volver a la encuesta",
     "Add a column": "Añadir una columna",
     "Remove the column": "Borrar la columna",
+    "Confirm removal of the column.": "ES_Confirmer la supression de cette colonne.",
     "Column removed": "Columna borrado",
     "Choice added": "Elección añadida",
     "Confirm removal of all votes of the poll": "Confirma la supresión de todos los votos de la encuesta",

locale/fr.json

@@ -209,6 +209,7 @@
     "Back to the poll": "Retour au sondage",
     "Add a column": "Ajouter une colonne",
     "Remove the column": "Effacer la colonne",
+    "Confirm removal of the column.": "Confirmer la supression de cette colonne.",
     "Column removed": "Colonne supprimée",
     "Choice added": "Choix ajouté",
     "Confirm removal of all votes of the poll": "Confirmer la suppression de tous les votes de ce sondage",

locale/it.json

@@ -209,6 +209,7 @@
     "Back to the poll": "Torna al sondaggio",
     "Add a column": "Aggiungere una colonna",
     "Remove the column": "Cancellare la colonna",
+    "Confirm removal of the column.": "IT_Confirmer la supression de cette colonne.",
     "Column removed": "Colonna rimossa",
     "Choice added": "Scelta aggiunto",
     "Confirm removal of all votes of the poll": "Confermare l'eliminazione di tutti i voti del sondaggio",

locale/oc.json

@@ -209,6 +209,7 @@
     "Back to the poll": "Tornar al sondatge",
     "Add a column": "Apondre una colomna",
     "Remove the column": "Suprimir la colomna",
+    "Confirm removal of the column.": "OC_Confirmer la supression de cette colonne.",
     "Column removed": "Colomna suprimida",
     "Choice added": "Causida aponduda",
     "Confirm removal of all votes of the poll": "Confirmar la supression de totes los vòtes d'aqueste sondatge",

tpl/part/vote_table_classic.tpl

@@ -21,7 +21,8 @@
                     {foreach $slots as $id=>$slot}
                         <td headers="C{$id}">
                             <a href="{poll_url id=$admin_poll_id admin=true action='delete_column' action_value=$slot->title}"
-                               class="btn btn-link btn-sm" title="{__('adminstuds', 'Remove the column')} {$slot->title|html}">
+                               data-remove-confirmation="{__('adminstuds', 'Confirm removal of the column.')}"
+                               class="btn btn-link btn-sm remove-column" title="{__('adminstuds', 'Remove the column')} {$slot->title|html}">
                                 <i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span>
                             </a>
                             </td>

tpl/part/vote_table_date.tpl

@@ -24,7 +24,8 @@
                         {foreach $slot->moments as $id=>$moment}
                             <td headers="M{$slot@key} D{$headersDCount} H{$headersDCount}">
                                 <a href="{poll_url id=$admin_poll_id admin=true action='delete_column' action_value=$slot->day|cat:'@'|cat:$moment}"
-                                   class="btn btn-link btn-sm"
+                                   data-remove-confirmation="{__('adminstuds', 'Confirm removal of the column.')}"
+                                   class="btn btn-link btn-sm remove-column"
                                    title="{__('adminstuds', 'Remove the column')} {$slot->day|date_format:$date_format.txt_short|html} - {$moment|html}">
                                     <i class="glyphicon glyphicon-remove text-danger"></i><span class="sr-only">{__('Generic', 'Remove')}</span>
                                 </a>