Merge branch 'master' into bbmaster2

layout/browser/node.py

@@ -65,8 +65,9 @@ class LayoutNodeView(Page, BaseView):
         if self.target is not None:
             targetView = component.getMultiAdapter((self.target, self.request),
                                                    name='layout')
-            if targetView.title not in parts:
-                parts.append(targetView.title)
+            title = getattr(targetView, 'headTitle', targetView.title)
+            if title not in parts:
+                parts.append(title)
         if self.globalOptions('reverseHeadTitle'):
             parts.reverse()
         return ' - '.join(parts)

organize/browser/member.py

@@ -249,7 +249,7 @@ class SecureMemberRegistration(BaseMemberRegistration, CreateForm):
         regMan = IMemberRegistrationManager(self.context.getLoopsRoot())
         pw = generateName()
         email = form.get('email')
-        try:    
+        try:
             result = regMan.register(login, pw,
                                      form.get('lastName'), form.get('firstName'),
                                      email=email,)

organize/personal/favorite.py

@@ -109,7 +109,7 @@ def updateSortInfo(person, task, data):
                 break
         else:
             if data:
-                Favorites(favorites).add(task, person, 
+                Favorites(favorites).add(task, person,
                                          dict(type='sort', sortInfo=data))
     return data