changeset 4622:9d5825bf0b2d

Nicer display of multi-line error messages.
author Ralf Schlatterbeck <rsc@runtux.com>
date Mon, 14 May 2012 13:04:20 +0200
parents f22831a12ab8
children 4f9c3858b671
files share/roundup/templates/classic/html/page.html share/roundup/templates/devel/html/page.html share/roundup/templates/minimal/html/page.html website/issues/html/page.html
diffstat 4 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/share/roundup/templates/classic/html/page.html	Mon May 14 12:29:39 2012 +0200
+++ b/share/roundup/templates/classic/html/page.html	Mon May 14 13:04:20 2012 +0200
@@ -170,7 +170,8 @@
  </td>
  <td>
   <p tal:condition="options/error_message | nothing" class="error-message"
-     tal:repeat="m options/error_message" tal:content="structure m" />
+     tal:repeat="m options/error_message"
+     tal:content="structure string:$m <br/ > " />
   <p tal:condition="options/ok_message | nothing" class="ok-message">
     <span tal:repeat="m options/ok_message"
        tal:content="structure string:$m <br/ > " />
--- a/share/roundup/templates/devel/html/page.html	Mon May 14 12:29:39 2012 +0200
+++ b/share/roundup/templates/devel/html/page.html	Mon May 14 13:04:20 2012 +0200
@@ -234,10 +234,13 @@
   <div class="content">
    <h1 id="breadcrumb"><span metal:define-slot="body_title">body title</span></h1>
    <p tal:condition="options/error_message | nothing" class="error-message"
-      tal:repeat="m options/error_message" tal:content="structure m" />
+      tal:repeat="m options/error_message"
+      tal:content="structure string:$m <br/ > " />
    <p tal:condition="options/ok_message | nothing" class="ok-message">
-    <span tal:repeat="m options/ok_message" tal:content="structure string:$m <br/ > " />
-    <a class="form-small" tal:attributes="href request/current_url" i18n:translate="">clear this message</a>
+    <span tal:repeat="m options/ok_message"
+          tal:content="structure string:$m <br/ > " />
+    <a class="form-small" tal:attributes="href request/current_url"
+       i18n:translate="">clear this message</a>
    </p>
    <tal:block metal:define-slot="content">Page content goes here</tal:block>
   </div> <!-- content -->
--- a/share/roundup/templates/minimal/html/page.html	Mon May 14 12:29:39 2012 +0200
+++ b/share/roundup/templates/minimal/html/page.html	Mon May 14 13:04:20 2012 +0200
@@ -157,7 +157,8 @@
  </td>
  <td>
   <p tal:condition="options/error_message | nothing" class="error-message"
-     tal:repeat="m options/error_message" tal:content="structure m" />
+     tal:repeat="m options/error_message"
+     tal:content="structure string:$m <br/ > " />
   <p tal:condition="options/ok_message | nothing" class="ok-message">
     <span tal:repeat="m options/ok_message"
        tal:content="structure string:$m <br/ > " />
--- a/website/issues/html/page.html	Mon May 14 12:29:39 2012 +0200
+++ b/website/issues/html/page.html	Mon May 14 13:04:20 2012 +0200
@@ -185,7 +185,8 @@
 <div class="content">
 <h1 id="breadcrumb"><span metal:define-slot="body_title">body title</span></h1>
  <p tal:condition="options/error_message | nothing" class="error-message"
-    tal:repeat="m options/error_message" tal:content="structure m" />
+    tal:repeat="m options/error_message"
+    tal:content="structure string:$m <br/ > " />
  <p tal:condition="options/ok_message | nothing" class="ok-message">
   <span tal:repeat="m options/ok_message"
         tal:content="structure string:$m <br/ > " />

Roundup Issue Tracker: http://roundup-tracker.org/