Index: snap/add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/add.html,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -b -r1.3 -r1.5
--- snap/add.html 24 Jan 2002 01:15:31 -0000 1.3
+++ snap/add.html 3 May 2004 22:22:15 -0000 1.5
@@ -11,9 +11,9 @@
message.^M
--%>^M
<html>^M
- <head>^M
+<head>
<title><%site_title%>: Add a Resource</title>^M
- </head>^M
+</head>
^M
<body bgcolor="#FFFFFF" text="#000000">^M
^M
@@ -26,9 +26,10 @@
<tr><td>^M
<table width="100%" cellpadding=4 cellspacing=0 border=0>^M
<tr><td><b><font face="Arial,Helvetica"> ^M
-Add a Resource^M
+ Add a Resource
</font></b></td>^M
- </tr></table>^M
+ </tr>
+ </table>
</td></tr>^M
<tr><td bgcolor="#666666" height=2><spacer type=block width=1 height=1></td></tr>^M
</table>^M
@@ -41,7 +42,6 @@
<!-- Content Intro -->^M
<table width="75%" cellspacing=0 cellpadding=0 border=0>^M
<tr valign="top"><td bgcolor="#CCCCFF"><font face="Arial,Helvetica" size=-1>^M
- ^M
<b>Please fill out the form completely, and we'll add your resource as soon ^M
as possible.</b>^M
</font>^M
@@ -60,6 +60,7 @@
<input type="hidden" name="add" value="1">^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: snap/link.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/link.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- snap/link.html 23 Jan 2002 21:55:59 -0000 1.2
+++ snap/link.html 1 May 2004 02:32:11 -0000 1.3
@@ -1,29 +1,74 @@
-<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
+<%--
+ File : link.html
+ Description : This file displays a single link. It is used on category listings,
+ search results, what's new, what's cool, pretty much anywhere you
+ see a link.
+ Tags : You have all the properties of a link available on this page, plus:
+ detailed_url => The URL to the detailed page (if enabled in admin).
+ 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>
^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%>^M
^M
-<small class="date">(Added: <%Add_Date%> Hits: <%Hits%> Rating: <%Rating%> Votes: <%Votes%>) ^M
-<a href="<%db_cgi_url%>/rate.cgi?ID=<%ID%>">Rate It</a></small>^M
-<%if Review_Count%>^M
- <small><a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>">Read <%Review_Count%> Reviews</a></small>^M
+<%if paymentsEnabled and isUnpaid%>
+ <font color="red"><small><sup class="pop">unpaid</sup></small></font>
<%endif%>^M
- <small class="date"><a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>&add_review=1">Review It</a></small>^M
-<%if isLinkOwner%>^M
- <small class="date"><a href="<%db_cgi_url%>/modify.cgi?LinkID=<%ID%>">Update</a></small>^M
+
+<%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%>^M
^M
+<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%>
+
+<%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'%>
+ <a href="<%db_cgi_url%>/rate.cgi?ID=<%ID%>">Rate It</a>
+ <a href="<%db_cgi_url%>/review.cgi?ID=<%ID%>&add_review=1">Review It</a>
+<%endif%>
+<%if detailed_url and isValidated eq 'Yes'%>
+ <a href="<%detailed_url%>">Details</a>
+<%endif%>
+<%if isLinkOwner and isValidated eq 'Yes'%>
+ <a href="<%db_cgi_url%>/modify.cgi?LinkID=<%ID%>">Edit this link</a>
+<%endif%>
+
+<%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>^M
Index: snap/modify.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/modify.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -b -r1.2 -r1.4
--- snap/modify.html 23 Jan 2002 21:55:59 -0000 1.2
+++ snap/modify.html 3 May 2004 22:22:15 -0000 1.4
@@ -57,6 +57,7 @@
<input type="hidden" name="modify" value="1">^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: snap/modify_select.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/modify_select.html,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -b -r1.3 -r1.5
--- snap/modify_select.html 24 Jan 2002 01:15:31 -0000 1.3
+++ snap/modify_select.html 3 May 2004 22:22:15 -0000 1.5
@@ -59,8 +59,10 @@
<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
- <%Links::Utils::load_link%>^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%>
</td></tr>^M
<%endloop%>^M
</table>^M
Index: snap/modify_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/modify_success.html,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -b -r1.3 -r1.5
--- snap/modify_success.html 24 Jan 2002 01:15:31 -0000 1.3
+++ snap/modify_success.html 3 May 2004 22:22:15 -0000 1.5
@@ -36,7 +36,6 @@
<!-- Content Intro -->^M
<table width="75%" cellspacing=0 cellpadding=0 border=0>^M
<tr valign="top"><td bgcolor="#CCCCFF"><font face="Arial,Helvetica" size=-1>^M
- ^M
<b>Your resource has been modified!</b>^M
</font></td>^M
</tr>^M
@@ -45,8 +44,13 @@
</table>^M
^M
<!-- Content -->^M
-^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
@@ -54,8 +58,9 @@
Contact Name: <%Contact_Name%>^M
Contact Email: <%Contact_Email%>^M
</pre> ^M
- ^M
+ <%if payment_term ne 'free'%>
<p>Thank you! We will send you an email once your record has been validated.</p>^M
+ <%endif%>
^M
<!-- Rest is in the footer -->^M
<%include include_footer.html%>^M
Index: snap/review_add.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/review_add.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- snap/review_add.html 23 Jan 2002 21:55:59 -0000 1.1
+++ snap/review_add.html 1 May 2004 02:32:11 -0000 1.2
@@ -37,7 +37,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: snap/review_add_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/review_add_success.html,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -b -r1.1 -r1.3
--- snap/review_add_success.html 23 Jan 2002 21:55:59 -0000 1.1
+++ snap/review_add_success.html 3 May 2004 22:22:15 -0000 1.3
@@ -31,7 +31,7 @@
<table border="0" width="100%" height="100%" cellpadding="3" cellspacing="0">^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: snap/review_edit.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/review_edit.html,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -b -r1.1 -r1.3
--- snap/review_edit.html 23 Jan 2002 21:55:59 -0000 1.1
+++ snap/review_edit.html 3 May 2004 22:22:15 -0000 1.3
@@ -43,7 +43,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: snap/review_edit_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/review_edit_success.html,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -b -r1.1 -r1.3
--- snap/review_edit_success.html 23 Jan 2002 21:55:59 -0000 1.1
+++ snap/review_edit_success.html 3 May 2004 22:22:15 -0000 1.3
@@ -34,7 +34,7 @@
<table border="0" width="100%" height="100%" cellpadding="3" cellspacing="0">^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: snap/review_search_results.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/review_search_results.html,v
retrieving revision 1.1
retrieving revision 1.3
diff -u -b -r1.1 -r1.3
--- snap/review_search_results.html 23 Jan 2002 21:55:59 -0000 1.1
+++ snap/review_search_results.html 3 May 2004 22:22:15 -0000 1.3
@@ -54,7 +54,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: snap/validate_success.html
===================================================================
RCS file: /cvs/gossamer/lsqldev/templates/snap/validate_success.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3