Index: default/add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/add.html,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- default/add.html    9 Jan 2002 23:21:41 -0000       1.15
+++ default/add.html    17 Dec 2003 02:26:12 -0000      1.16
@@ -43,6 +43,7 @@
     <form action="<%db_cgi_url%>/add.cgi" enctype="multipart/form-data" method="POST">
             <table border="0" cellspacing="0" cellpadding="0">
     <%include include_form.html%>
+    <%if user_may_upload_attachments%> <%include include_attachment_form.html%> <%endif%>
                 <tr><td>&nbsp;</td><td><%body_font%>
     <input type="SUBMIT" name="add" value="Add Link"></font></td></tr>
             </table>
Index: default/browser.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser.html,v
retrieving revision 1.18
retrieving revision 1.20
diff -u -b -r1.18 -r1.20
--- default/browser.html        9 Jan 2002 23:21:41 -0000       1.18
+++ default/browser.html        28 Apr 2003 20:54:43 -0000      1.20
@@ -29,7 +29,6 @@
 CODE_FRAME_ID  = 2;
 CAN_UPDATE        = 0;

-
 /***************************************************************************************
  * Javascript UnloadedNode class                                                       *
  **************************************************************************************/
@@ -286,7 +285,8 @@
  */
 function UnloadedNode_toHtml()
 {
-    return this.expandButtonHtml() +
+    return '<a name="' + this.getId() + '"></a>' +
+            this.expandButtonHtml() +
            this.folderHtml() +
            "&nbsp; " +
                   this.name +
@@ -633,7 +633,8 @@
                   "</p>\n";
        }
        else {
-           return this.expandButtonHtml() +
+            return '<a name="' + this.getId() + '"></a>' +
+            this.expandButtonHtml() +
            this.folderHtml() +
            "&nbsp; " +
            this.name   +
@@ -872,7 +873,7 @@
 {
        return '<html><head>\n'                                                                            +
                   '<body bgcolor="#FFFFFF">'                                                                  +
-                  '<p><font face="Tahoma,Arial,Helvetica" size="2"><b>Category Browser:</b><br>'                          +
+           '<p><font face="Tahoma,Arial,Helvetica" size="2"><b>Editor:</b><br><%Name%> (<%owner_links%>)<br><br><b>Category Browser:</b><br>'                      +
                   this.toHtml_nodeLevel (<%id%>, 0)                                                           +
                   '</font></p></body></html>';
 }
@@ -1193,17 +1194,36 @@
  * Set the location, this prevents the tree from redrawing and positioning
  * up at the top again. Only works in IE 5.5, but Netscape behave nicely.
  */
-function set_location (node_id) 
-{
+function set_location (node_id) {
        if (document.all) {
-               var ver   = navigator.appVersion;       
-               var ie55  = (ver.indexOf("MSIE 5.5") > -1) ? 1 : 0;
-               if (ie55) {
+                if (isIE()) {
                        frames[LEFT_FRAME_ID].location.hash = node_id;
                }
        }
 }

+function isIE() {
+        var ver = window.navigator.appVersion;
+
+        var pos = ver.search('MSIE ');
+        var ie  = false;
+
+        if ( pos == -1 ) { 
+                return ie;
+        }
+
+        if ( ver.substr(pos + 5, 1) > 5 ) {
+                ie = true;
+        }
+        else if ( ver.substr(pos + 5, 1) == 5 ) {
+                var v = ver.substr(pos + 7, 1);  
+                if ( !isNaN(v) && v >= 5 ) {
+                ie = true;  
+                }
+        }
+        return ie;
+}
+        
 /***************************************************************************************
  * Javascript and HTML startup                                                         *
  **************************************************************************************/
Index: default/browser_category.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser_category.html,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -b -r1.5 -r1.9
--- default/browser_category.html       4 Aug 2001 21:56:14 -0000       1.5
+++ default/browser_category.html       27 Apr 2004 22:17:38 -0000      1.9
@@ -29,7 +29,7 @@
 <%endif%>
 <%if links%>
        <table border=1 cellpadding=3 cellspacing=0>
-               <tr><td colspan=6><font size="2" face="Tahoma,Arial,Helvetica">There are <b><%count%></b> links.</font></td></tr>
+               <tr><td colspan=6><font size="2" face="Tahoma,Arial,Helvetica">There are <b><%count%></b> links (<font color="red">red</font> links are still awaiting payment, or have expired).</font></td></tr>
                <%links%>
        </table>
 <%endif%>
Index: default/browser_category_add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser_category_add.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- default/browser_category_add.html   4 Aug 2001 21:56:14 -0000       1.5
+++ default/browser_category_add.html   28 Apr 2003 20:54:43 -0000      1.6
@@ -15,6 +15,7 @@
        parent.frames[parent.LEFT_FRAME_ID].document.open();
        parent.frames[parent.LEFT_FRAME_ID].document.writeln (parent.tree.toHtml());
        parent.frames[parent.LEFT_FRAME_ID].document.close();
+        parent.frames[parent.LEFT_FRAME_ID].navigate("#<%father_id%>");
 }
 parent.CAN_UPDATE = 0;
 // -->
Index: default/browser_category_modify.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser_category_modify.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- default/browser_category_modify.html        4 Aug 2001 21:56:14 -0000       1.6
+++ default/browser_category_modify.html        28 Apr 2003 20:54:43 -0000      1.7
@@ -6,7 +6,7 @@
  * A category has just been modified, therefore the javascript
  * tree on the left pane should be updated consequently.
  */
-if (parent.CAN_UPDATE) {
+ if (parent.CAN_UPDATE) {
        var modified_category_id   = <%category_id%>;
        var modified_category_name = <%Name_quoted%>;

@@ -16,6 +16,7 @@
        parent.frames[parent.LEFT_FRAME_ID].document.open();
        parent.frames[parent.LEFT_FRAME_ID].document.writeln (parent.tree.toHtml());
        parent.frames[parent.LEFT_FRAME_ID].document.close()
+        parent.frames[parent.LEFT_FRAME_ID].navigate("#<%category_id%>");
 }
 parent.CAN_UPDATE = 0;
 // -->
Index: default/browser_category_move.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser_category_move.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- default/browser_category_move.html  4 Aug 2001 21:56:14 -0000       1.6
+++ default/browser_category_move.html  28 Apr 2003 20:54:43 -0000      1.7
@@ -73,6 +73,7 @@

        // redisplays this info
        parent.draw_tree();
+        parent.frames[parent.LEFT_FRAME_ID].navigate("#<%old%>");
 }
 // -->
 </script>
Index: default/browser_link_add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser_link_add.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- default/browser_link_add.html       4 Aug 2001 21:56:14 -0000       1.5
+++ default/browser_link_add.html       28 Apr 2003 20:54:43 -0000      1.6
@@ -22,6 +22,7 @@
                fatherid = node.getFatherId();
        }
        parent.draw_tree();
+        parent.frames[parent.LEFT_FRAME_ID].navigate("#<%id%>");
 }
 parent.CAN_UPDATE = 0;
 // -->
