Skip to content

Commit 9f2711a

Browse files
committed
Nicer display of multi-line error messages.
1 parent b12b84f commit 9f2711a

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

share/roundup/templates/classic/html/page.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,8 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
170170
</td>
171171
<td>
172172
<p tal:condition="options/error_message | nothing" class="error-message"
173-
tal:repeat="m options/error_message" tal:content="structure m" />
173+
tal:repeat="m options/error_message"
174+
tal:content="structure string:$m <br/ > " />
174175
<p tal:condition="options/ok_message | nothing" class="ok-message">
175176
<span tal:repeat="m options/ok_message"
176177
tal:content="structure string:$m <br/ > " />

share/roundup/templates/devel/html/page.html

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,13 @@ <h1><a href="/">Roundup Demo Tracker</a></h1>
234234
<div class="content">
235235
<h1 id="breadcrumb"><span metal:define-slot="body_title">body title</span></h1>
236236
<p tal:condition="options/error_message | nothing" class="error-message"
237-
tal:repeat="m options/error_message" tal:content="structure m" />
237+
tal:repeat="m options/error_message"
238+
tal:content="structure string:$m <br/ > " />
238239
<p tal:condition="options/ok_message | nothing" class="ok-message">
239-
<span tal:repeat="m options/ok_message" tal:content="structure string:$m <br/ > " />
240-
<a class="form-small" tal:attributes="href request/current_url" i18n:translate="">clear this message</a>
240+
<span tal:repeat="m options/ok_message"
241+
tal:content="structure string:$m <br/ > " />
242+
<a class="form-small" tal:attributes="href request/current_url"
243+
i18n:translate="">clear this message</a>
241244
</p>
242245
<tal:block metal:define-slot="content">Page content goes here</tal:block>
243246
</div> <!-- content -->

share/roundup/templates/minimal/html/page.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,8 @@ <h2><span metal:define-slot="body_title">body title</span></h2>
157157
</td>
158158
<td>
159159
<p tal:condition="options/error_message | nothing" class="error-message"
160-
tal:repeat="m options/error_message" tal:content="structure m" />
160+
tal:repeat="m options/error_message"
161+
tal:content="structure string:$m <br/ > " />
161162
<p tal:condition="options/ok_message | nothing" class="ok-message">
162163
<span tal:repeat="m options/ok_message"
163164
tal:content="structure string:$m <br/ > " />

website/issues/html/page.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,8 @@ <h1><a href="/">Roundup Tracker - Issues</a></h1>
185185
<div class="content">
186186
<h1 id="breadcrumb"><span metal:define-slot="body_title">body title</span></h1>
187187
<p tal:condition="options/error_message | nothing" class="error-message"
188-
tal:repeat="m options/error_message" tal:content="structure m" />
188+
tal:repeat="m options/error_message"
189+
tal:content="structure string:$m <br/ > " />
189190
<p tal:condition="options/ok_message | nothing" class="ok-message">
190191
<span tal:repeat="m options/ok_message"
191192
tal:content="structure string:$m <br/ > " />

0 commit comments

Comments
 (0)