Index: add.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/add.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- add.html 11 May 2005 22:35:47 -0000 1.10 +++ add.html 23 Aug 2006 20:53:31 -0000 1.11 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Add a Link</h2> @@ -31,9 +33,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: add_success.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/add_success.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- add_success.html 4 Jul 2005 23:12:23 -0000 1.14 +++ add_success.html 23 Aug 2006 20:53:31 -0000 1.15 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Link Added</h2> @@ -63,9 +65,11 @@ <%~endif%> </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: bookmark_folder_add.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/bookmark_folder_add.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- bookmark_folder_add.html 11 May 2005 22:35:47 -0000 1.14 +++ bookmark_folder_add.html 23 Aug 2006 20:53:31 -0000 1.15 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Add Folder</h2> @@ -54,9 +56,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: bookmark_folder_edit.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/bookmark_folder_edit.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- bookmark_folder_edit.html 11 May 2005 22:35:47 -0000 1.13 +++ bookmark_folder_edit.html 23 Aug 2006 20:53:31 -0000 1.14 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Edit Folder</h2> @@ -55,9 +57,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: bookmark_folder_view.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/bookmark_folder_view.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bookmark_folder_view.html 4 Jan 2006 04:58:06 -0000 1.17 +++ bookmark_folder_view.html 23 Aug 2006 20:53:31 -0000 1.18 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2><%my_folder_username%><%if my_folder_name%>: <%my_folder_name%><%else%>'s Bookmarks<%endif%></h2> @@ -51,9 +53,11 @@ <%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: bookmark_link_add.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/bookmark_link_add.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bookmark_link_add.html 11 May 2005 22:35:47 -0000 1.17 +++ bookmark_link_add.html 23 Aug 2006 20:53:31 -0000 1.18 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Add Bookmark</h2> @@ -55,9 +57,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: bookmark_link_edit.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/bookmark_link_edit.html,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- bookmark_link_edit.html 11 May 2005 22:35:47 -0000 1.17 +++ bookmark_link_edit.html 23 Aug 2006 20:53:31 -0000 1.18 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Edit Bookmark</h2> @@ -55,9 +57,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: bookmark_list.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/bookmark_list.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- bookmark_list.html 4 Jan 2006 01:38:36 -0000 1.16 +++ bookmark_list.html 23 Aug 2006 20:53:31 -0000 1.17 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2><%if my_folder_name%><%my_folder_name%><%else%>My Bookmarks<%endif%></h2> @@ -68,9 +70,11 @@ <%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: bookmark_preferences.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/bookmark_preferences.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- bookmark_preferences.html 11 May 2005 22:35:47 -0000 1.14 +++ bookmark_preferences.html 23 Aug 2006 20:53:31 -0000 1.15 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Preferences</h2> @@ -61,9 +63,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: bookmark_users.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/bookmark_users.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- bookmark_users.html 19 Aug 2005 20:07:57 -0000 1.13 +++ bookmark_users.html 23 Aug 2006 20:53:31 -0000 1.14 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>User List</h2> @@ -41,9 +43,11 @@ <%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: category.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/category.html,v retrieving revision 1.29 retrieving revision 1.31 diff -u -r1.29 -r1.31 --- category.html 19 Aug 2005 20:07:57 -0000 1.29 +++ category.html 23 Aug 2006 20:53:31 -0000 1.31 @@ -1,4 +1,3 @@ -<%if Category_Template and Category_Template ne 'category.html'%><%include $Category_Template%><%endparse%><%endif~%> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <%Links::Utils::load_editors~%> <html> @@ -15,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2> @@ -70,9 +71,11 @@ </ul> <%~endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: cool.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/cool.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- cool.html 19 Aug 2005 20:07:57 -0000 1.15 +++ cool.html 23 Aug 2006 20:53:31 -0000 1.16 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Cool Links (top <%percent%>)</h2> @@ -29,9 +31,11 @@ <%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: detailed.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/detailed.html,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- detailed.html 11 May 2005 22:35:47 -0000 1.16 +++ detailed.html 23 Aug 2006 20:53:31 -0000 1.17 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> @@ -70,9 +72,11 @@ <%if Review_Total > $Review_Loop.length%><p class="reviewsfooter"><a href="<%config.db_cgi_url%>/review.cgi?ID=<%ID%>">Read all <%Review_Total%> review<%if Review_Total != 1%>s<%endif%></a></p><%endif%> <%~endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: error.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/error.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- error.html 11 May 2005 22:35:47 -0000 1.11 +++ error.html 23 Aug 2006 20:53:31 -0000 1.12 @@ -15,9 +15,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Error</h2> @@ -29,9 +31,11 @@ <%error_message%> </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: home.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/home.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- home.html 11 May 2005 22:35:47 -0000 1.15 +++ home.html 23 Aug 2006 20:53:31 -0000 1.16 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <%set split = Links::Utils::column_split($category_loop.length, $home_category_cols)~%> <div class="clear"> @@ -28,9 +30,11 @@ </div> <h4>There <%if grand_total != 1%>are<%else%>is<%endif%> <strong><%grand_total%></strong> link<%if grand_total != 1%>s<%endif%> for you to choose from!</h4> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: include_common_head.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/include_common_head.html,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- include_common_head.html 24 Jun 2005 20:13:32 -0000 1.7 +++ include_common_head.html 28 Jul 2006 21:02:17 -0000 1.8 @@ -1,4 +1,4 @@ -<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" /> +<meta http-equiv="content-type" content="text/html; charset=<%config.header_charset || iso-8859-1%>" /> <%if Meta_Description%><meta name="description" content="<%Meta_Description%>" /><%endif%> <%if Meta_Keywords%><meta name="keywords" content="<%Meta_Keywords%>" /><%endif%> <%if theme%><link type="text/css" rel="stylesheet" href="<%config.build_static_url%>/<%t%>/<%theme%>.css" /><%endif%> Index: include_footer.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/include_footer.html,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- include_footer.html 22 Mar 2005 02:01:36 -0000 1.6 +++ include_footer.html 11 Aug 2006 07:51:23 -0000 1.7 @@ -1,6 +1,6 @@ <hr class="hide" /> <div id="footer" class="clear"> <a href="http://www.gossamer-threads.com"><img src="<%Links::Utils::image_url('poweredby.gif')%>" alt="Powered by Gossamer Links" /></a> - <p>© 2005 Gossamer Threads Inc.</p> + <p>© 2006 Gossamer Threads Inc.</p> </div> <%--if in.debug%><%DUMP%><%endif--%> Index: include_form.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/include_form.html,v retrieving revision 1.10 retrieving revision 1.14 diff -u -r1.10 -r1.14 --- include_form.html 18 Apr 2005 21:39:36 -0000 1.10 +++ include_form.html 19 Aug 2006 03:23:10 -0000 1.14 @@ -12,20 +12,41 @@ </div> <div class="row<%unless category_loop_selected%> required<%endunless%> clear"> <label for="CatLinks.CategoryID" class="name">Category:<%unless category_loop_selected%> <span>*</span><%endunless%></label> - <div class="value<%if category_loop_selected%> wrappedtext<%endif%>"> - <%if category_loop_selected%> - <%if category_loop.length > 1%> - <ul><%loop category_loop%><li><%Full_Name%><input type="hidden" name="CatLinks.CategoryID" value="<%escape_html ID%>" /></li><%endloop%></ul> - <%else%> + <div class="value wrappedtext"> + <%~if config.db_gen_category_list == 2%> + <script type="text/javascript" src="<%config.build_static_url%>/treecats.js"></script> + <%~set selected_cats = Links::Tools::category_list_selected%> + <%~loop selected_cats%> + <input type="hidden" name="CatLinks.CategoryID" value="<%escape_html ID%>" /> + <%~endloop%> + <noscript> + <ul class="categories"> + <%~loop selected_cats%> + <li><%Full_Name%></li> + <%~endloop%> + <%~if not selected_cats.length%> + <li><%Links::language('ADD_SELCAT')%></li> + <%~endif%> + </ul> + </noscript> + <div id="treecats"></div> + <script type="text/javascript"> + var tc = new treecats({ <%-- selectionMode : 'multiple', --%> cgiURL : '<%config.db_cgi_url%>', imageURL : '<%config.build_static_url%>/<%t%>/images' }); + tc.load(); + </script> + <%~elsif category_loop_selected%> + <%~if category_loop.length > 1%> + <ul class="categories"><%loop category_loop%><li><%Full_Name%><input type="hidden" name="CatLinks.CategoryID" value="<%escape_html ID%>" /></li><%endloop%></ul> + <%~else%> <%loop category_loop%><%Full_Name%><input type="hidden" name="CatLinks.CategoryID" value="<%escape_html ID%>" /><%endloop%> - <%endif%> - <%else%> + <%~endif%> + <%~else%> <select id="CatLinks.CategoryID" name="CatLinks.CategoryID"> - <%loop category_loop%> + <%~loop category_loop%> <option value="<%escape_html ID%>"<%if selected%> selected="selected"<%endif%>><%' ' x $CatDepth%><%Name%></option> - <%endloop%> + <%~endloop%> </select> - <%endif%> + <%~endif%> </div> </div> <div class="row clear"> Index: language.txt =================================================================== RCS file: /glinks/cgi/admin/templates/luna/language.txt,v retrieving revision 1.20 retrieving revision 1.24 diff -u -r1.20 -r1.24 --- language.txt 14 Feb 2006 00:27:03 -0000 1.20 +++ language.txt 11 Aug 2006 23:46:45 -0000 1.24 @@ -6,7 +6,7 @@ '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 cannot be left blank.', - 'ADD_SELCAT' => 'Please first visit the category you wish to add your link to, then click on Add.', + 'ADD_SELCAT' => 'Please first visit the category you wish to add or move your link to, then click on Add/Modify a Link.', 'ADD_UNIQUE' => 'The column \'%s\' must be unique, and already has an entry \'%s\'.', 'BOOKMARK_BAD_FOLDER' => 'Please enter a valid folder name.', 'BOOKMARK_BAD_FOLDER_ID' => 'There is no folder with the id \'%s\'.', @@ -23,7 +23,7 @@ 'BOOKMARK_FOLDER_NO_MOVE' => 'You cannot move links to the folder with id \'%s\'.', 'BOOKMARK_FOLDER_REMOVED' => 'The folder %s has been removed.', 'BOOKMARK_LINK_ADDED' => 'The link has been bookmarked.', - 'BOOKMARK_LINK_EXISTS' => 'You have already bookmarked this link.', + 'BOOKMARK_LINK_EXISTS' => 'This link has already been bookmarked in the selected folder.', 'BOOKMARK_LINK_LIMIT' => 'You may not add any more links as you have reached your limit.', 'BOOKMARK_LINK_MOVED' => '%s link(s) have been moved to folder %s.', 'BOOKMARK_LINK_NOTEXISTS' => 'The link with id \'%s\' doesn\'t exist in your bookmarks.', @@ -79,6 +79,7 @@ 'LINKS_VALIDATE' => 'Validation', 'MODIFY_BADSTATUS' => 'Your link could not be modified because it is not accessible: %s.', 'MODIFY_BADURL' => 'We were unable to find the URL \'%s\' in the database. Please make sure you typed it in exactly as it appears in the directory.', + 'MODIFY_INVALIDLINKID' => 'Invalid link ID.', 'MODIFY_NOCATEGORY' => 'You did not specify a category for this link.', 'MODIFY_NOLINKS' => 'You do not have any links to modify.', 'MODIFY_NOTOWNER' => 'You are not authorized to modify this link.', @@ -109,7 +110,7 @@ 'PAYMENTERR_INVALIDTERM' => 'You have selected an invalid payment term.', 'PAYMENTERR_NOLEVEL' => 'You must select a payment level.', 'PAYMENTERR_NOMETHOD' => 'You must select a payment method.', - 'PAYMENTERR_NOTACCEPTED' => 'Payments are not accepted for the link the category is in.', + 'PAYMENTERR_NOTACCEPTED' => 'Payments are not accepted for the category the link is in.', 'PAYMENTERR_NOTOWNER' => 'You can only make payments to your own links.', 'PAYMENT_CURRENCY_FORMAT' => '$%s ', 'PAYMENT_DIRECT_AuthorizeDotNet' => 'Authorize.Net', @@ -149,7 +150,9 @@ 'REVIEW_INVALIDID' => 'Invalid Link ID : %s.', 'REVIEW_INVALID_ACTION' => 'Invalid action!', 'REVIEW_INVALID_UPDATE' => 'Unable to update review database. User is invalid for this review or the review is not validated.', - 'REVIEW_MODIFY_DENIED' => 'You have already reviewed this link. Reviews cannot be modified.', + 'REVIEW_MAX_REVIEWS' => 'You can only add %s review(s) to a link.', + 'REVIEW_MODIFY_DENIED' => 'You do not have permission to modify your review.', + 'REVIEW_MODIFY_TIMEOUT' => 'The edit time for the review has expired.', 'REVIEW_NORESULTS' => 'No reviews are available.', 'REVIEW_NOT_EXISTS' => 'Review doesn\'t exist!', 'REVIEW_RATING' => 'Please select a rating from 1 to 5 only.', Index: link.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/link.html,v retrieving revision 1.15 retrieving revision 1.20 diff -u -r1.15 -r1.20 --- link.html 10 Feb 2006 01:26:18 -0000 1.15 +++ link.html 12 Jul 2006 01:49:36 -0000 1.20 @@ -25,12 +25,14 @@ <%if Description%><div class="linkdescription"><%if highlight%><%Links::Tools::highlight($Description, $query)%><%else%><%Description%><%endif%></div><%endif%> <p class="linkactions"> - <%~if isValidated eq 'Yes'%> + <%~if isValidated eq Yes%> <%if Review_Count%><a href="<%config.db_cgi_url%>/review.cgi?ID=<%ID%>">Read <%Review_Count%> Review<%if Review_Count != 1%>s<%endif%></a><%endif%> <a href="<%config.db_cgi_url%>/review.cgi?ID=<%ID%>;add_review=1">Review It</a> <a href="<%config.db_cgi_url%>/rate.cgi?ID=<%ID%>">Rate It</a> <%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%> + <%if not isExpired and not isUnpaid%> + <%if isLinkOwner or not config.user_required%><a href="<%config.db_cgi_url%>/modify.cgi?LinkID=<%ID%>">Edit this link</a><%endif%> + <%endif%> <%~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> Index: login.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/login.html,v retrieving revision 1.16 retrieving revision 1.21 diff -u -r1.16 -r1.21 --- login.html 11 May 2005 22:35:47 -0000 1.16 +++ login.html 23 Aug 2006 20:53:31 -0000 1.21 @@ -1,4 +1,11 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<%~if logout and error%> + <%~set message = $error%> + <%~set error = ''%> +<%~endif%> +<%~if url and not error%> + <%~set error = 'You must first login before you can access that.'%> +<%~endif%> <html> <head> <title><%site_title%>: User Login</title> @@ -13,14 +20,15 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>User Login</h2> -<%if url%><p>You must first login before you can access that.</p><%endif%> <p>Login to <%site_title%>:</p> <form action="<%config.db_cgi_url%>/user.cgi" method="post"> @@ -39,6 +47,14 @@ <input type="password" id="Password" name="Password" class="password" /> </div> </div> +<%~if config.user_sessions eq Cookies%> + <div class="row clear"> + <label for="Remember" class="name">Remember Me:</label> + <div class="value"> + <input type="checkbox" id="Remember" name="Remember" class="checkbox" /> + </div> + </div> +<%~endif%> <div class="formsubmit"> <input type="submit" value="Login" class="submit" /> </div> @@ -49,9 +65,11 @@ If you've forgotten your password, we can <a href="<%config.db_cgi_url%>/user.cgi?email_pass=1">e-mail it to you</a>. </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: login_email.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/login_email.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- login_email.html 11 May 2005 22:35:47 -0000 1.12 +++ login_email.html 23 Aug 2006 20:53:31 -0000 1.13 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Forgot your password?</h2> @@ -43,9 +45,11 @@ If you don't have an account, please <a href="<%config.db_cgi_url%>/user.cgi?signup_form=1">register</a>. </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: login_success.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/login_success.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- login_success.html 11 May 2005 22:35:47 -0000 1.10 +++ login_success.html 23 Aug 2006 20:53:31 -0000 1.11 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Logged In</h2> @@ -30,9 +32,11 @@ </p> <%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: modify.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/modify.html,v retrieving revision 1.11 retrieving revision 1.17 diff -u -r1.11 -r1.17 --- modify.html 11 May 2005 22:35:47 -0000 1.11 +++ modify.html 23 Aug 2006 20:53:31 -0000 1.17 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Modify a Link</h2> @@ -25,9 +27,37 @@ <%~if LinkID%> <input type="hidden" name="LinkID" value="<%escape_html LinkID%>" /> <%~else%> - Please enter the URL of the link you wish to modify. Make sure it is identical to the one already in the database: - <input type="text" name="Current_URL" value="<%if Current_URL%><%escape_html Current_URL%><%endif%>" class="text" /> - Now enter the new information (all of it, not just the changes) below: + <noscript> + <p> + Please enter the URL of the link you wish to modify. Make sure it is identical to the one already in the database: + </p> + <div class="row required clear"> + <label for="Current_URL" class="name">URL: <span>*</span></label> + <div class="value"> + <input type="text" name="Current_URL" value="<%if Current_URL%><%escape_html Current_URL%><%endif%>" class="text" /> + </div> + </div> + </noscript> + <div id="LinkID" class="row required clear" style="display: none"> + <label class="name">Link: <span>*</span></label> + <div class="value wrappedtext"> +<%~if Current_ID%> + <input type="hidden" name="Current_ID" value="<%Current_ID%>" /> +<%~endif%> + <script type="text/javascript" src="<%config.build_static_url%>/treecats.js"></script> + <div id="treecats-links"></div> + <script type="text/javascript"> + var tcl = new treecats({ selectionMode : 'link', workspace : 'treecats-links', objName : 'tcl', inputName : 'Current_ID', cgiURL : '<%config.db_cgi_url%>', imageURL : '<%config.build_static_url%>/<%t%>/images' }); + tcl.load(); + </script> + </div> + </div> + <script type="text/javascript"> + document.getElementById('LinkID').style.display = ''; + </script> + <p> + Enter the new information (all of it, not just the changes) below: + </p> <%~endif%> <%include include_form.html%> <div class="formsubmit"> @@ -35,9 +65,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: modify_select.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/modify_select.html,v retrieving revision 1.15 retrieving revision 1.17 diff -u -r1.15 -r1.17 --- modify_select.html 19 Aug 2005 20:07:57 -0000 1.15 +++ modify_select.html 23 Aug 2006 20:53:31 -0000 1.17 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Modify a Link</h2> @@ -28,7 +30,7 @@ <form action="<%config.db_cgi_url%>/modify.cgi" method="post"> <%~loop link_results_loop%> - <input type="radio" name="LinkID" value="<%escape_html ID%>" class="radio"<%if isValidated eq 'No'%> disabled="disabled"<%endif%> /> + <input type="radio" name="LinkID" value="<%escape_html ID%>" class="radio"<%if isValidated eq No or isExpired or isUnpaid%> disabled="disabled"<%endif%> /> <%include link.html%> <%~endloop%> <input type="submit" value="Modify Link" class="submit" /> @@ -36,9 +38,11 @@ <%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: modify_success.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/modify_success.html,v retrieving revision 1.13 retrieving revision 1.15 diff -u -r1.13 -r1.15 --- modify_success.html 4 Jul 2005 23:12:23 -0000 1.13 +++ modify_success.html 23 Aug 2006 20:53:31 -0000 1.15 @@ -13,15 +13,17 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Link Modified</h2> <p> -<%~if payment_term eq 'free'%> +<%~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: @@ -59,11 +61,13 @@ <div class="value wrappedtext"><%Contact_Email%></div> </div> -<%if payment_term ne 'free'%><p>Thank you! We will send you an e-mail once your link has been validated.</p><%endif%> +<%if not config.user_direct_mod and payment_term ne free%><p>Thank you! We will send you an e-mail once your link has been validated.</p><%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: new.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/new.html,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- new.html 19 Aug 2005 20:07:57 -0000 1.14 +++ new.html 23 Aug 2006 20:53:31 -0000 1.15 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>New Links</h2> @@ -50,9 +52,11 @@ <%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%> <%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: newsletter.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/newsletter.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- newsletter.html 11 May 2005 22:35:47 -0000 1.9 +++ newsletter.html 23 Aug 2006 20:53:31 -0000 1.10 @@ -17,9 +17,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Newsletter</h2> @@ -27,9 +29,11 @@ <%if error_message%><p class="errormessage"><%error_message%></p><%endif%> <%if info_message%><p class="infomessage"><%info_message%></p><%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: newsletter_browse.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/newsletter_browse.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- newsletter_browse.html 11 May 2005 22:35:47 -0000 1.15 +++ newsletter_browse.html 23 Aug 2006 20:53:31 -0000 1.16 @@ -68,9 +68,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Newsletter</h2> @@ -94,9 +96,11 @@ <input type="submit" value="Update Subscriptions" class="submit" /> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: newsletter_global.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/newsletter_global.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- newsletter_global.html 11 May 2005 22:35:47 -0000 1.9 +++ newsletter_global.html 23 Aug 2006 20:53:31 -0000 1.10 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Newsletter</h2> @@ -30,9 +32,11 @@ <input type="submit" value="<%if subscribed%>Unsubscribe<%else%>Subscribe<%endif%>" class="submit" /> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: newsletter_list.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/newsletter_list.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- newsletter_list.html 11 May 2005 22:35:47 -0000 1.15 +++ newsletter_list.html 23 Aug 2006 20:53:31 -0000 1.16 @@ -20,9 +20,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Newsletter</h2> @@ -49,9 +51,11 @@ </p> <%~endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: payment.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/payment.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- payment.html 11 May 2005 22:35:47 -0000 1.12 +++ payment.html 23 Aug 2006 20:53:31 -0000 1.13 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Payment</h2> @@ -109,9 +111,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: payment_2checkout_include.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/payment_2checkout_include.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- payment_2checkout_include.html 18 Apr 2005 21:39:36 -0000 1.3 +++ payment_2checkout_include.html 22 Aug 2006 20:44:01 -0000 1.4 @@ -1,6 +1,13 @@ -<form action="https://www.2checkout.com/cgi-bin/sbuyers/cartpurchase.2c" method="post"> +<form action="https://www.2checkout.com/2co/buyer/purchase" method="post"> <input type="hidden" name="sid" value="<%escape_html seller_id%>" /> <input type="hidden" name="total" value="<%escape_html payment_amount%>" /> <input type="hidden" name="cart_order_id" value="<%escape_html unique_id%>" /> + <input type="hidden" name="fixed" value="Y" /> + <input type="hidden" name="pay_method" value="CC" /> +<%~-- This will only work if this matches the domain set up with 2Checkout: https://support.2co.com/deskpro/faq.php?do=article&articleid=363 --%> + <input type="hidden" name="x_receipt_link_url" value="<%config.db_cgi_url%>/postback.cgi" /> +<%~if demo%> + <input type="hidden" name="demo" value="Y" /> +<%~endif%> <input type="submit" value="Make Payment" class="submit" /> </form> Index: payment_direct.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/payment_direct.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- payment_direct.html 11 May 2005 22:35:47 -0000 1.13 +++ payment_direct.html 23 Aug 2006 20:53:31 -0000 1.14 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Payment Confirmation</h2> @@ -27,9 +29,11 @@ <a href="<%Links::transform_url($config.build_root_url)%>">here</a>. </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: payment_form.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/payment_form.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- payment_form.html 11 May 2005 22:35:47 -0000 1.10 +++ payment_form.html 23 Aug 2006 20:53:31 -0000 1.11 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Payment</h2> @@ -45,9 +47,11 @@ <%include payment_manual_include.html%> <%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: payment_method.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/payment_method.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- payment_method.html 11 May 2005 22:35:47 -0000 1.13 +++ payment_method.html 23 Aug 2006 20:53:31 -0000 1.14 @@ -15,9 +15,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Payment</h2> @@ -68,9 +70,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: payment_success.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/payment_success.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- payment_success.html 11 May 2005 22:35:47 -0000 1.13 +++ payment_success.html 23 Aug 2006 20:53:31 -0000 1.14 @@ -14,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Payment Confirmation</h2> @@ -26,9 +28,11 @@ If this does not happen, click <a href="<%Links::transform_url($config.build_root_url)%>">here</a>. </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: rate.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/rate.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- rate.html 11 May 2005 22:35:47 -0000 1.13 +++ rate.html 23 Aug 2006 20:53:31 -0000 1.14 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Rate a Link</h2> @@ -50,9 +52,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: rate_success.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/rate_success.html,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- rate_success.html 11 May 2005 22:35:47 -0000 1.9 +++ rate_success.html 23 Aug 2006 20:53:31 -0000 1.10 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Rate a Link</h2> @@ -24,9 +26,11 @@ Thank you for your vote. </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: rate_top.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/rate_top.html,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- rate_top.html 11 May 2005 22:35:47 -0000 1.12 +++ rate_top.html 23 Aug 2006 20:53:31 -0000 1.13 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Top Rated Links</h2> @@ -54,9 +56,11 @@ <%~endloop%> </table> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: review_add.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/review_add.html,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- review_add.html 11 May 2005 22:35:47 -0000 1.18 +++ review_add.html 23 Aug 2006 20:53:31 -0000 1.19 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Add a Review</h2> @@ -76,9 +78,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: review_add_success.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/review_add_success.html,v retrieving revision 1.15 retrieving revision 1.17 diff -u -r1.15 -r1.17 --- review_add_success.html 11 May 2005 22:35:47 -0000 1.15 +++ review_add_success.html 23 Aug 2006 20:53:31 -0000 1.17 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Review Added</h2> @@ -24,10 +26,12 @@ We have received the following review: </p> +<%~if Review_Rating%> <div class="row clear"> <label class="name">Rating:</label> <div class="value wrappedtext"><%Review_Rating%></div> </div> +<%~endif%> <div class="row clear"> <label class="name">Subject:</label> <div class="value wrappedtext"><%Review_Subject%></div> @@ -59,9 +63,11 @@ <%~endif%> </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: review_added.eml =================================================================== RCS file: /glinks/cgi/admin/templates/luna/review_added.eml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- review_added.eml 27 Oct 2005 23:25:24 -0000 1.8 +++ review_added.eml 15 Aug 2006 00:21:19 -0000 1.9 @@ -7,7 +7,9 @@ Thank you for visiting our site. We've added the following review into our directory: +<%~if Review_Rating%> Rating: <%Review_Rating%> +<%~endif%> Subject: <%Review_Subject%> By Line: <%Review_ByLine%> Date: <%Review_Date%> Index: review_edit.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/review_edit.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- review_edit.html 11 May 2005 22:35:47 -0000 1.15 +++ review_edit.html 23 Aug 2006 20:53:31 -0000 1.16 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Edit Review</h2> @@ -75,9 +77,11 @@ <%~endif%> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: review_edit_success.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/review_edit_success.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- review_edit_success.html 11 May 2005 22:35:47 -0000 1.11 +++ review_edit_success.html 23 Aug 2006 20:53:31 -0000 1.12 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Review Updated</h2> @@ -49,9 +51,11 @@ <%~endif%> </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: review_include.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/review_include.html,v retrieving revision 1.13 retrieving revision 1.15 diff -u -r1.13 -r1.15 --- review_include.html 18 Apr 2005 21:39:36 -0000 1.13 +++ review_include.html 27 Jul 2006 04:29:57 -0000 1.15 @@ -6,7 +6,7 @@ <%~set ID = ''%> <%~endif%> <h4 class="reviewsubject"> - <%Review_Subject%><%if Review_Owner eq $user.Username and config.review_allow_modify%> <span class="hsmall">(<a href="<%config.db_cgi_url%>/review.cgi?edit_review=1;ID=<%Review_LinkID%>;confirmed=1">edit</a>)</span><%endif%> + <%Review_Subject%><%if Review_CanModify%> <span class="hsmall">(<a href="<%config.db_cgi_url%>/review.cgi?edit_review=1;ID=<%Review_LinkID%>;ReviewID=<%ReviewID%>;confirmed=1">edit</a>)</span><%endif%> <img src="<%Links::Utils::image_url("stars-5-${Review_Rating}.gif")%>" alt="<%Review_Rating%> out of 5 stars" title="<%Review_Rating%> out of 5 stars" /> <%if Review_IsNew%><span class="new-item"><span>new</span></span><%endif%> </h4> @@ -16,7 +16,7 @@ </h5> <%~endif%> <p class="reviewer"> - Reviewed by: <%if Review_GuestName%><a href="mailto:<%Review_GuestEmail%>"><%Review_GuestName%></a><%else%><a href="<%config.db_cgi_url%>/review.cgi?username=<%Review_Owner%>"><%Review_Owner%></a><%endif%>, <%Review_Date%> + Reviewed by: <%if Review_GuestName%><a href="mailto:<%Review_GuestEmail%>"><%Review_GuestName%></a><%else%><a href="<%config.db_cgi_url%>/review.cgi?username=<%Review_Owner%>"><%Review_Owner%></a><%endif%>, <%Review_Date%><%if Review_ModifyDate%> (Modified: <%Review_ModifyDate%>)<%endif%> </p> <%~if Review_Contents%> <div class="reviewcontent"> Index: review_search_results.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/review_search_results.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- review_search_results.html 19 Aug 2005 20:07:57 -0000 1.15 +++ review_search_results.html 23 Aug 2006 20:53:31 -0000 1.16 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Reviews</h2> @@ -40,9 +42,11 @@ <%if ID and not error%><p class="reviewfooter"><a href="<%config.db_cgi_url%>/review.cgi?ID=<%ID%>;add_review=1">Add your own Review</a></p><%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: search.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/search.html,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- search.html 11 May 2005 22:35:47 -0000 1.13 +++ search.html 23 Aug 2006 20:53:31 -0000 1.14 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Search Form</h2> @@ -54,9 +56,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: search_results.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/search_results.html,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- search_results.html 19 Aug 2005 20:07:57 -0000 1.19 +++ search_results.html 23 Aug 2006 20:53:31 -0000 1.20 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Search Results</h2> @@ -51,9 +53,11 @@ <%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: signup_form.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/signup_form.html,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- signup_form.html 11 May 2005 22:35:47 -0000 1.15 +++ signup_form.html 23 Aug 2006 20:53:31 -0000 1.16 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>User Sign Up</h2> @@ -48,9 +50,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: signup_success.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/signup_success.html,v retrieving revision 1.11 retrieving revision 1.13 diff -u -r1.11 -r1.13 --- signup_success.html 11 May 2005 22:35:47 -0000 1.11 +++ signup_success.html 23 Aug 2006 20:53:31 -0000 1.13 @@ -1,4 +1,5 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<%~set message = 'Registration successful'%> <html> <head> <title><%site_title%>: Successful Sign Up</title> @@ -13,9 +14,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Successful Sign Up</h2> @@ -24,13 +27,15 @@ <%~if Validation%> Thanks for signing up, an e-mail has been sent to you with a validation code. Once you receive it, you'll need to enter a <a href="<%config.db_cgi_url%>/user.cgi?validate=1">validation code</a> <%~else%> - You have successfully registered. + You are now logged into <%site_title%> as '<%user.Username%>'. <%~endif%> </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: validate_form.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/validate_form.html,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- validate_form.html 11 May 2005 22:35:47 -0000 1.11 +++ validate_form.html 23 Aug 2006 20:53:31 -0000 1.12 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Validation</h2> @@ -37,9 +39,11 @@ </div> </form> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div> Index: validate_success.html =================================================================== RCS file: /glinks/cgi/admin/templates/luna/validate_success.html,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- validate_success.html 11 May 2005 22:35:47 -0000 1.10 +++ validate_success.html 23 Aug 2006 20:53:31 -0000 1.11 @@ -13,9 +13,11 @@ <div id="icwrapper" class="clear"> <%include include_leftsidebar.html%> <div id="contentwrapper" class="shadowleft"> +<%include include_contentwrapper_top.html%> <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div> <div class="shadowright"> <div id="content"> +<%include include_content_top.html%> <div class="crumb"><%Links::Utils::format_title($main_title_loop, separator => $crumb_separator, no_escape_separator => $no_escape_crumb_separator, include_home => 1, link_type => 2)%></div> <h2>Account Activated</h2> @@ -24,9 +26,11 @@ Thank you, your account is now activated. </p> +<%include include_content_bottom.html%> </div> </div> <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div> +<%include include_contentwrapper_bottom.html%> </div> <%include include_rightsidebar.html%> </div>