Index: mint/add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/mint/add.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mint/add.html       13 Dec 2001 03:37:05 -0000      1.1
+++ mint/add.html       1 May 2004 02:32:09 -0000       1.2
@@ -55,6 +55,7 @@
     <form action="<%db_cgi_url%>/add.cgi" method="POST">
             <table border="0" cellspacing="4" cellpadding="0">
     <%include include_form.html%>
+        <%if user_may_upload_attachments%> <%include include_attachment_form.html%> <%endif%>
                 <tr><td>&nbsp;</td><td><%body_font%><br>
     <input class="button" type="SUBMIT" name="add" value="Add Link"></font></td></tr>
             </table>
Index: mint/link.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/mint/link.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mint/link.html      13 Dec 2001 03:37:05 -0000      1.1
+++ mint/link.html      1 May 2004 02:32:09 -0000       1.2
@@ -8,50 +8,67 @@
                     isLinkOwner  => True if the logged in user owns this link (used to
                                     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></font>
+<li><%body_font%><a class="category_links" target="_blank" href="<%db_cgi_url%>/jump.cgi?ID=<%ID%>"><%Title%></a></font>

 <%if isNew%>
-  &nbsp;<%body_font%><font color="#CC0000"><sup>new</sup></font></font>
+  &nbsp;<font color=red><small><sup>new</sup></small></font>
 <%endif%>

 <%if isChanged%>
-  &nbsp;<%body_font%><font color="#CC0000"><sup>updated</sup></font></font>
+  &nbsp;<font color=red><small><sup>updated</sup></small></font>
 <%endif%>

 <%if isPopular%>
-  &nbsp;<%body_font%><font color="#6699cc"><small><sup class="pop">pop</sup></small></font></font>
+  &nbsp;<font color="#6699cc"><small><sup class="pop">pop</sup></small></font>
 <%endif%>
-<br>

-<%if Description%>
-  <%body_font%><%Description%></font><br>
+<%if paymentsEnabled and isUnpaid%>
+  &nbsp;<font color="red"><small><sup class="pop">unpaid</sup></small></font>
 <%endif%>

-<%if URL%>
-  <%body_font%><font color="#B1D0A6"><%URL%></font></font><br>
+<%if paymentsEnabled and isExpired%>
+  &nbsp;<font color="red"><small><sup class="pop">expired</sup></small></font>
 <%endif%>

-<%if Review_Count%>
-       <a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>">Read <%Review_Count%> Reviews</a><br>
+<%if paymentsEnabled and isFree%>
+  &nbsp;<font color="red"><small><sup class="pop">free</sup></small></font>
 <%endif%>

-<%body_font%><small>(Added: <%Add_Date%> Hits: <%Hits%>  Rating: <%Rating%> Votes: <%Votes%>) </small></font> 
+<br>

-<%body_font%><small><a href="<%db_cgi_url%>/rate.cgi?ID=<%ID%>">Rate It</a></small></font>
-&nbsp;<%body_font%><small><a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>&add_review=1">Review It</a></small></font>
+<%if Description%>
+  <%body_font%><%Description%></font><br>
+<%endif%>

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

-<%if detailed_url%>
-    &nbsp;<%body_font%><small><a href="<%detailed_url%>">Details</a></small></font>
+<%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%>

-<%if isLinkOwner%>
-    &nbsp;<%body_font%><small><a href="<%db_cgi_url%>/modify.cgi?LinkID=<%ID%>">Edit this link</a></small></font>
+<%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>
+<%endif%>
+<%if detailed_url and isValidated eq 'Yes'%>
+    &nbsp;<a href="<%detailed_url%>">Details</a>
+<%endif%>
+<%if isLinkOwner and isValidated eq 'Yes'%>
+    &nbsp;<a href="<%db_cgi_url%>/modify.cgi?LinkID=<%ID%>">Edit this link</a>
+<%endif%>

+<%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: mint/modify.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/mint/modify.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mint/modify.html    13 Dec 2001 03:37:05 -0000      1.1
+++ mint/modify.html    1 May 2004 02:32:09 -0000       1.2
@@ -63,6 +63,7 @@
                        <tr><td><%body_font%><b>Current URL:</b></font></td><td><input class="button"name="Current_URL" value="<%if Current_URL%><%Current_URL%><%endif%>" size="30"></td></tr><%endif%>

                 <%include include_form.html%>
+                <%if user_may_upload_attachments%> <%include include_attachment_form.html%> <%endif%>
                 <tr><td></td><td><%body_font%><br>
                 <input class="button" type="SUBMIT" name="modify" value="Modify Link"></font></td></tr>
             </table>
Index: mint/modify_select.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/mint/modify_select.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mint/modify_select.html     13 Dec 2001 03:37:05 -0000      1.1
+++ mint/modify_select.html     1 May 2004 02:32:09 -0000       1.2
@@ -49,8 +49,10 @@

         <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_info%>
             <%include link.html%>
             </td></tr>
         <%endloop%>
Index: mint/modify_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/mint/modify_success.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mint/modify_success.html    13 Dec 2001 03:37:05 -0000      1.1
+++ mint/modify_success.html    1 May 2004 02:32:09 -0000       1.2
@@ -41,14 +41,21 @@
             <table width="100%" border=0 cellpadding=2 cellspacing=0>
               <tr><td colspan=2 valign=middle>
               <img src="<%build_images_url%>/mint/ClearShim.gif" width="100%" height="20" alt=""><br>
-              <%body_font%>We have received the following link:</font><br><br></td></tr>
+              <%body_font%>
+              <%if payment_term eq 'free'%>
+                Your link has been changed to a free link:
+              <%else%>
+                We have received the following link:
+              <%endif%></font><br><br></td></tr>
               <tr><td width="20%"><%body_font%>Title:</font></td><td><b><%body_font%><%Title%></b></font></td></tr>
               <tr><td width="20%"><%body_font%>URL:</font></td><td><b><%body_font%><%URL%></b></font></td></tr>
               <tr><td width="20%"><%body_font%>Category:</font></td><td><b><%body_font%><%Category%></b></font></td></tr>
               <tr><td width="20%" valign="top"><%body_font%>Description:</font></td><td><b><%body_font%><%Description%></b></font></td></tr>
               <tr><td width="20%"><%body_font%>Contact Name:</font></td><td><b><%body_font%><%Contact_Name%></b></font></td></tr>
               <tr><td width="20%"><%body_font%>Contact Email:</font></td><td><b><%body_font%><%Contact_Email%></b></font></td></tr>
+              <%if payment_term ne 'free' %>
               <tr><td colspan=2><br><%body_font%>Thank you! We will send you an email once your link has been validated.</font></td></tr>
+              <%endif%>

             </table>

Index: mint/review_add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/mint/review_add.html,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -b -r1.1 -r1.3
--- mint/review_add.html        13 Dec 2001 03:37:05 -0000      1.1
+++ mint/review_add.html        1 May 2004 02:32:09 -0000       1.3
@@ -18,96 +18,128 @@

 <%include include_header.html%>
 <%body_table%>
-  <tr><td colspan=2 align=center><%include include_menu.html%><%include include_search_bar_rest.html%></td></tr>
-
- <tr>
+<tr>
+  <td colspan=2 align=center><%include include_menu.html%><%include include_search_bar_rest.html%></td>
+</tr>
+<tr> 
       <td valign=top>
-
          <table border=0 width="<%body_width%>" cellpadding=0 cellspacing=0>
-
-     <tr><td width="20%" bgcolor="<%left_menu_head_color%>" align="center"><%body_font%><b>Menu</b></font>
-               </td>
-                        
-                <td bgcolor="<%header_color%>" align="left">
-           <%header_font%>&nbsp;Add a Review:<%/header_font%></td></tr>
-
-                  <tr><td valign="top" align="left" width="20%" bgcolor="<%left_menu_color%>" rowspan="12">
-
-           <%include include_menu_table.html%>
-
+      <tr>
+        <td width="20%" bgcolor="<%left_menu_head_color%>" align="center"><%body_font%><b>Menu</b> 
            </td>
+        <td bgcolor="<%header_color%>" align="left"> <%header_font%>&nbsp;Add a Review:<%/header_font%></td>
            </tr>
-
-
-<tr>
-<td colspan=2>
-
-    <%if URL%><br><%include link.html%><%endif%>
-    
+      <tr>
+        <td valign="top" align="left" width="20%" bgcolor="<%left_menu_color%>" rowspan="12"> 
+          <%include include_menu_table.html%> </td>
+      </tr>
+      <tr> 
+        <td colspan=2> <%if URL%><br>
+          <%Links::Utils::load_link_info%><%include link.html%><%endif%> 
     <form action="<%db_cgi_url%>/review.cgi" method="POST">
-       <table cellpadding="5" width="100%"><tr><td>
-
+            <table cellpadding="5" width="100%">
+              <tr>
+                <td> 
             <table border="0" cellspacing="0" cellpadding="2">
                 <%if confirm_add%>
-                    <tr><td colspan="2"><%body_font%><br>Our records show that you have previously rated or commented on this script, 
-                    so we are making sure you wish to overwrite those previous submissions.<br><br>
+                    <tr>
+                      <td colspan="2"><%body_font%><br>
+                        Our records show that you have previously rated or commented 
+                        on this script, so we are making sure you wish to overwrite 
+                        those previous submissions.<br>
+                        <br>
                     <input type="hidden" name="Review_Rating" value="<%Review_Rating%>">
                     <input type="hidden" name="Review_Subject" value="<%Review_Subject%>">
                     <input type="hidden" name="Review_ByLine" value="<%Review_ByLine%>">
                     <input type="hidden" name="Review_Contents" value="<%Review_Contents%>">
                     <input type="hidden" name="ReviewID" value="<%ReviewID%>">
                     <input type="hidden" name="Overwrite" value="yes">
-                    <br></td><tr>
-                                   
+                        <br>
+                      </td>
+                    <tr> 
                 <%else%>
-                    <tr><td colspan="2"><%body_font%>
-    <%if error%>
-    <br><%error_font%><b><%error%></b></font><br><br>
+                    <tr>
+                      <td colspan="2"><%body_font%> <%if error%> <br>
+                        <%error_font%><b><%error%></b><br>
+                        <br>
+                        <%endif%> Please completely fill out the form below, and 
+                        we'll add your review as soon as possible.<br>
+                        <br>
+                      </td>
+                    </tr>
+                    <tr>
+                      <td valign="top"><%body_font%>Your Rating:</td>
+                      <td> 
+                        <input type="radio" name="Review_Rating" value="1" <%if Review_Rating eq '1'%>checked<%endif%>>
+                        <%body_font%>1 
+                        <input type="radio" name="Review_Rating" value="2" <%if Review_Rating eq '2'%>checked<%endif%>>
+                        <%body_font%>2 
+                        <input type="radio" name="Review_Rating" value="3" <%if Review_Rating eq '3'%>checked<%endif%>>
+                        <%body_font%>3 
+                        <input type="radio" name="Review_Rating" value="4" <%if Review_Rating eq '4'%>checked<%endif%>>
+                        <%body_font%>4 
+                        <input type="radio" name="Review_Rating" value="5" <%if Review_Rating eq '5'%>checked<%endif%>>
+                        <%body_font%>5 </td>
+                    </tr>
+                    <tr>
+                      <td valign="top"><%body_font%>Subject:</td>
+                      <td>
+                        <input class="button" name="Review_Subject" value="<%if Review_Subject%><%Review_Subject%><%endif%>" size="50">
+                      </td>
+                    </tr>
+                    <tr>
+                      <td valign="top"><%body_font%>By Line:</td>
+                      <td>
+                        <input class="button" name="Review_ByLine" value="<%if Review_ByLine%><%Review_ByLine%><%endif%>" size="50">
+                      </td>
+                    </tr>
+                    <tr>
+                      <td valign="top"><%body_font%>Write a review:</td>
+                      <td><%body_font%>
+                        <textarea wrap="virtual" name="Review_Contents" rows="3" cols="42" class="button" ><%if Review_Contents%><%Review_Contents%><%endif%></textarea>
+                      </td>
+                    </tr>
+                      <%if anonymous%>
+                        <tr>
+                          <td valign="top"><%body_font%>Your Name:</td>
+                          <td>
+                            <input class="button" name="Review_GuestName" value="<%if Review_GuestName%><%Review_GuestName%><%endif%>" size="30">
+                          </td>
+                        </tr>
+                        <tr>
+                          <td valign="top"><%body_font%>Your Email:</td>
+                          <td>
+                            <input class="button" name="Review_GuestEmail" value="<%if Review_GuestEmail%><%Review_GuestEmail%><%endif%>" size="30">
+                          </td>
+                        </tr>
+                      <%endif%>
     <%endif%>
-Please completely fill out the form below, and we'll 
-                    add your review as soon as possible.<br><br></td></tr>
-                    <tr><td valign="top"><%body_font%>Your Rating:</td>
-                        <td>
-                        <input type="radio" name="Review_Rating" value="1" <%if Review_Rating eq '1'%>checked<%endif%>> <%body_font%>1</font>
-                        <input type="radio" name="Review_Rating" value="2" <%if Review_Rating eq '2'%>checked<%endif%>> <%body_font%>2</font>
-                        <input type="radio" name="Review_Rating" value="3" <%if Review_Rating eq '3'%>checked<%endif%>> <%body_font%>3</font>
-                        <input type="radio" name="Review_Rating" value="4" <%if Review_Rating eq '4'%>checked<%endif%>> <%body_font%>4</font>
-                        <input type="radio" name="Review_Rating" value="5" <%if Review_Rating eq '5'%>checked<%endif%>> <%body_font%>5</font>       
-                        </td></tr>
-                    <tr><td valign="top"><%body_font%>Subject:</td>
-                        <td><input class="button" name="Review_Subject" value="<%if Review_Subject%><%Review_Subject%><%endif%>" size="50">
-                        </td></tr>
-                    <tr><td valign="top"><%body_font%>By Line:</td>
-                        <td><input class="button" name="Review_ByLine" value="<%if Review_ByLine%><%Review_ByLine%><%endif%>" size="50">
-                        </td></tr>
-                    <tr><td valign="top"><%body_font%>Write a review:</td>
-                        <td><%body_font%><textarea wrap="virtual" name="Review_Contents" rows="3" cols="42" class="button" ><%if Review_Contents%><%Review_Contents%><%endif%></textarea>
-                        </td></tr>
+                    <tr>
+                      <td></td>
+                      <td><br>
+                        <%if ID%>
+                        <input type="hidden" name="ID" value=<%ID%>>
                 <%endif%>
-                    <tr><td></td><td><br>
-                        <%if ID%><input type="hidden" name="ID" value=<%ID%>><%endif%>
                         <input type="hidden" name="add_this_review" value=1>
-
                         <input class="button" type="SUBMIT" name="add_review" value="Add Review">
-                        <br><br>
-                        </td></tr>
+                        <br>
+                        <br>
+                      </td>
+                    </tr>
+                  </table>
+                </td>
+              </tr>
             </table>
-   
-  </td></tr></table>
-
    </form>
-</td>
-</tr>
-</table>
-
-</td>
+        </td>
+      </tr>
+    </table>
+  </td>
 </tr>
-<tr><td colspan=2>
-<%include include_menu.html%>
-</td>
+<tr>
+  <td colspan=2> <%include include_menu.html%> </td>
 </tr>
-</table>
 <%include include_footer.html%>
-
 </body>
 </html>
+
Index: mint/review_search_results.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/mint/review_search_results.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- mint/review_search_results.html     13 Dec 2001 03:37:05 -0000      1.1
+++ mint/review_search_results.html     1 May 2004 02:32:09 -0000       1.2
@@ -49,13 +49,11 @@
                <tr><td><%error_font%><b><%error%></b></td></tr>
             <%else%>
                 <tr><td>
-                
                             <%if user%>
                                 <br><%body_font%><b><%user%></b> has <%review_count%> review(s)</font>
                                                         <%endif%>
                                </td></tr>
             <%endif%>
-            
             <%if review_results_loop%>
                 <!-- Next/Previous links if spanning pages. -->
                 <%if review_next%>