Merge branch 'lebouquetin-feature/improve-mail-notifications'

tracim/tracim/config/app_cfg.py

 import tracim
 from tracim import model
 from tracim.lib.base import logger
+from tracim.model.data import ActionDescription
+from tracim.model.data import ContentType
 
 base_config = AppConfig()
 base_config.renderers = []
 
         self.WEBSITE_TREEVIEW_CONTENT = tg.config.get('website.treeview.content')
 
+        self.EMAIL_NOTIFICATION_NOTIFIED_EVENTS = [
+            ActionDescription.COMMENT,
+            ActionDescription.CREATION,
+            ActionDescription.EDITION,
+            ActionDescription.REVISION
+        ]
+
+        self.EMAIL_NOTIFICATION_NOTIFIED_CONTENTS = [
+            ContentType.Page,
+            ContentType.Thread,
+            ContentType.File,
+            ContentType.Comment,
+            # ContentType.Folder -- Folder is skipped
+        ]
+
 
     def get_tracker_js_content(self, js_tracker_file_path = None):
         js_tracker_file_path = tg.config.get('js_tracker_path', None)

tracim/tracim/controllers/content.py

         workspace = tmpl_context.workspace
 
         try:
+            item_saved = False
             api = ContentApi(tmpl_context.current_user)
             item = api.get_one(int(item_id), self._item_type, workspace)
-            if comment or label:
-                api.update_content(item, label if label else item.label, comment if comment else '')
-                action_description = ActionDescription.EDITION
-                # The action_description is overwritten by ActionDescription.REVISION if the file content is also updated
 
-            if isinstance(file_data, FieldStorage):
-                api.update_file_data(item, file_data.filename, file_data.type, file_data.file.read())
-                action_description = ActionDescription.REVISION
+            # TODO - D.A. - 2015-03-19
+            # refactor this method in order to make code easier to understand
 
-            api.save(item, action_description)
+            if comment and label:
+                updated_item = api.update_content(
+                    item, label if label else item.label,
+                    comment if comment else ''
+                )
+                api.save(updated_item, ActionDescription.EDITION)
+
+                # This case is the default "file title and description update"
+                # In this case the file itself is not revisionned
+
+            else:
+                # So, now we may have a comment and/or a file revision
+                if comment and ''==label:
+                    comment_item = api.create_comment(workspace,
+                                                      item, comment,
+                                                      do_save=False)
+
+                    if not isinstance(file_data, FieldStorage):
+                        api.save(comment_item, ActionDescription.COMMENT)
+                    else:
+                        # The notification is only sent
+                        # if the file is NOT updated
+                        #
+                        #  If the file is also updated,
+                        #  then a 'file revision' notification will be sent.
+                        api.save(comment_item,
+                                 ActionDescription.COMMENT,
+                                 do_notify=False)
+
+                if isinstance(file_data, FieldStorage):
+                    api.update_file_data(item, file_data.filename, file_data.type, file_data.file.read())
+                    api.save(item, ActionDescription.REVISION)
 
             msg = _('{} updated').format(self._item_type_label)
             tg.flash(msg, CST.STATUS_OK)
 
         page = api.create(ContentType.Page, workspace, tmpl_context.folder, label)
         page.description = content
-        api.save(page, ActionDescription.CREATION)
+        api.save(page, ActionDescription.CREATION, do_notify=True)
 
         tg.flash(_('Page created'), CST.STATUS_OK)
         tg.redirect(tg.url('/workspaces/{}/folders/{}/pages/{}').format(tmpl_context.workspace_id, tmpl_context.folder_id, page.content_id))
 
 
