X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fdomain%2FPingConfigForm.templ;h=f8f700f369b427041888d03802be5b9671e4e935;hp=800c683593f80ebb50974860d345d0a81c69bc10;hb=67bdb3b1fd3ff821d00715bf2a7ed90ca7a7a664;hpb=4ef7ef003efbb904af6d4bce0ea0ee1b5091b65f

diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
index 800c6835..f8f700f3 100644
--- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
@@ -1,63 +1,48 @@
-  <tr><th></th><th><?=_Verification mechanisms?></th></tr>
+<h3><?=_Verification mechanisms?></h3>
 
-  <tr>
-    <td class='domainPinglogFirstCell'><input type="checkbox" name="emailType" value="y"<?=$!mail?>></td>
-    <td><?=_Verify by sending an email to authoritative email addresses?> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td class='radio'>
-        Select the destination mail address:<br/>
-        <? foreach($authEmails) { ?>
-        <input type="radio" id="email_<?=$i?>" name="email" value="<?=$i?>"<?=$!checked?>/>
-        <label for="email_<?=$i?>"><span class='name'><?=$email?>@<span class='exampleDomain'>example.org</span></span></label><div class='elements'></div>
-        <? } ?>
-	</td>
-  </tr>
-
-  <tr>
-    <td><input type="checkbox" name="DNSType" value="y"<?=$!dns?>></td>
-    <td><?=_Verify by reading DNS-TXT entries?> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>
-        Please insert the following DNS TXT entry into the Zone-file of your domain:<br/>
-        <pre>
-        <?=$tokenName?>._cacert._auth IN TXT <?=$tokenValue?>
-        </pre>
-    </td>
-  </tr>
-
-  <tr>
-    <td><input type="checkbox" name="HTTPType" value="y"<?=$!http?>></td>
-    <td><?=_Verify by reading HTTP-content?> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>
-        <?=_Please make the following content available under ?><pre class='string'>http://<span class='exampleDomain'>example.org</span>/cacert-<?=$tokenName?>.txt</pre><br/>
-        <pre><?=$tokenValue?></pre>
-    </td>
-  </tr>
-
-  <tr>
-    <td><input type="checkbox" name="SSLType" value="y"<?=$!ssl?>></td>
-    <td><?=_Verify by searching for installed certificate.?> </td>
-  </tr>
-  <tr>
-    <td></td>
-    <td>
-        <?=_Please list up to four services using your certificate. You need to have one of them up and using a valid SomeCA certificate or a specific self-signed certificate in order to pass this test?>:
-        <?=_The self-signed certificate needs to contain your domain as CN and $tokenValue as organization unit, with -subj "/CN=<domain>/OU=$tokenValue"?>:
-        <table>
-        <? foreach($ssl-services){ ?>
-        <tr><td><select name='ssl-type-<?=$i?>'>
-        	<?foreach($ssl-types){ ?>
-          <option<?=$!selected?>><?=$name?></option><? } ?></select>
-        </td><td>Port: <input type='text' name='ssl-port-<?=$i?>' value='<?=$port?>'></td></tr>
-        <? } ?>
-        </table>
-    </td>
-  </tr>
-  
\ No newline at end of file
+<div class="panel panel-info panel-activatable">
+  <div class="panel-heading"><input type="checkbox" name="emailType" value="y"<?=$!mail?>> <?=_Verify by sending an email to authoritative email addresses?></div>
+  <div class="panel-body">
+    <?=_Select the destination mail address:?><br/>
+    <? foreach($authEmails) { ?>
+      <input type="radio" id="email_<?=$i?>" name="email" value="<?=$i?>"<?=$!checked?>/>
+      <label for="email_<?=$i?>"><span class='name'><?=$email?>@<span class='exampleDomain'>example.org</span></span></label><div class='elements'></div>
+    <? } ?>
+  </div>
+</div>
+<div class="panel panel-info panel-activatable">
+  <div class="panel-heading"><input type="checkbox" name="DNSType" value="y"<?=$!dns?>> <?=_Verify by reading DNS-TXT entries?></div>
+  <div class="panel-body">
+    <?=_Please insert the following DNS TXT entry into the Zone-file of your domain:?><br/>
+    <pre><?=$tokenName?>.<?=$dnsPrefix?>._auth IN TXT <?=$tokenValue?></pre>
+  </div>
+</div>
+<div class="panel panel-info panel-activatable">
+  <div class="panel-heading"><input type="checkbox" name="HTTPType" value="y"<?=$!http?>> <?=_Verify by reading HTTP-content?></div>
+  <div class="panel-body">
+    <?=_Please make the following content available under ?><pre class='string'>http://<span class='exampleDomain'>example.org</span>/<?=$httpPrefix?><?=$tokenName?>.txt</pre><br/>
+    <pre><?=$tokenValue?></pre>
+  </div>
+</div>
+<div class="panel panel-info panel-activatable">
+  <div class="panel-heading"><input type="checkbox" name="SSLType" value="y"<?=$!ssl?>> <?=_Verify by searching for installed certificate.?></div>
+  <div class="panel-body">
+    <?=_Please list up to four services using your certificate. You need to have one of them up and using a valid SomeCA certificate or a specific self-signed certificate in order to pass this test?>:
+    <?=_The self-signed certificate needs to contain your domain as CN and ${tokenValue} as organization unit.?> <?=_You can use these commands to create such a certificate:?>
+    <code>
+openssl req -newkey rsa:4096 -subj "/CN=<span class='exampleDomain'>example.org</span>/OU=<?=$tokenValue?>" -nodes -out myCSR -keyout myKey<br>
+openssl x509 -req -in myCSR -signkey myKey -out myCert -extfile &lt;(printf 'extendedKeyUsage = serverAuth\n')
+    </code>
+    <table>
+    <? foreach($ssl-services){ ?>
+    <tr><td><select name='ssl-type-<?=$i?>'>
+      <?foreach($ssl-types){ ?>
+      <option<?=$!selected?>><?=$name?></option><? } ?></select>
+    </td><td>Port: <input type='text' name='ssl-port-<?=$i?>' value='<?=$port?>'></td></tr>
+    <? } ?>
+    </table>
+  </div>
+</div>
+<? if($notEmbedded) { ?>
+<button class="btn btn-primary" type="submit"><?=_Update?></button>
+<? } ?>