- Fixing admin_links for CSV import and export

www/index.adp

@@ -6,39 +6,28 @@
 
 <form enctype="multipart/form-data" method=POST action="import-2.tcl">
 <%= [export_vars -form {return_url main_navbar_label}] %>
-
      <table border="0">
      <tr> 
 	<td>#intranet-csv-import.Object_Type#</td>
 	<td> 
-<%= [im_select object_type [list \
+	<%= [im_select object_type [list \
 	      im_company "Company" \
-	      im_conf_item "Configuration Item (no mapping, requires correct CSV header names)" \
+	      im_conf_item "Configuration Item" \
 	      im_project "Project" \
-	      im_hour "Hour" \
 	      im_risk "Risk" \
+	      im_hour "Timesheet Hour" \
 	      im_timesheet_task "Timesheet Task" \
 	      im_membership "Membership" \
-] $object_type] %>
-
+	] $object_type] %>
 	</td>
      </tr>
-
      <tr> 
 	<td><%= [lang::message::lookup "" intranet-csv-import.Filename] %></td>
-	<td> 
-	  <input type="file" name="upload_file" size="30">
+	<td><input type="file" name="upload_file" size="30">
 	<%= [im_gif help "Use the &quot;Browse...&quot; button to locate your file, then click &quot;Open&quot;."] %>
 	</td>
      </tr>
-
-     <tr> 
-	<td></td>
-	<td> 
-	  <input type="submit">
-	</td>
-    </tr>
-
+     <tr><td></td><td><input type="submit"></td></tr>
     </table>
 </form>
 
@@ -48,7 +37,8 @@
 <tr>
   <td colspan=4>
     <p>Please find below sample CSV files for each of the object types above.</p>
-    <p>Each file contains a list of column names in the first row. Column names are case insensitive and spaces may be replaced by "_" (underscore characters).</p>
+    <p>Each file contains a list of column names in the first row. 
+       Column names are case insensitive and spaces may be replaced by "_" (underscore characters).</p>
   </td>
 </tr>
 
@@ -65,7 +55,9 @@
     <a href="examples/im_company.csv"><%= [im_gif zip-download] %></a>
   </td>
   <td>
-    Company Name, Company Path, Company Status, Company Type, Primary Contact, Accounting Contact, Note, VAT Number, Phone, Fax, Address Line1, Address Line2, Address City, Address State, Address Postal Code, Address Country Code, Default Payment Days, Default VAT.<br>
+    Company Name, Company Path, Company Status, Company Type, Primary Contact, Accounting Contact, Note, VAT Number, 
+    Phone, Fax, Address Line1, Address Line2, Address City, Address State, Address Postal Code, Address Country Code, 
+    Default Payment Days, Default VAT.<br>
     Company <a href="/intranet-dynfield/object-type?object_type=im_company">DynFields</a> 
     are also recognized by their "pretty name" or "column name".</p>
   </td>
@@ -78,22 +70,23 @@
     <a href="examples/im_conf_item.csv"><%= [im_gif zip-download] %></a>
   </td>
   <td>
-    Conf Item Parent Nrs, Conf Item Name, Conf Item Code, Conf Item Nr, Conf Item Status, Conf Item Type, IP Address, Conf Item Owner, Conf Item Cost Center, Description, Note<br>
+    Please note that this import requires exact naming of column headers.<br>
+    Conf Item Parent Nrs, Conf Item Name, Conf Item Code, Conf Item Nr, Conf Item Status, Conf Item Type, IP Address, 
+    Conf Item Owner, Conf Item Cost Center, Description, Note<br>
     Conf Item <a href="/intranet-dynfield/object-type?object_type=im_conf_item">DynFields</a> 
     are also recognized by their "pretty name" or "column name".</p>
   </td>
 </tr>
 
 <tr>
-  <td><%= [im_gif hourglass] %></td>
-  <td>Timesheet Hour</td>
+  <td><%= [im_gif [db_string gif "select object_type_gif from acs_object_types where object_type = 'person'"]] %></td>
+  <td>Person</td>
   <td align=center>
-    <a href="examples/im_hour.csv"><%= [im_gif zip-download] %></a>
   </td>
   <td>
-    Hour Project Parent Nrs, Hour Name, Hour Probability, Hour Impact, Hour Status, Hour Type, Hour Description, Hour Mitigation Plan<br>
-    Hour <a href="/intranet-dynfield/object-type?object_type=im_hour">DynFields</a> 
-    are also recognized by their "pretty name" or "column name".</p>
+    Person import is under active development at the moment.<br>
+    Meanwhile, please use the old facilities for 
+    <a href="<%= [export_vars -base "/intranet/users/upload-contacts" {return_url}] %>">importing users from MS-Outlook exports</a>.
   </td>
 </tr>
 
@@ -104,7 +97,8 @@
     <a href="examples/im_project.csv"><%= [im_gif zip-download] %></a>
   </td>
   <td>
-    Parent Nrs, Project Nr, Project Name, Customer Name, Project Status, Project Type, Start Date, End Date, Percent Completed, On Track Status, Budget, Budget Hours, Priority, Note, Project Manager, Description.<br>
+    Parent Nrs, Project Nr, Project Name, Customer Name, Project Status, Project Type, Start Date, End Date, 
+    Percent Completed, On Track Status, Budget, Budget Hours, Priority, Note, Project Manager, Description.<br>
     Project <a href="/intranet-dynfield/object-type?object_type=im_project">DynFields</a> 
     are also recognized by their "pretty name" or "column name".</p>
   </td>
@@ -117,12 +111,26 @@
     <a href="examples/im_risk.csv"><%= [im_gif zip-download] %></a>
   </td>
   <td>
-    Risk Project Parent Nrs, Risk Name, Risk Probability, Risk Impact, Risk Status, Risk Type, Risk Description, Risk Mitigation Plan<br>
+    Risk Project Parent Nrs, Risk Name, Risk Probability, Risk Impact, Risk Status, Risk Type, Risk Description, 
+    Risk Mitigation Plan<br>
     Risk <a href="/intranet-dynfield/object-type?object_type=im_risk">DynFields</a> 
     are also recognized by their "pretty name" or "column name".</p>
   </td>
 </tr>
 
+<tr>
+  <td><%= [im_gif hourglass] %></td>
+  <td>Timesheet Hour</td>
+  <td align=center>
+    <a href="examples/im_hour.csv"><%= [im_gif zip-download] %></a>
+  </td>
+  <td>
+    Hour Project Parent Nrs, Hour Name, Hour Probability, Hour Impact, Hour Status, Hour Type, Hour Description<br>
+    DynFields for hours are not supported.
+  </td>
+</tr>
+
+
 <tr>
   <td colspan=4>
     <p>The ]project-open[ team offers professional services to help you import data from