dirty misc commit including:

doc/database/tracim-init-database.new.sql

@@ -152,7 +152,8 @@ ALTER SEQUENCE seq__users__user_id OWNED BY users.user_id;
 CREATE TABLE user_workspace (
     user_id integer NOT NULL,
     workspace_id integer NOT NULL,
-    role integer
+    role integer,
+    do_notify boolean DEFAULT FALSE NOT NULL
 );
 
 CREATE TABLE workspaces (

doc/database/tracim-migrate-to-first-stable-release.sql

@@ -65,6 +65,8 @@ CREATE TABLE pod_user_workspace
   user_id integer NOT NULL,
   workspace_id integer NOT NULL,
   role integer,
+  do_notify boolean DEFAULT FALSE NOT NULL,
+
   CONSTRAINT pk__pod_user_workspace__user_id__workspace_id PRIMARY KEY (user_id , workspace_id ),
   CONSTRAINT fk__pod_user_workspace__user_id FOREIGN KEY (user_id)
       REFERENCES pod_user (user_id) MATCH SIMPLE

tracim/tracim/config/app_cfg.py

@@ -13,13 +13,16 @@ convert them into boolean, for example, you should use the
  
 """
 
+import tg
 from tg.configuration import AppConfig
-from tgext.pluggable import plug, replace_template
+from tgext.pluggable import plug
+from tgext.pluggable import replace_template
+
 from tg.i18n import lazy_ugettext as l_
 
 import tracim
 from tracim import model
-from tracim.lib import app_globals, helpers
+from tracim.lib.base import logger
 
 base_config = AppConfig()
 base_config.renderers = []
@@ -131,6 +134,12 @@ Please click this link to reset your password:
 If you no longer wish to make the above change, or if you did not initiate this request, please disregard and/or delete this e-mail.
 ''')
 
+#######
+#
+# INFO - D.A. - 2014-10-31
+# The following code is a dirty way to integrate translation for resetpassword tgapp in tracim
+# TODO - Integrate these translations into tgapp-resetpassword
+#
 
 l_('New password')
 l_('Confirm new password')
@@ -152,4 +161,59 @@ Please click this link to reset your password:
 %(password_reset_link)s
 
 If you no longer wish to make the above change, or if you did not initiate this request, please disregard and/or delete this e-mail.
-''')
+''')
+
+class CFG(object):
+    """
+    Singleton used for easy access to config file parameters
+    """
+
+    _instance = None
+
+    @classmethod
+    def get_instance(cls) -> 'CFG':
+        if not CFG._instance:
+            CFG._instance = CFG()
+        return CFG._instance
+
+    def __init__(self):
+        self.WEBSITE_TITLE = tg.config.get('website.title', 'TRACIM')
+        self.WEBSITE_HOME_TITLE_COLOR = tg.config.get('website.title.color', '#555')
+        self.WEBSITE_HOME_IMAGE_URL = tg.lurl('/assets/img/home_illustration.jpg')
+        self.WEBSITE_HOME_BACKGROUND_IMAGE_URL = tg.lurl('/assets/img/bg.jpg')
+        self.WEBSITE_BASE_URL = tg.config.get('website.base_url')
+
+        self.EMAIL_NOTIFICATION_FROM = tg.config.get('email.notification.from')
+        self.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_HTML = tg.config.get('email.notification.content_update.template.html')
+        self.EMAIL_NOTIFICATION_CONTENT_UPDATE_TEMPLATE_TEXT = tg.config.get('email.notification.content_update.template.text')
+        self.EMAIL_NOTIFICATION_CONTENT_UPDATE_SUBJECT = tg.config.get('email.notification.content_update.subject')
+        self.EMAIL_NOTIFICATION_PROCESSING_MODE = tg.config.get('email.notification.processing_mode')
+
+
+        self.EMAIL_NOTIFICATION_SMTP_SERVER = tg.config.get('email.notification.smtp.server')
+        self.EMAIL_NOTIFICATION_SMTP_PORT = tg.config.get('email.notification.smtp.port')
+        self.EMAIL_NOTIFICATION_SMTP_USER = tg.config.get('email.notification.smtp.user')
+        self.EMAIL_NOTIFICATION_SMTP_PASSWORD = tg.config.get('email.notification.smtp.password')
+
+
+    class CST(object):
+        ASYNC = 'ASYNC'
+        SYNC = 'SYNC'
+
+#######
+#
+# INFO - D.A. - 2014-11-05
+# Allow to process asynchronous tasks
+# This is used for email notifications
+#
+
+# import tgext.asyncjob
+# tgext.asyncjob.plugme(base_config)
+#
+# OR
+#
+# plug(base_config, 'tgext.asyncjob', app_globals=base_config)
+#
+# OR
+#
+plug(base_config, 'tgext.asyncjob')

tracim/tracim/controllers/admin/__init__.py

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from tg.i18n import lazy_ugettext as l_
 from tg.predicates import in_any_group
-from tg.predicates import in_group
 
 from tracim.controllers import StandardController
 from tracim.controllers.admin.workspace import WorkspaceRestController
@@ -10,6 +8,7 @@ from tracim.controllers.admin.user import UserRestController
 
 from tracim.model.auth import Group
 
+
 class AdminController(StandardController):
 
     allow_only = in_any_group(Group.TIM_MANAGER_GROUPNAME, Group.TIM_ADMIN_GROUPNAME)

tracim/tracim/controllers/content.py

@@ -293,7 +293,6 @@ class UserWorkspaceFolderPageRestController(TIMWorkspaceContentRestController):
     @tg.require(current_user_is_contributor())
     @tg.expose()
     def post(self, label='', content=''):
-        # TODO - SECURE THIS
         workspace = tmpl_context.workspace
 
         api = ContentApi(tmpl_context.current_user)

tracim/tracim/controllers/user.py

@@ -28,6 +28,43 @@ from tracim.model import DBSession
 from tracim.model.auth import Group, User
 from tracim.model.serializers import Context, CTX, DictLikeClass
 
+
+class UserWorkspaceRestController(TIMRestController):
+
+    def _before(self, *args, **kw):
+        """
+        Instantiate the current workspace in tg.tmpl_context
+        :param args:
+        :param kw:
+        :return:
+        """
+        super(self.__class__, self)._before(args, kw)
+
+        api = UserApi(tg.tmpl_context.current_user)
+        user_id = tmpl_context.current_user_id
+        user = tmpl_context.current_user
+
+    @tg.expose()
+    def enable_notifications(self, workspace_id):
+        workspace_id = int(workspace_id)
+        api = WorkspaceApi(tg.tmpl_context.current_user)
+
+        workspace = api.get_one(workspace_id)
+        api.enable_notifications(tg.tmpl_context.current_user, workspace)
+        tg.flash(_('Notification enabled for workspace {}').format(workspace.label))
+        tg.redirect(self.parent_controller.url(None, 'me'))
+
+    @tg.expose()
+    def disable_notifications(self, workspace_id):
+        workspace_id = int(workspace_id)
+        api = WorkspaceApi(tg.tmpl_context.current_user)
+
+        workspace = api.get_one(workspace_id)
+        api.disable_notifications(tg.tmpl_context.current_user, workspace)
+        tg.flash(_('Notification disabled for workspace {}').format(workspace.label))
+        tg.redirect(self.parent_controller.url(None, 'me'))
+
+
 class UserPasswordRestController(TIMRestController):
     """
      CRUD Controller allowing to manage password of a given user
@@ -85,6 +122,7 @@ class UserRestController(TIMRestController):
     """
 
     password = UserPasswordRestController()
+    workspaces = UserWorkspaceRestController()
 
     @classmethod
     def current_item_id_key_in_context(cls):
@@ -106,6 +144,7 @@ class UserRestController(TIMRestController):
         current_user = tmpl_context.current_user
         assert user_id==current_user.user_id
         api = UserApi(current_user)
+        current_user = api.get_one(current_user.user_id)
         dictified_user = Context(CTX.USER).toDict(current_user, 'user')
         current_user_content = Context(CTX.CURRENT_USER).toDict(tmpl_context.current_user)
         fake_api_content = DictLikeClass(current_user=current_user_content)

tracim/tracim/controllers/workspace.py

@@ -3,16 +3,12 @@
 import tg
 from tg import tmpl_context
 from tg.i18n import ugettext as _
+from tg.predicates import not_anonymous
 
 from tracim.controllers import TIMRestController
-from tracim.controllers import TIMRestPathContextSetup
-
+from tracim.controllers.content import UserWorkspaceFolderRestController
 
-from tracim.lib import CST
 from tracim.lib.helpers import convert_id_into_instances
-from tracim.lib.base import BaseController
-from tracim.lib.user import UserApi
-from tracim.lib.userworkspace import RoleApi
 from tracim.lib.content import ContentApi
 from tracim.lib.workspace import WorkspaceApi
 
@@ -20,16 +16,16 @@ from tracim.model.data import NodeTreeItem
 from tracim.model.data import Content
 from tracim.model.data import ContentType
 from tracim.model.data import Workspace
-from tracim.model.data import UserRoleInWorkspace
 
 from tracim.model.serializers import Context, CTX, DictLikeClass
 
-from tracim.controllers.content import UserWorkspaceFolderRestController
 
 
 
 class UserWorkspaceRestController(TIMRestController):
 
+    allow_only = not_anonymous()
+
     folders = UserWorkspaceFolderRestController()
 
     @property

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

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pod 0.1\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-10-30 17:34+0100\n"
-"PO-Revision-Date: 2014-10-30 17:37+0100\n"
+"POT-Creation-Date: 2014-11-06 14:37+0100\n"
+"PO-Revision-Date: 2014-11-06 14:38+0100\n"
 "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"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: tracim/config/app_cfg.py:124
+#: tracim/config/app_cfg.py:130
 msgid "Password reset request"
 msgstr "Réinitialisation du mot de passe"
 
-#: tracim/config/app_cfg.py:125
-#: tracim/config/app_cfg.py:148
+#: tracim/config/app_cfg.py:131
+#: tracim/config/app_cfg.py:160
 #, python-format
 msgid ""
 "\n"
@@ -41,43 +41,43 @@ msgstr ""
 "\n"
 "Si vous ne souhaitez plus procéder à ce changement, ou si vous n'êtes pas à l'originie de cette requête, merci d'ignorer et/ou supprimer cet e-mail.\n"
 
-#: tracim/config/app_cfg.py:135
+#: tracim/config/app_cfg.py:147
 #: 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:136
+#: tracim/config/app_cfg.py:148
 msgid "Confirm new password"
 msgstr "Confirmer le nouveau mot de passe"
 
-#: tracim/config/app_cfg.py:137
+#: tracim/config/app_cfg.py:149
 msgid "Save new password"
 msgstr "Enregistrer le nouveau mot de passe"
 
-#: tracim/config/app_cfg.py:138
+#: tracim/config/app_cfg.py:150
 #: tracim/templates/user_get_all.mak:34
 msgid "Email address"
 msgstr "Adresse email"
 
-#: tracim/config/app_cfg.py:139
+#: tracim/config/app_cfg.py:151
 msgid "Send Request"
 msgstr "Valider"
 
-#: tracim/config/app_cfg.py:142
+#: tracim/config/app_cfg.py:154
 msgid "Password reset request sent"
 msgstr "Requête de réinitialisation du mot de passe envoyée"
 
-#: tracim/config/app_cfg.py:143
-#: tracim/config/app_cfg.py:145
+#: tracim/config/app_cfg.py:155
+#: tracim/config/app_cfg.py:157
 msgid "Invalid password reset request"
 msgstr "Requête de réinitialisation du mot de passe invalide"
 
-#: tracim/config/app_cfg.py:144
+#: tracim/config/app_cfg.py:156
 msgid "Password reset request timed out"
 msgstr "Echec de la requête de réinitialisation du mot de passe"
 
-#: tracim/config/app_cfg.py:146
+#: tracim/config/app_cfg.py:158
 msgid "Password changed successfully"
 msgstr "Mot de passe changé"
 
@@ -162,39 +162,39 @@ msgstr "Fichier créé"
 msgid "Page"
 msgstr "Page"
 
-#: tracim/controllers/content.py:305
+#: tracim/controllers/content.py:304
 msgid "Page created"
 msgstr "Page créée"
 
-#: tracim/controllers/content.py:345
+#: tracim/controllers/content.py:344
 msgid "Thread"
-msgstr "Discussion"
+msgstr "Sujet"
 
-#: tracim/controllers/content.py:386
+#: tracim/controllers/content.py:385
 msgid "Thread created"
-msgstr "Discussion créée"
+msgstr "Sujet créé"
 
-#: tracim/controllers/content.py:465
+#: tracim/controllers/content.py:464
 msgid "Item moved to {}"
 msgstr "Element déplacé vers {}"
 
-#: tracim/controllers/content.py:467
+#: tracim/controllers/content.py:466
 msgid "Item moved to workspace root"
 msgstr "Element déplacé à la racine de l'espace de travail"
 
-#: tracim/controllers/content.py:587
+#: tracim/controllers/content.py:586
 msgid "Folder created"
 msgstr "Dossier créé"
 
-#: tracim/controllers/content.py:593
+#: tracim/controllers/content.py:592
 msgid "Folder not created: {}"
 msgstr "Dossier non créé : {}"
 
-#: tracim/controllers/content.py:628
+#: tracim/controllers/content.py:627
 msgid "Folder updated"
 msgstr "Dossier mis à jour"
 
-#: tracim/controllers/content.py:633
+#: tracim/controllers/content.py:632
 msgid "Folder not updated: {}"
 msgstr "Dossier non mis à jour : {}"
 
@@ -211,27 +211,35 @@ msgstr "Bonjour %s. Ravis de vous revoir !"
 msgid "Successfully logged out. We hope to see you soon!"
 msgstr "Déconnexion réussie. Nous espérons vous revoir bientôt !"
 
-#: tracim/controllers/user.py:64
+#: tracim/controllers/user.py:53
+msgid "Notification enabled for workspace {}"
+msgstr "Notifications activées pour l'espace de travail {}"
+
+#: tracim/controllers/user.py:63
+msgid "Notification disabled for workspace {}"
+msgstr "Notifications désactivées pour l'espace de travail {}"
+
+#: tracim/controllers/user.py:100
 #: tracim/controllers/admin/user.py:201
 msgid "Empty password is not allowed."
 msgstr "Le mot de passe ne doit pas être vide"
 
-#: tracim/controllers/user.py:68
+#: tracim/controllers/user.py:104
 #: tracim/controllers/admin/user.py:205
 msgid "The current password you typed is wrong"
 msgstr "Le mot de passe que vous avez tapé est erroné"
 
-#: tracim/controllers/user.py:72
+#: tracim/controllers/user.py:108
 #: tracim/controllers/admin/user.py:209
 msgid "New passwords do not match."
 msgstr "Les mots de passe ne concordent pas"
 
-#: tracim/controllers/user.py:78
+#: tracim/controllers/user.py:114
 #: tracim/controllers/admin/user.py:215
 msgid "Your password has been changed"
 msgstr "Votre mot de passe a été changé"
 
-#: tracim/controllers/user.py:133
+#: tracim/controllers/user.py:171
 msgid "profile updated."
 msgstr "Profil mis à jour"
 
@@ -356,98 +364,98 @@ msgstr "Managers globaux"
 msgid "Administrators"
 msgstr "Administrateurs"
 
-#: tracim/model/data.py:79
+#: tracim/model/data.py:80
 msgid "N/A"
 msgstr "N/A"
 
-#: tracim/model/data.py:80
+#: tracim/model/data.py:81
 #: tracim/templates/help/page-user-role-definition.mak:15
 msgid "Reader"
 msgstr "Lecteur"
 
-#: tracim/model/data.py:81
+#: tracim/model/data.py:82
 #: tracim/templates/help/page-user-role-definition.mak:19
 msgid "Contributor"
 msgstr "Contributeurs"
 
-#: tracim/model/data.py:82
+#: tracim/model/data.py:83
 #: tracim/templates/help/page-user-role-definition.mak:23
 msgid "Content Manager"
 msgstr "Gestionnaire de contenu"
 
-#: tracim/model/data.py:83
+#: tracim/model/data.py:84
 #: tracim/templates/help/page-user-role-definition.mak:27
 msgid "Workspace Manager"
 msgstr "Responsable"
 
-#: tracim/model/data.py:153
+#: tracim/model/data.py:154
 msgid "Item archived"
 msgstr "Element archivé"
 
-#: tracim/model/data.py:154
+#: tracim/model/data.py:155
 msgid "Item commented"
 msgstr "Element commenté"
 
-#: tracim/model/data.py:155
+#: tracim/model/data.py:156
 msgid "Item created"
 msgstr "Elément créé"
 
-#: tracim/model/data.py:156
+#: tracim/model/data.py:157
 msgid "Item deleted"
 msgstr "Element supprimé"
 
-#: tracim/model/data.py:157
+#: tracim/model/data.py:158
 msgid "Item modified"
 msgstr "Elément modifié"
 
-#: tracim/model/data.py:158
+#: tracim/model/data.py:159
 msgid "New revision"
 msgstr "Nouvelle version"
 
-#: tracim/model/data.py:159
+#: tracim/model/data.py:160
 msgid "Status modified"
 msgstr "Statut modifié"
 
-#: tracim/model/data.py:160
+#: tracim/model/data.py:161
 msgid "Item un-archived"
 msgstr "Elément désarchivé"
 
-#: tracim/model/data.py:161
+#: tracim/model/data.py:162
 msgid "Item undeleted"
 msgstr "Elément restauré"
 
-#: tracim/model/data.py:198
-#: tracim/model/data.py:208
+#: tracim/model/data.py:199
+#: tracim/model/data.py:209
 msgid "work in progress"
 msgstr "travail en cours"
 
-#: tracim/model/data.py:199
-#: tracim/model/data.py:209
+#: tracim/model/data.py:200
+#: tracim/model/data.py:210
 msgid "closed — validated"
 msgstr "clos(e) — validé(e)"
 
-#: tracim/model/data.py:200
-#: tracim/model/data.py:210
+#: tracim/model/data.py:201
+#: tracim/model/data.py:211
 msgid "closed — cancelled"
 msgstr "clos(e) — annulé(e)"
 
-#: tracim/model/data.py:201
-#: tracim/model/data.py:206
-#: tracim/model/data.py:211
+#: tracim/model/data.py:202
+#: tracim/model/data.py:207
+#: tracim/model/data.py:212
 msgid "deprecated"
 msgstr "obsolète"
 
-#: tracim/model/data.py:203
+#: tracim/model/data.py:204
 msgid "subject in progress"
-msgstr "discussion en cours"
+msgstr "sujet en cours"
 
-#: tracim/model/data.py:204
+#: tracim/model/data.py:205
 msgid "subject closed — resolved"
-msgstr "discussion close — résolue"
+msgstr "sujet close — résolu"
 
-#: tracim/model/data.py:205
+#: tracim/model/data.py:206
 msgid "subject closed — cancelled"
-msgstr "discussion close — annulée"
+msgstr "sujet clos — annulé"
 
 #: tracim/templates/create_account.mak:5
 msgid "Create account"
@@ -539,7 +547,7 @@ msgstr "Déplacer le dossier courant"
 
 #: tracim/templates/index.mak:25
 #: tracim/templates/index.mak:46
-#: tracim/templates/master_authenticated.mak:139
+#: tracim/templates/master_authenticated.mak:141
 msgid "Login"
 msgstr "Login"
 
@@ -579,12 +587,16 @@ msgstr "Espace de travail"
 msgid "Admin"
 msgstr "Admin"
 
-#: tracim/templates/master_authenticated.mak:129
+#: tracim/templates/master_authenticated.mak:100
+msgid "you MUST desactivate debug in production"
+msgstr "vous DEVEZ désactiver le mode \"debug\" en production"
+
+#: tracim/templates/master_authenticated.mak:131
 #: tracim/templates/master_no_toolbar_no_login.mak:144
 msgid "My account"
 msgstr "Mon compte"
 
-#: tracim/templates/master_authenticated.mak:134
+#: tracim/templates/master_authenticated.mak:136
 #: tracim/templates/master_no_toolbar_no_login.mak:149
 msgid "Logout"
 msgstr "Fermer la session"
@@ -654,15 +666,15 @@ msgstr "Requête de réinitialisation du mot de passe"
 
 #: tracim/templates/thread_toolbars.mak:8
 msgid "Edit current thread"
-msgstr "Modifier la discussion"
+msgstr "Modifier le sujet"
 
 #: tracim/templates/thread_toolbars.mak:22
 msgid "Archive thread"
-msgstr "Archiver la discussion"
+msgstr "Archiver le sujet"
 
 #: tracim/templates/thread_toolbars.mak:23
 msgid "Delete thread"
-msgstr "Supprimer la discussion"
+msgstr "Supprimer le sujet"
 
 #: tracim/templates/user_get_all.mak:24
 msgid "Create a user account..."
@@ -759,14 +771,13 @@ msgid "My profile"
 msgstr "Mon profil"
 
 #: tracim/templates/user_get_me.mak:26
-#: tracim/templates/user_get_one.mak:26
-msgid "This user can create workspaces."
-msgstr "Cet utilisateur peut créer des espaces de travail."
+#: tracim/templates/user_profile.mak:26
+msgid "I can create workspaces."
+msgstr "je peux créer des espaces de travail"
 
 #: tracim/templates/user_get_me.mak:29
-#: tracim/templates/user_get_one.mak:29
-msgid "This user is an administrator."
-msgstr "Cet utilisateur est un administrateur"
+msgid "I am an administrator."
+msgstr "Je suis un administrateur."
 
 #: tracim/templates/user_get_me.mak:39
 #: tracim/templates/user_workspace_get_all.mak:8
@@ -775,8 +786,28 @@ msgid "My workspaces"
 msgstr "Mes espaces de travail"
 
 #: tracim/templates/user_get_me.mak:42
-msgid "You are not member of any workspace."
-msgstr "Vous n'êtes membre d'aucun espace de travail"
+msgid "I'm not member of any workspace."
+msgstr "Je ne suis membre d'aucun espace de travail"
+
+#: tracim/templates/user_get_me.mak:52
+msgid "Email notifications subscribed. Click to stop notifications."
+msgstr "Vous êtes abonné(e) aux notifications par email. Cliquez pour pour les désactiver"
+
+#: tracim/templates/user_get_me.mak:56
+msgid "Email notifications desactivated. Click to subscribe."
+msgstr "Vous n'êtes pas abonné(e) aux notifications par email. Cliquez pour pour les activer"
+
+#: tracim/templates/user_get_me.mak:66
+msgid "You can configure your email notifications by clicking on the email icons above"
+msgstr "Vous pouvez configurer vos notifications par email en cliquant sur l'icône \"email\" ci-dessus"
+
+#: tracim/templates/user_get_one.mak:26
+msgid "This user can create workspaces."
+msgstr "Cet utilisateur peut créer des espaces de travail."
+
+#: tracim/templates/user_get_one.mak:29
+msgid "This user is an administrator."
+msgstr "Cet utilisateur est un administrateur"
 
 #: tracim/templates/user_get_one.mak:42
 #: tracim/templates/user_profile.mak:42
@@ -787,10 +818,6 @@ msgstr "Cet utilisateur n'est membre d'aucun espace de travail"
 msgid "User profile"
 msgstr "Profil utilisateur"
 
-#: tracim/templates/user_profile.mak:26
-msgid "I can create workspaces."
-msgstr "je peux créer des espaces de travail"
-
 #: tracim/templates/user_profile.mak:29
 msgid "I'm an administrator."
 msgstr "Je suis un administrateur"
@@ -942,7 +969,7 @@ msgstr "sous-dossiers"
 #: tracim/templates/user_workspace_forms.mak:18
 #: tracim/templates/user_workspace_forms.mak:55
 msgid "threads"
-msgstr "discussions"
+msgstr "sujets"
 
 #: tracim/templates/user_workspace_folder_get_one.mak:51
 #: tracim/templates/user_workspace_forms.mak:19
@@ -965,11 +992,11 @@ msgstr "créer un nouveau dossier..."
 
 #: tracim/templates/user_workspace_folder_get_one.mak:73
 msgid "Threads"
-msgstr "Discussions"
+msgstr "Sujets"
 
 #: tracim/templates/user_workspace_folder_get_one.mak:73
 msgid "start new thread..."
-msgstr "lancer une nouvelle discussion..."
+msgstr "lancer un nouveau sujet..."
 
 #: tracim/templates/user_workspace_folder_get_one.mak:83
 msgid "Files"
@@ -1028,7 +1055,7 @@ msgstr "Vous pouvez décrire le sujet (facultatif)"
 
 #: tracim/templates/user_workspace_folder_thread_get_one.mak:64
 msgid "<b>Note</b>: In case you'd like to post a reply, you must first open again the thread"
-msgstr "<b>Note</b> : si vous souhaitez commenter cette discussion, vous devez tout d'abord en modifier le statut pour la ré-ouvrir"
+msgstr "<b>Note</b> : si vous souhaitez commenter ce sujet, vous devez tout d'abord en modifier le statut pour la ré-ouvrir"
 
 #: tracim/templates/user_workspace_folder_thread_get_one.mak:69
 msgid "Post a reply..."
@@ -1161,7 +1188,7 @@ msgstr "{nb_total} sous-dossier(s)"
 
 #: tracim/templates/user_workspace_widgets.mak:50
 msgid "{nb_total} thread(s) &mdash; {nb_open} open"
-msgstr "{nb_total} discussion(s) &mdash; {nb_open} ouverte(s)"
+msgstr "{nb_total} sujet(s) &mdash; {nb_open} ouvert(s)"
 
 #: tracim/templates/user_workspace_widgets.mak:55
 msgid "{nb_total} file(s) &mdash; {nb_open} open"
@@ -1181,7 +1208,7 @@ msgstr "Aucun fichier."
 
 #: tracim/templates/user_workspace_widgets.mak:108
 msgid "No thread found."
-msgstr "Aucune discussion."
+msgstr "Aucun sujet."
 
 #: tracim/templates/user_workspace_widgets.mak:115
 msgid "{} message(s)"
@@ -1310,6 +1337,50 @@ msgstr "Comme <span style=\"color: #759ac5;\">contributeur</span> + gestion du c
 msgid "Same as <span style=\"color: #ea983d;\">content manager</span> + workspace management rights: edit workspace, invite users, revoke them."
 msgstr "Comme <span style=\"color: #ea983d;\">gestionnaire de contenu</span> + modification de l'espace de travail."
 
+#: tracim/templates/mail/content_update_body_html.mak:51
+#, fuzzy
+#| msgid "Some activity has been detected on the item above"
+msgid "Some activity has been detected"
+msgstr "Il se passe des choses"
+
+#: tracim/templates/mail/content_update_body_html.mak:59
+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:64
+#: 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:67
+#: 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:71
+msgid "Go to information"
+msgstr "Voir en ligne"
+
+#: tracim/templates/mail/content_update_body_html.mak:80
+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>"
+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"
+
+#: 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
+msgid "*{user_display_name}*, you receive this email because you are *{user_role_label}* in the workspace {workspace_label} - {workspace_url}"
+msgstr "*{user_display_name}*, vous recevez cet email car vous êtes *{user_role_label}* dans l'espace de travail {workspace_label} - {workspace_url}"
+
 #~ msgid "You have no document yet."
 #~ msgstr "Vous n'avez pas de document pour le moment."
 
@@ -1852,3 +1923,9 @@ msgstr "Comme <span style=\"color: #ea983d;\">gestionnaire de contenu</span> + m
 
 #~ msgid "Titleless Document"
 #~ msgstr "Document sans titre"
+
+#~ msgid "You can create workspaces."
+#~ msgstr "je peux créer des espaces de travail"
+
+#~ msgid "You are an administrator."
+#~ msgstr "Je suis un administrateur"

tracim/tracim/lib/content.py

@@ -5,6 +5,7 @@ __author__ = 'damien'
 import tg
 
 from sqlalchemy.orm.attributes import get_history
+from tracim.lib.notifications import Notifier
 from tracim.model import DBSession
 from tracim.model.auth import User
 from tracim.model.data import ContentStatus, ContentRevisionRO, ActionDescription
@@ -64,7 +65,7 @@ class ContentApi(object):
         content.revision_type = ActionDescription.CREATION
 
         if do_save:
-            self.save(content)
+            self.save(content, ActionDescription.CREATION)
         return content
 
 
@@ -80,7 +81,7 @@ class ContentApi(object):
         item.revision_type = ActionDescription.COMMENT
 
         if do_save:
-            self.save(item)
+            self.save(item, ActionDescription.COMMENT)
         return content
 
 
@@ -203,7 +204,7 @@ class ContentApi(object):
         content.is_deleted = False
         content.revision_type = ActionDescription.UNDELETION
 
-    def save(self, content: Content, action_description: str=None, do_flush=True):
+    def save(self, content: Content, action_description: str=None, do_flush=True, do_notify=True):
         """
         Save an object, flush the session and set the revision_type property
         :param content:
@@ -223,3 +224,5 @@ class ContentApi(object):
         if do_flush:
             DBSession.flush()
 
+        if do_notify:
+            Notifier(self._user).notify_content_update(content)

tracim/tracim/lib/email.py

@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+
+from email.mime.multipart import MIMEMultipart
+import smtplib
+
+from tracim.lib.base import logger
+
+
+class SmtpConfiguration(object):
+    """
+    Container class for SMTP configuration used in Tracim
+    """
+
+    def __init__(self, server: str, port: int, login: str, password: str):
+        self.server = server
+        self.port = port
+        self.login = login
+        self.password = password
+
+
+
+class EmailSender(object):
+    """
+    this class allow to send emails and has no relations with SQLAlchemy and other tg HTTP request environment
+    This means that it can be used in any thread (even through a asyncjob_perform() call
+    """
+    def __init__(self, config: SmtpConfiguration):
+        self._smtp_config = config
+        self._smtp_connection = None
+
+    def connect(self):
+        if not self._smtp_connection:
+            logger.info(self, 'Connecting from SMTP server {}'.format(self._smtp_config.server))
+            self._smtp_connection = smtplib.SMTP(self._smtp_config.server, self._smtp_config.port)
+            self._smtp_connection.ehlo()
+            self._smtp_connection.login(self._smtp_config.login, self._smtp_config.password)
+            logger.info(self, 'Connection OK')
+
+    def disconnect(self):
+        if self._smtp_connection:
+            logger.info(self, 'Disconnecting from SMTP server {}'.format(self._smtp_config.server))
+            self._smtp_connection.quit()
+            logger.info(self, 'Connection closed.')
+
+
+    def send_mail(self, message: MIMEMultipart):
+        self.connect() # Acutally, this connects to SMTP only if required
+        logger.info(self, 'Sending email to {}'.format(message['To']))
+        self._smtp_connection.send_message(message)

tracim/tracim/lib/helpers.py

@@ -96,8 +96,7 @@ def AllStatus(type=''):
 
 
 def is_debug_mode():
-    # return tg.config.get('debug')
-    return False
+    return tg.config.get('debug')
 
 def on_off_to_boolean(on_or_off: str) -> bool:
     return True if on_or_off=='on' else False
@@ -151,16 +150,5 @@ def user_role(user, workspace) -> int:
 
     return 0
 
-# SDAEP RELATED DAtA
-WEBSITE_TITLE = 'SDAEP22'
-WEBSITE_HOME_TITLE_COLOR = '#555'
-WEBSITE_HOME_IMAGE_URL = 'http://t0.gstatic.com/images?q=tbn:ANd9GcSGwpT9eJn4jSrQQuYyd6mxj9f59ZfHWf9m4FcWpinPV7eFXHaosDv4bynJ'
-WEBSITE_HOME_BACKGROUND_IMAGE_URL = tg.lurl('/assets/img/eau.jpg')
-
-
-
-WEBSITE_TITLE = 'Tracim'
-WEBSITE_TITLE_COLOR = '#555'
-WEBSITE_HOME_IMAGE_URL = tg.lurl('/assets/img/home_illustration.jpg')
-WEBSITE_HOME_BACKGROUND_IMAGE_URL = tg.lurl('/assets/img/bg.jpg')
-
+from tracim.config.app_cfg import CFG as CFG_ORI
+CFG = CFG_ORI.get_instance() # local CFG var is an instance of CFG class found in app_cfg

tracim/tracim/lib/notifications.py

@@ -0,0 +1,199 @@
+# -*- coding: utf-8 -*-
+
+from email.mime.multipart import MIMEMultipart
+from email.mime.text import MIMEText
+
+
+from mako.template import Template
+
+from tg.i18n import lazy_ugettext as l_
+from tg.i18n import ugettext as _
+
+from tracim.config.app_cfg import CFG
+
+from tracim.lib.base import logger
+from tracim.lib.email import SmtpConfiguration
+from tracim.lib.email import EmailSender
+from tracim.lib.user import UserApi
+from tracim.lib.workspace import WorkspaceApi
+
+from tracim.model.serializers import Context
+from tracim.model.serializers import CTX
+from tracim.model.serializers import DictLikeClass
+
+from tracim.model.data import Content, UserRoleInWorkspace, ContentType
+from tracim.model.auth import User
+
+
+from tgext.asyncjob import asyncjob_perform
+
+class Notifier(object):
+
+    def __init__(self, current_user: User=None):
+        """
+
+        :param current_user: the user that has triggered the notification
+        :return:
+        """
+        cfg = CFG.get_instance()
+
+        self._user = current_user
+        self._smtp_config = SmtpConfiguration(cfg.EMAIL_NOTIFICATION_SMTP_SERVER,
+                                       cfg.EMAIL_NOTIFICATION_SMTP_PORT,
+                                       cfg.EMAIL_NOTIFICATION_SMTP_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))
+
+        global_config = CFG.get_instance()
+
+        ####
+        #
+        # 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)
+        #
+        if global_config.EMAIL_NOTIFICATION_PROCESSING_MODE.lower()==global_config.CST.ASYNC.lower():
+            logger.info(self, 'Sending email in ASYNC mode')
+            # TODO - D.A - 2014-11-06
+            # This feature must be implemented in order to be able to scale to large communities
+            raise NotImplementedError('Sending emails through ASYNC mode is not working yet')
+            asyncjob_perform(EmailNotifier(self._smtp_config, global_config).notify_content_update, self._user.user_id, content.content_id)
+        else:
+            logger.info(self, 'Sending email in SYNC mode')
+            EmailNotifier(self._smtp_config, global_config).notify_content_update(self._user.user_id, content.content_id)
+
+class EST(object):
+    """
+    EST = Email Subject Tags - this is a convenient class - no business logic here
+    This class is intended to agregate all dynamic content that may be included in email subjects
+    """
+
+    WEBSITE_TITLE = '{website_title}'
+    WORKSPACE_LABEL = '{workspace_label}'
+    CONTENT_LABEL = '{content_label}'
+    CONTENT_STATUS_LABEL = '{content_status_label}'
+
+    @classmethod
+    def all(cls):
+        return [
+            cls.CONTENT_LABEL,
+            cls.CONTENT_STATUS_LABEL,
+            cls.WEBSITE_TITLE,
+            cls.WORKSPACE_LABEL
+        ]
+
+class EmailNotifier(object):
+
+    """
+    Compared to Notifier, this class is independant from the HTTP request thread
+
+    TODO: Do this class really independant (but it means to get as parameter the user language
+    and other stuff related to the turbogears environment)
+    """
+
+    def __init__(self, smtp_config: SmtpConfiguration, global_config: CFG):
+        self._smtp_config = smtp_config
+        self._global_config = global_config
+
+
+    def notify_content_update(self, event_actor_id: int, event_content_id: int):
+        """
+        Look for all users to be notified about the new content and send them an individual email
+        :param event_actor_id: id of the user that has triggered the event
+        :param event_content_id: related content_id
+        :return:
+        """
+        # FIXME - D.A. - 2014-11-05
+        # Dirty import. It's here in order to avoid circular import
+        from tracim.lib.content import ContentApi
+
+        user = UserApi(None).get_one(event_actor_id)
+        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
+        notifiable_roles = WorkspaceApi(user).get_notifiable_roles(content.workspace)
+
+        if len(notifiable_roles)<=0:
+            logger.info(self, 'Skipping notification as nobody subscribed to in workspace {}'.format(content.workspace.label))
+            return
+
+        logger.info(self, 'Sending asynchronous emails to {} user(s)'.format(len(notifiable_roles)))
+        # INFO - D.A. - 2014-11-06
+        # The following email sender will send emails in the async task queue
+        # This allow to build all mails through current thread but really send them (including SMTP connection)
+        # In the other thread.
+        #
+        # This way, the webserver will return sooner (actually before notification emails are sent
+        async_email_sender = EmailSender(self._smtp_config)
+
+        for role in notifiable_roles:
+            logger.info(self, 'Sending email to {}'.format(role.user.email))
+            to_addr = '{name} <{email}>'.format(name=role.user.display_name, email=role.user.email)
+
+            #
+            #  INFO - D.A. - 2014-11-06
+            # We do not use .format() here because the subject defined in the .ini file
+            # may not include all required labels. In order to avoid partial format() (which result in an exception)
+            # we do use replace and force the use of .__str__() in order to process LazyString objects
+            #
+            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__())
+            subject = subject.replace(EST.CONTENT_STATUS_LABEL, content.get_status().label.__str__())
+
+            message = MIMEMultipart('alternative')
+            message['Subject'] = subject
+            message['From'] = self._global_config.EMAIL_NOTIFICATION_FROM
+            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.
+            # According to RFC 2046, the last part of a multipart message, in this case
+            # the HTML message, is best and preferred.
+            message.attach(part1)
+            message.attach(part2)
+
+            message_str = message.as_string()
+            asyncjob_perform(async_email_sender.send_mail, message)
+            # s.send_message(message)
+
+        # Note: The following action allow to close the SMTP connection.
+        # This will work only if the async jobs are done in the right order
+        asyncjob_perform(async_email_sender.disconnect)
+
+
+    def _build_email_body(self, mako_template_filepath: str, role: UserRoleInWorkspace, content: Content, actor: User) -> str:
+        """
+        Build an email body and return it as a string
+        :param mako_template_filepath: the absolute path to the mako template to be used for email body building
+        :param role: the role related to user to whom the email must be sent. The role is required (and not the user only) in order to show in the mail why the user receive the notification
+        :param content: the content item related to the notification
+        :param actor: the user at the origin of the action / notification (for example the one who wrote a comment
+        :param config: the global configuration
+        :return: the built email body as string. In case of multipart email, this method must be called one time for text and one time for html
+        """
+        logger.debug(self, 'Building email content from MAKO template {}'.format(mako_template_filepath))
+
+        template = Template(filename=mako_template_filepath)
+        # TODO - D.A. - 2014-11-06 - move this
+        # Import is here for circular import problem
+        import tracim.lib.helpers as helpers
+
+        dictified_item = Context(CTX.EMAIL_NOTIFICATION, self._global_config.WEBSITE_BASE_URL).toDict(content)
+        dictified_actor = Context(CTX.DEFAULT).toDict(actor)
+
+        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,
+                               result = DictLikeClass(item=dictified_item, actor=dictified_actor))
+
+        return body_content