+    @tg.require(current_user_is_contributor())
+    @tg.expose()
+    def put(self, item_id, label='',content=''):
+        # INFO - D.A. This method is a raw copy of
+        # TODO - SECURE THIS
+        workspace = tmpl_context.workspace
+
+        try:
+            api = ContentApi(tmpl_context.current_user)
+            item = api.get_one(int(item_id), self._item_type, workspace)
+            api.update_content(item, label, content)
+            api.save(item, ActionDescription.REVISION)
+
+            msg = _('{} updated').format(self._item_type_label)
+            tg.flash(msg, CST.STATUS_OK)
+            tg.redirect(self._std_url.format(tmpl_context.workspace_id, tmpl_context.folder_id, item.content_id))
+
+        except ValueError as e:
+            msg = _('{} not updated - error: {}').format(self._item_type_label, str(e))
+            tg.flash(msg, CST.STATUS_ERROR)
+            tg.redirect(self._err_url.format(tmpl_context.workspace_id, tmpl_context.folder_id, item_id))
+
 
 class UserWorkspaceFolderThreadRestController(TIMWorkspaceContentRestController):
     """
 
         thread = api.create(ContentType.Thread, workspace, tmpl_context.folder, label)
         # FIXME - DO NOT DUPLCIATE FIRST MESSAGE thread.description = content
-        api.save(thread, ActionDescription.CREATION)
+        api.save(thread, ActionDescription.CREATION, do_notify=False)
 
         comment = api.create(ContentType.Comment, workspace, thread, label)
         comment.label = ''
         comment.description = content
-        api.save(comment, ActionDescription.COMMENT)
+        api.save(comment, ActionDescription.COMMENT, do_notify=False)
+        api.do_notify(thread)
 
         tg.flash(_('Thread created'), CST.STATUS_OK)
         tg.redirect(self._std_url.format(tmpl_context.workspace_id, tmpl_context.folder_id, thread.content_id))

tracim/tracim/i18n/fr/LC_MESSAGES/tracim.po

 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 "POT-Creation-Date: 2015-03-02 22:28+0100\n"
 "PO-Revision-Date: 2015-03-02 22:32+0100\n"
 =======
 "POT-Creation-Date: 2015-03-10 18:35+0100\n"
 "PO-Revision-Date: 2015-03-10 18:32+0100\n"
 >>>>>>> 139e854c54cbb438fb69dda1149d450228cf2e8a
+=======
+"POT-Creation-Date: 2015-03-20 00:44+0100\n"
+"PO-Revision-Date: 2015-03-20 00:37+0100\n"
+>>>>>>> b67ad8598a3cfae087b99a8b7bf905ae8b8ec991
 "Last-Translator: Damien Accorsi <damien.accorsi@free.fr>\n"
 "Language-Team: fr_FR <LL@li.org>\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: tracim/config/app_cfg.py:135
+#: tracim/config/app_cfg.py:137
 msgid "Password reset request"
 msgstr "Réinitialisation du mot de passe"
 
-#: tracim/config/app_cfg.py:136 tracim/config/app_cfg.py:165
+#: tracim/config/app_cfg.py:138 tracim/config/app_cfg.py:167
 #, python-format
 msgid ""
 "\n"
 " à l'originie de cette requête, merci d'ignorer et/ou supprimer cet "
 "e-mail.\n"
 
-#: tracim/config/app_cfg.py:152 tracim/templates/user_workspace_forms.mak:251
+#: tracim/config/app_cfg.py:154 tracim/templates/user_workspace_forms.mak:251
 #: tracim/templates/user_workspace_forms.mak:252
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: tracim/config/app_cfg.py:153
+#: tracim/config/app_cfg.py:155
 msgid "Confirm new password"
 msgstr "Confirmer le nouveau mot de passe"
 
-#: tracim/config/app_cfg.py:154
+#: tracim/config/app_cfg.py:156
 msgid "Save new password"
 msgstr "Enregistrer le nouveau mot de passe"
 
-#: tracim/config/app_cfg.py:155 tracim/templates/user_get_all.mak:34
+#: tracim/config/app_cfg.py:157 tracim/templates/user_get_all.mak:34
 msgid "Email address"
 msgstr "Adresse email"
 
-#: tracim/config/app_cfg.py:156
+#: tracim/config/app_cfg.py:158
 msgid "Send Request"
 msgstr "Valider"
 
-#: tracim/config/app_cfg.py:159
+#: tracim/config/app_cfg.py:161
 msgid "Password reset request sent"
 msgstr "Requête de réinitialisation du mot de passe envoyée"
 
-#: tracim/config/app_cfg.py:160 tracim/config/app_cfg.py:162
+#: tracim/config/app_cfg.py:162 tracim/config/app_cfg.py:164
 msgid "Invalid password reset request"
 msgstr "Requête de réinitialisation du mot de passe invalide"
 
-#: tracim/config/app_cfg.py:161
+#: tracim/config/app_cfg.py:163
 msgid "Password reset request timed out"
 msgstr "Echec de la requête de réinitialisation du mot de passe"
 
-#: tracim/config/app_cfg.py:163
+#: tracim/config/app_cfg.py:165
 msgid "Password changed successfully"
 msgstr "Mot de passe changé"
 
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: tracim/controllers/__init__.py:139
 #: tracim/templates/dashboard.mak:36
 #: tracim/templates/master_authenticated.mak:94
 
 #: tracim/controllers/__init__.py:252 tracim/controllers/content.py:288
 >>>>>>> 139e854c54cbb438fb69dda1149d450228cf2e8a
+=======
+#: tracim/controllers/__init__.py:247 tracim/controllers/content.py:310
+#: tracim/controllers/content.py:425
+msgid "{} updated"
+msgstr "{} mis(e) à jour"
+
+#: tracim/controllers/__init__.py:252 tracim/controllers/content.py:315
+#: tracim/controllers/content.py:430
+>>>>>>> b67ad8598a3cfae087b99a8b7bf905ae8b8ec991
 msgid "{} not updated - error: {}"
 msgstr "{} pas mis(e) à jour - erreur : {}"
 
 
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 #: tracim/controllers/__init__.py:302
 >>>>>>> b2e4664ae2ad0cc8fbc3344f6fa37845cf7e344d
 #: tracim/controllers/content.py:748
 #: tracim/controllers/content.py:797
 =======
 #: tracim/controllers/__init__.py:302 tracim/controllers/content.py:748
+=======
+#: tracim/controllers/__init__.py:302 tracim/controllers/content.py:798
+>>>>>>> b67ad8598a3cfae087b99a8b7bf905ae8b8ec991
 msgid "{} archived. <a class=\"alert-link\" href=\"{}\">Cancel action</a>"
 msgstr "{} archivé(e). <a class=\"alert-link\" href=\"{}\">Annuler l'opération</a>"
 
-#: tracim/controllers/__init__.py:311 tracim/controllers/content.py:757
+#: tracim/controllers/__init__.py:311 tracim/controllers/content.py:807
 msgid "{} not archived: {}"
 msgstr "{} non archivé(e) : {}"
 
-#: tracim/controllers/__init__.py:325 tracim/controllers/content.py:771
+#: tracim/controllers/__init__.py:325 tracim/controllers/content.py:821
 msgid "{} unarchived."
 msgstr "{} désarchivé(e)"
 
-#: tracim/controllers/__init__.py:333 tracim/controllers/content.py:779
+#: tracim/controllers/__init__.py:333 tracim/controllers/content.py:829
 msgid "{} not un-archived: {}"
 msgstr "{} non désarchivé(e) : {}"
 
 #: tracim/controllers/__init__.py:351 tracim/controllers/content.py:88
+<<<<<<< HEAD
 #: tracim/controllers/content.py:796
 >>>>>>> 139e854c54cbb438fb69dda1149d450228cf2e8a
 msgid "{} deleted. <a class=\"alert-link\" href=\"{}\">Cancel action</a>"
 
 #: tracim/controllers/__init__.py:351 tracim/controllers/content.py:88
 #: tracim/controllers/content.py:796
+=======
+#: tracim/controllers/content.py:846
+>>>>>>> b67ad8598a3cfae087b99a8b7bf905ae8b8ec991
 msgid "{} deleted. <a class=\"alert-link\" href=\"{}\">Cancel action</a>"
 msgstr ""
 "{} supprimé(e). <a class=\"alert-link\" href=\"{}\">Annuler "
 "l'opération</a>"
 
 #: tracim/controllers/__init__.py:360 tracim/controllers/content.py:99
-#: tracim/controllers/content.py:805
+#: tracim/controllers/content.py:855
 msgid "{} not deleted: {}"
 msgstr "{} non supprimé(e) : {}"
 
 #: tracim/controllers/__init__.py:375 tracim/controllers/content.py:116
-#: tracim/controllers/content.py:820
+#: tracim/controllers/content.py:870
 msgid "{} undeleted."
 msgstr "{} restauré(e)."
 
 
 >>>>>>> 139e854c54cbb438fb69dda1149d450228cf2e8a
 #: tracim/controllers/__init__.py:385 tracim/controllers/content.py:128
+<<<<<<< HEAD
 #: tracim/controllers/content.py:830
 >>>>>>> b2e4664ae2ad0cc8fbc3344f6fa37845cf7e344d
+=======
+#: tracim/controllers/content.py:880
+>>>>>>> b67ad8598a3cfae087b99a8b7bf905ae8b8ec991
 msgid "{} not un-deleted: {}"
 msgstr "{} non restauré(e) : {}"
 
 msgid "File created"
 msgstr "Fichier créé"
 
-#: tracim/controllers/content.py:313
+#: tracim/controllers/content.py:340
 msgid "Page"
 msgstr "Page"
 
-#: tracim/controllers/content.py:381
+#: tracim/controllers/content.py:408
 msgid "Page created"
 msgstr "Page créée"
 
-#: tracim/controllers/content.py:421
+#: tracim/controllers/content.py:470
 msgid "Thread"
 msgstr "Discussion"
 
-#: tracim/controllers/content.py:462
+#: tracim/controllers/content.py:512
 msgid "Thread created"
 msgstr "Discussion créée"
 
-#: tracim/controllers/content.py:547
+#: tracim/controllers/content.py:597
 msgid "Item moved to {}"
 msgstr "Element déplacé vers {}"
 
-#: tracim/controllers/content.py:549
+#: tracim/controllers/content.py:599
 msgid "Item moved to workspace root"
 msgstr "Element déplacé à la racine de l'espace de travail"
 
-#: tracim/controllers/content.py:669
+#: tracim/controllers/content.py:719
 msgid "Folder created"
 msgstr "Dossier créé"
 
-#: tracim/controllers/content.py:675
+#: tracim/controllers/content.py:725
 msgid "Folder not created: {}"
 msgstr "Dossier non créé : {}"
 
-#: tracim/controllers/content.py:710
+#: tracim/controllers/content.py:760
 msgid "Folder updated"
 msgstr "Dossier mis à jour"
 
-#: tracim/controllers/content.py:715
+#: tracim/controllers/content.py:765
 msgid "Folder not updated: {}"
 msgstr "Dossier non mis à jour : {}"
 
-#: tracim/controllers/content.py:730
+#: tracim/controllers/content.py:780
 msgid "Folder"
 <<<<<<< HEAD
 msgstr "Dossier"
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 #: tracim/lib/content.py:98
 #: tracim/templates/dashboard.mak:36
 =======
 #: tracim/lib/content.py:98 tracim/templates/dashboard.mak:36
 >>>>>>> 139e854c54cbb438fb69dda1149d450228cf2e8a
+=======
+#: tracim/lib/content.py:100 tracim/templates/dashboard.mak:36
+>>>>>>> b67ad8598a3cfae087b99a8b7bf905ae8b8ec991
 #: tracim/templates/master_authenticated.mak:94
 #: tracim/templates/master_no_toolbar_no_login.mak:112
 #: tracim/templates/search.mak:11 tracim/templates/user_get_one.mak:39
 msgid "Workspaces"
 msgstr "Espaces de travail"
 
+<<<<<<< HEAD
 >>>>>>> b2e4664ae2ad0cc8fbc3344f6fa37845cf7e344d
+=======
+#: tracim/lib/notifications.py:289
+msgid "<span id=\"content-intro-username\">{}</span> added a comment:"
+msgstr "<span id=\"content-intro-username\">{}</span> a ajouté un commentaire :"
+
+#: tracim/lib/notifications.py:291 tracim/lib/notifications.py:300
+msgid "Answer"
+msgstr "Répondre"
+
+#: tracim/lib/notifications.py:297 tracim/lib/notifications.py:321
+#: tracim/lib/notifications.py:347
+msgid "View online"
+msgstr "Voir en ligne"
+
+#: tracim/lib/notifications.py:301
+msgid "<span id=\"content-intro-username\">{}</span> started a thread entitled:"
+msgstr ""
+"<span id=\"content-intro-username\">{}</span> a lancé une discussion "
+"intitulée :"
+
+#: tracim/lib/notifications.py:306
+msgid "<span id=\"content-intro-username\">{}</span> added a file entitled:"
+msgstr ""
+"<span id=\"content-intro-username\">{}</span> a ajouté un fichier "
+"intitulé :"
+
+#: tracim/lib/notifications.py:316
+msgid "<span id=\"content-intro-username\">{}</span> added a page entitled:"
+msgstr ""
+"<span id=\"content-intro-username\">{}</span> a ajouté une page intitulée"
+" :"
+
+#: tracim/lib/notifications.py:324
+msgid "<span id=\"content-intro-username\">{}</span> uploaded a new revision."
+msgstr ""
+"<span id=\"content-intro-username\">{}</span> a téléchargé une nouvelle "
+"version."
+
+#: tracim/lib/notifications.py:328
+msgid "<span id=\"content-intro-username\">{}</span> updated this page."
+msgstr "<span id=\"content-intro-username\">{}</span> a mis à jour cette page."
+
+#: tracim/lib/notifications.py:333
+msgid "<p id=\"content-body-intro\">Here is an overview of the changes:</p>"
+msgstr "<p id=\"content-body-intro\">Voici un aperçu des modifications :</p>"
+
+#: tracim/lib/notifications.py:338
+msgid ""
+"<span id=\"content-intro-username\">{}</span> updated the thread "
+"description."
+msgstr ""
+"<span id=\"content-intro-username\">{}</span> a mis à jour la description"
+" de la discussion."
+
+#: tracim/lib/notifications.py:350
+msgid ""
+"<span id=\"content-intro-username\">{}</span> updated the file "
+"description."
+msgstr ""
+"<span id=\"content-intro-username\">{}</span> a mis à jour la description"
+" du fichier."
+
+>>>>>>> b67ad8598a3cfae087b99a8b7bf905ae8b8ec991
 #: tracim/lib/predicates.py:17
 msgid "You are not authorized to access this resource"
 msgstr "Vous n'êtes pas autorisé à accéder à cette ressource"
 msgid "Item undeleted"
 msgstr "Elément restauré"
 
-#: tracim/model/data.py:202 tracim/model/data.py:212
+#: tracim/model/data.py:201 tracim/model/data.py:211
 msgid "work in progress"
 msgstr "travail en cours"
 
-#: tracim/model/data.py:203 tracim/model/data.py:213
+#: tracim/model/data.py:202 tracim/model/data.py:212
 msgid "closed — validated"
 msgstr "clos(e) — validé(e)"
 
-#: tracim/model/data.py:204 tracim/model/data.py:214
+#: tracim/model/data.py:203 tracim/model/data.py:213
 msgid "closed — cancelled"
 msgstr "clos(e) — annulé(e)"
 
-#: tracim/model/data.py:205 tracim/model/data.py:210 tracim/model/data.py:215
+#: tracim/model/data.py:204 tracim/model/data.py:209 tracim/model/data.py:214
 msgid "deprecated"
 msgstr "obsolète"
 
-#: tracim/model/data.py:207
+#: tracim/model/data.py:206
 msgid "subject in progress"
 msgstr "discussion en cours"
 
-#: tracim/model/data.py:208
+#: tracim/model/data.py:207
 msgid "subject closed — resolved"
 msgstr "discussion close — résolue"
 
-#: tracim/model/data.py:209
+#: tracim/model/data.py:208
 msgid "subject closed — cancelled"
 msgstr "discussion close — annulée"
 
-#: tracim/model/data.py:292
+#: tracim/model/data.py:291
 msgid "Delete this workspace"
 <<<<<<< HEAD
 msgstr "Supprimer cet espace de travail"
 msgstr "Supprimer l'espace de travail"
 >>>>>>> b2e4664ae2ad0cc8fbc3344f6fa37845cf7e344d
 
-#: tracim/model/data.py:293
+#: tracim/model/data.py:292
 msgid "Delete this folder"
 msgstr "Supprimer ce dossier"
 
-#: tracim/model/data.py:294
+#: tracim/model/data.py:293
 msgid "Delete this file"
 <<<<<<< HEAD
 msgstr "Supprimer ce fichier"
 msgstr "Supprimer le fichier"
 >>>>>>> b2e4664ae2ad0cc8fbc3344f6fa37845cf7e344d
 
-#: tracim/model/data.py:295
+#: tracim/model/data.py:294
 msgid "Delete this page"
 msgstr "Supprimer cette page"
 
-#: tracim/model/data.py:296
+#: tracim/model/data.py:295
 msgid "Delete this thread"
 msgstr "Supprimer cette discussion"
 
-#: tracim/model/data.py:297
+#: tracim/model/data.py:296
 msgid "Delete this comment"
 msgstr "Supprimer ce commentaire"
 
 "Comme <span style=\"color: #ea983d;\">gestionnaire de contenu</span> + "
 "modification de l'espace de travail."
 
-#: tracim/templates/mail/content_update_body_html.mak:52
-msgid "Some activity has been detected"
-msgstr "Il se passe des choses"
-
-#: tracim/templates/mail/content_update_body_html.mak:60
-msgid "<span style=\"{style}\">&mdash; by {actor_name}</span>"
-msgstr "<span style=\"{style}\">&mdash; par {actor_name}</span>"
-
-#: tracim/templates/mail/content_update_body_html.mak:65
-#: tracim/templates/mail/content_update_body_text.mak:16
-msgid "This item has been deleted."
-msgstr "Cet élément a été supprimé"
-
-#: tracim/templates/mail/content_update_body_html.mak:68
-#: tracim/templates/mail/content_update_body_text.mak:18
-msgid "This item has been archived."
-msgstr "Cet élément a été archivé."
-
-#: tracim/templates/mail/content_update_body_html.mak:72
-msgid "Go to information"
-msgstr "Voir en ligne"
-
-#: tracim/templates/mail/content_update_body_html.mak:82
+#: tracim/templates/mail/content_update_body_html.mak:66
 msgid ""
-"{user_display_name}, you receive this email because you are "
-"<b>{user_role_label}</b> in the workspace <a "
-"href=\"{workspace_url}\">{workspace_label}</a>"
+"{user_display_name}, you receive this email because you are registered on"
+" <i>{website_title}</i> and you are <i>{user_role_label}</i> in the "
+"workspace <a href=\"{workspace_url}\">{workspace_label}</a>."
 msgstr ""
-"{user_display_name}, vous recevez cet email car vous êtes "
-"<b>{user_role_label}</b> dans l'espace de travail <a "
-"href=\"{workspace_url}\">{workspace_label}</a>"
-
-#: tracim/templates/mail/content_update_body_text.mak:8
-msgid "Some activity has been detected on the item above"
-msgstr "Il se passe des choses"
+"{user_display_name}, vous recevez cet email car vous êtes enregistré sur "
+"le site web <i>{website_title}</i> et vous êtes <i>{user_role_label}</i> "
+"dans l'espace de travail <a "
+"href=\"{workspace_url}\">{workspace_label}</a>."
 
-#: tracim/templates/mail/content_update_body_text.mak:8
-msgid "-- by {actor_name}"
-msgstr "-- par {actor_name}"
-
-#: tracim/templates/mail/content_update_body_text.mak:20
-msgid "Go to information:"
-msgstr "Voir en ligne :"
-
-#: tracim/templates/mail/content_update_body_text.mak:25
+#: tracim/templates/mail/content_update_body_html.mak:70
 msgid ""
-"*{user_display_name}*, you receive this email because you are "
-"*{user_role_label}* in the workspace {workspace_label} - {workspace_url}"
+"This email was automatically sent by <i>Tracim</i>, a collaborative "
+"software developped by Algoo."
 msgstr ""
-"*{user_display_name}*, vous recevez cet email car vous êtes "
-"*{user_role_label}* dans l'espace de travail {workspace_label} - "
-"{workspace_url}"
+"Cet email a été envoyé automatiquement par <i>Tracim</i>, un logiciel "
+"collaboratif développé par Algoo."
 
 #~ msgid "You have no document yet."
 #~ msgstr "Vous n'avez pas de document pour le moment."
 #~ msgid "Create a topic"
 #~ msgstr "Créer un sujet"
 
+#~ msgid "Some activity has been detected"
+#~ msgstr "Il se passe des choses"
+
+#~ msgid "<span style=\"{style}\">&mdash; by {actor_name}</span>"
+#~ msgstr "<span style=\"{style}\">&mdash; par {actor_name}</span>"
+
+#~ msgid "Go to information"
+#~ msgstr "Voir en ligne"
+
+#~ msgid "Some activity has been detected on the item above"
+#~ msgstr "Il se passe des choses"
+
+#~ msgid "-- by {actor_name}"
+#~ msgstr "-- par {actor_name}"
+
+#~ msgid "This item has been deleted."
+#~ msgstr "Cet élément a été supprimé"
+
+#~ msgid "This item has been archived."
+#~ msgstr "Cet élément a été archivé."
+
+#~ msgid "Go to information:"
+#~ msgstr "Voir en ligne :"
+
 #~ msgid ""
-#~ "This user has no password. Visit "
-#~ "<a href=\"{}\">Reset password</a> page for "
-#~ "init."
+#~ "*{user_display_name}*, you receive this email"
+#~ " because you are *{user_role_label}* in "
+#~ "the workspace {workspace_label} - "
+#~ "{workspace_url}"
 #~ msgstr ""
-#~ "Cet utilisateur n'a pas de mot de"
-#~ " passe. Visitez <a href=\"{}\">cette "
-#~ "page</a> pour l'initialiser."
+#~ "*{user_display_name}*, vous recevez cet email"
+#~ " car vous êtes *{user_role_label}* dans "
+#~ "l'espace de travail {workspace_label} - "
+#~ "{workspace_url}"
 

tracim/tracim/lib/content.py

 from tracim.model.data import ContentType
 from tracim.model.data import NodeTreeItem
 from tracim.model.data import Workspace
+from tracim.model.data import UserRoleInWorkspace
 
-def compare_content_for_sorting_by_type_and_name(content1: Content, content2: Content):
+def compare_content_for_sorting_by_type_and_name(content1: Content,
+                                                 content2: Content):
     """
     :param content1:
     :param content2:
         if workspace:
             result = result.filter(Content.workspace_id==workspace.workspace_id)
 
