Index: luna/bookmark_folder_view.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/bookmark_folder_view.html,v retrieving revision 1.15 retrieving revision 1.17 diff -u -r1.15 -r1.17 --- luna/bookmark_folder_view.html 11 May 2005 22:35:47 -0000 1.15 +++ luna/bookmark_folder_view.html 4 Jan 2006 04:58:06 -0000 1.17 @@ -4,12 +4,6 @@ <head> <title><%site_title%>: Bookmarks: <%my_folder_username%><%if my_folder_name%>: <%my_folder_name%><%else%>'s Bookmarks<%endif%></title> <%include include_common_head.html%> - <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script> - <script type="text/javascript"> - //<![CDATA[ -registerEvent(window, 'onload', function () { hideObjects('paging_button', 'paging_button2') }); - //!]]> - </script> </head> <body id="bookmark_folder_view"> <%include include_accessibility.html%> @@ -35,6 +29,8 @@ <%~endif%> </p> +<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%> + <%if Folders.length~%> <ul class="folders"> <%~loop Folders%> @@ -46,8 +42,6 @@ </ul> <%~endif%> -<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%> - <%if Bookmarks.length~%> <%~loop Bookmarks%> <p class="category"><%Links::Utils::format_title($title_loop, separator => $category_separator, no_escape_separator => $no_escape_category_separator, include_home => 0, link_type => 1)%></p> Index: luna/bookmark_list.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/bookmark_list.html,v retrieving revision 1.14 retrieving revision 1.16 diff -u -r1.14 -r1.16 --- luna/bookmark_list.html 11 May 2005 22:35:47 -0000 1.14 +++ luna/bookmark_list.html 4 Jan 2006 01:38:36 -0000 1.16 @@ -4,12 +4,6 @@ <head> <title><%site_title%>: <%if my_folder_name%>Bookmarks: <%my_folder_name%><%else%>My Bookmarks<%endif%></title> <%include include_common_head.html%> - <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script> - <script type="text/javascript"> - //<![CDATA[ -registerEvent(window, 'onload', function () { hideObjects('paging_button', 'paging_button2') }); - //!]]> - </script> </head> <body id="bookmark_list"> <%include include_accessibility.html%> @@ -35,6 +29,8 @@ <%~endif%> </p> +<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%> + <%if Folders.length~%> <ul class="folders"> <%~loop Folders%> @@ -51,8 +47,6 @@ </ul> <%~endif%> -<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%> - <%if Bookmarks.length~%> <form action="<%config.db_cgi_url%>/bookmark.cgi" method="post"> <input type="hidden" name="action" value="links_manage" /> Index: luna/bookmark_users.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/bookmark_users.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- luna/bookmark_users.html 11 May 2005 22:35:47 -0000 1.12 +++ luna/bookmark_users.html 19 Aug 2005 20:07:57 -0000 1.13 @@ -4,12 +4,6 @@ <head> <title><%site_title%>: Bookmarks: User List</title> <%include include_common_head.html%> - <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script> - <script type="text/javascript"> - //<![CDATA[ -registerEvent(window, 'onload', function () { hideObjects('paging_button', 'paging_button2') }); - //!]]> - </script> </head> <body id="bookmark_users"> <%include include_accessibility.html%> Index: luna/category.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/category.html,v retrieving revision 1.28 retrieving revision 1.29 diff -u -r1.28 -r1.29 --- luna/category.html 4 Jul 2005 23:12:23 -0000 1.28 +++ luna/category.html 19 Aug 2005 20:07:57 -0000 1.29 @@ -5,12 +5,6 @@ <head> <title><%site_title%>: <%category_name%></title> <%include include_common_head.html%> - <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script> - <script type="text/javascript"> - //<![CDATA[ -registerEvent(window, 'onload', function () { hideObjects('paging_button', 'paging_button2') }); - //!]]> - </script> </head> <body id="category"> <%include include_accessibility.html%> Index: luna/cool.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/cool.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- luna/cool.html 11 May 2005 22:35:47 -0000 1.14 +++ luna/cool.html 19 Aug 2005 20:07:57 -0000 1.15 @@ -3,12 +3,6 @@ <head> <title><%site_title%>: What's Cool</title> <%include include_common_head.html%> - <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script> - <script type="text/javascript"> - //<![CDATA[ -registerEvent(window, 'onload', function () { hideObjects('paging_button', 'paging_button2') }); - //!]]> - </script> </head> <body id="cool"> <%include include_accessibility.html%> Index: luna/language.txt =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/language.txt,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- luna/language.txt 12 May 2005 20:51:55 -0000 1.18 +++ luna/language.txt 19 Jan 2006 21:43:09 -0000 1.19 @@ -3,6 +3,7 @@ 'ADD_BADSTATUS' => 'Your link could not be added because it is not accessible: %s.', 'ADD_ILLEGALVAL' => '%s can not contain the value \'%s\'', 'ADD_INVALIDCAT' => 'Unable to find category with ID \'%s\'.', + 'ADD_NOCATEGORIES' => 'There are no categories to add a link to.', 'ADD_NOCATEGORY' => 'You did not specify a category for this link.', 'ADD_NOTNULL' => 'Column %s can not be left blank.', 'ADD_SELCAT' => 'Please first visit the category you wish to add your link to, then click on Add.', Index: luna/link.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/link.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- luna/link.html 5 Jul 2005 00:40:02 -0000 1.14 +++ luna/link.html 10 Feb 2006 01:26:18 -0000 1.15 @@ -17,7 +17,7 @@ <%~set intRating = $Rating i/ 1%> <img src="<%Links::Utils::image_url("stars-10-${intRating}.gif")%>" alt="<%intRating%> out of 10 stars" title="<%intRating%> out of 10 stars" /> (<%Votes%> vote<%if Votes != 1%>s<%endif%>) <%~endif%> - <%~if paymentsEnabled and ExpiryDateFormatted and not isFree%> + <%~if paymentsEnabled and ExpiryDateFormatted and wasPaid%> <%if isNotify or isExpired%><span class="linkexpired"><%endif%><%if isExpired%>Expired on:<%else%>Expiry date:<%endif%> <%ExpiryDateFormatted%><%if isNotify or isExpired%></span><%endif%> <%~endif%> </p> @@ -32,6 +32,6 @@ <%if config.bookmark_enabled%><a href="<%config.db_cgi_url%>/bookmark.cgi?action=link_add;ID=<%ID%>">Bookmark It</a><%endif%> <%if isLinkOwner%><a href="<%config.db_cgi_url%>/modify.cgi?LinkID=<%ID%>">Edit this link</a><%endif%> <%~endif%> - <%if paymentsEnabled%><a href="<%config.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%> + <%if paymentsEnabled%><a href="<%config.db_cgi_url%>/modify.cgi?do=payment_linked;process_payment=1;modify=1;ID=<%ID%>"><%if not wasPaid%>New Payment<%else%>Renewal Payment<%endif%></a><%endif%> </p> </div> Index: luna/link_added.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/link_added.eml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- luna/link_added.eml 14 Mar 2005 23:13:40 -0000 1.5 +++ luna/link_added.eml 27 Oct 2005 23:25:24 -0000 1.6 @@ -1,4 +1,4 @@ -To: <%if Contact_Email%><%if Contact_Name%><%Contact_Name%> <<%Contact_Email%>><%else%><%Contact_Email%><%endif%><%elsif Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Contact_Email%><%if Contact_Name%>"<%Contact_Name%>" <<%Contact_Email%>><%else%><%Contact_Email%><%endif%><%elsif Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Your link has been approved Index: luna/link_expired.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/link_expired.eml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- luna/link_expired.eml 14 Mar 2005 23:13:40 -0000 1.6 +++ luna/link_expired.eml 27 Oct 2005 23:25:24 -0000 1.7 @@ -1,4 +1,4 @@ -To: <%if Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Expiry Notification Index: luna/link_expiry_notify.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/link_expiry_notify.eml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- luna/link_expiry_notify.eml 21 Apr 2005 19:49:17 -0000 1.7 +++ luna/link_expiry_notify.eml 27 Oct 2005 23:25:24 -0000 1.8 @@ -1,4 +1,4 @@ -To: <%if Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Expiry Notification Index: luna/link_modified.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/link_modified.eml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- luna/link_modified.eml 14 Mar 2005 23:13:40 -0000 1.5 +++ luna/link_modified.eml 27 Oct 2005 23:25:24 -0000 1.6 @@ -1,4 +1,4 @@ -To: <%if Contact_Email%><%if Contact_Name%><%Contact_Name%> <<%Contact_Email%>><%else%><%Contact_Email%><%endif%><%elsif Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Contact_Email%><%if Contact_Name%>"<%Contact_Name%>" <<%Contact_Email%>><%else%><%Contact_Email%><%endif%><%elsif Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Your link has been successfully updated Index: luna/link_rejected.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/link_rejected.eml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- luna/link_rejected.eml 15 Feb 2005 20:31:38 -0000 1.3 +++ luna/link_rejected.eml 27 Oct 2005 23:25:24 -0000 1.4 @@ -1,4 +1,4 @@ -To: <%if Contact_Email%><%if Contact_Name%><%Contact_Name%> <<%Contact_Email%>><%else%><%Contact_Email%><%endif%><%elsif Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Contact_Email%><%if Contact_Name%>"<%Contact_Name%>" <<%Contact_Email%>><%else%><%Contact_Email%><%endif%><%elsif Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Your <%if modify%>change<%else%>link<%endif%> has been rejected Index: luna/modify_select.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/modify_select.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- luna/modify_select.html 11 May 2005 22:35:47 -0000 1.14 +++ luna/modify_select.html 19 Aug 2005 20:07:57 -0000 1.15 @@ -3,12 +3,6 @@ <head> <title><%site_title%>: Modify a Link</title> <%include include_common_head.html%> - <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script> - <script type="text/javascript"> - //<![CDATA[ -registerEvent(window, 'onload', function () { hideObjects('paging_button', 'paging_button2') }); - //!]]> - </script> </head> <body id="modify_select"> <%include include_accessibility.html%> Index: luna/new.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/new.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- luna/new.html 11 May 2005 22:35:47 -0000 1.13 +++ luna/new.html 19 Aug 2005 20:07:57 -0000 1.14 @@ -3,12 +3,6 @@ <head> <title><%site_title%>: New Links</title> <%include include_common_head.html%> - <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script> - <script type="text/javascript"> - //<![CDATA[ -registerEvent(window, 'onload', function () { hideObjects('paging_button', 'paging_button2') }); - //!]]> - </script> </head> <body id="new"> <%include include_accessibility.html%> Index: luna/password.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/password.eml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- luna/password.eml 15 Feb 2005 20:31:38 -0000 1.4 +++ luna/password.eml 27 Oct 2005 23:25:24 -0000 1.5 @@ -1,4 +1,4 @@ -To: <%if Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Your password you requested Index: luna/payment_received.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/payment_received.eml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- luna/payment_received.eml 14 Mar 2005 23:13:40 -0000 1.5 +++ luna/payment_received.eml 27 Oct 2005 23:25:24 -0000 1.6 @@ -1,4 +1,4 @@ -To: <%if Contact_Email%><%if Contact_Name%><%Contact_Name%> <<%Contact_Email%>><%else%><%Contact_Email%><%endif%><%elsif Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Contact_Email%><%if Contact_Name%>"<%Contact_Name%>" <<%Contact_Email%>><%else%><%Contact_Email%><%endif%><%elsif Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Payment has been received and your link has been added Index: luna/review_added.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/review_added.eml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- luna/review_added.eml 15 Apr 2005 00:07:25 -0000 1.7 +++ luna/review_added.eml 27 Oct 2005 23:25:24 -0000 1.8 @@ -1,4 +1,4 @@ -To: <%if Review_GuestEmail%><%if Review_GuestName%><%Review_GuestName%> <<%Review_GuestEmail%>><%else%><%Review_GuestEmail%><%endif%><%elsif Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Review_GuestEmail%><%if Review_GuestName%>"<%Review_GuestName%>" <<%Review_GuestEmail%>><%else%><%Review_GuestEmail%><%endif%><%elsif Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Your review has been approved Index: luna/review_rejected.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/review_rejected.eml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- luna/review_rejected.eml 14 Mar 2005 23:13:40 -0000 1.4 +++ luna/review_rejected.eml 27 Oct 2005 23:25:24 -0000 1.5 @@ -1,4 +1,4 @@ -To: <%if Review_GuestEmail%><%if Review_GuestName%><%Review_GuestName%> <<%Review_GuestEmail%>><%else%><%Review_GuestEmail%><%endif%><%elsif Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Review_GuestEmail%><%if Review_GuestName%>"<%Review_GuestName%>" <<%Review_GuestEmail%>><%else%><%Review_GuestEmail%><%endif%><%elsif Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Your review has been rejected Index: luna/review_search_results.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/review_search_results.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- luna/review_search_results.html 11 May 2005 22:35:47 -0000 1.14 +++ luna/review_search_results.html 19 Aug 2005 20:07:57 -0000 1.15 @@ -3,12 +3,6 @@ <head> <title><%site_title%>: Reviews</title> <%include include_common_head.html%> - <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script> - <script type="text/javascript"> - //<![CDATA[ -registerEvent(window, 'onload', function () { hideObjects('paging_button', 'paging_button2') }); - //!]]> - </script> </head> <body id="review_search_results"> <%include include_accessibility.html%> Index: luna/search_results.html =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/search_results.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- luna/search_results.html 5 Jul 2005 00:40:02 -0000 1.18 +++ luna/search_results.html 19 Aug 2005 20:07:57 -0000 1.19 @@ -3,12 +3,6 @@ <head> <title><%site_title%>: Search Results</title> <%include include_common_head.html%> - <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script> - <script type="text/javascript"> - //<![CDATA[ -registerEvent(window, 'onload', function () { hideObjects('paging_button', 'paging_button2') }); - //!]]> - </script> </head> <body id="search_results"> <%include include_accessibility.html%> Index: luna/validate.eml =================================================================== RCS file: /cvs/gossamer/glinks/cgi/admin/templates/luna/validate.eml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- luna/validate.eml 14 Mar 2005 23:13:40 -0000 1.4 +++ luna/validate.eml 27 Oct 2005 23:25:24 -0000 1.5 @@ -1,4 +1,4 @@ -To: <%if Name%><%Name%> <<%Email%>><%else%><%Email%><%endif%> +To: <%if Name%>"<%Name%>" <<%Email%>><%else%><%Email%><%endif%> From: <%config.db_admin_email%> Subject: Your validation code