Merge branch 'master' of ssh://git.cy55.de/home/git/loops into bbmaster

browser/common.py

@@ -674,6 +674,8 @@ class BaseView(GenericView, I18NView):
 
     @Lazy
     def xeditable(self):
+        if self.typeOptions('no_external_edit'):
+            return False
         ct = getattr(self.context, 'contentType', '')
         if not ct or ct in ('application/pdf', 'application/x-pdf'):
             return False

browser/form.py

@@ -387,8 +387,10 @@ class CreateConceptForm(CreateObjectForm):
             include.remove('subtype')
             parentType = self.target.conceptType
             subtypePred = self.conceptManager['issubtype']
+            tconcepts = (self.target.getChildren([subtypePred]) +
+                            parentType.getChildren([subtypePred]))
             types = [dict(token=ConceptTypeInfo(t).token, title=t.title)
-                        for t in parentType.getChildren([subtypePred])]
+                        for t in tconcepts]
         if include or include is None:
             return util.KeywordVocabulary(types + self.listTypes(include, ('hidden',)))
         return util.KeywordVocabulary(types)

browser/resource.py

@@ -207,6 +207,7 @@ class ResourceView(BaseView):
         data = context.data
         if useAttachment:
             filename = adapted(self.context).localFilename or getName(self.context)
+            if not self.typeOptions('no_normalize_download_filename'):
                 filename = NameChooser(getParent(self.context)).normalizeName(filename)
             response.setHeader('Content-Disposition',
                                'attachment; filename=%s' % filename)

browser/skin/lobo/body.pt

@@ -33,11 +33,13 @@
             <td style="white-space: nowrap; vertical-align: top; width: 10%"
                 i18n:translate="">You are here:</td>
             <td>
+              <span>
                 <span style="white-space: nowrap"
                       tal:repeat="crumb crumbs">
                   <a tal:attributes="href crumb/url"
                       tal:content="crumb/label" />
-              <span tal:condition="not:repeat/crumb/end"> > </span></span>
+                  <tal:delimiter
+                    condition="not:repeat/crumb/end"> ></tal:delimiter></span> </span>
             </td>
           </tr>
         </table>