Index: default/browser_link_copy.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser_link_copy.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- default/browser_link_copy.html      4 Aug 2001 21:56:14 -0000       1.5
+++ default/browser_link_copy.html      28 Apr 2003 20:54:43 -0000      1.6
@@ -25,6 +25,7 @@

        // redisplays this info
        parent.draw_tree();
+        parent.frames[parent.LEFT_FRAME_ID].navigate("#<%new%>");
 }
 parent.CAN_UPDATE = 0;
 // -->
Index: default/browser_link_list.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser_link_list.html,v
retrieving revision 1.8
retrieving revision 1.14
diff -u -b -r1.8 -r1.14
--- default/browser_link_list.html      4 Sep 2001 19:53:48 -0000       1.8
+++ default/browser_link_list.html      27 Apr 2004 22:17:38 -0000      1.14
@@ -1,16 +1,20 @@
-<tr><td><li><font face="Tahoma,Arial,Helvetica" size="2"><%Title%></font></td>
-    <td><font face="Tahoma,Arial,Helvetica" size="2"><a href="<%URL%>" target="_blank"><%URL%></a></font></td>
+<tr>
+  <td>
+    <font face="Tahoma,Arial,Helvetica" size="2"><li><%if ExpiryDate < $TIME%><font color="red"><%endif%><%Title%><%if ExpiryDate < $TIME%></font><%endif%></font>
+  </td>
+  <td><font face="Tahoma,Arial,Helvetica" size="2"><a href="<%URL%>" target="_blank"><%URL%></a></font>
+  </td>
        <td><font face="Tahoma,Arial,Helvetica" size="1">