tracim/tracim/lib/workspace.py

@@ -73,6 +73,24 @@ class WorkspaceApi(object):
         workspaces.sort(key=lambda workspace: workspace.label.lower())
         return workspaces
 
+    def disable_notifications(self, user: User, workspace: Workspace):
+        for role in user.roles:
+            if role.workspace==workspace:
+                role.do_notify = False
+
+    def enable_notifications(self, user: User, workspace: Workspace):
+        for role in user.roles:
+            if role.workspace==workspace:
+                role.do_notify = True
+
+    def get_notifiable_roles(self, workspace: Workspace) -> [UserRoleInWorkspace]:
+        roles = []
+        for role in workspace.roles:
+            print(role.user.email)
+            if role.do_notify==True and role.user!=self._user:
+                roles.append(role)
+        return roles
+
     def save(self, workspace: Workspace):
         DBSession.flush()
 

tracim/tracim/model/data.py

@@ -65,6 +65,7 @@ class UserRoleInWorkspace(DeclarativeBase):
     user_id = Column(Integer, ForeignKey('users.user_id'), nullable=False, default=None, primary_key=True)
     workspace_id = Column(Integer, ForeignKey('workspaces.workspace_id'), nullable=False, default=None, primary_key=True)
     role = Column(Integer, nullable=False, default=0, primary_key=False)
