From 0fe19828acc1c84550ee1f4869ec77ce66c621e3 Mon Sep 17 00:00:00 2001
From: Miles Lott <milosch@alumni.egroupware.org>
Date: Sat, 31 Mar 2001 04:50:32 +0000
Subject: [PATCH] Update templates to match current

---
 addressbook/templates/idsociety/add.tpl    |  6 +++++
 addressbook/templates/idsociety/edit.tpl   | 30 ++++++++++------------
 addressbook/templates/idsociety/export.tpl | 12 ++++++++-
 addressbook/templates/idsociety/footer.tpl | 23 ++++++++++++++---
 addressbook/templates/idsociety/header.tpl |  7 ++++-
 addressbook/templates/idsociety/import.tpl | 26 +++++++++++++------
 addressbook/templates/idsociety/view.tpl   |  4 +--
 7 files changed, 77 insertions(+), 31 deletions(-)

diff --git a/addressbook/templates/idsociety/add.tpl b/addressbook/templates/idsociety/add.tpl
index ba0448e531..ad9fc7b4f0 100755
--- a/addressbook/templates/idsociety/add.tpl
+++ b/addressbook/templates/idsociety/add.tpl
@@ -18,6 +18,12 @@
             <tr>
               <td width="8%">
               <form action="{cancel_url}" method="post">
+              <input type="hidden" name="ab_id" value="{ab_id}">
+              <input type="hidden" name="sort" value="{sort}">
+              <input type="hidden" name="order" value="{order}">
+              <input type="hidden" name="filter" value="{filter}">
+              <input type="hidden" name="query" value="{query}">
+              <input type="hidden" name="start" value="{start}">
               <input type="submit" name="Cancel" value="{lang_cancel}">
               </form>
               </td>
diff --git a/addressbook/templates/idsociety/edit.tpl b/addressbook/templates/idsociety/edit.tpl
index 1d87ddd7fe..23cdb15adc 100644
--- a/addressbook/templates/idsociety/edit.tpl
+++ b/addressbook/templates/idsociety/edit.tpl
@@ -14,25 +14,23 @@
          </TD>
          <TD align="left" width="7%">
             {cancel_link}
-        <input type="hidden" name="ab_id" value="{ab_id}">
-        <input type="hidden" name="sort" value="{sort}">
-        <input type="hidden" name="order" value="{order}">
-        <input type="hidden" name="filter" value="{filter}">
-		<input type="hidden" name="query" value="{query}">
-        <input type="hidden" name="start" value="{start}">
-        <input type="hidden" name="cat_id" value="{cat_id}">
-        <input type="submit" name="cancel" value="{lang_cancel}"></form>
+            <input type="hidden" name="sort" value="{sort}">
+            <input type="hidden" name="order" value="{order}">
+            <input type="hidden" name="filter" value="{filter}">
+            <input type="hidden" name="query" value="{query}">
+            <input type="hidden" name="start" value="{start}">
+            <input type="submit" name="cancel" value="{lang_cancel}"></form>
               </TD>
           <TD align="right">
             {delete_link}
-        <input type="hidden" name="ab_id" value="{ab_id}">
-        <input type="hidden" name="sort" value="{sort}">
-        <input type="hidden" name="order" value="{order}">
-        <input type="hidden" name="filter" value="{filter}">
-        <input type="hidden" name="query" value="{query}">
-        <input type="hidden" name="start" value="{start}">
-        <input type="hidden" name="cat_id" value="{cat_id}">
-        <input type="submit" name="delete" value="{lang_delete}"></form>
+            <input type="hidden" name="ab_id" value="{ab_id}">
+            <input type="hidden" name="sort" value="{sort}">
+            <input type="hidden" name="order" value="{order}">
+            <input type="hidden" name="filter" value="{filter}">
+            <input type="hidden" name="query" value="{query}">
+            <input type="hidden" name="start" value="{start}">
+            {delete_button}
+           </form>
 	      </TD>
             </TR>
             </TBODY> 
diff --git a/addressbook/templates/idsociety/export.tpl b/addressbook/templates/idsociety/export.tpl
index 001d43be1a..cd8ac8fbdf 100644
--- a/addressbook/templates/idsociety/export.tpl
+++ b/addressbook/templates/idsociety/export.tpl
@@ -15,16 +15,26 @@
         <OPTION VALUE="none">&lt;none&gt;</OPTION>
 {conv}        </SELECT><P></LI>
         <LI>{filename}:<INPUT NAME="tsvfilename" VALUE="export.txt"></LI>