-
-<%if isValidated eq 'No'%>
+    <%if isValidated eq 'No'%>
             <%if CanValLink eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?action=link_validate_form&category_id=<%category_id%>&link_id=<%ID%>">Validate</a> | <%endif%>
-<%endif%>
-<%if hasChangeRequest%>
+    <%endif%>
+    <%if hasChangeRequest%>
             <%if CanValLink eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?action=link_validate_form&category_id=<%category_id%>&link_id=<%ID%>&update=1">Update</a> | <%endif%>
-<%endif%>
+    <%endif%>
                 <%if CanModLink eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?action=link_modify_form&category_id=<%category_id%>&link_id=<%ID%>">Edit</a> | <%endif%>
                 <%if CanDelLink eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?action=link_del_form&category_id=<%category_id%>&link_id=<%ID%>">Delete</a> | <%endif%>
                 <%if CanMoveLink eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?action=link_move_form&category_id=<%category_id%>&link_id=<%ID%>">Move</a> | <%endif%>
                 <%if CanCopyLink eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?action=link_copy_form&category_id=<%category_id%>&link_id=<%ID%>">Copy</a> | <%endif%>
-                <a href="<%db_cgi_url%>/browser.cgi?action=link_user_list&category_id=<%category_id%>&user=<%linkowner_esc%>">Owner</a> |
-</td></tr>
+    <a href="<%db_cgi_url%>/browser.cgi?action=link_user_list&category_id=<%category_id%>&user=<%linkowner_esc%>">Owner</a>
+  </td>
+</tr>
Index: default/browser_navbar.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser_navbar.html,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -b -r1.9 -r1.12
--- default/browser_navbar.html 4 Sep 2001 19:53:48 -0000       1.9
+++ default/browser_navbar.html 24 Mar 2004 02:47:28 -0000      1.12
@@ -1,12 +1,13 @@
-<a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_click">Browse</a> |^M
-<%if CanAddCat eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_add_form">Add Cat</a> |<%endif%>^M
+<a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_click">Browse</a>
+<%if CanAddCat eq 'Yes'%> | <a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_add_form">Add Cat</a><%endif%>
 ^M
 <%if category_id%>^M
-       <%if CanAddLink eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=link_add_form">Add Link</a> | <%endif%>^M
-       <%if CanModCat eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_modify_form">Edit</a> | <%endif%>^M
-       <%if CanDelCat eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_del_form">Delete</a> | <%endif%>^M
-       <%if CanMoveCat eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_move_form">Move</a> | <%endif%>^M
-       <%if CanAddEdit eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_editors_form">Editors</a> | <%endif%>^M
-       <%if CanAddRel eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_related_form">Related</a> | <%endif%>^M
+       <%if CanAddLink eq 'Yes'%> | <a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=link_add_form">Add Link</a><%endif%>
+       <%if CanModCat eq 'Yes'%> | <a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_modify_form">Edit</a><%endif%>
+       <%if CanDelCat eq 'Yes'%> | <a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_del_form">Delete</a><%endif%>
+       <%if CanMoveCat eq 'Yes'%> | <a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_move_form">Move</a><%endif%>
+       <%if CanAddEdit eq 'Yes'%> | <a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_editors_form">Editors</a><%endif%>
+       <%if CanAddRel eq 'Yes'%> | <a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=category_related_form">Related</a><%endif%>
 <%endif%>^M
