[Bps-public-commit] rt-extension-spamfilter branch, update-for-rt5, updated. 50be7beff3ff83b623b5dec1db3957e14997a6c3

[Dianne Skoll]

The branch, update-for-rt5 has been updated
       via  50be7beff3ff83b623b5dec1db3957e14997a6c3 (commit)
      from  c6d9834b6bd6c783e2cfdb304217422fb32e0ff2 (commit)

Summary of changes:
 html/Tools/SpamFilter/Display.html        |  4 +--
 html/Tools/SpamFilter/Elements/ShowBasics | 52 +++++++++++++++----------------
 2 files changed, 27 insertions(+), 29 deletions(-)

- Log -----------------------------------------------------------------
commit 50be7beff3ff83b623b5dec1db3957e14997a6c3
Author: Dianne Skoll <dianne at bestpractical.com>
Date:   Wed Dec 16 14:51:06 2020 -0500

    Update display page to fit better with RT5 look-and-feel; use Bootstrap flexboxes instead of tables.

diff --git a/html/Tools/SpamFilter/Display.html b/html/Tools/SpamFilter/Display.html
index 8e9afc0..0c845df 100644
--- a/html/Tools/SpamFilter/Display.html
+++ b/html/Tools/SpamFilter/Display.html
@@ -75,9 +75,7 @@
 </&>
 
 <&| /Widgets/TitleBox, title => loc('Content'), &>
-<pre>
-<% $email->Content %>
-</pre>
+% $m->comp('/Elements/ShowMessageStanza', Message     => $email->Content, );
 </&>
 
 <%init>
diff --git a/html/Tools/SpamFilter/Elements/ShowBasics b/html/Tools/SpamFilter/Elements/ShowBasics
index 3c231ac..abbd72e 100644
--- a/html/Tools/SpamFilter/Elements/ShowBasics
+++ b/html/Tools/SpamFilter/Elements/ShowBasics
@@ -46,32 +46,32 @@
 %# those contributions and any derivatives thereof.
 %#
 %# END BPS TAGGED BLOCK }}}
-<table>
-  <tr class="id">
-    <td class="label"><&|/l&>id</&>:</td>
-    <td class="value"><%$Spam->id %></td>
-  </tr>
-  <tr class="status">
-    <td class="label"><&|/l&>Status</&>:</td>
-    <td class="value"><% loc($Spam->Status) %></td>
-  </tr>
-  <tr class="Subject">
-    <td class="label"><&|/l&>Subject</&>:</td>
-    <td class="value"><% $Spam->GetHeader('Subject') || loc("(No subject)") %></td>
-  </tr>
-  <tr class="from">
-    <td class="label"><&|/l&>From</&>:</td>
-    <td class="value"><% $Spam->From %></td>
-  </tr>
-  <tr class="to">
-    <td class="label"><&|/l&>To</&>:</td>
-    <td class="value"><% $Spam->GetHeader('To') %></td>
-  </tr>
-  <tr class="date">
-    <td class="label"><&|/l&>Date</&>:</td>
-    <td class="value"><% $Spam->GetHeader('Date') %></td>
-  </tr>
-</table>
+<div>
+  <div class="id form-row">
+    <div class="label col-1"><&|/l&>id</&>:</div>
+    <div class="value col-11"><%$Spam->id %></div>
+  </div>
+  <div class="status form-row">
+    <div class="label col-1"><&|/l&>Status</&>:</div>
+    <div class="value col-11"><% loc($Spam->Status) %></div>
+  </div>
+  <div class="Subject form-row"">
+    <div class="label col-1"><&|/l&>Subject</&>:</div>
+    <div class="value col-11"><% $Spam->GetHeader('Subject') || loc("(No subject)") %></div>
+  </div>
+  <div class="from form-row"">
+    <div class="label col-1"><&|/l&>From</&>:</div>
+    <div class="value col-11"><% $Spam->From %></div>
+  </div>
+  <div class="to form-row"">
+    <div class="label col-1"><&|/l&>To</&>:</div>
+    <div class="value col-11"><% $Spam->GetHeader('To') %></div>
+  </div>
+  <div class="date form-row"">
+    <div class="label col-1"><&|/l&>Date</&>:</div>
+    <div class="value col-11"><% $Spam->GetHeader('Date') %></div>
+  </div>
+</div>
 <%ARGS>
 $Spam => undef
 </%ARGS>

-----------------------------------------------------------------------