+    do_notify = Column(Boolean, unique=False, nullable=False, default=False)
 
     workspace = relationship('Workspace', remote_side=[Workspace.workspace_id], backref='roles', lazy='joined')
     user = relationship('User', remote_side=[User.user_id], backref='roles')

tracim/tracim/model/serializers.py

@@ -55,30 +55,24 @@ class ContextConverterNotFoundException(Exception):
 
 class CTX(object):
     """ constants that are used for serialization / dictification of models"""
-    DEFAULT = 'DEFAULT' # default context. This will allow to define a serialization method to be used by default
-
-    CURRENT_USER = 'CURRENT_USER'
-
-    USER = 'USER'
-    USERS = 'USERS'
     ADMIN_WORKSPACE = 'ADMIN_WORKSPACE'
     ADMIN_WORKSPACES = 'ADMIN_WORKSPACES'
-
-    WORKSPACE = 'WORKSPACE'
-    FOLDER = 'FOLDER'
-    FOLDERS = 'FOLDERS'
-
+    CURRENT_USER = 'CURRENT_USER'
+    DEFAULT = 'DEFAULT' # default context. This will allow to define a serialization method to be used by default
+    EMAIL_NOTIFICATION = 'EMAIL_NOTIFICATION'
     FILE = 'FILE'
     FILES = 'FILES'
