#
#
# patch "src/view/widgets/CertListBrowser.cpp"
#  from [504061148c90414210435cf7ad61f0820b64887c]
#    to [84ff550c7b531f549a9485a9ed65ca60a4bdfdfb]
# 
# patch "src/view/widgets/CertListBrowser.h"
#  from [6228fa6e76611a1f06f5ec309cdefc03b5d9bf25]
#    to [4239a26eceecd5d00e334b517024b126a3193f26]
# 
# patch "src/vocab.h"
#  from [cbfc15387b50095e8d7fec842b57e6c445400350]
#    to [45f37ad58d947f6ab3e7b07d314fd62f54c5356c]
#
============================================================
--- src/view/widgets/CertListBrowser.cpp	504061148c90414210435cf7ad61f0820b64887c
+++ src/view/widgets/CertListBrowser.cpp	84ff550c7b531f549a9485a9ed65ca60a4bdfdfb
@@ -20,8 +20,30 @@ CertListBrowser::CertListBrowser(QWidget
 #include "MonotoneUtil.h"
 
 CertListBrowser::CertListBrowser(QWidget * parent)
-  : QTextBrowser(parent) {}
+  : QTextBrowser(parent)
+{
+    nameI18NMap.insert("author",     tr("Author"));
+    nameI18NMap.insert("date",       tr("Date"));
+    nameI18NMap.insert("branch",     tr("Branch"));
+    nameI18NMap.insert("tag",        tr("Tag"));
+    nameI18NMap.insert("changelog",  tr("Changelog"));
+    nameI18NMap.insert("comment",    tr("Comment"));
+    nameI18NMap.insert("testresult", tr("Test result"));
+    nameI18NMap.insert("suspend",    tr("Suspended branch"));
 
+    // the order is important here!
+    certFormat.append(qMakePair(QString("date"),       table));
+    certFormat.append(qMakePair(QString("author"),     table));
+    certFormat.append(qMakePair(QString("branch"),     table));
+    certFormat.append(qMakePair(QString("tag"),        table));
+    certFormat.append(qMakePair(QString("suspend"),    table));
+    certFormat.append(qMakePair(QString("testresult"), table));
+    certFormat.append(qMakePair(QString("changelog"),  definition));
+    certFormat.append(qMakePair(QString("comment"),    definition));
+
+    certsPerTableRow = 2;
+}
+
 CertListBrowser::~CertListBrowser() {}
 
 void CertListBrowser::setKeyMap(const QMap<QString, QString> & map)
@@ -33,8 +55,15 @@ void CertListBrowser::setCertList(const 
 {
     QString html =
         "<style type=\"text/css\">"
-        "h1 { font-size: large; text-decoration: underline; }"
-        "dl dt { font-weight: bold; }"
+            "h1 { font-size: medium; } "
+            "dl { margin-top: 10px; margin-left: 10px; } "
+            "dl dt { margin-left: 3px; } "
+            "ul {margin-left: -40px; } "
+            "table { margin-top: 10px; margin-left: 10px; } "
+            "table th { text-align: right; font-weight: normal; } "
+            "table td { padding-left: 10px; padding-right: 30px; } "
+            "table th, table td { vertical-align: middle; } "
+            "table th, dl dt { font-size: small; font-weight: bold; } "
         "</style>"
     ;
 
@@ -49,45 +78,111 @@ void CertListBrowser::setCertList(const 
         else
             signerHtml = tr("<h1>Signer: %1</h1>").arg(signer);
 
+        QMap<QString, QStringList> formattedCertValues;
+
         foreach (const Cert & cert, list.findBySigner(signer))
         {
-            QString name, value;
+            QString value;
             if (cert.name == "date")
             {
-                name = tr("Date");
                 value = cert.dateTimeValue().toString(
                     Qt::DefaultLocaleShortDate
                 );
             }
-            else if (cert.name == "changelog")
+            else if (cert.name == "changelog" ||
+                     cert.name == "comment")
             {
-                name = tr("Changelog");
                 value = cert.htmlValue();
             }
-            else if (cert.name == "comment")
+            else
             {
-                name = tr("Comment");
-                value = cert.htmlValue();
+                value = cert.value;
+                value.replace("<", "&lt;");
             }
+
+            formattedCertValues[cert.name].push_back(value);
+        }
+
+        format_type current = none;
+        int certCounter = 0;
+
+        for (int i=0; i<certFormat.size(); ++i)
+        {
+            QString certName = certFormat.at(i).first;
+            format_type next = certFormat.at(i).second;
+
+            if (!formattedCertValues.contains(certName))
+                continue;
+
+            if (next != current || current == none)
+            {
+                if (current == table)
+                    certHtml += "</tr></table>";
+                else if (current == definition)
+                    certHtml += "</dl>";
+
+                if (next == table)
+                    certHtml += "<table><tr>";
+                else if (next == definition)
+                    certHtml += "<dl>";
+
+                current = next;
+                certCounter = 0;
+            }
+
+            QString format;
+            if (current == table)
+            {
+                if (certCounter % certsPerTableRow == 0 && certCounter != 0)
+                    certHtml += "</tr><tr>";
+                format = QString("<th>%1</th><td>%2</td>");
+            }
             else
             {
-                // localize common certs
-                if (cert.name == "author")
-                    name = tr("Author");
-                else if (cert.name == "branch")
-                    name = tr("Branch");
-                else if (cert.name == "tag")
-                    name = tr("Tag");
-                else
-                    name = cert.name;
+                format = QString("<dt>%1</dt><dd>%2</dd>");
+            }
 
-                value = cert.value;
+            certHtml += format.arg(nameI18NMap.value(certName))
+                              .arg(formattedCertValues.value(certName).join(", "));
+
+            formattedCertValues.remove(certName);
+
+            certCounter++;
+        }
+
+        if (formattedCertValues.size() > 0)
+        {
+            if (current != table)
+            {
+                if (current == definition)
+                    certHtml += "</dl>";
+
+                certHtml += "<table><tr>";
+                certCounter = 0;
             }
 
-            certHtml += QString("<dt>%1</dt><dd>%2</dd>").arg(name).arg(value);
+            QMapIterator<QString, QStringList> it(formattedCertValues);
+            while (it.hasNext())
+            {
+                it.next();
+                if (certCounter % certsPerTableRow == 0 && certCounter != 0)
+                    certHtml += "</tr><tr>";
+                certHtml += QString("<th>%1</th><td>%2</td>")
+                    .arg(nameI18NMap.value(it.key()))
+                    .arg(formattedCertValues.value(it.key()).join(", "));
+            }
         }
 
-        html += QString("%1<dl>%2</dl>").arg(signerHtml).arg(certHtml);
+        if (current == table)
+        {
+            certHtml += "</tr></table>";
+        }
+        else if (current == definition)
+        {
+            certHtml += "</dl>";
+        }
+
+        html += signerHtml + certHtml;
     }
 
     setHtml(html);
============================================================
--- src/view/widgets/CertListBrowser.h	6228fa6e76611a1f06f5ec309cdefc03b5d9bf25
+++ src/view/widgets/CertListBrowser.h	4239a26eceecd5d00e334b517024b126a3193f26
@@ -36,6 +36,11 @@ private:
 
 private:
     QMap<QString, QString> keyMap;
+    QMap<QString, QString> nameI18NMap;
+
+    enum format_type { none, table, definition };
+    QList<QPair<QString, format_type> > certFormat;
+    int certsPerTableRow;
 };
 
 #endif
============================================================
--- src/vocab.h	cbfc15387b50095e8d7fec842b57e6c445400350
+++ src/vocab.h	45f37ad58d947f6ab3e7b07d314fd62f54c5356c
@@ -134,7 +134,7 @@ struct Cert
                 else
                 {
                     inList = true;
-                    htmlValue += "<ul \"margin-left: -25px\">\n";
+                    htmlValue += "<ul>\n";
                 }
 
                 htmlValue += "<li>" + line.mid(1).trimmed();