-        <LI>{lang_cat}:{cat_id}</LI>
+        <LI>{lang_cat}:{cat_link}</LI>
         <LI><INPUT NAME="download" TYPE="checkbox" checked>Download export file (Uncheck to debug output in browser)</LI>
         <LI><INPUT NAME="convert" TYPE="submit" VALUE="{download}"></LI>
         </OL>
+        <input type="hidden" name="sort" value="{sort}">
+        <input type="hidden" name="order" value="{order}">
+        <input type="hidden" name="filter" value="{filter}">
+        <input type="hidden" name="query" value="{query}">
+        <input type="hidden" name="start" value="{start}">
         </FORM>
       </TD>
     </TR>
     <TR>
       <TD>
         <FORM action="{cancel_url}" method="post">
+        <input type="hidden" name="sort" value="{sort}">
+        <input type="hidden" name="order" value="{order}">
+        <input type="hidden" name="filter" value="{filter}">
+        <input type="hidden" name="query" value="{query}">
+        <input type="hidden" name="start" value="{start}">
         <INPUT type="submit" name="Cancel" value="{lang_cancel}">
         </FORM>
       </TD>
diff --git a/addressbook/templates/idsociety/footer.tpl b/addressbook/templates/idsociety/footer.tpl
index 8e2903df76..ba068e15af 100644
--- a/addressbook/templates/idsociety/footer.tpl
+++ b/addressbook/templates/idsociety/footer.tpl
@@ -1,15 +1,24 @@
 <!-- BEGIN addressbook_footer -->
  </table>
- <form method="POST" action="{actionurl}">
  <table width="75%" border="0" cellspacing="0" cellpadding="4">
    <tr> 
      <td width="16%"> 
        <div align="left"> 
+         <form action="{add_url}" method="post">
+         <input type="hidden" name="sort" value="{sort}">
+         <input type="hidden" name="order" value="{order}">
+         <input type="hidden" name="filter" value="{filter}">
+         <input type="hidden" name="start" value="{start}">
         <input type="submit" name="Add" value="{lang_add}">
        </div>
      </td>
      <td width="16%">
        <div align="left">
+         <form action="{vcard_url}" method="post">
+         <input type="hidden" name="sort" value="{sort}">
+         <input type="hidden" name="order" value="{order}">
+         <input type="hidden" name="filter" value="{filter}">
+         <input type="hidden" name="start" value="{start}">
         <input type="submit" name="AddVcard" value="{lang_addvcard}">
        </div>
      </td>
@@ -21,14 +30,22 @@
      <td width="16%">
        <div align="left">
          <form action="{import_url}" method="post">
-           <input type="submit" name="Import" value="{lang_import}">
+         <input type="hidden" name="sort" value="{sort}">
+         <input type="hidden" name="order" value="{order}">
+         <input type="hidden" name="filter" value="{filter}">
+         <input type="hidden" name="start" value="{start}">
+         <input type="submit" name="Import" value="{lang_import}">
          </form>
        </div>
      </td>
      <td width="16%">
        <div align="left">
          <form action="{export_url}" method="post">
-           <input type="submit" name="Export" value="{lang_export}">
+         <input type="hidden" name="sort" value="{sort}">
+         <input type="hidden" name="order" value="{order}">
+         <input type="hidden" name="filter" value="{filter}">
+         <input type="hidden" name="start" value="{start}">
+         <input type="submit" name="Export" value="{lang_export}">
          </form>
        </div>
      </td>
diff --git a/addressbook/templates/idsociety/header.tpl b/addressbook/templates/idsociety/header.tpl
index f5170d7151..011a510346 100644
--- a/addressbook/templates/idsociety/header.tpl
+++ b/addressbook/templates/idsociety/header.tpl
@@ -5,7 +5,12 @@
 <br>{searchreturn}
   <form action="{cats_url}" method="POST">
 {cats}{cats_link}