+        if self._user:
+            # Filter according to user workspaces
+            workspace_ids = [r.workspace_id for r in self._user.roles \
+                             if r.role>=UserRoleInWorkspace.READER]
+            result = result.filter(Content.workspace_id.in_(workspace_ids))
+
         return result
 
     def _base_query(self, workspace: Workspace=None):
         :param workspace:
         :param filter_by_allowed_content_types:
         :param removed_item_ids:
-        :param allowed_node_types:
+        :param allowed_node_types: This parameter allow to hide folders for which the given type of content is not allowed.
+               For example, if you want to move a Page from a folder to another, you should show only folders that accept pages
         :return:
         """
         if not allowed_node_types:
             filter(Content.content_id.notin_(removed_item_ids)).\
             all()
 
-        if not filter_by_allowed_content_types or len(filter_by_allowed_content_types)<=0:
-            filter_by_allowed_content_types = ContentType.allowed_types_for_folding()
-
-        # Now, the case is to filter folders by the content that they are allowed to contain
+        if not filter_by_allowed_content_types or \
+                        len(filter_by_allowed_content_types)<=0:
+            # Standard case for the left treeview: we want to show all contents
+            # in the left treeview... so we still filter because for example
+            # comments must not appear in the treeview
+            return [folder for folder in folders \
+                    if folder.type in ContentType.allowed_types_for_folding()]
+
+        # Now this is a case of Folders only (used for moving content)
+        # When moving a content, you must get only folders that allow to be filled
+        # with the type of content you want to move
         result = []
         for folder in folders:
             for allowed_content_type in filter_by_allowed_content_types:
             DBSession.flush()
 
         if do_notify:
-            NotifierFactory.create(self._user).notify_content_update(content)
+            self.do_notify(content)
 
+    def do_notify(self, content: Content):
+        """
+        Allow to force notification for a given content. By default, it is
+        called during the .save() operation
+        :param content:
+        :return:
+        """
+        NotifierFactory.create(self._user).notify_content_update(content)
 
     def get_keywords(self, search_string, search_string_separators=None) -> [str]:
         """

