Index: yahoo/add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/add.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -b -r1.2 -r1.4
--- yahoo/add.html 24 Jan 2002 18:18:07 -0000 1.2
+++ yahoo/add.html 3 May 2004 22:22:16 -0000 1.4
@@ -29,6 +29,7 @@
<div class="margin">^M
<table border ="0" cellspacing="3" cellpadding="0" width="356">^M
<%include include_form.html%>^M
+ <%if user_may_upload_attachments%> <%include include_attachment_form.html%> <%endif%>
<tr>^M
<td></td>^M
<td>^M
Index: yahoo/link.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/link.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- yahoo/link.html 24 Jan 2002 18:18:07 -0000 1.3
+++ yahoo/link.html 1 May 2004 02:32:12 -0000 1.4
@@ -8,38 +8,67 @@
isLinkOwner => True if the logged in user owns this link (used to^M
provide a link to the modify form).^M
--%>^M
-<ul><li><a class="link" href="<%db_cgi_url%>/jump.cgi?ID=<%ID%>"><%Title%></a>^M
-^M
-<%if Description%>^M
- <span class="descript">- <%Description%></span>^M
-<%endif%>^M
+<ul>
+<li><%body_font%><a class="category_links" target="_blank" href="<%db_cgi_url%>/jump.cgi?ID=<%ID%>"><%Title%></a></font>
^M
<%if isNew%>^M
- <small><sup class="new">new</sup></small>^M
+ <font color=red><small><sup>new</sup></small></font>
<%endif%>^M
^M
<%if isChanged%>^M
- <small><sup class="new">update</sup></small>^M
+ <font color=red><small><sup>updated</sup></small></font>
<%endif%>^M
^M
<%if isPopular%>^M
- <small><sup class="pop">pop</sup></small>^M
+ <font color="#6699cc"><small><sup class="pop">pop</sup></small></font>
+<%endif%>
+
+<%if paymentsEnabled and isUnpaid%>
+ <font color="red"><small><sup class="pop">unpaid</sup></small></font>
+<%endif%>
+
+<%if paymentsEnabled and isExpired%>
+ <font color="red"><small><sup class="pop">expired</sup></small></font>
+<%endif%>
+
+<%if paymentsEnabled and isFree%>
+ <font color="red"><small><sup class="pop">free</sup></small></font>
+<%endif%>
+
+<br>
+
+<%if Description%>
+ <%body_font%><%Description%></font><br>
+<%endif%>
+
+<%if URL%>
+ <%body_font%><small><%URL%></small></font><br>
+<%endif%>
+
+<%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%>^M
^M
-<%if Review_Count%>^M
- <small><a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>">Read <%Review_Count%> Reviews</a></small><br>^M
+<%if Review_Count %>
+ <%body_font%><small><a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>">Read <%Review_Count%> Reviews</a></small></font><br>
<%endif%>^M
^M
-<br><small class="date">(Added: <%Add_Date%> Hits: <%Hits%> Rating: <%Rating%> Votes: <%Votes%>) ^M
+<%body_font%><small>(Added: <%Add_Date%> Hits: <%Hits%> Rating: <%Rating%> Votes: <%Votes%>)
+<%if isValidated eq 'Yes'%>
<a href="<%db_cgi_url%>/rate.cgi?ID=<%ID%>">Rate It</a>^M
<a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>&add_review=1">Review It</a>^M
-^M
-<%if detailed_url%>^M
+<%endif%>
+<%if detailed_url and isValidated eq 'Yes'%>
<a href="<%detailed_url%>">Details</a>^M
-<%endif%></small>^M
-^M
-<%if isLinkOwner%>^M
- <small class="date"><a href="<%db_cgi_url%>/modify.cgi?LinkID=<%ID%>">Update</a></small>^M
+<%endif%>
+<%if isLinkOwner and isValidated eq 'Yes'%>
+ <a href="<%db_cgi_url%>/modify.cgi?LinkID=<%ID%>">Edit this link</a>
<%endif%>^M
^M
+<%if paymentsEnabled%>
+ <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>
\ No newline at end of file
Index: yahoo/modify.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/modify.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -b -r1.2 -r1.4
--- yahoo/modify.html 24 Jan 2002 18:18:07 -0000 1.2
+++ yahoo/modify.html 3 May 2004 22:22:16 -0000 1.4
@@ -37,6 +37,7 @@
<div class="margin">^M
<table border="0" cellspacing="0" cellpadding="0">^M
<%include include_form.html%> ^M
+ <%if user_may_upload_attachments%> <%include include_attachment_form.html%> <%endif%>
<tr><td></td><td><input type="SUBMIT" name="modify" value="Modify Resource"></td></tr>^M
</table>^M
</div>^M
Index: yahoo/modify_select.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/modify_select.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -b -r1.2 -r1.4
--- yahoo/modify_select.html 24 Jan 2002 18:18:07 -0000 1.2
+++ yahoo/modify_select.html 3 May 2004 22:22:16 -0000 1.4
@@ -32,7 +32,9 @@
<p>Please pick which link you would like to update: <br>^M
<table border=0>^M
<%loop link_results_loop%>^M
- <tr><td><input type=radio name=LinkID value="<%ID%>"></td><td>^M
+ <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%>^M
</td></tr>^M
<%endloop%>^M
Index: yahoo/modify_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/modify_success.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -b -r1.2 -r1.4
--- yahoo/modify_success.html 24 Jan 2002 18:18:07 -0000 1.2
+++ yahoo/modify_success.html 3 May 2004 22:22:16 -0000 1.4
@@ -22,7 +22,13 @@
</tr>^M
</table>^M
<%include include_search_bar.html%>^M
-<p>We have received the following link:</p>^M
+<p>
+<%if payment_term eq 'free'%>
+ Your link has been changed to a free link:
+<%else%>
+ We have received the following link:
+<%endif%>
+</p>
<pre> Title: <%Title%>^M
URL: <%URL%>^M
Category: <%Category%>^M
@@ -30,9 +36,7 @@
Contact Name: <%Contact_Name%>^M
Contact Email: <%Contact_Email%>^M
</pre> ^M
- ^M
- <p>Thank you! We will send you an email once your record has been validated.</p>^M
- ^M
+ <%if payment_term ne 'free' %><p>Thank you! We will send you an email once your record has been validated.</p><%endif%>
^M
<br><%include include_footer.html%> ^M
</body>^M
Index: yahoo/review_add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/review_add.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- yahoo/review_add.html 24 Jan 2002 18:18:07 -0000 1.2
+++ yahoo/review_add.html 1 May 2004 02:32:12 -0000 1.3
@@ -31,7 +31,7 @@
<font face='Arial,Helvetica' size=2 color=red><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: yahoo/review_add_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/review_add_success.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -b -r1.2 -r1.4
--- yahoo/review_add_success.html 24 Jan 2002 18:18:07 -0000 1.2
+++ yahoo/review_add_success.html 3 May 2004 22:22:16 -0000 1.4
@@ -26,7 +26,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: yahoo/review_edit.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/review_edit.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -b -r1.2 -r1.4
--- yahoo/review_edit.html 24 Jan 2002 18:18:07 -0000 1.2
+++ yahoo/review_edit.html 3 May 2004 22:22:16 -0000 1.4
@@ -33,7 +33,7 @@
<font face='Arial,Helvetica' color=red size=2 ><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: yahoo/review_edit_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/review_edit_success.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -b -r1.2 -r1.4
--- yahoo/review_edit_success.html 24 Jan 2002 18:18:07 -0000 1.2
+++ yahoo/review_edit_success.html 3 May 2004 22:22:16 -0000 1.4
@@ -31,7 +31,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: yahoo/review_search_results.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/review_search_results.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -b -r1.2 -r1.4
--- yahoo/review_search_results.html 24 Jan 2002 18:18:07 -0000 1.2
+++ yahoo/review_search_results.html 3 May 2004 22:22:16 -0000 1.4
@@ -44,7 +44,7 @@
<%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
Index: yahoo/validate_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/yahoo/validate_success.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3