upd: use bootstrap-panels to separate domain ping alternatives

Change-Id: Id3dd47d9b17282a1c3ac4e5e7b540f9a397762e7

diff --git a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ
index 94e04edc07653b416e4baef698117bab43ab674e..89d2dcde6df3c4054239bcca8f0d7270e1c9f6af 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ
@@ -1,17 +1,4 @@
-<table class="table">
-  <thead>
-  <tr>
-    <th colspan="2" class="title"><?=_Add Domain?></th>
-  </tr>
-  </thead>
-<tbody>
-  <tr>
-    <td><?=_Domain?> </td>
-    <td><input class="form-control" type="text" name="newdomain" value="" required> (<?=_In the following:?> <span class='exampleDomainPlace'>example.org</span>)</td>
-  </tr>
-  <?=$pingconfig?>
-  <tr>
-    <td colspan="2"><input type="submit" name="adddomain" value="<?=_I own or am authorised to control this domain?>"></td>
-  </tr>
-</tbody>
-</table>
+<label for="newdomain"><?=_Domain?>: </label><input class="form-control" type="text" name="newdomain" value="" required> (<?=_In the following:?> <span class='exampleDomainPlace'>example.org</span>)
+
+<?=$pingconfig?>
+<input type="submit" name="adddomain" value="<?=_I own or am authorised to control this domain?>">

diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
index 80ce8ff2e06bebac61203dcef1a9d9ea1b39a82c..84301d3bc73d8cdd37216ebddd1a63f0fa35e0d7 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
+++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.java
@@ -147,9 +147,8 @@ public class PingConfigForm extends Form {
 
     @Override
     protected void outputContent(PrintWriter out, Language l, Map<String, Object> vars) {
-        out.print("<table class=\"wrapper dataTable\"><tbody>");
         outputEmbeddableContent(out, l, vars);
-        out.print("<tr><td></td><td><input type=\"submit\" value=\"Update\"/></td></tbody></table>");
+        out.print("<input type=\"submit\" value=\"Update\"/>");
     }
 
     protected void outputEmbeddableContent(PrintWriter out, Language l, Map<String, Object> vars) {

diff --git a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
index 91f3ee53302d8e15813173bc8e80afbd2f9147f7..62cb70fd3319989aec7c830653e6f8597efed8f9 100644 (file)
--- a/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/PingConfigForm.templ
@@ -1,63 +1,42 @@
-  <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 $!{openSSLHelp} OpenSSL command line utilities can generate such a certificate.?>:
-        <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>
+<div class="panel panel-info">
+  <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">
+  <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?>._cacert._auth IN TXT <?=$tokenValue?></pre>
+  </div>
+</div>
+<div class="panel panel-info">
+  <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>/cacert-<?=$tokenName?>.txt</pre><br/>
+    <pre><?=$tokenValue?></pre>
+  </div>
+</div>
+<div class="panel panel-info">
+  <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. With $!{openSSLHelp} OpenSSL command line utilities can generate such a certificate.?>:
+    <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>
   
\ No newline at end of file