X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Fvcard%2Fedit.html;h=b1a2adceaae7190a08c62feec4879c7a3ac2b426;hb=48a75931f41b5d4d04c6d39d9677bd9e4b611c00;hp=cc0430a6c785e3f64ff40f49bd40e72cf432e92e;hpb=4c9f5cbc2190bee39df82586465e2d89c4d33eeb;p=citadel.git

diff --git a/webcit/static/t/vcard/edit.html b/webcit/static/t/vcard/edit.html
index cc0430a6c..b1a2adcea 100644
--- a/webcit/static/t/vcard/edit.html
+++ b/webcit/static/t/vcard/edit.html
@@ -2,7 +2,6 @@
 
 <form method="POST" action="submit_vcard">
 <input type="hidden" name="nonce" value="<?NONCE()>">
-<input type="hidden" name="force_room" value="My Citadel Config">
 <table class="vcard_edit_background"><tr><td>
 
 <table border="0">
@@ -14,65 +13,69 @@
   <td><?_("Suffix")></td>
 </tr>
 <tr>
-  <td><input type="text" name="prefix" value='<?VC:ITEM(#"VC:.n.prefix", "X")>' maxlength="5" size="5"></td>
-  <td><input type="text" name="firstname" value='<?VC:ITEM(#"VC:.n.first", "X")>' maxlength="29"></td>
-  <td><input type="text" name="middlename" value='<?VC:ITEM(#"VC:.n.middle", "X")>' maxlength="29"></td>
-  <td><input type="text" name="lastname" value='<?VC:ITEM(#"VC:.n.last", "X")>' maxlength="29"></td>
-  <td><input type="text" name="suffix" value='<?VC:ITEM(#"VC:.n.suffix", "X")>' maxlength="10" size="10"></td>
+  <td><input type="text" name='VC:<?DEF:VAL(#"VC:.n.prefix")>' value='<?VC:ITEM(#"VC:.n.prefix", "X")>' maxlength="5" size="5"></td>
+  <td><input type="text" name='VC:<?DEF:VAL(#"VC:.n.first")>' value='<?VC:ITEM(#"VC:.n.first", "X")>' maxlength="29"></td>
+  <td><input type="text" name='VC:<?DEF:VAL(#"VC:.n.middle")>' value='<?VC:ITEM(#"VC:.n.middle", "X")>' maxlength="29"></td>
+  <td><input type="text" name='VC:<?DEF:VAL(#"VC:.n.last")>' value='<?VC:ITEM(#"VC:.n.last", "X")>' maxlength="29"></td>
+  <td><input type="text" name='VC:<?DEF:VAL(#"VC:.n.suffix")>' value='<?VC:ITEM(#"VC:.n.suffix", "X")>' maxlength="10" size="10"></td>
 </tr></table>
 
 <table  class="vcard_edit_background_alt">
 <tr>
   <td>
-    <?_("Display name:")><br> <input type="text" name="fullname" value='<?VC:ITEM(#"VC:.fn", "X")>' maxlength="40"><br><br>
-    <?_("Title:")><br><input type="text" name="title" value='<?VC:ITEM(#"VC:.title", "X")>' maxlength="40"><br><br>
-    <?_("Organization:")><br><input type="text" name="org" value='<?VC:ITEM(#"VC:.org", "X")>' maxlength="40"><br><br>
+    <?_("Display name:")><br> <input type="text" name='VC:<?DEF:VAL(#"VC:.fn")>' value='<?VC:ITEM(#"VC:.fn", "X")>' maxlength="40"><br><br>
+    <?_("Title:")><br><input type="text" name='VC:<?DEF:VAL(#"VC:.title")>' value='<?VC:ITEM(#"VC:.title", "X")>' maxlength="40"><br><br>
+    <?_("Organization:")><br><input type="text" name='VC:<?DEF:VAL(#"VC:.org")>' value='<?VC:ITEM(#"VC:.org", "X")>' maxlength="40"><br><br>
   </td>
 <td>
 
 <table border="0">
-  <tr><td><?_("PO box:")></td><td><input type="text" name="pobox" value='<?VC:ITEM(#"VC:.adr.POBox", "X")>' maxlength="29"></td></tr>
-  <tr><td><?_("Address:")></td><td><input type="text" name="extadr" value='<?VC:ITEM(#"VC:.adr.address", "X")>' maxlength="29"></td></tr>
-  <tr><td> </td><td><input type="text" name="street" value='<?VC:ITEM(#"VC:.adr.address2", "X")>' maxlength="29"></td></tr>
-  <tr><td><?_("City:")></td><td><input type="text" name="city" value='<?VC:ITEM(#"VC:.adr.city", "X")>' maxlength="29"></td></tr>
-  <tr><td><?_("State:")></td><td><input type="text" name="state" value='<?VC:ITEM(#"VC:.adr.state", "X")>' maxlength="29"></td></tr>
-  <tr><td><?_("ZIP code:")></td><td><input type="text" name="zipcode" value='<?VC:ITEM(#"VC:.adr.zip", "X")>' maxlength="10"></td></tr>
-  <tr><td><?_("Country:")></td><td><input type="text" name="country" value='<?VC:ITEM(#"VC:.adr.country", "X")>' maxlength="29" width="5"></td></tr>
+  <tr><td><?_("PO box:")></td>   <td><input type="text" name='VC:<?DEF:VAL(#"VC:.adr.POBox")>' value='<?VC:ITEM(#"VC:.adr.POBox", "X")>' maxlength="29"></td></tr>
+  <tr><td><?_("Address:")></td>  <td><input type="text" name='VC:<?DEF:VAL(#"VC:.adr.extadr")>' value='<?VC:ITEM(#"VC:.adr.extadr", "X")>' maxlength="29"></td></tr>
+  <tr><td></td>                  <td><input type="text" name='VC:<?DEF:VAL(#"VC:.adr.street")>' value='<?VC:ITEM(#"VC:.adr.street", "X")>' maxlength="29"></td></tr>
+  <tr><td><?_("City:")></td>     <td><input type="text" name='VC:<?DEF:VAL(#"VC:.adr.city")>' value='<?VC:ITEM(#"VC:.adr.city", "X")>' maxlength="29"></td></tr>
+  <tr><td><?_("State:")></td>    <td><input type="text" name='VC:<?DEF:VAL(#"VC:.adr.state")>' value='<?VC:ITEM(#"VC:.adr.state", "X")>' maxlength="29"></td></tr>
+  <tr><td><?_("ZIP code:")></td> <td><input type="text" name='VC:<?DEF:VAL(#"VC:.adr.zip")>' value='<?VC:ITEM(#"VC:.adr.zip", "X")>' maxlength="10"></td></tr>
+  <tr><td><?_("Country:")></td>  <td><input type="text" name='VC:<?DEF:VAL(#"VC:.adr.country")>' value='<?VC:ITEM(#"VC:.adr.country", "X")>' maxlength="29" width="5"></td></tr>
 </table>
 
 </table>
 <table border=0>
 <tr>