-
+    FOLDER = 'FOLDER'
+    FOLDERS = 'FOLDERS'
+    MENU_API = 'MENU_API'
+    MENU_API_BUILD_FROM_TREE_ITEM = 'MENU_API_BUILD_FROM_TREE_ITEM'
     PAGE = 'PAGE'
     PAGES = 'PAGES'
-
     THREAD = 'THREAD'
     THREADS = 'THREADS'
-
-    MENU_API = 'MENU_API'
-    MENU_API_BUILD_FROM_TREE_ITEM = 'MENU_API_BUILD_FROM_TREE_ITEM'
+    USER = 'USER'
+    USERS = 'USERS'
+    WORKSPACE = 'WORKSPACE'
 
 
 class DictLikeClass(dict):
@@ -93,7 +87,6 @@ class DictLikeClass(dict):
     __setattr__ = dict.__setitem__
 
 
-
 class Context(object):
     """
     Convert a series of mapped objects into ClassLikeDict (a dictionnary which can be accessed through properties)
@@ -139,10 +132,18 @@ class Context(object):
 
             raise ContextConverterNotFoundException(context_string,model_class)
 
-    def __init__(self, context_string):
+    def __init__(self, context_string, base_url=''):
         """
         """
         self.context_string = context_string
+        self._base_url = base_url # real root url like http://mydomain.com:8080
+
+    def url(self, base_url='/', params=None, qualified=False) -> str:
+        url = tg.url(base_url, params)
+
+        if self._base_url:
+            url = '{}{}'.format(self._base_url, url)
+        return  url
 
     def toDict(self, serializableObject, key_value_for_a_list_object='', key_value_for_list_item_nb=''):
         """