-<%if CanValLink eq 'Yes'%><a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=link_validate_list">Validate</a> | <%endif%>^M
+<%if CanValLink eq 'Yes'%> | <a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=link_validate_list">Validate</a><%endif%>
+ | <a href="<%db_cgi_url%>/browser.cgi?category_id=<%category_id%>&action=link_search_form">Search</a>
Index: default/browser_validate_links.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/browser_validate_links.html,v
retrieving revision 1.3
retrieving revision 1.7
diff -u -b -r1.3 -r1.7
--- default/browser_validate_links.html 4 Aug 2001 21:56:14 -0000       1.3
+++ default/browser_validate_links.html 27 Apr 2004 22:17:38 -0000      1.7
@@ -29,7 +29,7 @@
 <%endif%>
 <%if links%>
        <table border=1 cellpadding=3 cellspacing=0>
-               <tr><td colspan=6><font size="2" face="Tahoma,Arial,Helvetica">There are <b><%count%></b> links waiting to be validated.</font></td></tr>
+               <tr><td colspan=6><font size="2" face="Tahoma,Arial,Helvetica">There are <b><%count%></b> links waiting to be validated (<font color="red">red</font> links are still awaiting payment).</font></td></tr>
                <%links%>
        </table>
 <%else%>
Index: default/cool.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/cool.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- default/cool.html   30 Dec 2001 19:39:00 -0000      1.10
+++ default/cool.html   1 Apr 2004 22:25:51 -0000       1.11
@@ -32,7 +32,7 @@

         <%header_row%><td width=200>
         <%header_font%><%total%> COOL LINKS (the top <%percent%>):<%/header_font%></td>
-        <td width="540" bgcolor=white><img src="<%build_images_url%>/default/ClearShim.gif" width=540 height=3>
+        <td width="500" bgcolor=white><img src="<%build_images_url%>/default/ClearShim.gif" width=500 height=3>
          </td></tr>
         <tr><td colspan=2>
                <%if next_span%>
Index: default/email-add.txt
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/email-add.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- default/email-add.txt       4 Aug 2001 21:56:14 -0000       1.6
+++ default/email-add.txt       23 Mar 2004 21:06:59 -0000      1.7
@@ -10,7 +10,7 @@

 You can see your new listing at:

-    http://www.gossamer-threads.com/scripts/links/
+    <%build_root_url%>

 Should you have any questions, please don't hesitate to ask.

Index: default/email-mod.txt
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/email-mod.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- default/email-mod.txt       4 Aug 2001 21:56:14 -0000       1.5
+++ default/email-mod.txt       23 Mar 2004 21:06:59 -0000      1.6
@@ -10,7 +10,7 @@

 You can see your updated listing at:

-  http://www.gossamer-threads.com/scripts/links/
+  <%build_root_url%>

 Should you have any questions, please don't hesitate to ask.

Index: default/home.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/home.html,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- default/home.html   9 Jan 2002 23:21:41 -0000       1.13
+++ default/home.html   1 Apr 2004 22:26:24 -0000       1.14
@@ -23,7 +23,7 @@
     <%include include_menu.html%><br><%include include_search_bar.html%>
   </td></tr>
   <tr>
-   <td width="230" valign=top align=left>
+   <td width="200" valign=top align=left>
      <table width="200" border=0 cellpadding=0 cellspacing=0>
        <tr><td>
        <img src="<%build_images_url%>/default/ChainLink.jpg" border=0>
@@ -32,7 +32,7 @@
      </td></tr></table>
     </td>
     <td width=6 bgcolor=black rowspan=2>&nbsp;</td>
-    <td valign=top align=left width="534">
+    <td valign=top align=left width="564">
       <table border=0 width="100%" cellpadding=3 cellspacing=0>
          <%header_row%><td>&nbsp;</td>
          <td>
Index: default/link.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/link.html,v
retrieving revision 1.16
retrieving revision 1.27
diff -u -b -r1.16 -r1.27
--- default/link.html   7 Jan 2002 00:32:13 -0000       1.16
+++ default/link.html   16 Apr 2004 22:04:34 -0000      1.27
@@ -9,7 +9,7 @@
                                     provide a link to the modify form).
 --%>
 <ul>
-<li><%body_font%><a class="category_links" target="_blank" href="<%db_cgi_url%>/jump.cgi?ID=<%ID%>"><%Title%></a>
+<li><%body_font%><a class="category_links" target="_blank" href="<%db_cgi_url%>/jump.cgi?ID=<%ID%>"><%Title%></a></font>

 <%if isNew%>
   &nbsp;<font color=red><small><sup>new</sup></small></font>