-  <td><?_("Home telephone:")></td><td><input type="text" name="hometel" value='<?VC:ITEM(#"VC:.tel;home", "X")>' maxlength="29"></td>
-  <td><?_("Work telephone:")></td><td><input type="text" name="worktel" value='<?VC:ITEM(#"VC:.tel;work", "X")>' maxlength="29"></td>
+  <td><?_("Home telephone:")></td><td><input type="text" name='VC:<?DEF:VAL(#"VC:.tel;home")>' value='<?VC:ITEM(#"VC:.tel;home", "X")>' maxlength="29"></td>
+  <td><?_("Work telephone:")></td><td><input type="text" name='VC:<?DEF:VAL(#"VC:.tel;work")>' value='<?VC:ITEM(#"VC:.tel;work", "X")>' maxlength="29"></td>
 </tr>
 <tr>
-  <td><?_("Mobile telephone:")></td><td><input type="text" name="mobiletel" value='<?VC:ITEM(#"VC:.tel;cell", "X")>' maxlength="29"></td>
-  <td><?_("Fax number:")></td><td><input type="text" name="faxtel" value='<?VC:ITEM(#"VC:.tel;fax", "X")>' maxlength="29"></td>
+  <td><?_("Mobile telephone:")></td> <td><input type="text" name='VC:<?DEF:VAL(#"VC:.tel;cell")>' value='<?VC:ITEM(#"VC:.tel;cell", "X")>' maxlength="29"></td>
+  <td><?_("Fax number:")></td>       <td><input type="text" name='VC:<?DEF:VAL(#"VC:.tel;fax")>' value='<?VC:ITEM(#"VC:.tel;fax", "X")>' maxlength="29"></td>
 </tr></table>
 
+<??("COND:SUPPRESS_EMAIL_FIELDS", 1)>
 <table class="vcard_edit_background_alt">
 <tr>
   <td>
     <table border=0>
       <tr>
 	<td valign=top><?_("Primary Internet e-mail address")><br>
-	  <input type="text" name="primary_inetemail" size=40 maxlength=60 value='<?VC:ITEM(#"VC:.email;internet", "X")>'><br>
+	  <input type="text" name='VC:<?DEF:VAL(#"VC:.email;internet")>' size=40 maxlength=60 value='<?VC:ITEM(#"VC:.email;internet", "X")>'><br>
 	</td>
 	<td valign=top><?_("Internet e-mail aliases")><br><textarea name="other_inetemail" rows=5 cols=40 width=40><?ITERATE("VC:TYPE", ="vcard_edit_email", 0, 0, -1, #"EmailAddr")></textarea>
     </td>
     </tr>
     </table>
 </td></tr></table>
+<??("X", 1)>
 
-<input type="hidden" name="extrafields" value="VERSION:2.1
-FBURL;PREF:http://flunder/willi.vfb
-UID:Citadel vCard: personal card for willi at flunder
-TODO
-">
+<input type="hidden" name='VC:<?DEF:VAL(#"VC:.version")>' value='<?VC:ITEM(#"VC:.version", "X")>'>
+<input type="hidden" name='VC:<?DEF:VAL(#"VC:.rev")>' value='<?VC:ITEM(#"VC:.rev", "X")>'>
+<input type="hidden" name='VC:<?DEF:VAL(#"VC:.label")>' value='<?VC:ITEM(#"VC:.label", "X")>'>
+<input type="hidden" name='VC:<?DEF:VAL(#"VC:.uid")>' value='<?VC:ITEM(#"VC:.uid", "X")>'>
+<input type="hidden" name="extrafields" value='<?VC:ITEM(#"VC:.uid", "X")>'>
 
 <input type="hidden" name="return_to" value="display_main_menu?go=Contacts">
 <div class="buttons">
-<input type="submit" name="ok_button" value="Save changes">&nbsp;<input type="submit" name="cancel_button" value="Cancel"></div></form>
+<input type="submit" name="ok_button" value="Save changes">&nbsp;<input type="submit" name="cancel_button" value="Cancel"></div>
 </td></tr></table>
+</form>
 <?=("box_end")>
+</div>