Merge remote-tracking branch 'origin/libs/scrypt/local'

[gigi.git] / src / org / cacert / gigi / pages / orga / CreateOrgForm.templ

diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
index 3d16d0bee31fbbe490b44857c40a0417582c8ac3..fc94fe3a855433bddfbcc80a4dcf43bbe1598aa8 100644 (file)
--- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
+++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
@@ -1,6 +1,11 @@
 <table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
   <tr>
-    <th colspan="2"><?=_New Organisation?></th>
+    <th colspan="2">
+    <? if($edit) { ?>
+    <?=_Edit Organisation?>
+    <? } else { ?>
+    <?=_New Organisation?>
+    <? } ?></th>
   </tr>
   <tr>
     <td><?=_Organisation Name?>:</td>
@@ -8,7 +13,7 @@
   </tr>
   <tr>
     <td><?=_Contact Email?>:</td>
-    <td><input type="text" name="contact" value="" maxlength="255" size="90"></td>
+    <td><input type="text" name="contact" value="<?=$email?>" maxlength="255" size="90"></td>
   </tr>
   <tr>
     <td><?=_Town/Suburb?>:</td>
@@ -21,13 +26,19 @@
   <tr>
     <td><?=_Country?>:</td>
     <td><input type="text" name="C" value="<?=$C?>" maxlength="2" size="5">
-        <?=s,!"<a href='http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm'>",!"</a>",(2 letter %s ISO code %s )?>
+        <?=_(2 letter !'<a href="http://www.iso.org/iso/home/standards/country_codes/iso-3166-1_decoding_table.htm">'ISO code!'</a>')?>
     </td>
   </tr>
   <tr>
     <td><?=_Comments?>:</td>
     <td><textarea name="comments" cols="60" rows="10"></textarea></td>
   </tr>
+  <? if($edit) { ?>
+  <tr>
+    <td></td>
+    <td><?=_WARNING: updating the data will revoke all issued certificates.?></td>
+  </tr>
+  <? } ?>
   <tr>
     <td colspan="2"><input type="submit" value="<?=_Submit?>"></td>
   </tr>