Confirmation message before suppression of accounts and suppression of feeds.

9 files changed, 35 insertions, 12 deletions

diff --git a/messages.pot b/messages.pot
index d2f7b373..49058e79 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-05-04 19:44+0200\n"
+"POT-Creation-Date: 2014-05-04 22:11+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -293,6 +293,11 @@ msgstr ""
 msgid "Delete this feed"
 msgstr ""
 
+#: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:34
+#: pyaggr3g470r/templates/admin/user.html:47
+msgid "You are going to delete this feed."
+msgstr ""
+
 #: pyaggr3g470r/templates/feed.html:12
 msgid "This feed contains"
 msgstr ""
@@ -497,6 +502,10 @@ msgid "Last seen:"
 msgstr ""
 
 #: pyaggr3g470r/templates/management.html:26
+msgid "You are going to delete your account."
+msgstr ""
+
+#: pyaggr3g470r/templates/management.html:26
 msgid "Delete your account"
 msgstr ""
 
@@ -561,6 +570,10 @@ msgstr ""
 msgid "Delete this user"
 msgstr ""
 
+#: pyaggr3g470r/templates/admin/dashboard.html:28
+msgid "You are going to delete this account."
+msgstr ""
+
 #: pyaggr3g470r/templates/admin/dashboard.html:37
 msgid "As an administrator you are not listed in this table"
 msgstr ""
diff --git a/pyaggr3g470r/templates/admin/dashboard.html b/pyaggr3g470r/templates/admin/dashboard.html
index a9b3e546..5c7fa5c1 100644
--- a/pyaggr3g470r/templates/admin/dashboard.html
+++ b/pyaggr3g470r/templates/admin/dashboard.html
@@ -25,7 +25,7 @@
             <td>
                 <a href="/admin/user/{{ user.id }}/"><i class="glyphicon glyphicon-user" title="{{ _('View this user') }}<"></i></a>
                 <a href="/admin/edit_user/{{ user.id }}/"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this user') }}"></i></a>
-                <a href="/admin/delete_user/{{ user.id }}/"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this user') }}"></i></a>
+                <a href="/admin/delete_user/{{ user.id }}/"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this user') }}" onclick="return confirm('{{ _('You are going to delete this account.') }}');"></i></a>
             </td>
         </tr>
     {% endfor %}
diff --git a/pyaggr3g470r/templates/admin/user.html b/pyaggr3g470r/templates/admin/user.html
index b7148617..3e2d7f3e 100644
--- a/pyaggr3g470r/templates/admin/user.html
+++ b/pyaggr3g470r/templates/admin/user.html
@@ -44,7 +44,7 @@
                         <td>
                             <a href="/feed/{{ feed.id }}"><i class="glyphicon glyphicon-th-list" title="{{ _('Feed') }}"></i></a>
                             <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
-                            <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}"></i></a>
+                            <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
                         </td>
                 {% endfor %}
                 </tbody>
diff --git a/pyaggr3g470r/templates/feed.html b/pyaggr3g470r/templates/feed.html
index 1caa6d13..21db7ebe 100644
--- a/pyaggr3g470r/templates/feed.html
+++ b/pyaggr3g470r/templates/feed.html
@@ -4,7 +4,7 @@
     <div class="jumbotron">
         <h2>{{ feed.title }}</h2>
         {% if feed.description %} <p>{{ feed.description }}</p> {% endif %}
-        <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}"></i></a>
+        <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
         <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
     </div>
     <div class="jumbotron">
diff --git a/pyaggr3g470r/templates/feeds.html b/pyaggr3g470r/templates/feeds.html
index 4caf6653..509df190 100644
--- a/pyaggr3g470r/templates/feeds.html
+++ b/pyaggr3g470r/templates/feeds.html
@@ -31,7 +31,7 @@
                     <td>
                         <a href="/articles/{{ feed.id }}/100"><i class="glyphicon glyphicon-th-list" title="{{ _('Articles') }}"></i></a>
                         <a href="/edit_feed/{{ feed.id }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a>
-                        <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}"></i></a>
+                        <a href="/delete_feed/{{ feed.id }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a>
                     </td>
             </tr>
             {% endfor %}