@@ -22,30 +22,53 @@
 <%if isPopular%>
   &nbsp;<font color="#6699cc"><small><sup class="pop">pop</sup></small></font>
 <%endif%>
-<br></font>
+
+<%if paymentsEnabled and isUnpaid%>
+  &nbsp;<font color="red"><small><sup class="pop">unpaid</sup></small></font>
+<%endif%>
+
+<%if paymentsEnabled and isExpired%>
+  &nbsp;<font color="red"><small><sup class="pop">expired</sup></small></font>
+<%endif%>
+
+<%if paymentsEnabled and isFree%>
+  &nbsp;<font color="red"><small><sup class="pop">free</sup></small></font>
+<%endif%>
+
+<br>

 <%if Description%>
   <%body_font%><%Description%></font><br>
 <%endif%>

 <%if URL%>
-  <small><%URL%></small><br>
+  <%body_font%><small><%URL%></small></font><br>
 <%endif%>

-<%if Review_Count%>
-       <small><a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>">Read <%Review_Count%> Reviews</a></small><br>
+<%if paymentsEnabled and ExpiryDateFormatted and not isFree%>
+  <%body_font%><small>(<%if isNotify or isExpired%><font color="red"><%endif%><%if isExpired%>Expired on:<%else%>Expiry date:<%endif%> <%ExpiryDateFormatted%><%if isNotify or isExpired%></font><%endif%>)</small></font><br>
 <%endif%>

-<%body_font%><small>(Added: <%Add_Date%> Hits: <%Hits%>  Rating: <%Rating%> Votes: <%Votes%>) 
+<%if Review_Count %>
+  <%body_font%><small><a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>">Read <%Review_Count%> Reviews</a></small></font><br>
+<%endif%>

+<%body_font%><small>(Added: <%Add_Date%> Hits: <%Hits%>  Rating: <%Rating%> Votes: <%Votes%>)
+<%if isValidated eq 'Yes'%>
 &nbsp; <a href="<%db_cgi_url%>/rate.cgi?ID=<%ID%>">Rate It</a>
 &nbsp; <a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>&add_review=1">Review It</a>
-
-<%if detailed_url%>
+<%endif%>
+<%if detailed_url and isValidated eq 'Yes'%>
     &nbsp;<a href="<%detailed_url%>">Details</a>
 <%endif%>
-<%if isLinkOwner%>
+<%if isLinkOwner and isValidated eq 'Yes'%>
     &nbsp;<a href="<%db_cgi_url%>/modify.cgi?LinkID=<%ID%>">Edit this link</a>
 <%endif%>
-</small></font>
+
+<%if paymentsEnabled%>
+&nbsp; <a href="<%db_cgi_url%>/modify.cgi?do=payment_linked;process_payment=1;modify=1;ID=<%ID%>"><%if isUnpaid or isFree%>New Payment<%else%>Renewal Payment<%endif%></a>
+<%endif%>
+</small>
+</font>
+<br>
 </ul>
Index: default/modify.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/modify.html,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -b -r1.14 -r1.16
--- default/modify.html 30 Dec 2001 19:39:00 -0000      1.14
+++ default/modify.html 30 Mar 2004 03:20:50 -0000      1.16
@@ -50,8 +50,9 @@
     <%endif%>
             <table border="0" cellspacing="0" cellpadding="0">
                 <%include include_form.html%>
+                <%if user_may_upload_attachments%> <%include include_attachment_form.html%> <%endif%>
                 <tr><td></td><td><%body_font%>
-                <input type="SUBMIT" name="modify" value="Modify Link"></font></td></tr>
+                <input type="SUBMIT" name="modify_submit" value="Modify Link"></font></td></tr>
             </table>
             </form>
         </font></td></tr>
Index: default/modify_select.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/modify_select.html,v
retrieving revision 1.9
retrieving revision 1.11
diff -u -b -r1.9 -r1.11
--- default/modify_select.html  7 Jan 2002 00:32:13 -0000       1.9
+++ default/modify_select.html  28 Apr 2004 23:19:49 -0000      1.11
@@ -37,9 +37,11 @@

         <table border=0>
         <%loop link_results_loop%>