@@ -206,6 +207,7 @@ class Context(object):
         assert isinstance(result, DictLikeClass)
         return result
 
+
 ########################################################################################################################
 ## ActionDescription
 
@@ -253,6 +255,19 @@ def serialize_breadcrumb_item(content: Content, context: Context):
         workspace = context.toDict(content.workspace)
     )
 
+@pod_serializer(Content, CTX.EMAIL_NOTIFICATION)
+def serialize_item(content: Content, context: Context):
+    return DictLikeClass(
+        id = content.content_id,
+        label = content.label,
+        status = context.toDict(content.get_status()),
+        folder = context.toDict(DictLikeClass(id = content.parent.content_id if content.parent else None)),
+        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))
+    )
+
 
 @pod_serializer(Content, CTX.MENU_API)
 def serialize_content_for_menu_api(content: Content, context: Context):
@@ -263,7 +278,7 @@ def serialize_content_for_menu_api(content: Content, context: Context):
         id = CST.TREEVIEW_MENU.ID_TEMPLATE__FULL.format(workspace_id, content_id),
         children = True, # TODO: make this dynamic
         text = content.label,
-        a_attr = { 'href' : tg.url('/workspaces/{}/folders/{}'.format(workspace_id, content_id)) },
+        a_attr = { 'href' : context.url('/workspaces/{}/folders/{}'.format(workspace_id, content_id)) },
         li_attr = { 'title': content.label, 'class': 'tracim-tree-item-is-a-folder' },
         type = content.type,
         state = { 'opened': False, 'selected': False }
