fix self registration form: respect content type, remove excess br tag

browser/form_macros.pt

@@ -25,12 +25,11 @@
       <tal:title condition="not:view/isInnerHtml">
         <h1 tal:content="request/view_title|view/title"
             i18n:translate="">Edit Information Object</h1>
-        <br />
       </tal:title>
 
       <table cellpadding="3" class="form">
-        <tbody>
-          <tr tal:condition="view/isInnerHtml">
+        <tbody tal:condition="view/isInnerHtml">
+          <tr>
             <th colspan="5" class="headline"
                 tal:attributes="colspan python: useI18N and 4 or 5">
               <span tal:content="request/view_title|view/title"

organize/browser/member.py

@@ -138,7 +138,7 @@ class BaseMemberRegistration(NodeView):
         name = '.'.join((self.text_names_prefix, self.info_key))
         text = self.resourceManager.get(name)
         if text:
-            return self.renderText(text.data)
+            return self.renderText(text.data, text.contentType)
         return u''
 
     @Lazy