diff --git a/pyaggr3g470r/templates/management.html b/pyaggr3g470r/templates/management.html
index 8dbe193a..6a58919e 100644
--- a/pyaggr3g470r/templates/management.html
+++ b/pyaggr3g470r/templates/management.html
@@ -23,7 +23,7 @@
         </div>
         <div class="row">
             <div class="col-md-12">
-                <a href="/delete_account/" class="btn btn-default">{{ _('Delete your account') }}</a>
+                <a href="/delete_account/" class="btn btn-default" onclick="return confirm('{{ _('You are going to delete your account.') }}');">{{ _('Delete your account') }}</a>
             </div>
        </div>
     </div>
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
index 0df0a5ca..0bba8ddc 100644
--- a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
+++ b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.mo
diff --git a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
index aae342d3..54d12282 100644
--- a/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
+++ b/pyaggr3g470r/translations/fr/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-05-04 19:44+0200\n"
-"PO-Revision-Date: 2014-05-04 19:45+0100\n"
+"POT-Creation-Date: 2014-05-04 22:11+0200\n"
+"PO-Revision-Date: 2014-05-04 22:11+0100\n"
 "Last-Translator: Cédric Bonhomme <cedric@cedricbonhomme.org>\n"
 "Language-Team: fr <LL@li.org>\n"
 "Language: fr\n"
@@ -296,6 +296,11 @@ msgstr "Éditer ce flux"
 msgid "Delete this feed"
 msgstr "Supprimer ce flux"
 
+#: pyaggr3g470r/templates/feed.html:7 pyaggr3g470r/templates/feeds.html:34
+#: pyaggr3g470r/templates/admin/user.html:47
+msgid "You are going to delete this feed."
+msgstr "Vous allez supprimer ce flux."
+
 #: pyaggr3g470r/templates/feed.html:12
 msgid "This feed contains"
 msgstr "Ce flux contient"
@@ -504,6 +509,10 @@ msgid "Last seen:"
 msgstr "Vue la dernière fois le"
 
 #: pyaggr3g470r/templates/management.html:26
+msgid "You are going to delete your account."
+msgstr "Vous allez supprimer votre compte."
+
+#: pyaggr3g470r/templates/management.html:26
 msgid "Delete your account"
 msgstr "Supprimer votre compte"
 
@@ -548,7 +557,6 @@ msgid "Registered users"
 msgstr "Utilisateurs enregistrés"
 
 #: pyaggr3g470r/templates/admin/dashboard.html:12
-#, fuzzy
 msgid "Firstname"
 msgstr "Prénom"
 
@@ -569,6 +577,10 @@ msgstr "Éditer cet utilisateur"
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
 
+#: pyaggr3g470r/templates/admin/dashboard.html:28
+msgid "You are going to delete this account."
+msgstr "Vous allez supprimer ce compte."
+
 #: pyaggr3g470r/templates/admin/dashboard.html:37
 msgid "As an administrator you are not listed in this table"
 msgstr "En tant qu'administrateur vous ne figurez pas dans ce tableau"
@@ -582,7 +594,6 @@ msgid "This user is not subscribed to any feed."
 msgstr "Cet utilisateur n'est pas encore abonné à des flux."
 
 #: pyaggr3g470r/templates/admin/user.html:24
-#, fuzzy
 msgid "Feeds"
 msgstr "Flux"
 
@@ -595,6 +606,5 @@ msgid "Number of articles"
 msgstr "Nombre d'articles"
 
 #: pyaggr3g470r/templates/admin/user.html:53
-#, fuzzy
 msgid "Add a new feed"
 msgstr "Ajouter un flux"
diff --git a/pyaggr3g470r/views.py b/pyaggr3g470r/views.py
index 58a3b361..b6b93c3b 100644
--- a/pyaggr3g470r/views.py
+++ b/pyaggr3g470r/views.py
@@ -629,7 +629,7 @@ def delete_account():
         flash(gettext('Your account has been deleted.'), 'success')
     else:
         flash(gettext('This user does not exist.'), 'danger')
-    return redirect(url_for('home'))
+    return redirect(url_for('login'))
 
 
 #