mutt: make dmarc xsl more plaintext friendly

It still requires parsing through w3m but it quite a bit more readable.

diff --git a/mutt/dmarc.xsl b/mutt/dmarc.xsl
index b942425ce01a16441d6e3b42ebe6e37521b68de9..b6f693f1a26b0d3a899146c050f14e31fc0bcacc 100644 (file)
--- a/mutt/dmarc.xsl
+++ b/mutt/dmarc.xsl
@@ -36,12 +36,15 @@
                                                margin: 1em;
                                                padding: 4pt;
                                                background-color: #ffeeaa;
                                                margin: 1em;
                                                padding: 4pt;
                                                background-color: #ffeeaa;

-                                               border: 3pt solid #776633; 
+                                               border: 3pt solid #776633;
+                                       }
+                                       table.report_metadata th {
+                                               text-align: right;

                                        }
                                        td, th {
                                                margin: 2pt;
                                                padding: 2pt;
                                        }
                                        td, th {
                                                margin: 2pt;
                                                padding: 2pt;

-                                               border: 1pt solid #776633; 
+                                               border: 1pt solid #776633;

                                        }
                                        .pass {
                                                background-color: #11bb00;
                                        }
                                        .pass {
                                                background-color: #11bb00;


@@ -77,9 +80,10 @@
                                        <xsl:value-of select="$title"/>
                                </h1>
                                <p>
                                        <xsl:value-of select="$title"/>
                                </h1>
                                <p>

-                                       <xsl:apply-templates select="report_metadata"/>
-                                       <br/>
-                                       <xsl:apply-templates select="policy_published"/>
+                                       <table>
+                                               <xsl:apply-templates select="report_metadata"/>
+                                               <xsl:apply-templates select="policy_published"/>
+                                       </table>

                                </p>
                                <table>
                                        <tr>
                                </p>
                                <table>
                                        <tr>


@@ -87,15 +91,13 @@
                                                        Relaying IP
                                                </th>
                                                <th>
                                                        Relaying IP
                                                </th>
                                                <th>

-                                                       message count
+                                                       msg count

                                                </th>
                                                <th>
                                                </th>
                                                <th>

-                                                       reason and disposition
+                                                       reason/dispo

                                                </th>
                                                <th>
                                                </th>
                                                <th>

-                                                       From header
-                                                       <br/>
-                                                       (opt. envelope)
+                                                       From: hdr

                                                </th>
                                                <th>
                                                        SPF
                                                </th>
                                                <th>
                                                        SPF


@@ -148,21 +150,42 @@
                </html>
        </xsl:template>
        <xsl:template match="policy_published">
                </html>
        </xsl:template>
        <xsl:template match="policy_published">

-               <span class="field">Domain: </span>
-               <xsl:value-of select="domain"/>
-               <xsl:text>; </xsl:text>
-               <span class="field">DKIM: </span>
-               <xsl:apply-templates select="adkim"/>
-               <xsl:text>; </xsl:text>
-               <span class="field">SPF: </span>
-               <xsl:apply-templates select="aspf"/>
-               <xsl:text>; </xsl:text>
-               <span class="field">policy published: </span>
-               <xsl:value-of select="p"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="sp"/>
-               <xsl:text> </xsl:text>
-               <xsl:value-of select="pct"/>
+                       <tr>
+                               <th align="right">
+                                       <span class="field">Domain: </span>
+                               </th>
+                               <td>
+                                       <xsl:value-of select="domain"/>
+                               </td>
+                       </tr>
+                       <tr>
+                               <th align="right">
+                                       <span class="field">DKIM: </span>
+                               </th>
+                               <td>
+                                       <xsl:apply-templates select="adkim"/>
+                               </td>
+                       </tr>
+                       <tr>
+                               <th align="right">
+                                       <span class="field">SPF: </span>
+                               </th>
+                               <td>
+                                       <xsl:apply-templates select="aspf"/>
+                               </td>
+                       </tr>
+                       <tr>
+                               <th align="right">
+                                       <span class="field">policy published: </span>
+                               </th>
+                               <td>
+                                       <xsl:value-of select="p"/>
+                                       <xsl:text> </xsl:text>
+                                       <xsl:value-of select="sp"/>
+                                       <xsl:text> </xsl:text>
+                                       <xsl:value-of select="pct"/>
+                               </td>
+                       </tr>

        </xsl:template>
        <xsl:template match="adkim|aspf">
                <xsl:variable name="alignment">
        </xsl:template>
        <xsl:template match="adkim|aspf">
                <xsl:variable name="alignment">


@@ -181,18 +204,28 @@
                </xsl:choose>
        </xsl:template>
        <xsl:template match="report_metadata">
                </xsl:choose>
        </xsl:template>
        <xsl:template match="report_metadata">

-               <span class="field">Id: </span>
-               <xsl:value-of select="report_id"/>
-               <xsl:text>; </xsl:text>
-               <span class="field">begin: </span>
-               <xsl:call-template name="date-range">
-                       <xsl:with-param name="utime" select="date_range/begin"/>
-               </xsl:call-template>
-               <xsl:text>; </xsl:text>
-               <span class="field">end: </span>
-               <xsl:call-template name="date-range">
-                       <xsl:with-param name="utime" select="date_range/end"/>
-               </xsl:call-template>
+               <tr>
+                       <th align="right">Id:</th>
+                       <td>
+                               <xsl:value-of select="report_id"/>
+                       </td>
+               </tr>
+               <tr>
+                       <th align="right">begin:</th>
+                       <td>
+                               <xsl:call-template name="date-range">
+                                       <xsl:with-param name="utime" select="date_range/begin"/>
+                               </xsl:call-template>
+                       </td>
+               </tr> 
+               <tr> 
+                       <th align="right">end:</th>
+                       <td>
+                               <xsl:call-template name="date-range">
+                                       <xsl:with-param name="utime" select="date_range/end"/>
+                               </xsl:call-template>
+                       </td>
+               </tr>

                <xsl:for-each select="error">
                        <xsl:if test="position()=1">
                                <br/>
                <xsl:for-each select="error">
                        <xsl:if test="position()=1">
                                <br/>

diff --git a/mutt/mailcap b/mutt/mailcap
index 7faa4b87fdfc332952f5effe6dd847a4c75adb01..e7ddad0d1d6052d9d2255574331fa002ecd244c4 100644 (file)
--- a/mutt/mailcap
+++ b/mutt/mailcap
@@ -1,7 +1,7 @@
 text/html;       $XDG_CONFIG_HOME/mutt/mutt_bgrun qutebrowser %s; test=test -n "$DISPLAY"; nametemplate=%s.html
 text/html;       w3m -I %{charset} -dump %s -T text/html -cols "$COLUMNS" -o display_link_number=1; copiousoutput; nametemplate=%s.html
 text/calendar;   $XDG_CONFIG_HOME/mutt/ical2txt; copiousoutput
 text/html;       $XDG_CONFIG_HOME/mutt/mutt_bgrun qutebrowser %s; test=test -n "$DISPLAY"; nametemplate=%s.html
 text/html;       w3m -I %{charset} -dump %s -T text/html -cols "$COLUMNS" -o display_link_number=1; copiousoutput; nametemplate=%s.html
 text/calendar;   $XDG_CONFIG_HOME/mutt/ical2txt; copiousoutput

-# generate html from dmarc report, testing against *rmz.io* because all other tests were to difficult
+# generate html from dmarc report, testing against *rmz.io* because all other tests were too difficult

 application/gzip; zcat  | xsltproc $XDG_CONFIG_HOME/mutt/dmarc.xsl - > /tmp/dmarc.html && qutebrowser /tmp/dmarc.html ;\
     test=[[ '%s' == *rmz.io* ]]
 application/zip; funzip | xsltproc $XDG_CONFIG_HOME/mutt/dmarc.xsl - > /tmp/dmarc.html && qutebrowser /tmp/dmarc.html ;\
 application/gzip; zcat  | xsltproc $XDG_CONFIG_HOME/mutt/dmarc.xsl - > /tmp/dmarc.html && qutebrowser /tmp/dmarc.html ;\
     test=[[ '%s' == *rmz.io* ]]
 application/zip; funzip | xsltproc $XDG_CONFIG_HOME/mutt/dmarc.xsl - > /tmp/dmarc.html && qutebrowser /tmp/dmarc.html ;\