tracim/tracim/lib/notifications.py

 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 
+import lxml
+from lxml.html.diff import htmldiff
 
 from mako.template import Template
 
 from tracim.model.serializers import CTX
 from tracim.model.serializers import DictLikeClass
 
-from tracim.model.data import Content, UserRoleInWorkspace, ContentType
+from tracim.model.data import Content, UserRoleInWorkspace, ContentType, \
+    ActionDescription
 from tracim.model.auth import User
 
 
                                        cfg.EMAIL_NOTIFICATION_SMTP_PASSWORD)
 
     def notify_content_update(self, content: Content):
-        logger.info(self, 'About to email-notify update of content {} by user {}'.format(content.content_id, self._user.user_id if self._user else 0)) # 0 means "no user"
-
         global_config = CFG.get_instance()
 
+        if content.get_last_action().id not \
+                in global_config.EMAIL_NOTIFICATION_NOTIFIED_EVENTS:
+            logger.info(
+                self,
+                'Skip email notification for update of content {}'
+                'by user {} (the action is {})'.format(
+                    content.content_id,
+                    # below: 0 means "no user"
+                    self._user.user_id if self._user else 0,
+                    content.get_last_action().id
+                )
+            )
+            return
+
+        logger.info(self,
+                    'About to email-notify update'
+                    'of content {} by user {}'.format(
+                        content.content_id,
+                        # Below: 0 means "no user"
+                        self._user.user_id if self._user else 0
+                    )
+        )
+
+        if content.type not \
+                in global_config.EMAIL_NOTIFICATION_NOTIFIED_CONTENTS:
+            logger.info(
+                self,
+                'Skip email notification for update of content {}'
+                'by user {} (the content type is {})'.format(
+                    content.type,
+                    # below: 0 means "no user"
+                    self._user.user_id if self._user else 0,
+                    content.get_last_action().id
+                )
+            )
+            return
+
+        logger.info(self,
+                    'About to email-notify update'
+                    'of content {} by user {}'.format(
+                        content.content_id,
+                        # Below: 0 means "no user"
+                        self._user.user_id if self._user else 0
+                    )
+        )
+
         ####
         #
