cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Helmut Merz 2013-12-05 13:43:01 +01:00
parent a149c1630c
commit 047d601043
2 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
browser/form_macros.pt
View file

@ -25,30 +25,29 @@
<tal:title condition="not:view/isInnerHtml"> <tal:title condition="not:view/isInnerHtml">
<h1 tal:content="request/view_title|view/title" <h1 tal:content="request/view_title|view/title"
i18n:translate="">Edit Information Object</h1> i18n:translate="">Edit Information Object</h1>
<br />
</tal:title> </tal:title>
<table cellpadding="3" class="form"> <table cellpadding="3" class="form">
<tbody> <tbody tal:condition="view/isInnerHtml">
<tr tal:condition="view/isInnerHtml"> <tr>
<th colspan="5" class="headline" <th colspan="5" class="headline"
tal:attributes="colspan python: useI18N and 4 or 5"> tal:attributes="colspan python: useI18N and 4 or 5">
<span tal:content="request/view_title|view/title" <span tal:content="request/view_title|view/title"
i18n:translate="">Edit Information Object</span> i18n:translate="">Edit Information Object</span>
</th> </th>
<th tal:condition="useI18N" <th tal:condition="useI18N"
style="vertical-align: bottom; text-align: right; style="vertical-align: bottom; text-align: right;
padding-right: 1em"> padding-right: 1em">
<select name="loops.language" id="loops.language" <select name="loops.language" id="loops.language"
tal:attributes="onChange tal:attributes="onChange
string:return replaceFieldsNodeForLanguage( string:return replaceFieldsNodeForLanguage(
'form.fields', 'loops.language', 'form.fields', 'loops.language',
'${view/virtualTargetUrl}/$innerForm')"> '${view/virtualTargetUrl}/$innerForm')">
<option tal:repeat="lang languages" <option tal:repeat="lang languages"
tal:content="lang" tal:content="lang"
tal:attributes="selected python: lang == language;">en</option> tal:attributes="selected python: lang == language;">en</option>
</select> </select>
</th> </th>
</tr></tbody> </tr></tbody>
<tbody metal:define-slot="custom_header" /> <tbody metal:define-slot="custom_header" />

2
organize/browser/member.py
View file

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