fix: display help text for certificate validity selector

[gigi.git] / src / org / cacert / gigi / pages / account / certs / CertificateIssueForm.templ

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index dda8ce4fb9094785dfc46638eeb2d1b97c0de97f..e1404ce56b69209882fdcada6f2355daa8ddbfcf 100644 (file)
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -1,11 +1,11 @@
 <h3><?=_CAcert Certificate Acceptable Use Policy?></h3>
-<p><?=_I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to CAcert Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.?></p>
+<p><?=_I hereby represent that I am fully authorized by the owner of the information contained in the CSR sent to SomeCA Inc. to apply for an Digital Certificate for secure and authenticated electronic transactions. I understand that a digital certificate serves to identify the Subscriber for the purposes of electronic communication and that the management of the private keys associated with such certificates is the responsibility of the subscriber's technical staff and/or contractors.?></p>
 
-<p><?=_CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with CAcert Inc.'s CPS and supporting documentation published at?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
+<p><?=_CAcert Inc.'s public certification services are governed by a CPS as amended from time to time which is incorporated into this Agreement by reference. The Subscriber will use the SSL Server Certificate in accordance with SomeCA Inc.'s CPS and supporting documentation published at?> <a href="http://www.cacert.org/cps.php">http://www.cacert.org/cps.php</a></p>
 
-<p><?=_If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.?></p>
+<p><?=_If the Subscriber's name and/or domain name registration change the subscriber will immediately inform SomeCA Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.?></p>
 
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_New Certificate?></th>
@@ -24,28 +24,15 @@
     </select>
     </td>
   </tr>
-  <? if($orga) { ?>
-  <tr> 
-    <td>
-      <label for='org'><?=_Organisation?></label>
-    </td>  
-    <td><select name="org" id='org'>
-      <option value="-1"><?=_(none)?></option>
-    <? foreach($orga) { ?>
-      <option value="<?=$key?>"<?=$!selected?>><?=$name?></option>
-    <? } ?>
-    </select></td>
-  </tr>
-  <? } ?>
   <tr>
     <td>
     <label for='CN'><?=_Your name?></label>
     </td>
-    <td><input type='text' id='CN' name='CN' value='<?=$CN?>'/></td>
+    <td><input class="form-control" type='text' id='CN' name='CN' value='<?=$CN?>'/></td>
   </tr>
   <tr>
     <td>SANs</td>
-    <td align="left"><textarea rows='5' name='SANs' placeholder="dns:my.domain.example.com, dns:*.example.com, email:my.email@example.com (or newline separated)"><?=$emails?></textarea></td>
+    <td align="left"><textarea class="form-control" rows='5' name='SANs' placeholder="dns:my.domain.example.com, dns:*.example.com, email:my.email@example.com (or newline separated)"><?=$emails?></textarea></td>
   </tr>
   <? if($orga) { ?>
   <tr>
@@ -74,16 +61,16 @@
   <tr class="expert">
     <td><?=_Valid period?></td>
     <td>
-        <?=$validity?>
+        <?=$validity?>(<?=_start: "now" or YYYY-MM-DD date, end: e.g. 2y, 6m or YYYY-MM-DD date?>)
     </td>
   </tr>
     <tr>
     <td class='check'>
-      <input type="checkbox" id="CCA" name="CCA" />
+      <input type="checkbox" id="tos_agree" name="tos_agree" />
     </td>
     <td align="left">
-      <label for="CCA"><strong><?=_I accept the CAcert Community Agreement ($!{CCA}).?> </strong><br />
-      <?=_Please note: You need to accept the CCA to proceed.?></label>
+      <label for="tos_agree"><strong><?=_I accept the Terms of Service ($!{ToS}).?> </strong><br />
+      <?=_Please note: You need to accept the ToS to proceed.?></label>
     </td>
   </tr>
   <tr><td colspan='2'>&nbsp;</td></tr>
@@ -98,9 +85,9 @@
     </td>
   </tr>
   <tr>
-    <td colspan="2" align="left">
+    <td colspan="2">
       <label for="description"><?=_Optional comment, only used in the certificate overview?></label><br />
-      <input type="text" id="description" name="description" maxlength="100" size="100" />
+      <input class="form-control" type="text" id="description" name="description" maxlength="100" size="100" />
     </td>
   </tr>