-        # INFO - D.A. - 2014-11-05 - Emails are sent through asynchronous jobs. For that reason, we do not
-        # give SQLAlchemy objects but ids only (SQLA objects are related to a given thread/session)
+        # INFO - D.A. - 2014-11-05 - Emails are sent through asynchronous jobs.
+        # For that reason, we do not give SQLAlchemy objects but ids only
+        # (SQLA objects are related to a given thread/session)
         #
         try:
             if global_config.EMAIL_NOTIFICATION_PROCESSING_MODE.lower()==global_config.CST.ASYNC.lower():
         logger.debug(self, 'Content: {}'.format(event_content_id))
 
         content = ContentApi(user, show_archived=True, show_deleted=True).get_one(event_content_id, ContentType.Any) # TODO - use a system user instead of the user that has triggered the event
-        content = content.parent if content.type==ContentType.Comment else content
+        main_content = content.parent if content.type==ContentType.Comment else content
         notifiable_roles = WorkspaceApi(user).get_notifiable_roles(content.workspace)
 
         if len(notifiable_roles)<=0:
             #
             subject = self._global_config.EMAIL_NOTIFICATION_CONTENT_UPDATE_SUBJECT
             subject = subject.replace(EST.WEBSITE_TITLE, self._global_config.WEBSITE_TITLE.__str__())
