X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Faccount%2Fcerts%2FCertificateIssueForm.templ;h=5fe3de07b6388d2f2a2817e1aaa392ef48e30384;hp=3be5737c39ff6d836baac50f2dfef5834a07ac89;hb=cd8500a5faf420aace24ee253a4f2407eb85588d;hpb=ed2a1041c12f9fcdba56472e1d938bb121166566

diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index 3be5737c..5fe3de07 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -1,11 +1,18 @@
-<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>
+<h3><?=_SomeCA 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 SomeCA 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>
-
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<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>
+<span id="placeholderName" class="js-hint"><?=$placeholderName?></span>
+<? if($defaultName) { ?>
+<span id="defaultName" class="js-hint"><?=$defaultName?></span>
+<span id="defaultEmail" class="js-hint"><?=$defaultEmail?></span>
+<? } ?>
+<? if($defaultDomain) { ?>
+<span id="defaultDomain" class="js-hint"><?=$defaultDomain?></span>
+<? } ?>
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_New Certificate?></th>
@@ -14,38 +21,37 @@
   <tbody>
   <tr>
     <td>
-    <label for='profile'><?=_Key type?></label>
+      <label for='profile'><?=_Key type?></label>
     </td>
     <td>
-    <select name="profile" id='profile'>
+      <select name="profile" id='profile'>
     <? foreach($profiles) { ?>
-      <option value="<?=$key?>"<?=$!selected?>><?=$name?></option>
+        <option value="<?=$key?>"<?=$!selected?>><?=$name?></option>
     <? } ?>
-    </select>
+      </select>
+      <br />
+      <?=_Select desired type. To have your name added to a certificate you need to get your name verified with at least 50 !'<a href="/wot/rules" target="blank">'Verification Points (VP)!'</a>'.?>
     </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>
+      <label for='CN'><?=_Your name?></label>
+    </td>
+    <td>
+      <input class="form-control" type='text' id='CN' name='CN' value='<?=$CN?>'/>
+      <?=_For a client certificate you need to enter a name with at least 50 VP or 'SomeCA user' will be used.?><br />
+      <?=_For a server certificate leave this field blank.?>
     </td>
-    <td><input 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>
+      <label for='SANs'>SANs</label>
+    </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><br />
+      <?=_Syntax for SAN?>: dns:my.domain.example.com, dns:*.example.com, email:my.email@example.com <?=_(or newline separated)?><br />
+      <?=_Recommendation for inexperienced users: only use one email address for client certificates.?>
+      </td>
   </tr>
   <? if($orga) { ?>
   <tr>
@@ -74,16 +80,7 @@
   <tr class="expert">
     <td><?=_Valid period?></td>
     <td>
-        <?=$validity?>
-    </td>
-  </tr>
-    <tr>
-    <td class='check'>
-      <input type="checkbox" id="CCA" name="CCA" />
-    </td>
-    <td align="left">
-      <label for="CCA"><strong><?=s,$!CCA,I accept the CAcert Community Agreement (%s).?> </strong><br />
-      <?=_Please note: You need to accept the CCA to proceed.?></label>
+        <?=$validity?>(<?=_start: "now" or YYYY-MM-DD date, end: e.g. 2y, 6m or YYYY-MM-DD date?>)
     </td>
   </tr>
   <tr><td colspan='2'>&nbsp;</td></tr>
@@ -93,19 +90,23 @@
       <input type="checkbox" id="login" name="login" value="1" checked="checked" />
     </td>
     <td align="left">
-      <label for="login"><?=_Enable certificate login with this certificate?><br />
-      <?=_By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .?></label>
+      <label for="login"><?=_Enable certificate login with this certificate?></label><br />
+      <span><?=_By allowing certificate login, this certificate can be used to log into this account at ${secureHostname}.?><br />
+      <?=_Recommendation: Have at least one client certificate for login enabled.?></span>
     </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>
 
   <tr>
-    <td colspan="2"><input type="submit" name="process" value="<?=_Issue Certificate?>" /></td>
+    <td colspan="2">
+      <input class="btn btn-primary" type="submit" name="process" value="<?=_Issue Certificate?>" />  
+      <?=_Once the request is submitted, please be patient until the certificate is signed.?>
+    </td>
   </tr>
   </tbody>
 </table>