@@ -679,6 +694,8 @@ def serialize_role_in_list_for_user(role: UserRoleInWorkspace, context: Context)
     result['label'] = role.role_as_label()
     result['style'] = RoleType(role.role).css_style
     result['workspace'] =  context.toDict(role.workspace)
+    result['notifications_subscribed'] = role.do_notify
+
     # result['workspace_name'] = role.workspace.label
 
     return result
@@ -690,7 +707,8 @@ def serialize_role_in_list_for_user(role: UserRoleInWorkspace, context: Context)
 def serialize_workspace_default(workspace: Workspace, context: Context):
     result = DictLikeClass(
         id = workspace.workspace_id,
-        label = workspace.label
+        label = workspace.label,
+        url = context.url('/workspaces/{}'.format(workspace.workspace_id))
     )
     return result
 
@@ -741,7 +759,7 @@ def serialize_workspace_for_menu_api(workspace: Workspace, context: Context):
         id = CST.TREEVIEW_MENU.ID_TEMPLATE__WORKSPACE_ONLY.format(workspace.workspace_id),
         children = True, # TODO: make this dynamic
         text = workspace.label,
-        a_attr = { 'href' : tg.url('/workspaces/{}'.format(workspace.workspace_id)) },
+        a_attr = { 'href' : context.url('/workspaces/{}'.format(workspace.workspace_id)) },
         li_attr = { 'title': workspace.label, 'class': 'tracim-tree-item-is-a-workspace' },
         type = 'workspace',
         state = { 'opened': False, 'selected': False }