-            subject = subject.replace(EST.WORKSPACE_LABEL, content.workspace.label.__str__())
-            subject = subject.replace(EST.CONTENT_LABEL, content.label.__str__() if content.label else content.file_name.__str__())
-            subject = subject.replace(EST.CONTENT_STATUS_LABEL, content.get_status().label.__str__())
+            subject = subject.replace(EST.WORKSPACE_LABEL, main_content.workspace.label.__str__())
+            subject = subject.replace(EST.CONTENT_LABEL, main_content.label.__str__() if main_content.label else main_content.file_name.__str__())
+            subject = subject.replace(EST.CONTENT_STATUS_LABEL, main_content.get_status().label.__str__())
 
             message = MIMEMultipart('alternative')
             message['Subject'] = subject
             message['To'] = to_addr
 
             body_text = self._build_email_body(self._global_config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT, role, content, user)
+
+
+
             body_html = self._build_email_body(self._global_config.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_HTML, role, content, user)
+
             part1 = MIMEText(body_text, 'plain', 'utf-8')
             part2 = MIMEText(body_html, 'html', 'utf-8')
             # Attach parts into message container.
         dictified_item = Context(CTX.EMAIL_NOTIFICATION, self._global_config.WEBSITE_BASE_URL).toDict(content)
         dictified_actor = Context(CTX.DEFAULT).toDict(actor)
 
+        main_title = dictified_item.label
+        content_intro = ''
+        content_text = ''
+        call_to_action_text = ''
+
+        action = content.get_last_action().id
+        if ActionDescription.COMMENT == action:
+            content_intro = _('<span id="content-intro-username">{}</span> added a comment:'.format(actor.display_name))
+            content_text = content.description
+            call_to_action_text = _('Answer')
+
+        elif ActionDescription.CREATION == action:
+
+            # Default values (if not overriden)
+            content_text = content.description
+            call_to_action_text = _('View online')
+
+            if ContentType.Thread == content.type:
+                call_to_action_text = _('Answer')
+                content_intro = _('<span id="content-intro-username">{}</span> started a thread entitled:').format(actor.display_name)
+                content_text = '<p id="content-body-intro">{}</p>'.format(content.label) + \
+                               content.get_last_comment_from(actor).description
+
+            elif ContentType.File == content.type:
+                content_intro = _('<span id="content-intro-username">{}</span> added a file entitled:').format(actor.display_name)
+                if content.description:
+                    content_text = content.description
+                elif content.label:
+                    content_text = '<span id="content-body-only-title">{}</span>'.format(content.label)
+                else:
+                    content_text = '<span id="content-body-only-title">{}</span>'.format(content.file_name)
+
+
+            elif ContentType.Page == content.type:
+                content_intro = _('<span id="content-intro-username">{}</span> added a page entitled:').format(actor.display_name)
+                content_text = '<span id="content-body-only-title">{}</span>'.format(content.label)
+
+        elif ActionDescription.REVISION == action:
+            content_text = content.description
+            call_to_action_text = _('View online')
+
+            if ContentType.File == content.type:
+                content_intro = _('<span id="content-intro-username">{}</span> uploaded a new revision.').format(actor.display_name)
+                content_text = ''
+
+            elif ContentType.Page == content.type:
+                content_intro = _('<span id="content-intro-username">{}</span> updated this page.').format(actor.display_name)
+                previous_revision = content.get_previous_revision()
+                title_diff = ''
+                if previous_revision.label != content.label:
+                    title_diff = htmldiff(previous_revision.label, content.label)
+                content_text = _('<p id="content-body-intro">Here is an overview of the changes:</p>')+ \
+                    title_diff + \
+                    htmldiff(previous_revision.description, content.description)
+
+            elif ContentType.Thread == content.type:
+                content_intro = _('<span id="content-intro-username">{}</span> updated the thread description.').format(actor.display_name)
+
+            # elif ContentType.Thread == content.type:
+            #     content_intro = _('<span id="content-intro-username">{}</span> updated this page.').format(actor.display_name)
+            #     previous_revision = content.get_previous_revision()
+            #     content_text = _('<p id="content-body-intro">Here is an overview of the changes:</p>')+ \
+            #         htmldiff(previous_revision.description, content.description)
+
+        elif ActionDescription.EDITION == action:
+            call_to_action_text = _('View online')
+
+            if ContentType.File == content.type:
+                content_intro = _('<span id="content-intro-username">{}</span> updated the file description.').format(actor.display_name)
+                content_text = '<p id="content-body-intro">{}</p>'.format(content.get_label()) + \
+                    content.description
+
+
+        if '' == content_intro and content_text == '':
+            # Skip notification, but it's not normal
+            logger.error(
+                self, 'A notification is being sent but no content. '
+                      'Here are some debug informations: [content_id: {cid}]'
+                      '[action: {act}][author: {actor}]'.format(
+                    cid=content.content_id, act=action, actor=actor
+                )
+            )
+            raise ValueError('Unexpected empty notification')
+
+        # Thread - create
+        # logger.debug(self, 'This is a NOT comment <--------------------- {}'.format(content.type))
         body_content = template.render(base_url=self._global_config.WEBSITE_BASE_URL,
                                _=_,
                                h=helpers,
                                user_display_name=role.user.display_name,
                                user_role_label=role.role_as_label(),
                                workspace_label=role.workspace.label,
+                               content_intro=content_intro,
+                               content_text=content_text,
+                               main_title=main_title,
+                               call_to_action_text=call_to_action_text,
                                result = DictLikeClass(item=dictified_item, actor=dictified_actor))
 
         return body_content

