Index: add.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/add.html,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -r1.6 -r1.9
--- add.html 1 Mar 2005 01:11:04 -0000 1.6
+++ add.html 24 Mar 2005 08:58:29 -0000 1.9
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -32,8 +31,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: add_success.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/add_success.html,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -r1.6 -r1.11
--- add_success.html 1 Mar 2005 01:06:47 -0000 1.6
+++ add_success.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -25,17 +24,17 @@
We have received the following link:
</p>
-<div class="row">
+<div class="row clear">
<label class="name">Title:</label>
- <div class="value"><%Title%></div>
+ <div class="value wrappedtext"><%Title%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">URL:</label>
- <div class="value"><%URL%></div>
+ <div class="value wrappedtext"><%URL%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Category:</label>
- <div class="value">
+ <div class="value wrappedtext">
<%~if Category_loop.length > 1%>
<ul><%loop Category_loop%><li><%loop_value%></li><%endloop%></ul>
<%~else%>
@@ -43,17 +42,17 @@
<%~endif%>
</div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Description:</label>
- <div class="value"><%Description%></div>
+ <div class="value wrappedtext"><%Description%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Contact Name:</label>
- <div class="value"><%Contact_Name%></div>
+ <div class="value wrappedtext"><%Contact_Name%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Contact E-mail:</label>
- <div class="value"><%Contact_Email%></div>
+ <div class="value wrappedtext"><%Contact_Email%></div>
</div>
<p>
@@ -64,8 +63,11 @@
<%~endif%>
</p>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: bookmark_folder_add.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/bookmark_folder_add.html,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -r1.7 -r1.11
--- bookmark_folder_add.html 1 Mar 2005 01:11:04 -0000 1.7
+++ bookmark_folder_add.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -10,40 +10,39 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
<form action="<%config.db_cgi_url%>/bookmark.cgi" method="post">
<input type="hidden" name="action" value="folder_add" />
- <div class="row required">
+ <div class="row required clear">
<label for="my_folder_name" class="name">Name: <span>*</span></label>
<div class="value">
<input type="text" id="my_folder_name" name="my_folder_name" value="<%if my_folder_name%><%my_folder_name%><%endif%>" class="text" />
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label for="my_folder_description" class="name">Description:</label>
<div class="value">
<input type="text" id="my_folder_description" name="my_folder_description" value="<%if my_folder_description%><%my_folder_description%><%endif%>" class="text" />
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label class="name">Default Folder?</label>
<div class="value">
<input type="radio" id="my_folder_default_1" name="my_folder_default" value="1"<%if my_folder_default%> checked="checked"<%endif%> class="radio" /><label for="my_folder_default_1">Yes</label>
<input type="radio" id="my_folder_default_0" name="my_folder_default" value="0"<%ifnot my_folder_default%> checked="checked"<%endif%> class="radio" /><label for="my_folder_default_0">No</label>
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label class="name">Public Folder?</label>
<div class="value">
<input type="radio" id="my_folder_public_1" name="my_folder_public" value="1"<%if my_folder_public%> checked="checked"<%endif%>><label for="my_folder_public_1">Yes</label>
@@ -55,8 +54,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: bookmark_folder_edit.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/bookmark_folder_edit.html,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -r1.7 -r1.11
--- bookmark_folder_edit.html 1 Mar 2005 01:11:04 -0000 1.7
+++ bookmark_folder_edit.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -10,14 +10,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -25,26 +24,26 @@
<form action="<%config.db_cgi_url%>/bookmark.cgi" method="post">
<input type="hidden" name="action" value="folder_edit" />
<input type="hidden" name="my_folder_id" value="<%my_folder_id%>" />
- <div class="row required">
+ <div class="row required clear">
<label for="my_folder_name" class="name">Name: <span>*</span></label>
<div class="value">
<input type="text" id="my_folder_name" name="my_folder_name" value="<%if my_folder_name%><%my_folder_name%><%endif%>" class="text" />
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label for="my_folder_description" class="name">Description:</label>
<div class="value">
<input type="text" id="my_folder_description" name="my_folder_description" value="<%if my_folder_description%><%my_folder_description%><%endif%>" class="text" />
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label class="name">Default Folder?</label>
<div class="value">
<input type="radio" id="my_folder_default_1" name="my_folder_default" value="1"<%if my_folder_default%> checked="checked"<%endif%> class="radio" /><label for="my_folder_default_1">Yes</label>
<input type="radio" id="my_folder_default_0" name="my_folder_default" value="0"<%ifnot my_folder_default%> checked="checked"<%endif%> class="radio" /><label for="my_folder_default_0">No</label>
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label class="name">Public Folder?</label>
<div class="value">
<input type="radio" id="my_folder_public_1" name="my_folder_public" value="1"<%if my_folder_public%> checked="checked"<%endif%>><label for="my_folder_public_1">Yes</label>
@@ -56,8 +55,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: bookmark_folder_view.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/bookmark_folder_view.html,v
retrieving revision 1.9
retrieving revision 1.14
diff -u -r1.9 -r1.14
--- bookmark_folder_view.html 1 Mar 2005 01:11:04 -0000 1.9
+++ bookmark_folder_view.html 24 Mar 2005 08:58:29 -0000 1.14
@@ -4,7 +4,7 @@
<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.db_static_url%>/utils.js"></script>
+ <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') });
@@ -16,14 +16,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -47,7 +46,7 @@
</ul>
<%~endif%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style)%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%>
<%if Bookmarks.length~%>
<%~loop Bookmarks%>
@@ -56,10 +55,13 @@
<%~endloop%>
<%~endif%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style, button_id => 'paging_button2')%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: bookmark_link_add.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/bookmark_link_add.html,v
retrieving revision 1.10
retrieving revision 1.15
diff -u -r1.10 -r1.15
--- bookmark_link_add.html 1 Mar 2005 01:11:04 -0000 1.10
+++ bookmark_link_add.html 24 Mar 2005 08:58:29 -0000 1.15
@@ -10,14 +10,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -33,15 +32,15 @@
<form action="<%config.db_cgi_url%>/bookmark.cgi" method="post">
<input type="hidden" name="action" value="link_add" />
<input type="hidden" name="my_link_id_fk" value="<%ID%>" />
- <div class="row">
+ <div class="row clear">
<label for="my_comment" class="name">Comments:</label>
<div class="value">
<textarea name="my_comment" rows="3" cols="40"><%if my_comment%><%my_comment%><%endif%></textarea>
</div>
</div>
- <div class="row<%if Folders.length > 1%> required<%endif%>">
+ <div class="row<%if Folders.length > 1%> required<%endif%> clear">
<label for="my_folder_id_fk" class="name">Folder:<%if Folders.length > 1%> <span>*</span><%endif%></label>
- <div class="value">
+ <div class="value<%if Folders.length == 1%> wrappedtext<%endif%>">
<%~if Folders.length == 1%>
<input type="hidden" name="my_folder_id_fk" value="<%Folders.0.my_folder_id%>" /><%Folders.0.my_folder_name%>
<%~else%>
@@ -56,8 +55,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: bookmark_link_edit.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/bookmark_link_edit.html,v
retrieving revision 1.10
retrieving revision 1.15
diff -u -r1.10 -r1.15
--- bookmark_link_edit.html 1 Mar 2005 01:06:47 -0000 1.10
+++ bookmark_link_edit.html 24 Mar 2005 08:58:29 -0000 1.15
@@ -10,14 +10,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -33,15 +32,15 @@
<form action="<%config.db_cgi_url%>/bookmark.cgi" method="post">
<input type="hidden" name="action" value="edit_bookmark" />
<input type="hidden" name="id" value="<%ID%>" />
- <div class="row">
+ <div class="row clear">
<label for="my_comment" class="name">Comments:</label>
<div class="value">
<textarea name="my_comment" rows="3" cols="40"><%if my_comment%><%my_comment%><%endif%></textarea>
</div>
</div>
- <div class="row<%if Folders.length > 1%> required<%endif%>">
+ <div class="row<%if Folders.length > 1%> required<%endif%> clear">
<label for="my_folder_id_fk" class="name">Folder:<%if Folders.length > 1%> <span>*</span><%endif%></label>
- <div class="value">
+ <div class="value<%if Folders.length == 1%> wrappedtext<%endif%>">
<%~if Folders.length == 1%>
<input type="hidden" name="my_folder_id_fk" value="<%Folders.0.my_folder_id%>" /><%Folders.0.my_folder_name%>
<%~else%>
@@ -56,8 +55,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: bookmark_list.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/bookmark_list.html,v
retrieving revision 1.7
retrieving revision 1.12
diff -u -r1.7 -r1.12
--- bookmark_list.html 1 Mar 2005 01:11:04 -0000 1.7
+++ bookmark_list.html 24 Mar 2005 08:58:29 -0000 1.12
@@ -4,7 +4,7 @@
<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.db_static_url%>/utils.js"></script>
+ <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') });
@@ -16,14 +16,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -52,7 +51,7 @@
</ul>
<%~endif%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style)%></div><%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">
@@ -73,10 +72,13 @@
</form>
<%~endif%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style, button_id => 'paging_button2')%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: bookmark_nav.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/bookmark_nav.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bookmark_nav.html 27 Feb 2005 23:30:42 -0000 1.4
+++ bookmark_nav.html 26 Mar 2005 00:41:18 -0000 1.5
@@ -1,4 +1,4 @@
-<ul id="secondarynav">
+<ul class="secondarynav">
<li class="first"><a href="<%config.db_cgi_url%>/bookmark.cgi">My Bookmarks</a></li>
<li><a href="<%config.db_cgi_url%>/bookmark.cgi?action=folder_add">Add Folder</a></li>
<li><a href="<%config.db_cgi_url%>/bookmark.cgi?action=edit_preferences">Preferences</a></li>
Index: bookmark_preferences.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/bookmark_preferences.html,v
retrieving revision 1.6
retrieving revision 1.12
diff -u -r1.6 -r1.12
--- bookmark_preferences.html 1 Mar 2005 01:11:04 -0000 1.6
+++ bookmark_preferences.html 24 Mar 2005 08:58:29 -0000 1.12
@@ -5,26 +5,25 @@
<title><%site_title%>: Bookmarks: Preferences</title>
<%include include_common_head.html%>
</head>
-<body id="bookmark_list">
+<body id="bookmark_preferences">
<%include include_accessibility.html%>
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
<form action="<%config.db_cgi_url%>/bookmark.cgi" method="post">
<input type="hidden" name="action" value="edit_preferences" />
- <div class="row">
+ <div class="row clear">
<label for="SortField" class="name">Sort Links By:</label>
<div class="value">
<select id="SortField" name="SortField">
@@ -33,7 +32,7 @@
</select>
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label for="SortOrd" class="name">Link Sort Order:</label>
<div class="value">
<select id="SortOrd" name="SortOrd">
@@ -42,7 +41,7 @@
</select>
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label for="Grouping" class="name">Link Grouping:</label>
<div class="value">
<select id="Grouping" name="Grouping">
@@ -51,25 +50,7 @@
</select>
</div>
</div>
- <div class="row">
- <label for="FolderSortField" class="name">Folder Sort Field:</label>
- <div class="value">
- <select id="FolderSortField" name="FolderSortField">
- <option value="my_folder_name"<%if FolderSortField eq 'my_folder_name'%> selected<%endif%>>Folder Name</option>
- <option value="my_folder_id"<%if FolderSortField eq 'my_folder_id'%> selected<%endif%>>Folder ID</option>
- </select>
- </div>
- </div>
- <div class="row">
- <label for="FolderSortOrd" class="name">Folder Sort Order:</label>
- <div class="value">
- <select id="FolderSortOrd" name="FolderSortOrd">
- <option value="ASC"<%if FolderSortOrd eq 'ASC'%> selected="selected"<%endif%>>Ascending</option>
- <option value="DESC"<%if FolderSortOrd eq 'DESC'%> selected="selected"<%endif%>>Descending</option>
- </select>
- </div>
- </div>
- <div class="row">
+ <div class="row clear">
<label for="PerPage" class="name">Links Per Page:</label>
<div class="value">
<input type="text" id="PerPage" name="PerPage" value="<%PerPage%>" class="text shorttext" />
@@ -80,8 +61,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: bookmark_users.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/bookmark_users.html,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -r1.6 -r1.11
--- bookmark_users.html 1 Mar 2005 01:11:04 -0000 1.6
+++ bookmark_users.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -4,7 +4,7 @@
<head>
<title><%site_title%>: Bookmarks: User List</title>
<%include include_common_head.html%>
- <script type="text/javascript" src="<%config.db_static_url%>/utils.js"></script>
+ <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') });
@@ -16,14 +16,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -36,7 +35,7 @@
<%~endif%>
</p>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style)%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%>
<%if users~%>
<ul>
@@ -46,10 +45,13 @@
</ul>
<%~endif%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style, button_id => 'paging_button2')%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: category.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/category.html,v
retrieving revision 1.11
retrieving revision 1.21
diff -u -r1.11 -r1.21
--- category.html 1 Mar 2005 04:02:26 -0000 1.11
+++ category.html 25 Mar 2005 09:28:29 -0000 1.21
@@ -5,7 +5,7 @@
<head>
<title><%site_title%>: <%category_name%></title>
<%include include_common_head.html%>
- <script type="text/javascript" src="<%config.db_static_url%>/utils.js"></script>
+ <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') });
@@ -17,21 +17,20 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
<%category_short%>
<%~if config.newsletter_enabled%>
<%~Links::Newsletter::subscription_info($ID)%>
- <%if SubscriptionStatus == 2%><span>(<a href="<%config.db_cgi_url%>/subscribe.cgi?action=unsubscribe;ID=<%ID%>" title="Unsubscribe to stop getting updates from this category">Unsubscribe</a>)</span><%elsif SubscriptionStatus == 1%><%else%><span>(<a href="<%config.db_cgi_url%>/subscribe.cgi?action=subscribe;ID=<%ID%>" title="Subscribe to get updates from this category">Subscribe</a>)</span><%endif%>
+ <%if SubscriptionStatus == 2%><span class="hsmall">(<a href="<%config.db_cgi_url%>/subscribe.cgi?action=unsubscribe;ID=<%ID%>" title="Unsubscribe to stop getting updates from this category">Unsubscribe</a>)</span><%elsif SubscriptionStatus == 1%><%else%><span class="hsmall">(<a href="<%config.db_cgi_url%>/subscribe.cgi?action=subscribe;ID=<%ID%>" title="Subscribe to get updates from this category">Subscribe</a>)</span><%endif%>
<%~endif%>
</h2>
@@ -39,11 +38,11 @@
<h3>Categories</h3>
<%~set split = Links::Utils::column_split($category_loop.length, $category_cols)%>
<div class="clear">
-<%~loop category_loop%>
+<%loop category_loop%>
<%~set splitmod = $row_num % $split%>
- <%if row_num == 1 or splitmod == 1%><dl><%endif%>
-<%include subcategory.html%>
- <%if row_num == $category_loop.length or splitmod == 0%></dl><%endif%>
+ <%~if row_num == 1 or splitmod == 1%><dl><%endif%>
+<%~include subcategory.html%>
+ <%~if row_num == $category_loop.length or splitmod == 0%></dl><%endif%>
<%~endloop%>
</div>
<%~endif%>
@@ -59,13 +58,13 @@
<%if links_loop.length~%>
<h3>Links</h3>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style)%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%>
<%loop links_loop~%>
<%include link.html%>
<%~endloop%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style, button_id => 'paging_button2')%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%>
<%~endif%>
<%if editors_loop.length~%>
@@ -77,8 +76,11 @@
</ul>
<%~endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: cool.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/cool.html,v
retrieving revision 1.7
retrieving revision 1.13
diff -u -r1.7 -r1.13
--- cool.html 1 Mar 2005 01:15:10 -0000 1.7
+++ cool.html 24 Mar 2005 08:58:29 -0000 1.13
@@ -1,14 +1,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<%-- other tags:
-
-total => The total number of cool links
-
---%>
<html>
<head>
<title><%site_title%>: What's Cool</title>
<%include include_common_head.html%>
- <script type="text/javascript" src="<%config.db_static_url%>/utils.js"></script>
+ <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') });
@@ -20,29 +15,31 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style)%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%>
<%loop link_results_loop~%>
<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>
<%include link.html%>
<%~endloop%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style, button_id => 'paging_button2')%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: detailed.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/detailed.html,v
retrieving revision 1.10
retrieving revision 1.15
diff -u -r1.10 -r1.15
--- detailed.html 1 Mar 2005 01:11:04 -0000 1.10
+++ detailed.html 24 Mar 2005 08:58:29 -0000 1.15
@@ -10,21 +10,20 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
-<%if next_url or prev_url%><p class="linknav"><%if prev_url%><a href="<%prev_url%>"><img src="<%config.build_images_url%>/<%t%>/paging-prev.gif" alt="<" /> Previous</a><%endif%><%if next_url and prev_url%> | <%endif%><%if next_url%><a href="<%next_url%>">Next <img src="<%config.build_images_url%>/<%t%>/paging-next.gif" alt=">" /></a><%endif%></p><%endif%>
+<%if next_url or prev_url%><p class="linknav"><%if prev_url%><a href="<%prev_url%>"><img src="<%Links::Utils::image_url('paging-prev.gif')%>" alt="<" /> Previous</a><%endif%><%if next_url and prev_url%> | <%endif%><%if next_url%><a href="<%next_url%>">Next <img src="<%Links::Utils::image_url('paging-next.gif')%>" alt=">" /></a><%endif%></p><%endif%>
<h2>
- <%Title%><%if URL and URL ne 'http://'%> <span>(<a href="<%config.db_cgi_url%>/jump.cgi?ID=<%ID%>">Visit this link</a>)</span><%endif%>
+ <%Title%><%if URL and URL ne 'http://'%> <span class="hsmall">(<a href="<%config.db_cgi_url%>/jump.cgi?ID=<%ID%>">Visit this link</a>)</span><%endif%>
<%if isNew%><span class="new-item"><span>new</span></span><%endif%>
<%if isChanged%><span class="updated-item"><span>updated</span></span><%endif%>
<%if isPopular%><span class="popular-item"><span>popular</span></span><%endif%>
@@ -38,7 +37,7 @@
<%if Votes~%>
<p class="rating">
<%~set intRating = $Rating i/ 1%>
- <img src="<%config.build_images_url%>/<%t%>/stars-10-<%intRating%>.gif" alt="<%intRating%> out of 10 stars" /> (<%Votes%> vote<%if Votes != 1%>s<%endif%>)
+ <img src="<%Links::Utils::image_url("stars-10-${intRating}.gif")%>" alt="<%intRating%> out of 10 stars" /> (<%Votes%> vote<%if Votes != 1%>s<%endif%>)
</p>
<%~endif%>
@@ -71,8 +70,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%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: error.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/error.html,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -r1.7 -r1.10
--- error.html 1 Mar 2005 01:11:04 -0000 1.7
+++ error.html 24 Mar 2005 08:58:29 -0000 1.10
@@ -11,14 +11,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -30,8 +29,11 @@
<%error_message%>
</p>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: globals.txt
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/globals.txt,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -r1.3 -r1.5
--- globals.txt 17 Feb 2005 08:24:07 -0000 1.3
+++ globals.txt 15 Mar 2005 03:20:31 -0000 1.5
@@ -4,9 +4,13 @@
'crumb_separator' => ' > ',
'detailed_max_reviews' => 5,
'home_category_cols' => 2,
- 'paging_boundary_pages' => 1,
- 'paging_max_pages' => 25,
- 'paging_style' => 1,
+ 'paging_options' => 'sub {
+ return {
+ max_pages => 25,
+ boundary_pages => 1,
+ style => 1,
+ };
+}',
'site_title' => 'Gossamer Links'
};
Index: home.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/home.html,v
retrieving revision 1.6
retrieving revision 1.13
diff -u -r1.6 -r1.13
--- home.html 1 Mar 2005 01:14:13 -0000 1.6
+++ home.html 25 Mar 2005 09:28:29 -0000 1.13
@@ -9,32 +9,30 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-
-<p><strong>Welcome to the Gossamer Links demo. Feel free to add your own link, modify an existing link or just play around!</strong></p>
-<p>Our clients have thought of some unique and interesting ways to use <a href="http://www.gossamer-threads.com/scripts/links-sql">Gossamer Links</a>. </p>
-<p>Some examples are: software downloads site, classifieds, search directory, personals site, image licensing site, etc. The possibilities are endless! <a href="http://www.gossamer-threads.com/contact">Contact us</a> to find out how Gossamer Links can work for you.</p>
-
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<%set split = Links::Utils::column_split($category_loop.length, $home_category_cols)~%>
+<div class="clear">
<%loop category_loop%>
<%~set splitmod = $row_num % $split%>
- <%if row_num == 1 or splitmod == 1%><dl><%endif%>
-<%include subcategory.html%>
- <%if row_num == $category_loop.length or splitmod == 0%></dl><%endif%>
-<%endloop%>
-<span class="reset"></span>
-<h4>There are <strong><%grand_total%></strong> links for you to choose from!</h4>
+ <%~if row_num == 1 or splitmod == 1%><dl><%endif%>
+<%~include subcategory.html%>
+ <%~if row_num == $category_loop.length or splitmod == 0%></dl><%endif%>
+<%~endloop%>
+</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>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: include_accessibility.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/include_accessibility.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- include_accessibility.html 27 Feb 2005 23:00:18 -0000 1.2
+++ include_accessibility.html 19 Mar 2005 00:21:39 -0000 1.3
@@ -1,2 +1,2 @@
-<div id="accessibility"><a href="#primarynav">Skip to Navigation</a> | <a href="#content">Skip to Content</a></div>
+<div id="accessibility"><a href="#content">Skip to Content</a></div>
<hr class="hide" />
Index: include_common_head.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/include_common_head.html,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -r1.2 -r1.4
--- include_common_head.html 15 Feb 2005 21:00:41 -0000 1.2
+++ include_common_head.html 22 Mar 2005 07:36:03 -0000 1.4
@@ -1,5 +1,4 @@
<meta http-equiv="content-type" content="text/html; charset=iso-8859-1" />
<%if Meta_Description%><meta name="description" content="<%Meta_Description%>" /><%endif%>
<%if Meta_Keywords%><meta name="keywords" content="<%Meta_Keywords%>" /><%endif%>
-<link type="text/css" rel="stylesheet" media="screen" href="<%config.db_static_url%>/<%t%>/core.css" />
-<link type="text/css" rel="stylesheet" media="screen" href="<%config.db_static_url%>/<%t%>/custom.css" />
+<%if theme%><link type="text/css" rel="stylesheet" media="screen" 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.4
retrieving revision 1.6
diff -u -r1.4 -r1.6
--- include_footer.html 1 Mar 2005 01:22:23 -0000 1.4
+++ include_footer.html 22 Mar 2005 02:01:36 -0000 1.6
@@ -1,6 +1,6 @@
<hr class="hide" />
<div id="footer" class="clear">
- <a href="http://www.gossamer-threads.com"><img src="<%config.build_images_url%>/<%t%>/poweredby.gif" alt="Powered by Gossamer Links" /></a>
+ <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>
</div>
-<%--if in.debug%><%GT::Template::dump%><%endif--%>
+<%--if in.debug%><%DUMP%><%endif--%>
Index: include_form.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/include_form.html,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -r1.7 -r1.9
--- include_form.html 28 Feb 2005 21:04:05 -0000 1.7
+++ include_form.html 16 Mar 2005 08:44:37 -0000 1.9
@@ -1,18 +1,18 @@
-<div class="row required">
+<div class="row required clear">
<label for="Title" class="name">Title: <span>*</span></label>
<div class="value">
<input type="text" id="Title" name="Title" value="<%if Title%><%Title%><%endif%>" class="text" />
</div>
</div>
-<div class="row required">
+<div class="row required clear">
<label for="URL" class="name">URL: <span>*</span></label>
<div class="value">
<input type="text" id="URL" name="URL" value="<%if URL%><%URL%><%else%>http://<%endif%>" class="text" />
</div>
</div>
-<div class="row<%unless category_loop_selected%> required<%endunless%>">
+<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">
+ <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="<%ID%>" /></li><%endloop%></ul>
@@ -28,19 +28,19 @@
<%endif%>
</div>
</div>
-<div class="row">
+<div class="row clear">
<label for="Description" class="name">Description:</label>
<div class="value">
<textarea id="Description" name="Description" rows="3" cols="42"><%if Description%><%Description%><%endif%></textarea>
</div>
</div>
-<div class="row">
+<div class="row clear">
<label for="Contact_Name" class="name">Contact Name:</label>
<div class="value">
<input type="text" id="Contact_Name" name="Contact_Name" value="<%if Contact_Name%><%Contact_Name%><%endif%>" class="text" />
</div>
</div>
-<div class="row">
+<div class="row clear">
<label for="Contact_Email" class="name">Contact E-mail:</label>
<div class="value">
<input type="text" id="Contact_Email" name="Contact_Email" value="<%if Contact_Email%><%Contact_Email%><%endif%>" class="text" />
Index: include_header.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/include_header.html,v
retrieving revision 1.8
retrieving revision 1.10
diff -u -r1.8 -r1.10
--- include_header.html 28 Feb 2005 00:23:05 -0000 1.8
+++ include_header.html 26 Mar 2005 00:41:18 -0000 1.10
@@ -2,22 +2,22 @@
<div id="loginbar"><a href="<%config.db_cgi_url%>/user.cgi<%if user.Username%>?logout=1<%endif%>" class="<%if user.Username%>in<%else%>out<%endif%>"><%if user.Username%>Logout<%else%>Login/Register<%endif%></a></div>
<div id="logo"><h1><a href="<%config.build_root_url%>"><%site_title%></a></h1></div>
</div>
-<div id="navbar" class="clear">
- <ul id="primarynav">
+<div class="navbar clear">
+ <ul class="primarynav">
<li class="home"><a href="<%config.build_root_url%>">Home</a></li>
<li><a href="<%config.db_cgi_url%>/add.cgi<%if category_id%>?ID=<%category_id%><%endif%>">Add a Link</a></li>
<li><a href="<%config.db_cgi_url%>/modify.cgi<%if category_id%>?ID=<%category_id%><%endif%>">Modify a Link</a></li>
<li><a href="<%config.build_root_url%>/New/">New Links</a></li>
<li><a href="<%config.build_root_url%>/Cool/">Cool Links</a></li>
<li><a href="<%config.build_root_url%>/Ratings/">Top Rated</a></li>
- <li><a href="<%config.db_cgi_url%>/jump.cgi?ID=random">Random Link</a></li>
+ <li><a href="<%config.db_cgi_url%>/jump.cgi?ID=random<%if config.build_detailed%>;Detailed=1<%endif%>">Random Link</a></li>
<%if config.newsletter_enabled%><li><a href="<%config.db_cgi_url%>/subscribe.cgi">Newsletter</a></li><%endif%>
<%if config.bookmark_enabled%><li><a href="<%config.db_cgi_url%>/bookmark.cgi">Bookmarks</a></li><%endif%>
<%if Links::Utils::is_editor%><li><a href="<%config.db_cgi_url%>/browser.cgi">Editors</a></li><%endif%>
</ul>
<%if secondarynav%><%include $secondarynav%><%endif~%>
</div>
-<div id="searchbar">
+<div class="searchbar">
<form action="<%config.db_cgi_url%>/search.cgi">
<label for="searchbox">Search</label>
<%if category_id%><input type="radio" id="searchentire" name="catid" value="" checked="checked" /><label for="searchentire">the entire directory</label> <input type="radio" id="searchcat" name="catid" value="<%category_id%>" /><label for="searchcat">only this category</label><%endif%>
Index: jump_frame.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/jump_frame.html,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -r1.3 -r1.5
--- jump_frame.html 25 Feb 2005 06:09:56 -0000 1.3
+++ jump_frame.html 22 Mar 2005 02:01:36 -0000 1.5
@@ -7,7 +7,7 @@
</head>
<body id="jump_frame">
<div class="jumpwrapper">
- <a href="<%config.build_root_url%>"><img src="<%config.build_images_url%>/<%t%>/logo-small.gif" alt="<%site_title%>" class="floatleft" /></a>
+ <a href="<%config.build_root_url%>"><img src="<%Links::Utils::image_url('logo-small.gif')%>" alt="<%site_title%>" class="floatleft" /></a>
<%if error%>
<p class="errormessage">
@@ -15,7 +15,7 @@
</p>
<%else%>
<h4>
- <%if detailed_url%><a href="<%detailed_url%>"><%endif%><%Title%><%if detailed_url%></a><%endif%> <%if Votes%><%set intRating = $Rating i/ 1%><img src="<%config.build_images_url%>/<%t%>/stars-10-<%intRating%>.gif" alt="<%intRating%> out of 10 stars" title="<%intRating%> out of 10 stars" /> <span>(<%Votes%> vote<%if Votes != 1%>s<%endif%>)</span><%endif%>
+ <%if detailed_url%><a href="<%detailed_url%>"><%endif%><%Title%><%if detailed_url%></a><%endif%> <%if Votes%><%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" /> <span class="hsmall">(<%Votes%> vote<%if Votes != 1%>s<%endif%>)</span><%endif%>
</h4>
<div class="actions">
<%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%>
Index: language.txt
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/language.txt,v
retrieving revision 1.8
retrieving revision 1.13
diff -u -r1.8 -r1.13
--- language.txt 1 Mar 2005 02:11:21 -0000 1.8
+++ language.txt 16 Mar 2005 02:12:16 -0000 1.13
@@ -32,31 +32,10 @@
'BOOKMARK_PREF_INVALIDPERPAGE' => 'Links per page must be greater than 0.',
'BOOKMARK_PUBLIC_USER' => 'You do not have permission to access %s\'s folders.',
'BOOKMARK_USER_NOTEXISTS' => 'The user %s does not exist.',
- 'BROWSER_CANTMOD' => 'Unable to modify category: %s',
- 'BROWSER_CATCANTADD' => 'Unable to add category: %s',
- 'BROWSER_CATCANTDEL' => 'Unable to delete category: %s',
- 'BROWSER_EDITORADD' => 'Unable to add editor, please make sure %s is a valid user.',
- 'BROWSER_EDITORDEL' => 'Unable to delete editor: %s',
- 'BROWSER_INVALIDCATID' => 'Invalid category: \'%s\'.',
- 'BROWSER_INVALIDLINKID' => 'Invalid link id: %s',
- 'BROWSER_INVALIDUSER' => 'Sorry, but I don\'t know anything about user \'%s\'.',
- 'BROWSER_LINKCANTADD' => 'Unable to add link: %s',
- 'BROWSER_LINKCANTDEL' => 'Unable to delete link: %s',
- 'BROWSER_LINKCANTMOD' => 'Unable to modify link: %s',
- 'BROWSER_LINKMOVEEXISTS' => 'You can not move the link to that category, as it is already in that category.',
- 'BROWSER_LINKMOVEROOT' => 'Unable to move/copy a link to the root category, please pick a subcategory.',
- 'BROWSER_MOVECHILD' => 'Unable to move category into a sub tree of itself.',
- 'BROWSER_MOVEDUPE' => 'Unable to move category as a category with the same name already exists.',
- 'BROWSER_MOVESELF' => 'You can not move a category on top of itself.',
- 'BROWSER_NOROOT' => 'Invalid Category Root: \'%s\'.',
- 'BROWSER_NOSEARCH' => 'Your search did not match any records.',
- 'BROWSER_NOTEDITOR' => 'Sorry, but only category editors are allowed.',
- 'BROWSER_RELADD' => 'Unable to create relation: %s. Check to make sure it isn\'t already related, and that it is a valid category.',
- 'BROWSER_UNAUTHORIZED' => 'Sorry, you are not authorized to perform this action.',
'BUILD_DETAILED_ARGS' => 'Invalid argument passed to build_detailed: %s',
- 'BUILD_DETAILED_DISABLED' => 'Detailed pages are not enabled in the admin.',
+ 'BUILD_DETAILED_DISABLED' => 'Detailed pages are not enabled.',
'BUILD_DETAILED_EXPIRED' => 'The link has not been paid for or has expired.',
- 'BUILD_DETAILED_INVALIDID' => 'Invalid link id passed to build_detailed:(%s)',
+ 'BUILD_DETAILED_INVALIDID' => 'Invalid link id passed to build_detailed: %s',
'BUILD_DETAILED_UNVAL' => 'The link has not yet been validated.',
'DATE_UNIT_DAY' => 'Day',
'DATE_UNIT_DAYS' => 'Days',
@@ -122,246 +101,29 @@
'PAYLOG_INVALID_ID' => 'Invalid log ID.',
'PAYMENTERR_DECLINED' => 'Your payment was declined.',
'PAYMENTERR_DIRECT' => 'Your payment could not be processed. Please check the fields below and resubmit your payment.',
+ 'PAYMENTERR_INVALIDCATID' => 'Invalid category ID.',
'PAYMENTERR_INVALIDLEVEL' => 'You have selected an invalid payment level.',
+ 'PAYMENTERR_INVALIDLINKID' => 'Invalid link ID.',
'PAYMENTERR_INVALIDMETHOD' => 'You have selected an invalid payment method.',
'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_NOTOWNER' => 'You can only make payments to your own links.',
- 'PAYMENT_ADD_INVALID' => 'Invalid value entered for <b>%s</b>: \'%s\'',
- 'PAYMENT_ADD_NONE' => 'No value entered for <b>%s</b>',
- 'PAYMENT_ADD_OPT_INVALID' => 'Invalid value entered for <b>%s</b>',
- 'PAYMENT_CURRENCY_AED' => 'United Arab Emirates Dirham',
- 'PAYMENT_CURRENCY_AFA' => 'Afghani',
- 'PAYMENT_CURRENCY_ALL' => 'Lek',
- 'PAYMENT_CURRENCY_ANG' => 'Netherlands Antilles Guilder',
- 'PAYMENT_CURRENCY_AON' => 'New Kwanza',
- 'PAYMENT_CURRENCY_ARS' => 'Argentine Peso',
- 'PAYMENT_CURRENCY_AUD' => 'Australian Dollar',
- 'PAYMENT_CURRENCY_AWG' => 'Aruban Guilder',
- 'PAYMENT_CURRENCY_BAD' => 'Bosnian Dinar',
- 'PAYMENT_CURRENCY_BBD' => 'Barbados Dollar',
- 'PAYMENT_CURRENCY_BDT' => 'Taka',
- 'PAYMENT_CURRENCY_BGL' => 'Lev',
- 'PAYMENT_CURRENCY_BHD' => 'Bahraini Dinar',
- 'PAYMENT_CURRENCY_BIF' => 'Burundi Franc',
- 'PAYMENT_CURRENCY_BMD' => 'Bermudian Dollar',
- 'PAYMENT_CURRENCY_BND' => 'Brunei Dollar',
- 'PAYMENT_CURRENCY_BOB' => 'Boliviano',
- 'PAYMENT_CURRENCY_BRL' => 'Real',
- 'PAYMENT_CURRENCY_BSD' => 'Bahamian Dollar',
- 'PAYMENT_CURRENCY_BWP' => 'Pula',
- 'PAYMENT_CURRENCY_BZD' => 'Belize Dollar',
- 'PAYMENT_CURRENCY_CAD' => 'Canadian Dollars',
- 'PAYMENT_CURRENCY_CHF' => 'Swiss Franc',
- 'PAYMENT_CURRENCY_CLP' => 'Chilean Peso',
- 'PAYMENT_CURRENCY_CNY' => 'Yuan Renminbi',
- 'PAYMENT_CURRENCY_COP' => 'Colombian Peso',
- 'PAYMENT_CURRENCY_CRC' => 'Costa Rican Colon',
- 'PAYMENT_CURRENCY_CUP' => 'Cuban Peso',
- 'PAYMENT_CURRENCY_CVE' => 'Cape Verde Escudo',
- 'PAYMENT_CURRENCY_CYP' => 'Cyprus Pound',
- 'PAYMENT_CURRENCY_CZK' => 'Czech Koruna',
- 'PAYMENT_CURRENCY_DJF' => 'Djibouti Franc',
- 'PAYMENT_CURRENCY_DKK' => 'Danish Krone',
- 'PAYMENT_CURRENCY_DOP' => 'Dominican Peso',
- 'PAYMENT_CURRENCY_DZD' => 'Algerian Dinar',
- 'PAYMENT_CURRENCY_ECS' => 'Ecuador Sucre',
- 'PAYMENT_CURRENCY_EEK' => 'Kroon',
- 'PAYMENT_CURRENCY_EGP' => 'Egyptian Pound',
- 'PAYMENT_CURRENCY_ETB' => 'Ethiopian Birr',
- 'PAYMENT_CURRENCY_EUR' => 'Euros',
- 'PAYMENT_CURRENCY_FJD' => 'Fiji Dollar',
- 'PAYMENT_CURRENCY_FKP' => 'Falkland Islands Pound',
'PAYMENT_CURRENCY_FORMAT' => '$%s ',
- 'PAYMENT_CURRENCY_GBP' => 'Pounds Sterling',
- 'PAYMENT_CURRENCY_GHC' => 'Cedi',
- 'PAYMENT_CURRENCY_GIP' => 'Gibraltar Pound',
- 'PAYMENT_CURRENCY_GMD' => 'Dalasi',
- 'PAYMENT_CURRENCY_GNF' => 'Guinea Franc',
- 'PAYMENT_CURRENCY_GTQ' => 'Quetzal',
- 'PAYMENT_CURRENCY_GWP' => 'Guinea - Bissau Peso',
- 'PAYMENT_CURRENCY_GYD' => 'Guyana Dollar',
- 'PAYMENT_CURRENCY_HKD' => 'Hong Kong Dollar',
- 'PAYMENT_CURRENCY_HNL' => 'Lempira',
- 'PAYMENT_CURRENCY_HRK' => 'Croatian Kuna',
- 'PAYMENT_CURRENCY_HTG' => 'Gourde',
- 'PAYMENT_CURRENCY_HUF' => 'Forint',
- 'PAYMENT_CURRENCY_IDR' => 'Rupiah',
- 'PAYMENT_CURRENCY_ILS' => 'Shekel',
- 'PAYMENT_CURRENCY_INR' => 'Indian Rupee',
- 'PAYMENT_CURRENCY_IQD' => 'Iraqi Dinar',
- 'PAYMENT_CURRENCY_IRR' => 'Iranian Rial',
- 'PAYMENT_CURRENCY_ISK' => 'Iceland Krona',
- 'PAYMENT_CURRENCY_JMD' => 'Jamaican Dollar',
- 'PAYMENT_CURRENCY_JOD' => 'Jordanian Dinar',
- 'PAYMENT_CURRENCY_JPY' => 'Yen',
- 'PAYMENT_CURRENCY_KES' => 'Kenyan Shilling',
- 'PAYMENT_CURRENCY_KGS' => 'Som',
- 'PAYMENT_CURRENCY_KHR' => 'Cambodia Riel',
- 'PAYMENT_CURRENCY_KMF' => 'Comoro Franc',
- 'PAYMENT_CURRENCY_KPW' => 'North Korean Won',
- 'PAYMENT_CURRENCY_KRW' => 'Won',
- 'PAYMENT_CURRENCY_KWD' => 'Kuwaiti Dinar',
- 'PAYMENT_CURRENCY_KYD' => 'Cayman Islands Dollar',
- 'PAYMENT_CURRENCY_KZT' => 'Tenge',
- 'PAYMENT_CURRENCY_LAK' => 'Kip',
- 'PAYMENT_CURRENCY_LBP' => 'Lebanese Pound',
- 'PAYMENT_CURRENCY_LKR' => 'Sri Lanka Rupee',
- 'PAYMENT_CURRENCY_LRD' => 'Liberian Dollar',
- 'PAYMENT_CURRENCY_LSL' => 'Loti',
- 'PAYMENT_CURRENCY_LTL' => 'Lithuanian Litas',
- 'PAYMENT_CURRENCY_LVL' => 'Latvian Lats',
- 'PAYMENT_CURRENCY_LYD' => 'Libyan Dinar',
- 'PAYMENT_CURRENCY_MAD' => 'Moroccan Dirham',
- 'PAYMENT_CURRENCY_MGF' => 'Malagasy Franc',
- 'PAYMENT_CURRENCY_MKD' => 'Denar',
- 'PAYMENT_CURRENCY_MMK' => 'Myanmar Kyat',
- 'PAYMENT_CURRENCY_MNT' => 'Mongolia Tugrik',
- 'PAYMENT_CURRENCY_MOP' => 'Pataca',
- 'PAYMENT_CURRENCY_MRO' => 'Ouguiya',
- 'PAYMENT_CURRENCY_MTL' => 'Maltese Lira',
- 'PAYMENT_CURRENCY_MUR' => 'Mauritius Rupee',
- 'PAYMENT_CURRENCY_MVR' => 'Rufiyaa',
- 'PAYMENT_CURRENCY_MWK' => 'Kwacha',
- 'PAYMENT_CURRENCY_MXN' => 'Mexico Peso',
- 'PAYMENT_CURRENCY_MYR' => 'Malaysian Ringitt',
- 'PAYMENT_CURRENCY_MZM' => 'Metical',
- 'PAYMENT_CURRENCY_NAD' => 'Namibian Dollar',
- 'PAYMENT_CURRENCY_NGN' => 'Naira',
- 'PAYMENT_CURRENCY_NIO' => 'Cordoba Oro',
- 'PAYMENT_CURRENCY_NOK' => 'Norwegian Krone',
- 'PAYMENT_CURRENCY_NPR' => 'Nepalese Rupee',
- 'PAYMENT_CURRENCY_NZD' => 'New Zealand Dollar',
- 'PAYMENT_CURRENCY_OMR' => 'Rial Omani',
- 'PAYMENT_CURRENCY_PAB' => 'Balboa',
- 'PAYMENT_CURRENCY_PEN' => 'Nuevo Sol',
- 'PAYMENT_CURRENCY_PGK' => 'New Guinea Kina',
- 'PAYMENT_CURRENCY_PHP' => 'Philippine Peso',
- 'PAYMENT_CURRENCY_PKR' => 'Pakistan Rupee',
- 'PAYMENT_CURRENCY_PLN' => 'New Zloty',
- 'PAYMENT_CURRENCY_PYG' => 'Guarani',
- 'PAYMENT_CURRENCY_QAR' => 'Qatari Rial',
- 'PAYMENT_CURRENCY_ROL' => 'Leu',
- 'PAYMENT_CURRENCY_RUR' => 'Russian Ruble',
- 'PAYMENT_CURRENCY_RWF' => 'Rwanda Franc',
- 'PAYMENT_CURRENCY_SAR' => 'Saudi Riyal',
- 'PAYMENT_CURRENCY_SBD' => 'Solomon Islands Dollar',
- 'PAYMENT_CURRENCY_SCR' => 'Seychelles Rupee',
- 'PAYMENT_CURRENCY_SDP' => 'Sudanese Pound',
- 'PAYMENT_CURRENCY_SEK' => 'Sweden Krona',
- 'PAYMENT_CURRENCY_SGD' => 'Singapore Dollar',
- 'PAYMENT_CURRENCY_SHP' => 'St Helena Pound',
- 'PAYMENT_CURRENCY_SIT' => 'Tolar',
- 'PAYMENT_CURRENCY_SKK' => 'Slovak Koruna',
- 'PAYMENT_CURRENCY_SLL' => 'Leone',
- 'PAYMENT_CURRENCY_SOS' => 'Somalia Shilling',
- 'PAYMENT_CURRENCY_SRG' => 'Suriname Guilder',
- 'PAYMENT_CURRENCY_STD' => 'Dobra',
- 'PAYMENT_CURRENCY_SVC' => 'El Salvador Colon',
- 'PAYMENT_CURRENCY_SYP' => 'Syrian Pound',
- 'PAYMENT_CURRENCY_SZL' => 'Swaziland Lilangeni',
- 'PAYMENT_CURRENCY_THB' => 'Baht',
- 'PAYMENT_CURRENCY_TJR' => 'Tajik Ruble',
- 'PAYMENT_CURRENCY_TND' => 'Tunisian Dinar',
- 'PAYMENT_CURRENCY_TOP' => 'Tonga Pa\'anga',
- 'PAYMENT_CURRENCY_TPE' => 'Timor Escudo',
- 'PAYMENT_CURRENCY_TRL' => 'Turkish Lira',
- 'PAYMENT_CURRENCY_TTD' => 'Trinidad & Tobago Dollar',
- 'PAYMENT_CURRENCY_TWD' => 'New Taiwan Dollar',
- 'PAYMENT_CURRENCY_TZS' => 'Tanzanian Shilling',
- 'PAYMENT_CURRENCY_UAH' => 'Ukrainian Hryvnia',
- 'PAYMENT_CURRENCY_UGX' => 'Uganda Shilling',
- 'PAYMENT_CURRENCY_USD' => 'U.S. Dollars',
- 'PAYMENT_CURRENCY_UYU' => 'Uruguayan Peso',
- 'PAYMENT_CURRENCY_VEB' => 'Venezuela Bolivar',
- 'PAYMENT_CURRENCY_VND' => 'Viet Nam Dong',
- 'PAYMENT_CURRENCY_VUV' => 'Vanuatu Vatu',
- 'PAYMENT_CURRENCY_WST' => 'Tala',
- 'PAYMENT_CURRENCY_XAF' => 'CFA Franc BEAC',
- 'PAYMENT_CURRENCY_XCD' => 'East Caribbean Dollar',
- 'PAYMENT_CURRENCY_XOF' => 'CFA Franc BCEAO',
- 'PAYMENT_CURRENCY_XPF' => 'CFP Franc',
- 'PAYMENT_CURRENCY_YER' => 'Yemeni Rial',
- 'PAYMENT_CURRENCY_YUM' => 'Yugoslavian New Dinar',
- 'PAYMENT_CURRENCY_ZAR' => 'Rand',
- 'PAYMENT_CURRENCY_ZMK' => 'Zambian Kwacha',
- 'PAYMENT_CURRENCY_ZRN' => 'New Zaire',
- 'PAYMENT_CURRENCY_ZWD' => 'Zimbabwe Dollar',
'PAYMENT_DIRECT_AuthorizeDotNet' => 'Authorize.Net',
- 'PAYMENT_DIRECT_AuthorizeDotNet_account_key' => 'Transaction key',
- 'PAYMENT_DIRECT_AuthorizeDotNet_account_key_description' => 'Your Authorize.Net transaction key (obtained from the Settings -> Security -> Transaction link in the Authorize.Net merchant interface)',
- 'PAYMENT_DIRECT_AuthorizeDotNet_account_password' => 'Account Password',
- 'PAYMENT_DIRECT_AuthorizeDotNet_account_password_description' => 'Your Authorize.Net account password, if required. It is recommended that you configure your Authorize.Net account NOT to require this password for transactions.',
- 'PAYMENT_DIRECT_AuthorizeDotNet_account_username' => 'Login ID',
- 'PAYMENT_DIRECT_AuthorizeDotNet_account_username_description' => 'Your Authorize.Net account login ID',
- 'PAYMENT_DIRECT_AuthorizeDotNet_confirmation_confirm' => 'Customer E-mail Confirmation',
- 'PAYMENT_DIRECT_AuthorizeDotNet_confirmation_confirm_description' => 'This controls whether or not your customers will receive an e-mail confirmation regarding the payment processing',
- 'PAYMENT_DIRECT_AuthorizeDotNet_confirmation_merchant' => 'Merchant Confirmation E-mail',
- 'PAYMENT_DIRECT_AuthorizeDotNet_confirmation_merchant_description' => 'If set to a valid e-mail address, this address will be sent payment information, in addition to the address(es) defined in the Merchant interface',
- 'PAYMENT_DIRECT_AuthorizeDotNet_currency' => 'Currency',
- 'PAYMENT_DIRECT_AuthorizeDotNet_currency_description' => 'The currency in which orders will be charged',
- 'PAYMENT_DIRECT_AuthorizeDotNet_test_mode' => 'Test Mode',
- 'PAYMENT_DIRECT_AuthorizeDotNet_test_mode_description' => 'If enabled, transactions will be run in test mode. Although transactions will appear to be successful, no transactions performed will take effect. You should use this option when testing an account, but must leave it off for live credit card processing.',
'PAYMENT_DIRECT_Moneris' => 'Moneris',
- 'PAYMENT_DIRECT_Moneris_account_token' => 'API Token',
- 'PAYMENT_DIRECT_Moneris_account_token2' => 'Store ID',
- 'PAYMENT_DIRECT_Moneris_account_token2_description' => 'The eSelect Store ID for your moneris account',
- 'PAYMENT_DIRECT_Moneris_account_token_description' => 'The API Token provided to you by Moneris',
- 'PAYMENT_DIRECT_Moneris_test_mode' => 'Test Mode',
- 'PAYMENT_DIRECT_Moneris_test_mode_description' => 'If enabled, a special Moneris testing server will be used instead of the live transactions server. You should use this option when testing direct payment support, but must leave it off for live credit card processing. Note that you must change the above API Token and Store ID, and use a special credit card number. For specific values, please see the information in section <i>7. How Do I Test My Solution</i> of the <i>Perl Merchant Integration Guide</i>, available here: <a href="https://www3.moneris.com/connect/en/download/new/PERL_integration_guide_wVbV.pdf">https://www3.moneris.com/connect/en/download/new/PERL_integration_guide_wVbV.pdf</a>',
- 'PAYMENT_MANUAL' => 'Payment manually approved',
- 'PAYMENT_MODULE_MISSING' => 'You need to install the \'<b>%s</b>\' module.<br><br>
-Full error message:<br>
-%s',
'PAYMENT_REMOTE_2CheckOut' => '2CheckOut',
- 'PAYMENT_REMOTE_2CheckOut_notes' => 'Note that in order to properly use the 2CheckOut payment support, you need to enable the shopping cart postback "routines". They should point to the Gossamer Links postback URL (e.g. <code>http://www.example.com/cgi-bin/linkssql/postback.cgi</code>). You can set this from the "Shopping Cart" -> "Cart Details" menu. Unfortunately, 2CheckOut does not support using the same seller account for multiple programs/installations.',
- 'PAYMENT_REMOTE_2CheckOut_secret_word' => '2CheckOut Secret Word',
- 'PAYMENT_REMOTE_2CheckOut_secret_word_description' => 'Gossamer Links requires that you set up a "Secret Word" for your 2CheckOut account. This "Secret Word" helps keep your installation secure by allowing Gossamer Links to verify that incoming postbacks are in fact real 2CheckOut postbacks.',
- 'PAYMENT_REMOTE_2CheckOut_seller_id' => '2CheckOut Seller ID',
- 'PAYMENT_REMOTE_2CheckOut_seller_id_description' => 'This is your 2CheckOut seller ID - payments will be directed to this account.',
'PAYMENT_REMOTE_APPROVED' => 'Approved remote payment received from %s',
'PAYMENT_REMOTE_CANCELLED' => 'Cancelled payment notification received from %s',
'PAYMENT_REMOTE_INVALIDIP' => 'A payment notification was received from %s with an unauthorized IP address.',
'PAYMENT_REMOTE_INVALIDPW' => 'A payment notification was received from %s with an invalid password.',
'PAYMENT_REMOTE_Manual' => 'Manual',
- 'PAYMENT_REMOTE_Manual_notes' => 'Note that in order to properly use the Manual payment support, you need to edit the template payment_manual_include.html which shows payment instructions to your users (i.e how to pay by money order, cheque etc). Once the payment has been approved manually, you can approve the payment from browsing Payment Logs Manual, click on Payment ID and Manually approve payment link',
'PAYMENT_REMOTE_PayPal' => 'PayPal',
- 'PAYMENT_REMOTE_PayPal_business_email' => 'PayPal Business E-mail',
- 'PAYMENT_REMOTE_PayPal_business_email_description' => 'Your PayPal business (Seller\'s) e-mail address. This <b>must</b> be the primary e-mail address for the PayPal account. To send to a alternate e-mail address on the same account, see the "Recipient E-Mail" option below.',
- 'PAYMENT_REMOTE_PayPal_button' => 'Payment Button',
- 'PAYMENT_REMOTE_PayPal_button_description' => 'The button you select here will be shown on the payment page. If using a custom image, PayPal recommends that the image be specified via an https:// URL.',
- 'PAYMENT_REMOTE_PayPal_color' => 'Background Color',
- 'PAYMENT_REMOTE_PayPal_color_black' => 'Black',
- 'PAYMENT_REMOTE_PayPal_color_description' => 'You may optionally decide to change the color displayed on the PayPal payment page from the default white to a black background.',
- 'PAYMENT_REMOTE_PayPal_color_white' => 'White',
- 'PAYMENT_REMOTE_PayPal_currency' => 'PayPal Currency',
- 'PAYMENT_REMOTE_PayPal_currency_description' => 'The currency in which to charge users. Buyers will see the current exchange rate and the amount in their Primary Currency.',
- 'PAYMENT_REMOTE_PayPal_image_url' => 'Image URL',
- 'PAYMENT_REMOTE_PayPal_image_url_description' => 'If a URL to an image is specified here, the image will be shown on the PayPal purchase page. PayPal recommends that the image be specified via an https:// URL. The required size of the image is 150x50 pixels.',
- 'PAYMENT_REMOTE_PayPal_note' => 'Payment Note Title',
- 'PAYMENT_REMOTE_PayPal_note_description' => 'If set, buyers will be given the option to include a note with their payment. The value you enter into this field will be shown as the note title. This field can be a maximum of 30 characters. To show no note option, leave this field blank.',
- 'PAYMENT_REMOTE_PayPal_notes' => 'Note that in order to properly use the PayPal payment support, you should enable Instant Payment Notification (IPN) on your PayPal account, and direct the IPN responses to the Gossamer Links postback (e.g. <code>http://www.example.com/cgi-bin/linkssql/postback.cgi</code>). Note that if accessible via HTTPS, it is recommended to use an https:// URL instead of http://. Also see the optional IPN URL variable.',
- 'PAYMENT_REMOTE_PayPal_notify_url' => 'Payment IPN URL',
- 'PAYMENT_REMOTE_PayPal_notify_url_description' => 'This variable can be used to override the default IPN postback URL for your PayPal account. If set, this should point to the \'postback.cgi\' script in your user CGI directory - for example, if you login to Gossamer Links via http://www.example.com/cgi-bin/linkssql/login.cgi, you would enter <code>http://www.example.com/cgi-bin/linkssql/postback.cgi</code> here. This field is only required when setting up multiple IPN-aware scripts. If Gossamer Links is the only thing using IPN, it is recommended that you just set the IPN postback URL in your PayPal seller account settings.',
- 'PAYMENT_REMOTE_PayPal_to_email' => 'PayPal Recipient E-Mail',
- 'PAYMENT_REMOTE_PayPal_to_email_description' => 'Your PayPal business (Seller\'s) e-mail address at which you wish to receive payments. This only needs to be set when you want to send to an address other than the primary address on the account.',
'PAYMENT_REMOTE_RECURRING_ACCEPTED' => 'Recurring payment notification received from %s',
'PAYMENT_REMOTE_RECURRING_DECLINED' => 'Declined payment notification received from %s',
'PAYMENT_REMOTE_REFUND' => 'Notification of payment refund received from %s',
'PAYMENT_REMOTE_WorldPay' => 'WorldPay',
- 'PAYMENT_REMOTE_WorldPay_callback_password' => 'Callback Password',
- 'PAYMENT_REMOTE_WorldPay_callback_password_description' => 'The callback password (set in your WorldPay Customer Management System)',
- 'PAYMENT_REMOTE_WorldPay_currency' => 'Currency',
- 'PAYMENT_REMOTE_WorldPay_currency_description' => 'The currency in which users are charged. Note that if your account has been set up to handle multiple currencies, your customer may choose to pay in an alternate currency on the WorldPay payment page.',
- 'PAYMENT_REMOTE_WorldPay_installation_id' => 'Installation ID',
- 'PAYMENT_REMOTE_WorldPay_installation_id_description' => 'The WorldPay ID for this installation',
- 'PAYMENT_REMOTE_WorldPay_md5_password' => 'MD5 Signature Password',
- 'PAYMENT_REMOTE_WorldPay_md5_password_description' => 'A signature to use for MD5 signing purchases so that WorldPay can verify the validity of the purchase. This should be set here and in the WorldPay Customer Management System.',
- 'PAYMENT_REMOTE_WorldPay_notes' => 'Note that in order to properly use the WorldPay payment support, you need to enable WorldPay callbacks. They should point to the Gossamer Links postback URL (e.g. <code>http://www.example.com/cgi-bin/linkssql/postback.cgi</code>). If your Gossamer Links installation is available via HTTPS, it is recommended that you specify an https:// URL even if Gossamer Links is not normally accessed in this way.<br><br>The "Store-builder used" option should be left on the default setting of "Other".<br><br>In order to use recurring charges with WorldPay, you must also enable FuturePay with your WorldPay account and ensure that FuturePay callbacks are enabled.',
- 'PAYMENT_REMOTE_WorldPay_test_mode' => 'Test Mode',
- 'PAYMENT_REMOTE_WorldPay_test_mode_description' => 'If enabled, no actual transactions will be performed. You can set this to make all transactions succeed or fail.',
'PAYMENT_TYPE_AMEX' => 'American Express',
'PAYMENT_TYPE_DELTA' => 'Delta',
'PAYMENT_TYPE_DINERS' => 'Diners Club',
Index: link.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/link.html,v
retrieving revision 1.10
retrieving revision 1.12
diff -u -r1.10 -r1.12
--- link.html 26 Feb 2005 10:24:06 -0000 1.10
+++ link.html 22 Mar 2005 02:01:36 -0000 1.12
@@ -15,14 +15,14 @@
<p class="linkrating">
<%~if Votes%>
<%~set intRating = $Rating i/ 1%>
- <img src="<%config.build_images_url%>/<%t%>/stars-10-<%intRating%>.gif" alt="<%intRating%> out of 10 stars" title="<%intRating%> out of 10 stars" /> (<%Votes%> vote<%if Votes != 1%>s<%endif%>)
+ <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 isNotify or isExpired%><span class="linkexpired"><%endif%><%if isExpired%>Expired on:<%else%>Expiry date:<%endif%> <%ExpiryDateFormatted%><%if isNotify or isExpired%></span><%endif%>
<%~endif%>
</p>
- <%if Description%><p class="linkdescription"><%if highlight%><%Links::Tools::highlight($Description, $query)%><%else%><%Description%><%endif%></p><%endif%>
+ <%if Description%><div class="linkdescription"><%if highlight%><%Links::Tools::highlight($Description, $query)%><%else%><%Description%><%endif%></div><%endif%>
<p class="linkactions">
<%~if isValidated eq 'Yes'%>
Index: link_added.eml
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/link_added.eml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- link_added.eml 15 Feb 2005 20:31:38 -0000 1.4
+++ link_added.eml 14 Mar 2005 23:13:40 -0000 1.5
@@ -7,12 +7,12 @@
Thank you for visiting our site. We've added the following link into
our directory:
- Title: <%Title%>
- URL: <%URL%>
- Category: <%Category%>
- Description: <%Description%>
- Contact Name: <%Contact_Name%>
-Contact E-mail: <%Contact_Email%>
+ Title: <%Title%>
+ URL: <%URL%>
+ Category: <%Category%>
+ Description: <%Description%>
+ Contact Name: <%Contact_Name%>
+ Contact E-mail: <%Contact_Email%>
You can see your new listing at:
Index: link_expired.eml
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/link_expired.eml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- link_expired.eml 1 Mar 2005 01:11:41 -0000 1.5
+++ link_expired.eml 14 Mar 2005 23:13:40 -0000 1.6
@@ -6,12 +6,11 @@
The following link<%if expiry_links.length != 1%>s<%endif%> <%if expiry_links.length != 1%>have<%else%>has<%endif%> expired:
- <%loop expiry_links~%>
- - <%Title%> (ID #<%ID%>)
- Expiry Date: <%ExpiryDate%>.
+<%loop expiry_links~%>
+ <%Title%>
+ Expiry Date: <%ExpiryDate%>
Renewal Payment: <%renewal_url%>
- <%~endloop%>
-
+<%endloop%>
Please make a payment as soon as possible or contact us for more information.
Sincerely,
Index: link_expiry_notify.eml
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/link_expiry_notify.eml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- link_expiry_notify.eml 1 Mar 2005 01:11:41 -0000 1.5
+++ link_expiry_notify.eml 14 Mar 2005 23:13:40 -0000 1.6
@@ -6,12 +6,11 @@
The following link<%if expiry_links.length != 1%>s<%endif%> <%if expiry_links.length != 1%>are<%else%>is<%endif%> about to reach the expiry date:
- <%loop expiry_links~%>
- - <%Title%> (ID #<%ID%>)
- Expiry Date: <%ExpiryDate%>.
+<%loop expiry_links~%>
+ <%Title%>
+ Expiry Date: <%ExpiryDate%>.
Renewal Payment: <%renewal_url%>
- <%~endloop%>
-
+<%endloop%>
Please make a payment as soon as possible or contact us for more information.
Sincerely,
Index: link_modified.eml
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/link_modified.eml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- link_modified.eml 15 Feb 2005 20:31:38 -0000 1.4
+++ link_modified.eml 14 Mar 2005 23:13:40 -0000 1.5
@@ -7,16 +7,16 @@
Thank you for visiting our site. We've modified your link as
you requested. Here's our new listing:
- Title: <%Title%>
- URL: <%URL%>
- Category: <%Category%>
- Description: <%Description%>
- Contact Name: <%Contact_Name%>
-Contact E-mail: <%Contact_Email%>
+ Title: <%Title%>
+ URL: <%URL%>
+ Category: <%Category%>
+ Description: <%Description%>
+ Contact Name: <%Contact_Name%>
+ Contact E-mail: <%Contact_Email%>
You can see your updated listing at:
- <%config.build_root_url%>
+ <%config.build_root_url%>
Should you have any questions, please don't hesitate to ask.
Index: login.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/login.html,v
retrieving revision 1.8
retrieving revision 1.12
diff -u -r1.8 -r1.12
--- login.html 1 Mar 2005 01:11:04 -0000 1.8
+++ login.html 24 Mar 2005 08:58:29 -0000 1.12
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -28,13 +27,13 @@
<input type="hidden" name="login" value="1" />
<%if url%><input type="hidden" name="url" value="<%url%>" /><%endif%>
- <div class="row required">
+ <div class="row required clear">
<label for="Username" class="name">Username:</label>
<div class="value">
<input type="text" id="Username" name="Username" value="<%if Username%><%Username%><%endif%>" class="text" />
</div>
</div>
- <div class="row required">
+ <div class="row required clear">
<label for="Password" class="name">Password:</label>
<div class="value">
<input type="password" id="Password" name="Password" class="password" />
@@ -50,8 +49,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>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: login_email.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/login_email.html,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -r1.6 -r1.10
--- login_email.html 1 Mar 2005 01:06:47 -0000 1.6
+++ login_email.html 24 Mar 2005 08:58:29 -0000 1.10
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -29,7 +28,7 @@
<input type="hidden" name="send_pass" value="1" />
<%if url%><input type="hidden" name="url" value="<%url%>" /><%endif%>
- <div class="row required">
+ <div class="row required clear">
<label for="Email" class="name">E-mail Address:</label>
<div class="value">
<input type="text" id="Email" name="Email" value="" class="text" />
@@ -44,8 +43,11 @@
If you don't have an account, please <a href="<%config.db_cgi_url%>/user.cgi?signup_form=1">register</a>.
</p>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: login_success.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/login_success.html,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -r1.5 -r1.8
--- login_success.html 1 Mar 2005 01:06:47 -0000 1.5
+++ login_success.html 24 Mar 2005 08:58:29 -0000 1.8
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -25,8 +24,11 @@
You have been successfully logged into <%site_title%>.
</p>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: modify.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/modify.html,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -r1.6 -r1.9
--- modify.html 1 Mar 2005 01:11:04 -0000 1.6
+++ modify.html 24 Mar 2005 08:58:29 -0000 1.9
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -36,8 +35,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: modify_select.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/modify_select.html,v
retrieving revision 1.6
retrieving revision 1.12
diff -u -r1.6 -r1.12
--- modify_select.html 1 Mar 2005 01:11:04 -0000 1.6
+++ modify_select.html 24 Mar 2005 08:58:29 -0000 1.12
@@ -1,14 +1,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<%-- other tags
-
-total => A count of how many links the user owns.
-
---%>
<html>
<head>
<title><%site_title%>: Modify a Link</title>
<%include include_common_head.html%>
- <script type="text/javascript" src="<%config.db_static_url%>/utils.js"></script>
+ <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') });
@@ -20,14 +15,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -36,7 +30,7 @@
Please select which link you would like to modify:
</p>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style)%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%>
<form action="<%config.db_cgi_url%>/modify.cgi" method="post">
<%~loop link_results_loop%>
@@ -46,10 +40,13 @@
<input type="submit" value="Modify Link" class="submit" />
</form>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style, button_id => 'paging_button2')%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: modify_success.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/modify_success.html,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -r1.6 -r1.11
--- modify_success.html 1 Mar 2005 01:11:04 -0000 1.6
+++ modify_success.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -29,17 +28,17 @@
<%~endif%>
</p>
-<div class="row">
+<div class="row clear">
<label class="name">Title:</label>
- <div class="value"><%Title%></div>
+ <div class="value wrappedtext"><%Title%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">URL:</label>
- <div class="value"><%URL%></div>
+ <div class="value wrappedtext"><%URL%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Category:</label>
- <div class="value">
+ <div class="value wrappedtext">
<%~if Category_loop.length > 1%>
<ul><%loop Category_loop%><li><%loop_value%></li><%endloop%></ul>
<%~else%>
@@ -47,23 +46,26 @@
<%~endif%>
</div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Description:</label>
- <div class="value"><%Description%></div>
+ <div class="value wrappedtext"><%Description%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Contact Name:</label>
- <div class="value"><%Contact_Name%></div>
+ <div class="value wrappedtext"><%Contact_Name%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Contact E-mail:</label>
- <div class="value"><%Contact_Email%></div>
+ <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%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: new.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/new.html,v
retrieving revision 1.7
retrieving revision 1.12
diff -u -r1.7 -r1.12
--- new.html 1 Mar 2005 01:13:26 -0000 1.7
+++ new.html 24 Mar 2005 08:58:29 -0000 1.12
@@ -3,7 +3,7 @@
<head>
<title><%site_title%>: New Links</title>
<%include include_common_head.html%>
- <script type="text/javascript" src="<%config.db_static_url%>/utils.js"></script>
+ <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') });
@@ -15,14 +15,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -45,7 +44,7 @@
<%~endloop%>
<%~-- Displays the actual new links --~%>
<%else%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style)%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%>
<%if link_results_loop%>
<%loop link_results_loop%>
@@ -54,11 +53,14 @@
<%endloop%>
<%endif%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style, button_id => 'paging_button2')%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%>
<%endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: newsletter.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/newsletter.html,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -r1.5 -r1.8
--- newsletter.html 1 Mar 2005 01:11:04 -0000 1.5
+++ newsletter.html 24 Mar 2005 08:58:29 -0000 1.8
@@ -13,14 +13,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -28,8 +27,11 @@
<%if error_message%><p class="errormessage"><%error_message%></p><%endif%>
<%if info_message%><p class="infomessage"><%info_message%></p><%endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: newsletter_browse.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/newsletter_browse.html,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -r1.9 -r1.13
--- newsletter_browse.html 1 Mar 2005 01:11:04 -0000 1.9
+++ newsletter_browse.html 24 Mar 2005 08:58:29 -0000 1.13
@@ -4,7 +4,7 @@
<head>
<title><%site_title%>: Newsletter</title>
<%include include_common_head.html%>
- <script type="text/javascript" src="<%config.db_static_url%>/utils.js"></script>
+ <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script>
<script type="text/javascript">
//<![CDATA[
function disableChildrenInit() {
@@ -64,14 +64,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -95,8 +94,11 @@
<input type="submit" value="Update Subscriptions" class="submit" />
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: newsletter_global.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/newsletter_global.html,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -r1.5 -r1.8
--- newsletter_global.html 1 Mar 2005 01:11:04 -0000 1.5
+++ newsletter_global.html 24 Mar 2005 08:58:29 -0000 1.8
@@ -10,14 +10,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -31,8 +30,11 @@
<input type="submit" value="<%if subscribed%>Unsubscribe<%else%>Subscribe<%endif%>" class="submit" />
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: newsletter_list.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/newsletter_list.html,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -r1.9 -r1.13
--- newsletter_list.html 1 Mar 2005 01:11:04 -0000 1.9
+++ newsletter_list.html 24 Mar 2005 08:58:29 -0000 1.13
@@ -4,7 +4,7 @@
<head>
<title><%site_title%>: Newsletter</title>
<%include include_common_head.html%>
- <script type="text/javascript" src="<%config.db_static_url%>/utils.js"></script>
+ <script type="text/javascript" src="<%config.build_static_url%>/utils.js"></script>
<script type="text/javascript">
//<![CDATA[
registerEvent(window, 'onload', function () { checkAllInit('unsubscribe', 'ID', 'checkall') });
@@ -16,14 +16,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -50,8 +49,11 @@
</p>
<%~endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: payment.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/payment.html,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -r1.7 -r1.10
--- payment.html 1 Mar 2005 01:11:04 -0000 1.7
+++ payment.html 24 Mar 2005 08:58:29 -0000 1.10
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -110,8 +109,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: payment_direct.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/payment_direct.html,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -r1.6 -r1.11
--- payment_direct.html 1 Mar 2005 01:18:20 -0000 1.6
+++ payment_direct.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -2,7 +2,7 @@
<html>
<head>
<title><%site_title%>: Payment Confirmation</title>
- <meta http-equiv="refresh" content="5;url=page.cgi?<%if d%>d=1<%endif%>" />
+ <meta http-equiv="refresh" content="5;url=<%Links::transform_url($config.build_root_url, '', '&')%>" />
<%include include_common_head.html%>
</head>
<body id="payment_direct">
@@ -10,24 +10,26 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
Your payment has been approved, and your link enabled. You will be redirected
to the main page shortly. If this does not happen, click
-<a href="<%config.db_cgi_url%>/page.cgi?d=1">here</a>.
+<a href="<%Links::transform_url($config.build_root_url)%>">here</a>.
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: payment_direct_include.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/payment_direct_include.html,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -r1.7 -r1.9
--- payment_direct_include.html 1 Mar 2005 01:47:50 -0000 1.7
+++ payment_direct_include.html 16 Mar 2005 08:44:37 -0000 1.9
@@ -20,9 +20,9 @@
<input type="hidden" name="payment_method_type" value="<%payment_method_type%>" />
<%if modify%><input type="hidden" name="modify" value="1" /><%endif%>
- <div class="row<%unless no_cc_brand%> required<%endunless%><%if credit_card_brand_error%> invalid<%endif%>">
+ <div class="row<%unless no_cc_brand%> required<%endunless%><%if credit_card_brand_error%> invalid<%endif%> clear">
<label for="credit_card_brand" class="name"><%if no_cc_brand%>Cards Accepted:<%else%>Card Type: <span>*</span><%endif%></label>
- <div class="value">
+ <div class="value<%if no_cc_brand%> wrappedtext<%endif%>">
<%if no_cc_brand%>
<%loop payment_types%><%name%><%unless last%>, <%endunless%><%endloop%>
<%else%>
@@ -32,13 +32,13 @@
<%endif%>
</div>
</div>
- <div class="row required<%if credit_card_number_error%> invalid<%endif%>">
+ <div class="row required<%if credit_card_number_error%> invalid<%endif%> clear">
<label for="credit_card_number" class="name">Card Number: <span>*</span></label>
<div class="value">
<input type="text" id="credit_card_number" name="credit_card_number" value="<%if credit_card_number%><%credit_card_number%><%endif%>" class="text" autocomplete="off" />
</div>
</div>
- <div class="row required<%if credit_card_expiry_error%> invalid<%endif%>">
+ <div class="row required<%if credit_card_expiry_error%> invalid<%endif%> clear">
<label for="credit_card_expiry_month" class="name">Expiry: <span>*</span></label>
<div class="value">
<select id="credit_card_expiry_month" name="credit_card_expiry_month">
@@ -63,56 +63,56 @@
</select>
</div>
</div>
- <div class="row required<%if billing_fname_error%> invalid<%endif%>">
+ <div class="row required<%if billing_fname_error%> invalid<%endif%> clear">
<label for="billing_fname" class="name">First Name: <span>*</span></label>
<div class="value">
<input type="text" id="billing_fname" name="billing_fname" value="<%if billing_fname%><%billing_fname%><%endif%>" class="text" />
</div>
</div>
- <div class="row required<%if billing_lname_error%> invalid<%endif%>">
+ <div class="row required<%if billing_lname_error%> invalid<%endif%> clear">
<label for="billing_lname" class="name">Last Name: <span>*</span></label>
<div class="value">
<input type="text" id="billing_lname" name="billing_lname" value="<%if billing_lname%><%billing_lname%><%endif%>" class="text" />
</div>
</div>
- <div class="row required<%if billing_address_1_error%> invalid<%endif%>">
+ <div class="row required<%if billing_address_1_error%> invalid<%endif%> clear">
<label for="billing_address_1" class="name">Address Line 1: <span>*</span></label>
<div class="value">
<input type="text" id="billing_address_1" name="billing_address_1" value="<%if billing_address_1%><%billing_address_1%><%endif%>" class="text" />
</div>
</div>
- <div class="row<%if billing_address_2_error%> invalid<%endif%>">
+ <div class="row<%if billing_address_2_error%> invalid<%endif%> clear">
<label for="billing_address_2" class="name">Address Line 2:</label>
<div class="value">
<input type="text" id="billing_address_2" name="billing_address_2" value="<%if billing_address_2%><%billing_address_2%><%endif%>" class="text" />
</div>
</div>
- <div class="row required<%if billing_city_error%> invalid<%endif%>">
+ <div class="row required<%if billing_city_error%> invalid<%endif%> clear">
<label for="billing_city" class="name">City: <span>*</span></label>
<div class="value">
<input type="text" id="billing_city" name="billing_city" value="<%if billing_city%><%billing_city%><%endif%>" class="text" />
</div>
</div>
- <div class="row required<%if billing_state_error%> invalid<%endif%>">
+ <div class="row required<%if billing_state_error%> invalid<%endif%> clear">
<label for="billing_state" class="name">State/Province: <span>*</span></label>
<div class="value">
<input type="text" id="billing_state" name="billing_state" value="<%if billing_state%><%billing_state%><%endif%>" class="text" />
</div>
</div>
- <div class="row required<%if billing_country_error%> invalid<%endif%>">
+ <div class="row required<%if billing_country_error%> invalid<%endif%> clear">
<label for="billing_country" class="name">Country: <span>*</span></label>
<div class="value">
<input type="text" id="billing_country" name="billing_country" value="<%if billing_country%><%billing_country%><%endif%>" class="text" />
</div>
</div>
- <div class="row required<%if billing_postal_code_error%> invalid<%endif%>">
+ <div class="row required<%if billing_postal_code_error%> invalid<%endif%> clear">
<label for="billing_postal_code" class="name">ZIP/Postal Code: <span>*</span></label>
<div class="value">
<input type="text" id="billing_postal_code" name="billing_postal_code" value="<%if billing_postal_code%><%billing_postal_code%><%endif%>" class="text shorttext" />
</div>
</div>
<%~if billing_phone_required%>
- <div class="row required<%if billing_phone_error%> invalid<%endif%>">
+ <div class="row required<%if billing_phone_error%> invalid<%endif%> clear">
<label for="billing_phone" class="name">Phone: <span>*</span></label>
<div class="value">
<input type="text" id="billing_phone" name="billing_phone" value="<%if billing_phone%><%billing_phone%><%endif%>" class="text" />
Index: payment_form.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/payment_form.html,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -r1.6 -r1.9
--- payment_form.html 1 Mar 2005 01:11:04 -0000 1.6
+++ payment_form.html 24 Mar 2005 08:58:29 -0000 1.9
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -46,8 +45,11 @@
<%include payment_manual_include.html%>
<%endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: payment_manual_include.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/payment_manual_include.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- payment_manual_include.html 1 Mar 2005 01:06:47 -0000 1.2
+++ payment_manual_include.html 4 Mar 2005 00:45:17 -0000 1.3
@@ -9,4 +9,4 @@
Link ID: <%ID%><br />
Payment ID: <%unique_id%>
</p>
-<input type="button" value="Done" onclick="window.location='<%config.build_root_url%>'" />
+<input type="button" value="Done" onclick="window.location='<%Links::transform_url($config.build_root_url)%>'" />
Index: payment_method.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/payment_method.html,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -r1.8 -r1.11
--- payment_method.html 1 Mar 2005 01:11:04 -0000 1.8
+++ payment_method.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -11,14 +11,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -69,8 +68,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: payment_paypal_include.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/payment_paypal_include.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- payment_paypal_include.html 15 Feb 2005 21:06:14 -0000 1.3
+++ payment_paypal_include.html 4 Mar 2005 21:35:27 -0000 1.4
@@ -1,8 +1,8 @@
-<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
+<form action="https://www.<%if sandbox%>sandbox.<%endif%>paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="business" value="<%if to_email%><%to_email%><%else%><%business_email%><%endif%>" />
<input type="hidden" name="currency_code" value="<%currency%>" />
<input type="hidden" name="return" value="<%config.db_cgi_url%>/add.cgi" />
- <input type="hidden" name="custom" value="do;process_payment=1;payment_success=1<%if sid%>;sid=<%sid%><%endif%>" />
+ <input type="hidden" name="custom" value="do;process_payment=1;payment_success=1<%loop config.dynamic_preserve%><%if in.$loop_value%>;<%loop_value%>=<%in.$loop_value%><%endloop%>" />
<input type="hidden" name="cancel_return" value="<%config.db_cgi_url%>/add.cgi" />
<input type="hidden" name="rm" value="2" />
<%if notify_url%><input type="hidden" name="notify_url" value="<%notify_url%>" /><%endif%>
Index: payment_received.eml
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/payment_received.eml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- payment_received.eml 15 Feb 2005 20:31:38 -0000 1.4
+++ payment_received.eml 14 Mar 2005 23:13:40 -0000 1.5
@@ -7,12 +7,12 @@
Thank you for visiting our site. Your payment has been processed and
your link has been added to our directory:
- Title: <%Title%>
- URL: <%URL%>
- Category: <%Category%>
- Description: <%Description%>
- Contact Name: <%Contact_Name%>
-Contact E-mail: <%Contact_Email%>
+ Title: <%Title%>
+ URL: <%URL%>
+ Category: <%Category%>
+ Description: <%Description%>
+ Contact Name: <%Contact_Name%>
+ Contact E-mail: <%Contact_Email%>
You can see your new listing at:
Index: payment_success.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/payment_success.html,v
retrieving revision 1.6
retrieving revision 1.11
diff -u -r1.6 -r1.11
--- payment_success.html 1 Mar 2005 01:18:20 -0000 1.6
+++ payment_success.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -2,7 +2,7 @@
<html>
<head>
<title><%site_title%>: Payment Confirmation</title>
- <meta http-equiv="refresh" content="5;url=page.cgi?<%if d%>d=1<%endif%>" />
+ <meta http-equiv="refresh" content="5;url=<%Links::transform_url($config.build_root_url, '', '&')%>" />
<%include include_common_head.html%>
</head>
<body id="payment_success">
@@ -10,22 +10,24 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
-Your payment has been approved. You will be redirected to the main page shortly. If this does not happen, click <a href="<%config.db_cgi_url%>/page.cgi?d=1">here</a>.
+Your payment has been approved. You will be redirected to the main page shortly. If this does not happen, click <a href="<%Links::transform_url($config.build_root_url)%>">here</a>.
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: rate.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/rate.html,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -r1.7 -r1.11
--- rate.html 1 Mar 2005 01:06:47 -0000 1.7
+++ rate.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -28,7 +27,7 @@
<form action="<%config.db_cgi_url%>/rate.cgi" method="post">
<input type="hidden" name="ID" value="<%ID%>" />
- <div class="row required">
+ <div class="row required clear">
<label for="rate" class="name">Link Rating:</label>
<div class="value">
<select id="rate" name="rate">
@@ -51,8 +50,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: rate_success.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/rate_success.html,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -r1.5 -r1.8
--- rate_success.html 1 Mar 2005 01:06:47 -0000 1.5
+++ rate_success.html 24 Mar 2005 08:58:29 -0000 1.8
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -25,8 +24,11 @@
Thank you for your vote.
</p>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: rate_top.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/rate_top.html,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -r1.8 -r1.11
--- rate_top.html 1 Mar 2005 01:06:47 -0000 1.8
+++ rate_top.html 24 Mar 2005 08:58:29 -0000 1.11
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -55,8 +54,11 @@
<%~endloop%>
</table>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: review_add.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/review_add.html,v
retrieving revision 1.11
retrieving revision 1.15
diff -u -r1.11 -r1.15
--- review_add.html 1 Mar 2005 01:06:47 -0000 1.11
+++ review_add.html 24 Mar 2005 08:58:29 -0000 1.15
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -30,7 +29,7 @@
<form action="<%config.db_cgi_url%>/review.cgi" method="post">
<%if ID%><input type="hidden" name="ID" value="<%ID%>" /><%endif%>
<input type="hidden" name="add_this_review" value="1" />
- <div class="row required">
+ <div class="row required clear">
<label class="name">Your Rating: <span>*</span></label>
<div class="value">
<input type="radio" id="Review_Rating-1" name="Review_Rating" value="1"<%if Review_Rating == 1%> checked="checked"<%endif%> class="radio" /><label for="Review_Rating-1">1</label>
@@ -40,32 +39,32 @@
<input type="radio" id="Review_Rating-5" name="Review_Rating" value="5"<%if Review_Rating == 5%> checked="checked"<%endif%> class="radio" /><label for="Review_Rating-5">5</label>
</div>
</div>
- <div class="row required">
+ <div class="row required clear">
<label for="Review_Subject" class="name">Subject: <span>*</span></label>
<div class="value">
<input type="text" id="Review_Subject" name="Review_Subject" value="<%if Review_Subject%><%Review_Subject%><%endif%>" class="text" />
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label for="Review_ByLine" class="name">By Line:</label>
<div class="value">
<input type="text" id="Review_ByLine" name="Review_ByLine" value="<%if Review_ByLine%><%Review_ByLine%><%endif%>" class="text" />
</div>
</div>
- <div class="row required">
+ <div class="row required clear">
<label for="Review_Contents" class="name">Your Review: <span>*</span></label>
<div class="value">
<textarea id="Review_Contents" name="Review_Contents" rows="3" cols="42"><%if Review_Contents%><%Review_Contents%><%endif%></textarea>
</div>
</div>
<%~if anonymous%>
- <div class="row required">
+ <div class="row required clear">
<label for="Review_GuestName" class="name">Your Name: <span>*</span></label>
<div class="value">
<input type="text" id="Review_GuestName" name="Review_GuestName" value="<%if Review_GuestName%><%Review_GuestName%><%endif%>" class="text" />
</div>
</div>
- <div class="row required">
+ <div class="row required clear">
<label for="Review_GuestEmail" class="name">Your E-mail: <span>*</span></label>
<div class="value">
<input type="text" id="Review_GuestEmail" name="Review_GuestEmail" value="<%if Review_GuestEmail%><%Review_GuestEmail%><%endif%>" class="text" />
@@ -77,8 +76,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: review_add_success.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/review_add_success.html,v
retrieving revision 1.7
retrieving revision 1.12
diff -u -r1.7 -r1.12
--- review_add_success.html 1 Mar 2005 01:06:47 -0000 1.7
+++ review_add_success.html 24 Mar 2005 08:58:29 -0000 1.12
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -25,30 +24,30 @@
We have received the following review:
</p>
-<div class="row">
+<div class="row clear">
<label class="name">Rating:</label>
- <td><%Review_Rating%></td>
+ <div class="value wrappedtext"><%Review_Rating%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Subject:</label>
- <div class="value"><%Review_Subject%></div>
+ <div class="value wrappedtext"><%Review_Subject%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">By Line:</label>
- <div class="value"><%Review_ByLine%></div>
+ <div class="value wrappedtext"><%Review_ByLine%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Review:</label>
- <div class="value"><%Review_Contents%></div>
+ <div class="value wrappedtext"><%Review_Contents%></div>
</div>
<%~ifnot config.user_review_required%>
-<div class="row">
+<div class="row clear">
<label class="name">Name:</label>
- <div class="value"><%Review_GuestName%></div>
+ <div class="value wrappedtext"><%Review_GuestName%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">E-mail:</label>
- <div class="value"><%Review_GuestEmail%></div>
+ <div class="value wrappedtext"><%Review_GuestEmail%></div>
</div>
<%~endif%>
@@ -56,8 +55,11 @@
Thank you! We will send you an e-mail once your review has been validated.
</p>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: review_added.eml
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/review_added.eml,v
retrieving revision 1.4
retrieving revision 1.6
diff -u -r1.4 -r1.6
--- review_added.eml 15 Feb 2005 20:31:38 -0000 1.4
+++ review_added.eml 15 Mar 2005 20:13:12 -0000 1.6
@@ -7,18 +7,19 @@
Thank you for visiting our site. We've added the following review into
our directory:
- Rating: <%Review_Rating%>
- Subject: <%Review_Subject%>
- By Line: <%Review_ByLine%>
+ Rating: <%Review_Rating%>
+ Subject: <%Review_Subject%>
+ By Line: <%Review_ByLine%>
Date: <%Review_Date%>
-Contents:
-<%Review_Contents%>
+ Contents: <%Review_Contents%>
<%~if anonymous%>
Name: <%Review_GuestName%>
- E-mail: <%Review_GuestEmail%>
+ E-mail: <%Review_GuestEmail%>
<%~endif%>
-of the link: <%URL%>
+of the link:
+
+ <%URL%>
Should you have any questions, please don't hesitate to ask.
Index: review_edit.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/review_edit.html,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -r1.9 -r1.13
--- review_edit.html 1 Mar 2005 01:06:47 -0000 1.9
+++ review_edit.html 24 Mar 2005 08:58:29 -0000 1.13
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -42,7 +41,7 @@
<%~else%>
<input type="hidden" name="ReviewID" value="<%if ReviewID%><%ReviewID%><%endif%>" />
- <div class="row required">
+ <div class="row required clear">
<label class="name">Your Rating: <span>*</span></label>
<div class="value">
<input type="radio" id="Review_Rating-1" name="Review_Rating" value="1"<%if Review_Rating == 1%> checked="checked"<%endif%> class="radio" /><label for="Review_Rating-1">1</label>
@@ -52,19 +51,19 @@
<input type="radio" id="Review_Rating-5" name="Review_Rating" value="5"<%if Review_Rating == 5%> checked="checked"<%endif%> class="radio" /><label for="Review_Rating-5">5</label>
</div>
</div>
- <div class="row required">
+ <div class="row required clear">
<label for="Review_Subject" class="name">Subject: <span>*</span></label>
<div class="value">
<input type="text" id="Review_Subject" name="Review_Subject" value="<%if Review_Subject%><%Review_Subject%><%endif%>" class="text" />
</div>
</div>
- <div class="row">
+ <div class="row clear">
<label for="Review_ByLine" class="name">By Line:</label>
<div class="value">
<input type="text" id="Review_ByLine" name="Review_ByLine" value="<%if Review_ByLine%><%Review_ByLine%><%endif%>" class="text" />
</div>
</div>
- <div class="row required">
+ <div class="row required clear">
<label for="Review_Contents" class="name">Your Review: <span>*</span></label>
<div class="value">
<textarea id="Review_Contents" name="Review_Contents" rows="3" cols="42"><%if Review_Contents%><%Review_Contents%><%endif%></textarea>
@@ -76,8 +75,11 @@
<%~endif%>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: review_edit_success.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/review_edit_success.html,v
retrieving revision 1.4
retrieving revision 1.9
diff -u -r1.4 -r1.9
--- review_edit_success.html 1 Mar 2005 01:06:47 -0000 1.4
+++ review_edit_success.html 24 Mar 2005 08:58:29 -0000 1.9
@@ -9,41 +9,43 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
We have received the following review:
-<div class="row">
+<div class="row clear">
<label class="name">Rating:</label>
- <div class="value"><%Review_Rating%></div>
+ <div class="value wrappedtext"><%Review_Rating%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Subject:</label>
- <div class="value"><%Review_Subject%></div>
+ <div class="value wrappedtext"><%Review_Subject%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">By Line:</label>
- <div class="value"><%Review_ByLine%></div>
+ <div class="value wrappedtext"><%Review_ByLine%></div>
</div>
-<div class="row">
+<div class="row clear">
<label class="name">Review:</label>
- <div class="value"><%Review_Contents%></div>
+ <div class="value wrappedtext"><%Review_Contents%></div>
</div>
Thank you! We will send you an e-mail once your review has been validated.
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: review_include.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/review_include.html,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -r1.8 -r1.11
--- review_include.html 24 Feb 2005 20:38:14 -0000 1.8
+++ review_include.html 22 Mar 2005 02:01:36 -0000 1.11
@@ -6,8 +6,8 @@
<%~set ID = ''%>
<%~endif%>
<h4 class="reviewsubject">
- <%Review_Subject%>
- <img src="<%config.build_images_url%>/<%t%>/stars-5-<%Review_Rating%>.gif" alt="<%Review_Rating%> out of 5 stars" title="<%Review_Rating%> out of 5 stars" />
+ <%Review_Subject%><%if Review_Owner eq $user.Username%> <span class="hsmall">(<a href="<%config.db_cgi_url%>/review.cgi?edit_review=1;ID=<%Review_LinkID%>;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>
<%~if Review_ByLine%>
@@ -19,9 +19,9 @@
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%>
</p>
<%~if Review_Contents%>
- <p class="reviewcontent">
+ <div class="reviewcontent">
<%Review_Contents%>
- </p>
+ </div>
<%~endif%>
<div class="reviewhelpful clear">
<span><%if Num%><%Review_WasHelpful%> of <%Num%> people found this review helpful<%endif%></span>
Index: review_rejected.eml
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/review_rejected.eml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- review_rejected.eml 15 Feb 2005 20:31:38 -0000 1.3
+++ review_rejected.eml 14 Mar 2005 23:13:40 -0000 1.4
@@ -8,7 +8,7 @@
<%Review_Subject%>
-of the link
+of the link:
<%URL%>
Index: review_search_results.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/review_search_results.html,v
retrieving revision 1.8
retrieving revision 1.13
diff -u -r1.8 -r1.13
--- review_search_results.html 1 Mar 2005 01:11:04 -0000 1.8
+++ review_search_results.html 24 Mar 2005 08:58:29 -0000 1.13
@@ -3,7 +3,7 @@
<head>
<title><%site_title%>: Reviews</title>
<%include include_common_head.html%>
- <script type="text/javascript" src="<%config.db_static_url%>/utils.js"></script>
+ <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') });
@@ -15,14 +15,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -36,19 +35,22 @@
<%endunless%>
<%if Review_Loop.length~%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style)%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%>
<%loop Review_Loop~%>
<%include review_include.html%>
<%~endloop%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style, button_id => 'paging_button2')%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%>
<%~endif%>
<%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%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: search.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/search.html,v
retrieving revision 1.8
retrieving revision 1.12
diff -u -r1.8 -r1.12
--- search.html 1 Mar 2005 01:11:04 -0000 1.8
+++ search.html 24 Mar 2005 08:58:29 -0000 1.12
@@ -9,20 +9,19 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
<form action="<%config.db_cgi_url%>/search.cgi">
- <div class="row required">
+ <div class="row required clear">
<label for="query" class="name">Search:</label>
<div class="value">
<input type="text" id="query" name="query" class="text" />
@@ -39,7 +38,7 @@
<input type="radio" id="substring-0" name="substring" value="0" <%unless substring%>checked="checked" <%endif%>class="radio" /><label for="substring-0">Find exact words</label>
</div>
- <div class="row searchoption">
+ <div class="row searchoption clear">
<label for="mh" class="name">Links per page:</label>
<div class="value">
<select id="mh" name="mh">
@@ -55,8 +54,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: search_results.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/search_results.html,v
retrieving revision 1.9
retrieving revision 1.15
diff -u -r1.9 -r1.15
--- search_results.html 1 Mar 2005 01:11:41 -0000 1.9
+++ search_results.html 24 Mar 2005 08:58:29 -0000 1.15
@@ -1,17 +1,9 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<%-- other tags
-
-link_hits => a count of the number of matching links
-cat_hits => a count of the number of matching categories
-query => what the user searched for unescaped.
-term => what the user searched for escaped, useful for passing into other search engines
-
---%>
<html>
<head>
<title><%site_title%>: Search Results</title>
<%include include_common_head.html%>
- <script type="text/javascript" src="<%config.db_static_url%>/utils.js"></script>
+ <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') });
@@ -23,14 +15,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -53,7 +44,7 @@
<%if link_results_loop.length~%>
<h3>Links</h3>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style)%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging()%></div><%endif%>
<%loop link_results_loop~%>
<%if title_loop.length%>
@@ -64,10 +55,13 @@
<%~endloop%>
<%~endif%>
-<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(max_pages => $paging_max_pages, boundary_pages => $paging_boundary_pages, style => $paging_style, button_id => 'paging_button2')%></div><%endif%>
+<%if paging.num_hits%><div class="paging"><%Links::Utils::paging(button_id => 'paging_button2')%></div><%endif%>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: signup_form.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/signup_form.html,v
retrieving revision 1.9
retrieving revision 1.13
diff -u -r1.9 -r1.13
--- signup_form.html 1 Mar 2005 01:11:04 -0000 1.9
+++ signup_form.html 24 Mar 2005 08:58:29 -0000 1.13
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -26,19 +25,19 @@
</p>
<form action="<%config.db_cgi_url%>/user.cgi" method="post">
- <div class="row required">
+ <div class="row required clear">
<label for="Username" class="name">Username: <span>*</span></label>
<div class="value">
<input type="text" id="Username" name="Username" value="<%if Username%><%Username%><%endif%>" class="text" />
</div>
</div>
- <div class="row required">
+ <div class="row required clear">
<label for="Password" class="name">Password: <span>*</span></label>
<div class="value">
<input type="password" id="Password" name="Password" class="text" />
</div>
</div>
- <div class="row required">
+ <div class="row required clear">
<label for="Email" class="name">E-mail: <span>*</span></label>
<div class="value">
<input type="text" id="Email" name="Email" value="<%if Email%><%Email%><%endif%>" class="text" />
@@ -49,8 +48,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: signup_success.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/signup_success.html,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -r1.6 -r1.9
--- signup_success.html 1 Mar 2005 01:06:47 -0000 1.6
+++ signup_success.html 24 Mar 2005 08:58:29 -0000 1.9
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -29,8 +28,11 @@
<%~endif%>
</p>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: validate.eml
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/validate.eml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- validate.eml 15 Feb 2005 20:31:38 -0000 1.3
+++ validate.eml 14 Mar 2005 23:13:40 -0000 1.4
@@ -4,7 +4,7 @@
Hello<%if Name%> <%Name%><%endif%>,
-Thank you for registering. To activate your account, simply go to
+Thank you for registering. To activate your account, simply go to:
<%config.db_cgi_url%>/user.cgi?validate=1
Index: validate_form.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/validate_form.html,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -r1.6 -r1.10
--- validate_form.html 1 Mar 2005 01:06:47 -0000 1.6
+++ validate_form.html 24 Mar 2005 08:58:29 -0000 1.10
@@ -9,14 +9,13 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
@@ -27,7 +26,7 @@
<form action="<%config.db_cgi_url%>/user.cgi" method="post">
<input type="hidden" name="validate_user" value="1" />
- <div class="row required">
+ <div class="row required clear">
<label for="code" class="name">Code:</label>
<div class="value">
<input type="text" id="code" name="code" class="text" />
@@ -38,8 +37,11 @@
</div>
</form>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>
Index: validate_success.html
===================================================================
RCS file: /glinks/cgi/admin/templates/luna/validate_success.html,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -r1.5 -r1.9
--- validate_success.html 1 Mar 2005 01:06:47 -0000 1.5
+++ validate_success.html 24 Mar 2005 08:58:29 -0000 1.9
@@ -9,24 +9,26 @@
<div id="wrapper">
<%include include_header.html%>
<%include include_contentheader.html%>
- <div id="contentarea" class="clear">
- <div id="sidebar">
-<%include include_sidebar.html%>
- </div>
-
- <div id="contentwrapper" class="shadowleft">
- <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
- <div id="content" class="shadowright">
+ <div id="ocwrapper">
+ <div id="icwrapper" class="clear">
+<%include include_leftsidebar.html%>
+ <div id="contentwrapper" class="shadowleft">
+ <div class="shadowtop"><div class="shadowtopleft"></div><div class="shadowtopright"></div></div>
+ <div class="shadowright">
+ <div id="content">
<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>
<p>
- Thank you, your account is now activated. You may now <a href="<%config.db_cgi_url%>/user.cgi?Username=<%Username%>">log in</a>.
+ Thank you, your account is now activated.
</p>
+ </div>
+ </div>
+ <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
</div>
- <div class="shadowbottom"><div class="shadowbottomleft"></div><div class="shadowbottomright"></div></div>
+<%include include_rightsidebar.html%>
</div>
</div>
<%include include_contentfooter.html%>