X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fcerts%2FCertificateDisplay.templ;h=da3bef21a1099a0aa32fa03e2a02870f3c037063;hp=b2e93e8cfb2672be3b1e8a94daae4a850c203e88;hb=65e50396a0c9fdc000036f5990ffa1b388df4c5e;hpb=72328c64659f06441c35dbd4f8cdcfd41376e7a3

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ b/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ
index b2e93e8c..da3bef21 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateDisplay.templ
@@ -1,12 +1,127 @@
-<a href='<?=$serial?>.crt'><?=_PEM encoded Certificate?></a>
-<? foreach($trustchain) { ?>
- <?=_issued by?> <a href='<?=$link?>'><?=$name?></a>
-<? } ?><br/>
-<a href='<?=$serial?>.crt?chain'><?=_PEM encoded Certificate Cain?></a><br/>
-<a href='<?=$serial?>.crt?chain&noAnchor'><?=_PEM encoded Certificate Cain (Excluding Anchor)?></a><br/>
-<a href='<?=$serial?>.cer'><?=_DER encoded Certificate?></a><br/>
-<a href='<?=$serial?>.cer?install&chain'><?=_Install into browser.?></a><br/>
-<a href='<?=$serial?>.cer?install'><?=_Install into browser. (Chrome)?></a><br/>
-<pre>
-<?=$cert?>
-</pre>
+<table>
+<? if($support) {?>
+
+  <tr>
+    <th colspan="2"><?=_Support Info?>:</th>
+  </tr>
+
+  <tr>
+    <td><?=$type?>:</td>
+    <td><a href="<?=$link?>"><?=$name?></a></td>
+  </tr>
+<? } ?>
+
+
+  <tr>
+    <th colspan="2"><?=_X.509 Info?>:</th>
+  </tr>
+
+  <tr>
+    <td><?=_Profile?>:</td>
+    <td><?=$profile?></td>
+  </tr
+
+  <tr>
+    <td><?=_Serial Number?>:</td>
+    <td><?=$serial?></td>
+  </tr
+
+<? if($support) {?>
+  <tr>
+    <td><?=_Trustchain?>:</td>
+    <td>
+    <? foreach($trustchain) { ?>
+      <?=_issued by?> <code><?=$name?></code>
+    <? } ?>
+    </td>
+  </tr>
+<? } else { ?>
+  <tr>
+    <td valign="top"><?=_Certificate and Chain?>:</td>
+    <td>
+        <a href='<?=$serial?>.crt'><?=_PEM encoded Certificate?></a>
+        <? foreach($trustchain) { ?>
+            <?=_issued by?> <a href='<?=$link?>'><?=$name?></a>
+        <? } ?>*<br/>
+        <a href='<?=$serial?>.crt?chain'><?=_PEM encoded Certificate Chain?></a><br/>
+        <a href='<?=$serial?>.crt?chain&noAnchor'><?=_PEM encoded Certificate Chain (Excluding Anchor)?></a><br/>
+        <a href='<?=$serial?>.crt?chain&noLeaf'><?=_PEM encoded Certificate Chain (Excluding Leaf)?></a><br/>
+        <a href='<?=$serial?>.cer'><?=_DER encoded Certificate?></a><br/>
+        <a href='<?=$serial?>.cer?install&chain'><?=_Install into browser.?></a><br/>
+        <a href='<?=$serial?>.cer?install'><?=_Install into browser (Chrome)?></a>. <?=_Please ensure that the intermediate certificates listed above are installed prior to installing the certificate.?>*<br/><br/>
+        * <?=_For information on how to install the root certificates into the truststore of your browser take a look at the !'<a href="https://wiki.cacert.org/FAQ/CSR">'FAQ!'</a>'!?>
+        
+    </td>
+  </tr>
+<? } ?>
+
+  <tr>
+    <th colspan="2"><?=_Validity?>:</th>
+  </tr>
+
+  <tr>
+    <td><?=_Status?>:</td>
+    <td><?=$status?></td>
+  </tr>
+
+  <tr>
+    <td><?=_Issue Date?>:</td>
+    <td><?=$issued?></td>
+  </tr>
+
+  <tr>
+    <td><?=_Expire Date?>:</td>
+    <td><?=$expire?></td>
+  </tr>
+
+  <tr>
+    <td><?=_Revocation Date?>:</td>
+    <td><?=$revoked?></td>
+  </tr>
+
+  <tr>
+    <th colspan="2"><?=_Certificate Info?>:</th>
+  </tr>
+
+  <tr>
+    <td><?=_Fingerprint?>:</td>
+    <td><?=$fingerprint?></td>
+  </tr>
+
+  <tr>
+    <td valign="top"><?=_Certificate (PEM)?>:</td>
+    <td><pre><?=$cert?></pre></td>
+  </tr>
+
+  <tr>
+    <th colspan="2"><?=_Certificate Details?>:</th>
+  </tr>
+
+  <tr>
+    <td><?=_Login enabled?>:</td>
+    <td><?=$login?></td>
+  </tr>
+
+  <tr>
+    <td><?=_Digest?>:</td>
+    <td><?=$digest?></td>
+  </tr>
+
+  <tr>
+    <td><?=_Distinguished Name (DN)?>:</td>
+    <td><?=$DN?></td>
+  </tr>
+
+  <tr>
+    <td><?=_Subject Alternative Names (SAN)?>:</td>
+    <td>
+    <? foreach($san) { ?>
+      <?=$entry?>
+    <? } ?>
+    </td>
+  </tr>
+
+</table>
+<? if($revokeForm) {?>
+<?=$revokeForm?>
+<? } ?>