tracim/tracim/model/data.py

         'undeletion': l_('Item undeleted'),
     }
 
-
     def __init__(self, id):
         assert id in ActionDescription.allowed_values()
         self.id = id
                 children.append(child)
         return children
 
+    def get_last_comment_from(self, user: User) -> 'Content':
+        # TODO - Make this more efficient
+        last_comment_updated = None
+        last_comment = None
+        for comment in self.get_comments():
+            if user.user_id==comment.owner.user_id:
+                if not last_comment or last_comment_updated<comment.updated:
+                    # take only the latest comment !
+                    last_comment = comment
+                    last_comment_updated = comment.updated
+
+        return last_comment
+
+
+    def get_previous_revision(self) -> 'ContentRevisionRO':
+        rev_ids = [revision.revision_id for revision in self.revisions]
+        rev_ids.sort()
+
+        if len(rev_ids)>=2:
+            revision_rev_id = rev_ids[-2]
+
+            for revision in self.revisions:
+                if revision.revision_id == revision_rev_id:
+                    return revision
+
+        return None
+
 
 
 class ContentChecker(object):

tracim/tracim/model/serializers.py

 
 @pod_serializer(Content, CTX.EMAIL_NOTIFICATION)
 def serialize_item(content: Content, context: Context):
-    return DictLikeClass(
+    if ContentType.Comment==content.type:
+        content = content.parent
+
+    result = DictLikeClass(
         id = content.content_id,
         label = content.label if content.label else content.file_name,
         icon = ContentType.icon(content.type),
         workspace = context.toDict(content.workspace),
         is_deleted = content.is_deleted,
         is_archived = content.is_archived,
-        url = context.url('/workspaces/{wid}/folders/{fid}/{ctype}/{cid}'.format(wid = content.workspace_id, fid=content.parent_id, ctype=content.type+'s', cid=content.content_id))
+        url = context.url('/workspaces/{wid}/folders/{fid}/{ctype}/{cid}'.format(wid = content.workspace_id, fid=content.parent_id, ctype=content.type+'s', cid=content.content_id)),
+        last_action = context.toDict(content.get_last_action())
     )
 
+    return result
+
 
 @pod_serializer(Content, CTX.MENU_API)
 def serialize_content_for_menu_api(content: Content, context: Context):

tracim/tracim/templates/mail/content_update_body_html.mak

       }
       a.call-to-action img { vertical-align: middle;}
       th { vertical-align: top;}
+      
+      #content-intro-username { font-size: 1.5em; color: #666; font-weight: bold; }
+      #content-intro { margin: 0; border: 1em solid #DDD; border-width: 0 0 0 0em; padding: 1em 1em 1em 1em; }
+      #content-body { margin: 0em; border: 2em solid #DDD; border-width: 0 0 0 4em; padding: 0.5em 2em 1em 1em; }
+      #content-body-intro { font-size: 2em; color: #666; }
+      #content-body-only-title { font-size: 1.5em; }
+
+      #content-body ins { background-color: #AFA; }
+      #content-body del { background-color: #FAA; }
+
+
+      #call-to-action-button { background-color: #5CB85C; border: 1px solid #4CAE4C; color: #FFF; text-decoration: none; font-weight: bold; padding: 4px; border-radius: 3px; font-size: 2em; padding-right: 0.5em;}
+      #call-to-action-container { text-align: right; margin-top: 2em; }
+
+      #footer hr { border: 0px solid #CCC; border-top-width: 1px; width: 8em; max-width:25%; margin-left: 0;}
+      #footer { color: #999; margin: 4em auto auto 0.5em; }
+      #footer a { color: #999; }
     </style>
   </head>
-  <body style="font-family: Arial; font-size: 12px; width: 600px; margin: 0; padding: 0;">
+  <body style="font-family: Arial; font-size: 12px; max-width: 600px; margin: 0; padding: 0;">
 
-    <table style="width: 600px; cell-padding: 0; 	border-collapse: collapse;">
+    <table style="width: 100%; cell-padding: 0; border-collapse: collapse; margin: 0">
       <tr style="background-color: F5F5F5; border-bottom: 1px solid #CCC;" >
-        <td>
-          <img src="${base_url+'/assets/img/logo.png'}" style="vertical-align: middle;"/>
-          <span style="font-weight: bold; padding-left: 0.5em; font-size: 1.5em; vertical-align: middle;">${h.CFG.WEBSITE_TITLE}</span>
-        </td>
-      </tr>
-      <tr>
-        <td style="padding: 5px 5px 5px 2em;">
-          <img style="vertical-align: middle;" src="${base_url+'/assets/icons/32x32/places/folder-remote.png'}"/>
-          <span style="font-weight: bold; padding-left: 0.5em; font-size: 1.2em; vertical-align: middle;">${result.item.workspace.label}</span>
+        <td style="background-color: #666;">
+          <img src="http://team.trac.im/assets/img/logo.png" style="vertical-align: middle;"/>
         </td>