-    <input type="submit" name="cats" value="{lang_cats}">
+    <input type="hidden" name="sort" value="{sort}">
+    <input type="hidden" name="order" value="{order}">
+    <input type="hidden" name="filter" value="{filter}">
+    <input type="hidden" name="query" value="{query}">
+    <input type="hidden" name="start" value="{start}">
+    <noscript><input type="submit" name="cats" value="{lang_cats}"></noscript>
   </form>
 {search_filter}
 
diff --git a/addressbook/templates/idsociety/import.tpl b/addressbook/templates/idsociety/import.tpl
index 175502ce2e..d0f20ca4c5 100644
--- a/addressbook/templates/idsociety/import.tpl
+++ b/addressbook/templates/idsociety/import.tpl
@@ -13,12 +13,12 @@
 	    <TD><FORM ENCTYPE="multipart/form-data" action="{action_url}" method="post">
             <OL>
             <LI>In Netscape, open the Addressbook and select <b>Export</b> from the <b>File</b> menu.
-			  The file exported will be in LDIF format.
+                The file exported will be in LDIF format.
               <P>Or, in Outlook, select your Contacts folder, select <b>Import 
-              and Export...</b> from the <b>File</b> 
-              menu and export your contacts into a comma separated text (CSV) file.
-			  <P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu.
-			  The file exported will be in VCard format.<P>
+                and Export...</b> from the <b>File</b> 
+                menu and export your contacts into a comma separated text (CSV) file.
+              <P>Or, in Palm Desktop 4.0 or greater, visit your addressbook and select <b>Export</b> from the <b>File</b> menu.
+                The file exported will be in VCard format.<P>
 			</LI>
             <LI>Enter the path to the exported file here:
               <INPUT NAME="tsvfile" SIZE=48 TYPE="file" VALUE="{tsvfilename}"><P></LI>
@@ -27,11 +27,16 @@
             <OPTION VALUE="none">&lt;none&gt;</OPTION>
 	    {conv}
             </SELECT><P></LI>
-			<LI>{lang_cat}:{cat_id}</LI>
+			<LI>{lang_cat}:{cat_link}</LI>
 			<LI><INPUT NAME="private" TYPE="checkbox" VALUE="private" CHECKED>Mark records as private</LI>
             <LI><INPUT NAME="download" TYPE="checkbox" VALUE="{debug}" CHECKED>Debug output in browser</LI>
             <LI><INPUT NAME="convert" TYPE="submit" VALUE="{download}"></LI>
             </OL>
+              <input type="hidden" name="sort" value="{sort}">
+              <input type="hidden" name="order" value="{order}">
+              <input type="hidden" name="filter" value="{filter}">
+              <input type="hidden" name="query" value="{query}">
+              <input type="hidden" name="start" value="{start}">
             </FORM></TD>
           </TR>
         </TABLE>
@@ -41,8 +46,13 @@
      <td width="8%">
        <div align="left">
         <form action="{cancel_url}" method="post">
-	<input type="submit" name="Cancel" value="{lang_cancel}">
-	</form>
+        <input type="hidden" name="sort" value="{sort}">
+        <input type="hidden" name="order" value="{order}">
+        <input type="hidden" name="filter" value="{filter}">
+        <input type="hidden" name="query" value="{query}">
+        <input type="hidden" name="start" value="{start}">
+        <input type="submit" name="Cancel" value="{lang_cancel}">
+	    </form>
        </div>
      </td>
      <td width="64%">&nbsp;</td>
diff --git a/addressbook/templates/idsociety/view.tpl b/addressbook/templates/idsociety/view.tpl
index b0aa47de54..9f138d8c38 100755
--- a/addressbook/templates/idsociety/view.tpl
+++ b/addressbook/templates/idsociety/view.tpl
@@ -11,7 +11,8 @@
   <TR> 
    <TD align="left">
      {edit_link}
-     <input type="submit" name="edit" value="{lang_edit}">
+     <input type="hidden" name="ab_id" value="{ab_id}">
+     {edit_button}
     </form>
    </TD>
    <TD align="left">
@@ -36,7 +37,6 @@
    </TD>
    <TD align="left">
      {done_link}
-     <input type="hidden" name="ab_id" value="{ab_id}">
      <input type="hidden" name="sort" value="{sort}">
      <input type="hidden" name="order" value="{order}">
      <input type="hidden" name="filter" value="{filter}">