@@ -755,7 +773,7 @@ def serialize_node_tree_item_for_menu_api_tree(item: NodeTreeItem, context: Cont
             id=CST.TREEVIEW_MENU.ID_TEMPLATE__FULL.format(item.node.workspace_id, item.node.content_id),
             children=True if len(item.children)<=0 else context.toDict(item.children),
             text=item.node.label,
-            a_attr={'href': tg.url('/workspaces/{}/folders/{}'.format(item.node.workspace_id, item.node.content_id)) },
+            a_attr={'href': context.url('/workspaces/{}/folders/{}'.format(item.node.workspace_id, item.node.content_id)) },
             li_attr={'title': item.node.label, 'class': 'tracim-tree-item-is-a-folder'},
             type='folder',
             state={'opened': True if len(item.children)>0 else False, 'selected': item.is_selected}
@@ -765,10 +783,8 @@ def serialize_node_tree_item_for_menu_api_tree(item: NodeTreeItem, context: Cont
             id=CST.TREEVIEW_MENU.ID_TEMPLATE__WORKSPACE_ONLY.format(item.node.workspace_id),
             children=True if len(item.children)<=0 else context.toDict(item.children),
             text=item.node.label,
-            a_attr={'href': tg.url('/workspaces/{}'.format(item.node.workspace_id))},
+            a_attr={'href': context.url('/workspaces/{}'.format(item.node.workspace_id))},
             li_attr={'title': item.node.label, 'class': 'tracim-tree-item-is-a-workspace'},
             type='workspace',
             state={'opened': True if len(item.children)>0 else False, 'selected': item.is_selected}
         )
-
-

tracim/tracim/templates/index.mak

@@ -2,7 +2,7 @@
 <%namespace name="TIM" file="tracim.templates.pod"/>
 
 <%def name="title()">
-  ${h.WEBSITE_TITLE|n}
+  ${h.CFG.WEBSITE_TITLE|n}
 </%def>
 
 
@@ -11,13 +11,13 @@
         <div>
             <div class="row">
                 <div class="col-sm-offset-3 col-sm-5">
-                    <h1 class="text-center" style="color: ${h.WEBSITE_HOME_TITLE_COLOR};"><b>${h.WEBSITE_TITLE}</b></h1>
+                    <h1 class="text-center" style="color: ${h.CFG.WEBSITE_HOME_TITLE_COLOR};"><b>${h.CFG.WEBSITE_TITLE}</b></h1>
                 </div>
             </div>
             <div class="row">
                 <div class="col-sm-offset-3 col-sm-2">
                     <a class="thumbnail">
-                        <img src="${h.WEBSITE_HOME_IMAGE_URL}" alt="">
+                        <img src="${h.CFG.WEBSITE_HOME_IMAGE_URL}" alt="">
                     </a>
                 </div>
                 <div class="col-sm-3">

tracim/tracim/templates/mail/content_update_body_html.mak

@@ -0,0 +1,84 @@
+## -*- coding: utf-8 -*-
+<html>
+  <head>
+    <style>
+      a { color: #3465af;}
+      a.call-to-action {
+        background: #3465af;
+        padding: 3px 4px 5px 4px;
+        border: 1px solid #12438d;
+        font-weight: bold;
+        color: #FFF;
+        text-decoration: none;
+        margin-left: 5px;
+      }
+      a.call-to-action img { vertical-align: middle;}
+      th { vertical-align: top;}
+    </style>
+  </head>
+  <body style="font-family: Arial; font-size: 12px; width: 600px; margin: 0; padding: 0;">
+
+    <table style="width: 600px; cell-padding: 0; 	border-collapse: collapse;">
+      <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>
+      </tr>
+      <tr>
+        <td style="padding: 5px 5px 5px 4em;">
+          <img style="vertical-align: middle;" src="${base_url+'/assets/icons/32x32/apps/internet-group-chat.png'}"/>
+          <span style="font-weight: bold; padding-left: 0.5em; font-size: 1em; vertical-align: middle;">
+            ${result.item.label}
+            <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;">
+          </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>
+    </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

@@ -0,0 +1,26 @@
+## -*- 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)}
+

tracim/tracim/templates/master_anonymous.mak

@@ -17,7 +17,7 @@
 
     <body class="${self.body_class()}" style="
     height: 100%;
-    background: url(${h.WEBSITE_HOME_BACKGROUND_IMAGE_URL}) no-repeat center bottom scroll;
+    background: url(${h.CFG.WEBSITE_HOME_BACKGROUND_IMAGE_URL}) no-repeat center bottom scroll;
     -webkit-background-size: cover;
     -moz-background-size: cover;
     background-size: cover;

tracim/tracim/templates/master_authenticated.mak

@@ -21,10 +21,10 @@
         <div class="container-fluid">
             ${self.main_menu()}
             ${self.content_wrapper()}
-            <div id="tracim-footer-separator"></div>
-        </div>
-        ${self.footer()}
-
+            <div id="tracim-footer-separator"></div>
+        </div>
+        ${self.footer()}
+
         <script src="${tg.url('/assets/js/bootstrap.min.js')}"></script>
         ${h.tracker_js()|n}
     </body>
@@ -94,16 +94,18 @@
                         % endif
 
                         % if h.is_debug_mode():
-                          <li class="dropdown">
-                              <a href="#" class="dropdown-toggle" data-toggle="dropdown">${TIM.ICO(16, 'categories/applications-system')} Debug <b class="caret"></b></a>
-                              <ul class="dropdown-menu">
-                                <li><a href="${tg.url('/debug/environ')}">${TIM.ICO(16, 'apps/internet-web-browser')} request.environ</a></li>
-                                <li><a href="${tg.url('/debug/identity')}">${TIM.ICO(16, 'actions/contact-new')} request.identity</a></li>
-                                <li class="divider" role="presentation"></li>
-                                <li><a href="${tg.url('/debug/iconset-fa')}">${TIM.ICO(16, 'mimetypes/image-x-generic')} Icon set - Font Awesome</a></li>
-                                <li><a href="${tg.url('/debug/iconset-tango')}">${TIM.ICO(16, 'mimetypes/image-x-generic')} Icon set - Tango Icons</a></li>
-                              </ul>
-                          </li>
+                            <li class="dropdown text-danger" >
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown">${TIM.ICO(16, 'status/dialog-warning')} Debug <b class="caret"></b></a>
+                                <ul class="dropdown-menu">
+                                    <li><a class="text-danger" href=""><strong>${_('you MUST desactivate debug in production')}</strong></a></li>
+                                    <li class="divider" role="presentation"></li>
+                                    <li><a href="${tg.url('/debug/environ')}">${TIM.ICO(16, 'apps/internet-web-browser')} request.environ</a></li>
+                                    <li><a href="${tg.url('/debug/identity')}">${TIM.ICO(16, 'actions/contact-new')} request.identity</a></li>
+                                    <li class="divider" role="presentation"></li>
+                                    <li><a href="${tg.url('/debug/iconset-fa')}">${TIM.ICO(16, 'mimetypes/image-x-generic')} Icon set - Font Awesome</a></li>
+                                    <li><a href="${tg.url('/debug/iconset-tango')}">${TIM.ICO(16, 'mimetypes/image-x-generic')} Icon set - Tango Icons</a></li>
+                                </ul>
+                            </li>
                         % endif
                     </ul>
                 % endif

tracim/tracim/templates/reset_password_change_password.mak

@@ -1,13 +1,13 @@
 <%inherit file="local:templates.master_anonymous"/>
 
-<%def name="title()">${h.WEBSITE_TITLE|n} - ${_('Change Password Request')}</%def>
+<%def name="title()">${h.CFG.WEBSITE_TITLE|n} - ${_('Change Password Request')}</%def>
 
 <div class="container-fluid">
     <div class="row-fluid">
         <div>
             <div class="row">
                 <div class="col-sm-offset-3 col-sm-5">
-                    <h1 class="text-center" style="color: ${h.WEBSITE_HOME_TITLE_COLOR};"><b>${h.WEBSITE_TITLE}</b></h1>
+                    <h1 class="text-center" style="color: ${h.CFG.WEBSITE_HOME_TITLE_COLOR};"><b>${h.CFG.WEBSITE_TITLE}</b></h1>
                 </div>
             </div>
             <div class="row">

tracim/tracim/templates/reset_password_index.mak

@@ -1,13 +1,13 @@
 <%inherit file="local:templates.master_anonymous"/>
 
-<%def name="title()">${h.WEBSITE_TITLE|n} - ${_('Password Reset Request')}</%def>
+<%def name="title()">${h.CFG.WEBSITE_TITLE|n} - ${_('Password Reset Request')}</%def>
 
 <div class="container-fluid">
     <div class="row-fluid">
         <div>
             <div class="row">
                 <div class="col-sm-offset-3 col-sm-5">
-                    <h1 class="text-center" style="color: ${h.WEBSITE_HOME_TITLE_COLOR};"><b>${h.WEBSITE_TITLE}</b></h1>
+                    <h1 class="text-center" style="color: ${h.CFG.WEBSITE_HOME_TITLE_COLOR};"><b>${h.CFG.WEBSITE_TITLE}</b></h1>
                 </div>
             </div>
             <div class="row">

tracim/tracim/templates/user_get_me.mak

@@ -23,10 +23,10 @@
                         </p>
                         <p>
                             % if result.user.profile.id>=2:
-                                <span>${TIM.ICO(16, 'emblems/emblem-checked')} ${_('This user can create workspaces.')}</span><br/>
+                                <span>${TIM.ICO(16, 'emblems/emblem-checked')} ${_('I can create workspaces.')}</span><br/>
                             % endif
                             % if fake_api.current_user.profile.id>=3:
-                                <span>${TIM.ICO(16, 'emblems/emblem-checked')} ${_('This user is an administrator.')}</span><br/>
+                                <span>${TIM.ICO(16, 'emblems/emblem-checked')} ${_('I am an administrator.')}</span><br/>
                             % endif
                         </p>
                     </div>
@@ -39,15 +39,32 @@
                             ${_('My workspaces')}
                         </h3>
                         % if len(result.user.roles)<=0:
-                            ${WIDGETS.EMPTY_CONTENT(_('You are not member of any workspace.'))}
+                            ${WIDGETS.EMPTY_CONTENT(_('I\'m not member of any workspace.'))}
                         % else:
                             <table class="table">
                                 % for role in result.user.roles:
-                                    <tr><td>${role.workspace.name}</td><td><span style="${role.style}">${role.label}</span></td></tr>
+                                    <tr>
+                                        <td>${role.workspace.name}</td>
+                                        <td><span style="${role.style}">${role.label}</span></td>
+                                        <td>
+                                            % if role.notifications_subscribed:
+                                                <a href="${tg.url('/user/me/workspaces/{}/disable_notifications').format(role.workspace.id)}">
+                                                    ${TIM.ICO_TOOLTIP(16, 'actions/mail-reply-sender', _('Email notifications subscribed. Click to stop notifications.'))}
+                                                </a>
+                                            % else:
+                                                <a href="${tg.url('/user/me/workspaces/{}/enable_notifications').format(role.workspace.id)}">
+                                                    ${TIM.ICO_TOOLTIP(16, 'actions/mail-notification-none', _('Email notifications desactivated. Click to subscribe.'))}
+                                                </a>
+                                            % endif
+                                        </td>
+                                    </tr>
                                 % endfor
                             </table>
                         % endif
                     </div>
+                    % if len(result.user.roles)>0:
+                        <p class="alert alert-info">${_('You can configure your email notifications by clicking on the email icons above')}</p>
+                    % endif
                 </div>
             </div>
         </div>