-      </tr>
-      <tr>
-        <td style="padding: 5px 5px 5px 4em;">
-          <img style="vertical-align: middle;" src="${base_url+'/assets/icons/32x32/'+result.item.icon+'.png'}"/>
-          <span style="font-weight: bold; padding-left: 0.5em; font-size: 1em; vertical-align: middle;">
-            ${result.item.label} &mdash;
-            <span style="font-weight: bold; color: #999; font-weight: bold;">
+        <td style="padding: 0.5em; background-color: #666; text-align: left;">
+          <span style="font-size: 1.3em; color: #FFF; font-weight: bold;">
+            ${main_title}
+            &mdash;&nbsp;<span style="font-weight: bold; color: #999; font-weight: bold;">
                 ${result.item.status.label}
-                <img src="${base_url+'/assets/icons/16x16/{}.png'.format(result.item.status.icon)}" style="vertical-align: middle;">
+                <img alt="" src="${base_url+'/assets/icons/16x16/{}.png'.format(result.item.status.icon)}" style="vertical-align: middle;">
             </span>
-          </span>
         </td>
       </tr>
     </table>
 
-    <hr style="border: 0px solid #CCC; border-width: 1px 0 0 0;">
-
-    <div style="margin-left: 0.5em; border: 1em solid #DDD; border-width: 0 0 0 1em; padding-left: 1em;">
-      <p>
-        ${_('Some activity has been detected')|n}
-        ##
-        ## TODO - D.A. - Show last action in the notification message
-        ##
-        ## &mdash;
-        ## <img style="vertical-align: middle; " src="${base_url+'/assets/icons/16x16/'+result.item.last_action.icon+'.png'}"/>
-        ## ${result.item.last_action.label}
-        ##
-        ${_('<span style="{style}">&mdash; by {actor_name}</span>').format(style='color: #666; font-weight: bold;', actor_name=result.actor.name)}
-      </p>
-      <p>
-        % if result.item.is_deleted:
-            <img style="vertical-align: middle; " src="${base_url+'/assets/icons/16x16/status/user-trash-full.png'}"/>
-            ${_('This item has been deleted.')}
-        % elif result.item.is_archived:
-            <img style="vertical-align: middle; " src="${base_url+'/assets/icons/16x16/mimetypes/package-x-generic.png'}"/>
-            ${_('This item has been archived.')}
-        % else:
-            <a href="${result.item.url}" style="background-color: #5CB85C; border: 1px solid #4CAE4C; color: #FFF; text-decoration: none; font-weight: bold; padding: 4px; border-radius: 3px;">
-              <img style="vertical-align: middle; " src="${base_url+'/assets/icons/16x16/actions/system-search.png'}"/>
-              ${_('Go to information')}
-            </a>
-        % endif
-        <div style="clear:both;"></div>
-      </p>
+    <p id="content-intro">${content_intro|n}</p>
+    <div id="content-body">
+        <div>${content_text|n}</div>
+        <div id="call-to-action-container">
+            <span style="">
+                <a href="${result.item.url}" id='call-to-action-button'>${call_to_action_text}</a>
+            </span>
+        </div>
+    </div>
+    
+    <div id="footer">
+        <p>
+            ${_('{user_display_name}, you receive this email because you are registered on <i>{website_title}</i> and you are <i>{user_role_label}</i> in the workspace <a href="{workspace_url}">{workspace_label}</a>.').format(user_display_name=user_display_name, user_role_label=user_role_label, workspace_url=result.item.workspace.url, workspace_label=workspace_label, website_title=h.CFG.WEBSITE_TITLE)|n}
+        </p>
+        <hr/>
+        <p>
+            ${_('This email was automatically sent by <i>Tracim</i>, a collaborative software developped by Algoo.')}<br/>
+            Algoo SAS &mdash; 9 rue du rocher de Lorzier, 38430 Moirans, France &mdash; <a style="text-decoration: none;" href="http://algoo.fr">www.algoo.fr</a>
+        </p>
     </div>
-
-    <hr style="border: 0px solid #CCC; border-width: 1px 0 0 0;">
-
-    <p style="color: #999; margin-left: 0.5em;">
-      ${_('{user_display_name}, you receive this email because you are <b>{user_role_label}</b> in the workspace <a href="{workspace_url}">{workspace_label}</a>').format(user_display_name=user_display_name, user_role_label=user_role_label, workspace_url=result.item.workspace.url, workspace_label=workspace_label)|n}
-    </p>
   </body>
 </html>

tracim/tracim/templates/mail/content_update_body_text.mak

 ## -*- coding: utf-8 -*-
-${h.CFG.WEBSITE_TITLE}
--> ${result.item.workspace.label}
--> ${result.item.label} - ${result.item.status.label}
-
-==============================================================================
- 
-${_('Some activity has been detected on the item above')} ${_('-- by {actor_name}').format(actor_name=result.actor.name)}
-##
-## TODO - D.A. - Show last action in the notification message
-##
-##${_('{last_action} -- by {actor_name}').format(last_action=result.item.last_action.label, actor_name=result.actor.name)}
-##
-
-% if result.item.is_deleted:
-${_('This item has been deleted.')}
-% elif result.item.is_archived:
-${_('This item has been archived.')}
-% else:
-${_('Go to information:')} ${result.item.url}
-% endif
-
-==============================================================================
-
-${_('*{user_display_name}*, you receive this email because you are *{user_role_label}* in the workspace {workspace_label} - {workspace_url}').format(user_display_name=user_display_name, user_role_label=user_role_label, workspace_url=result.item.workspace.url, workspace_label=workspace_label)}
+
+Dear ${user_display_name},
+
+This email is intended to be read as HTML content.
+Please configure your email client to get the best of Tracim notifications.
+
+We understand that Email was originally intended to carry raw text only.
+And you probably understand on your own that we are a decades after email
+was created ;)
+
+Hope you'll switch your mail client configuration and enjoy Tracim :)
+
+
+--------------------------------------------------------------------------------
+
+
+You receive this email because you are registered on /${h.CFG.WEBSITE_TITLE}/
+and you are /${user_role_label}/ in the workspace /${workspace_label}/
+${result.item.workspace.url}
+
+----
+
+This email was automatically sent by *Tracim*,
+a collaborative software developped by Algoo.
+
+**Algoo SAS**
+9 rue du rocher de Lorzier
+38430 Moirans
+France
+http://algoo.fr