-            <tr><td valign=top><input type=radio name=LinkID value="<%ID%>" align=top></td>
+          <tr>
+            <td valign=top><%if isValidated eq 'Yes'%><input type=radio name=LinkID value="<%ID%>" align=top><%endif%></td>
             <td>
-              <%Links::Utils::load_link%>
+              <%Links::Utils::load_link_info%>
+              <%include link.html%>
             </td></tr>
         <%endloop%>
         </table>
Index: default/modify_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/modify_success.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- default/modify_success.html 9 Jan 2002 23:21:41 -0000       1.11
+++ default/modify_success.html 29 Apr 2004 00:45:03 -0000      1.12
@@ -25,7 +25,6 @@
     <tr><td bgcolor=black width=6 rowspan=2>
         <img src="<%build_images_url%>/default/ClearShim.gif" width=6 height="200"></td>
         <td>
-      
         <table border=0 width="100%" cellpadding=3 cellspacing=0>
           <%header_row%><td width="30%">
           <%header_font%>LINK MODIFIED!<%/header_font%></td>
@@ -34,14 +33,21 @@
             <table border=0 cellpadding=3 cellspacing=0>
               <tr><td colspan=2 valign=middle>
               <img src="<%build_images_url%>/default/ClearShim.gif" width="100%" height="20"><br>
-              We have received your request to modify the link as follows:</td></tr>
+                <%if payment_term eq 'free'%>
+                Your link has been changed to a free link:
+                <%else%>
+                We have received your request to modify the link as follows:
+                <%endif%>
+              </td></tr>
               <tr><td><%body_font%>Title:</td><td><b><%Title%></b></font></td></tr>
               <tr><td><%body_font%>URL:</td><td><b><%URL%></b></font></td></tr>
               <tr><td><%body_font%>Category:</td><td><b><%Category%></b></font></td></tr>
               <tr><td><%body_font%>Description:</td><td><b><%Description%></b></font></td></tr>
               <tr><td><%body_font%>Contact Name:</td><td><b><%Contact_Name%></b></font></td></tr>
               <tr><td><%body_font%>Contact Email:</td><td><b><%Contact_Email%></b></font></td></tr>
+              <%if payment_term ne 'free' %>
               <tr><td colspan=2>Thank you! We will send you an email once your link has been validated.</td></tr>
+              <%endif%>
               <tr><td colspan=2>&nbsp;</td><tr>
             </table>
          </td></tr></table>
Index: default/new.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/new.html,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- default/new.html    30 Dec 2001 19:39:00 -0000      1.11
+++ default/new.html    1 Apr 2004 22:26:24 -0000       1.12
@@ -46,7 +46,7 @@

         <%header_row%><td width="30%">
         <%header_font%><%total%> NEW LINKS:<%/header_font%></td>
-        <td bgcolor="white" width="70%" colspan=2><img src="<%build_images_url%>/default/ClearShim.gif" border=0 height=1 width="100%"></td></tr>
+        <td bgcolor="white" width="70%" colspan=2><img src="<%build_images_url%>/default/ClearShim.gif" border=0 height=1 width="500"></td></tr>
           <%if new_index%>
 <!-- Displays a list of dates and counts for each link -->
               <tr><td colspan=2><%body_font%>
@@ -65,7 +65,7 @@
                          <%endif%>
               </td></tr>
           <%endif%>
-       </table>
+       </table><br>
      </td>
    </tr>
 <tr><td colspan=2>
Index: default/rate_top.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/rate_top.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- default/rate_top.html       30 Dec 2001 19:39:00 -0000      1.8
+++ default/rate_top.html       1 Apr 2004 22:26:45 -0000       1.9
@@ -27,7 +27,7 @@
     <table border=0 width="100%" cellpadding=3 cellspacing=0>
         <%header_row%><td width="35%">
         <%header_font%> TOP 10 by rating (10 votes or more):<%/header_font%></td>
