summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-03-19 01:06:49 +0100
committerMichael Tänzer <neo@nhng.de>2014-03-19 01:06:49 +0100
commit233557135e4849f974bd893ab4250edac55a128d (patch)
tree52d6e4bd3017e4d959e7fd0eaabd93b9176b41c2
parent1c5409b02e58e938e44ab7f8f12eabd9288ed01d (diff)
downloadcacert-devel-233557135e4849f974bd893ab4250edac55a128d.tar.gz
cacert-devel-233557135e4849f974bd893ab4250edac55a128d.tar.xz
cacert-devel-233557135e4849f974bd893ab4250edac55a128d.zip
bug 807: Some HTML cleanup
Signed-off-by: Michael Tänzer <neo@nhng.de>
-rw-r--r--pages/account/10.php18
-rw-r--r--pages/account/20.php17
2 files changed, 24 insertions, 11 deletions
diff --git a/pages/account/10.php b/pages/account/10.php
index e8affff..b2be1ff 100644
--- a/pages/account/10.php
+++ b/pages/account/10.php
@@ -30,14 +30,19 @@
<p><?=_("If you are a valid organisation and would like the organisation name in the certificates you can apply for an organisation assurance. Contact us via support@cacert.org for more information.")?></p>
<form method="post" action="account.php">
-<p><?=_("Optional comment, only used in the certificate overview")?><br>
- <input type="text" name="description" maxlength="80" size=80/></p>
+<p><?=_("Optional comment, only used in the certificate overview")?><br />
+ <input type="text" name="description" maxlength="80" size=80 />
+</p>
<p><?=_("Paste your CSR(Certificate Signing Request) below...")?><br />
<textarea name="CSR" cols="80" rows="15"></textarea>
</p>
-<p id="expertoff" style="display:none"><input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" /> <label for="expertbox"><?=_("Show advanced options")?></label></p>
-<div id="advanced_options" style="border: 1px solid">
+<fieldset>
+<legend>
+ <input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" style="display:none" />
+ <label for="expertbox"><?=_("Advanced Options")?></label>
+</legend>
+<div id="advanced_options">
<? if($_SESSION['profile']['points'] >= 50) { ?>
<p>
@@ -48,8 +53,9 @@
<? } ?>
</div>
+</fieldset>
-<p><input type="checkbox" name="CCA" /> <strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong><br />
+<p><input type="checkbox" id="CCA" name="CCA" /> <label for="CCA"><strong><?=sprintf(_("I accept the CAcert Community Agreement (%s)."),"<a href='/policy/CAcertCommunityAgreement.html'>CCA</a>")?></strong></label><br />
<?=_("Please Note: You need to accept the CCA to proceed.")?></p>
<input type="submit" name="process" value="<?=_("Submit")?>" />
<input type="hidden" name="oldid" value="<?=$id?>" />
@@ -62,7 +68,7 @@ function showExpert(a)
var options=document.getElementById("advanced_options");
options.style.display = (a) ? "" : "none";
- var checkbox=document.getElementById("expertoff");
+ var checkbox=document.getElementById("expertbox");
checkbox.style.display = "";
}
showExpert(false);
diff --git a/pages/account/20.php b/pages/account/20.php
index e26309b..4f03061 100644
--- a/pages/account/20.php
+++ b/pages/account/20.php
@@ -28,18 +28,25 @@
<form method="post" action="account.php">
<p> <?=_("Optional comment, only used in the certificate overview")?><br />
- <input type="text" name="description" maxlength="80" size=80 /></p>
+ <input type="text" name="description" maxlength="80" size=80 />
+</p>
<p><?=_("Paste your CSR below...")?><br />
-<textarea name="CSR" cols="80" rows="15"></textarea></p>
+ <textarea name="CSR" cols="80" rows="15" />
+</p>
-<p id="expertoff" style="display:none"><input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" /> <label for="expertbox"><?=_("Show advanced options")?></label></p>
-<div id="advanced_options" style="border: 1px solid">
+<fieldset>
+<legend>
+ <input type="checkbox" id="expertbox" onchange="showExpert(this.checked)" style="display:none" />
+ <label for="expertbox"><?=_("Advanced Options")?></label>
+</legend>
+<div id="advanced_options">
<p>
<input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_("Sign by class 1 root certificate")?></label><br />
<input type="radio" id="root2" name="rootcert" value="2" checked /> <label for="root2"><?=_("Sign by class 3 root certificate")?></label>
</p>
<p><?=_("Please note: The class 3 root certificate needs to be setup in your webserver as a chained certificate, while slightly more complicated to setup, this root certificate is more likely to be trusted by more people.")?></p>
</div>
+</fieldset>
<input type="submit" name="process" value="<?=_("Submit")?>" />
<input type="hidden" name="oldid" value="<?=$id?>" />
@@ -51,7 +58,7 @@ function showExpert(a)
var options=document.getElementById("advanced_options");
options.style.display = (a) ? "" : "none";
- var checkbox=document.getElementById("expertoff");
+ var checkbox=document.getElementById("expertbox");
checkbox.style.display = "";
}
showExpert(false);