-        <td width="65%" bgcolor=white><img src="<%build_images_url%>/default/ClearShim.gif" width=540 height=3>
+        <td width="65%" bgcolor=white><img src="<%build_images_url%>/default/ClearShim.gif" width=500 height=3>
          </td></tr>
     <tr><td colspan=2>&nbsp;</td></tr>
     <tr><td colspan=2>
@@ -45,7 +45,7 @@
     <table border=0 width="100%" cellpadding=3 cellspacing=0>
         <%header_row%><td width="35%">
         <%header_font%> TOP 10 by votes (10 votes or more):<%/header_font%></td>
-        <td width="65%" bgcolor=white><img src="<%build_images_url%>/default/ClearShim.gif" width=540 height=3>
+        <td width="65%" bgcolor=white><img src="<%build_images_url%>/default/ClearShim.gif" width=500 height=3>
          </td></tr>
     <tr><td colspan=2>&nbsp;</td></tr>
     <tr><td colspan=2>
Index: default/review_add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/review_add.html,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- default/review_add.html     7 Jan 2002 00:32:13 -0000       1.12
+++ default/review_add.html     28 Apr 2004 23:19:49 -0000      1.13
@@ -43,7 +43,7 @@
               <%error_font%><b><%error%></b></font>
             </p>
           <%endif%>
-          <%if URL%><%Links::Utils::load_link%><%endif%>
+          <%if URL%><%Links::Utils::load_link_info%><%include link.html%><%endif%>
           </td>
         </tr>
       </table>
Index: default/review_add_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/review_add_success.html,v
retrieving revision 1.10
retrieving revision 1.12
diff -u -b -r1.10 -r1.12
--- default/review_add_success.html     9 Jan 2002 23:21:41 -0000       1.10
+++ default/review_add_success.html     28 Apr 2004 23:19:49 -0000      1.12
@@ -36,7 +36,7 @@
         </tr>^M
         <tr>^M
           <td colspan="2">^M
-            <%if URL%><%Links::Utils::load_link%><%endif%>^M
+            <%if URL%><%Links::Utils::load_link_info%><%include link.html%><%endif%>
           </td>^M
         </tr> ^M
         <tr>^M
Index: default/review_edit.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/review_edit.html,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -b -r1.4 -r1.6
--- default/review_edit.html    8 Jan 2002 11:49:21 -0000       1.4
+++ default/review_edit.html    28 Apr 2004 23:19:49 -0000      1.6
@@ -48,7 +48,7 @@
              <%error_font%><b><%error%></b></font>^M
             </p>^M
           <%endif%>^M
-            <%if URL%><%Links::Utils::load_link%><%endif%>^M
+            <%if URL%><%Links::Utils::load_link_info%><%include link.html%><%endif%>
           </td> ^M
         </tr> ^M
       </table> ^M
Index: default/review_edit_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/review_edit_success.html,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -b -r1.3 -r1.5
--- default/review_edit_success.html    3 Jan 2002 03:02:23 -0000       1.3
+++ default/review_edit_success.html    28 Apr 2004 23:19:49 -0000      1.5
@@ -39,7 +39,7 @@
               </tr> ^M
               <tr>^M
                 <td colspan="2">^M
-                  <%if URL%><%Links::Utils::load_link%><%endif%>^M
+                  <%if URL%><%Links::Utils::load_link_info%><%include link.html%><%endif%>
                 </td> ^M
               </tr> ^M
               <tr>^M
Index: default/review_search_results.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/cgi/admin/templates/default/review_search_results.html,v
retrieving revision 1.13
retrieving revision 1.15
diff -u -b -r1.13 -r1.15
--- default/review_search_results.html  8 Jan 2002 09:54:51 -0000       1.13
+++ default/review_search_results.html  28 Apr 2004 23:19:49 -0000      1.15
@@ -49,7 +49,8 @@
                   <%if user%>^M
                     <br><b><%user%></b> has <%Review_Count%> review(s)^M
                   <%elseif ID%>^M
-                    <%Links::Utils::load_link%>^M
+                    <%Links::Utils::load_link_info%>
+                    <%include link.html%>
                   <%endif%>^M
                   </p>^M
                 <%endif%>^M