Index: default/post_view_flat.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/post_view_flat.html,v
retrieving revision 1.26
retrieving revision 1.27
diff -b -u -r1.26 -r1.27
--- default/post_view_flat.html 4 Mar 2002 03:58:17 -0000 1.26
+++ default/post_view_flat.html 21 Mar 2002 04:56:45 -0000 1.27
@@ -127,7 +127,15 @@
<%if next%>
<input type="submit" value="Next Thread" name="do=post_view_flat;sb=<%sb%>;so=<%so%>;post=<%next%>;" class="button">
<%endif%>
- <input type="submit" value="Print Thread" name="do=post_view_printable;post=<%root_post_id%>" class="submit" >
+<%if current_user_id%>
+ <input type="submit" value="Watch Thread" name="do=watch_thread;thread=<%root_post_id%>;<%hidden_query%>" class="submit">
+<%endif%>
+<script><!--
+ document.write('<input type="button" value="Print Thread" onClick="openWindow(\'gforum.cgi?do=post_view_printable;post=<%root_post_id%>;<%hidden_query%>\')" class="submit">');
+//--></script>
+<noscript>
+ <a href="gforum.cgi?do=post_view_printable;post=<%root_post_id%>;<%hidden_query%>" target="_blank"><%title_font%>Print Thread<%/title_font%></a>
+</noscript>
<input type="submit" value="View Threaded" name="do=post_view_threaded;<%sb%>;so=<%so%>;post=<%root_post_id%>" class="submit">
</td>
</tr>
Index: default/post_view_threaded.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/post_view_threaded.html,v
retrieving revision 1.26
retrieving revision 1.28
diff -b -u -r1.26 -r1.28
--- default/post_view_threaded.html 4 Mar 2002 03:58:17 -0000 1.26
+++ default/post_view_threaded.html 21 Mar 2002 04:56:45 -0000 1.28
@@ -65,7 +65,7 @@
<input type="submit" value="Next Thread" name="do=post_view_threaded;sb=<%sb%>;so=<%so%>;post=<%next%>;" class="button">
<%endif%>
<%if current_user_id%>
- <input type="submit" value="Watch Thread" name="do=watch_thread;thread=<%root_post_id%>;<%hidden_query%>" class="submit">
+ <input type="submit" value="Watch Thread" name="do=watch_thread;thread=<%if post_root_id%><%post_root_id%><%else%><%post_id%><%endif%>;<%hidden_query%>" class="submit">
<%endif%>
<script><!--
document.write('<input type="button" value="Print Thread" onClick="openWindow(\'gforum.cgi?do=post_view_printable;post=<%if post_root_id%><%post_root_id%><%else%><%post_id%><%endif%>;<%hidden_query%>\')" class="submit">');
@@ -113,12 +113,20 @@
</td>
<td align=right>
<%if prev%>
- <input type="submit" value="Previous Thread" name="do=post_view_flat;sb=<%sb%>;so=<%so%>;post=<%prev%>;" class="button">
+ <input type="submit" value="Previous Thread" name="do=post_view_threaded;sb=<%sb%>;so=<%so%>;post=<%prev%>;" class="button">
<%endif%>
<%if next%>
- <input type="submit" value="Next Thread" name="do=post_view_flat;sb=<%sb%>;so=<%so%>;post=<%next%>;" class="button">
+ <input type="submit" value="Next Thread" name="do=post_view_threaded;sb=<%sb%>;so=<%so%>;post=<%next%>;" class="button">
<%endif%>
- <input type="submit" class="submit" value="Print Thread" name="do=post_view_printable;post=<%if post_root_id%><%post_root_id%><%else%><%post_id%><%endif%>">
+<%if current_user_id%>
+ <input type="submit" value="Watch Thread" name="do=watch_thread;thread=<%if post_root_id%><%post_root_id%><%else%><%post_id%><%endif%>;<%hidden_query%>" class="submit">
+<%endif%>
+<script><!--
+ document.write('<input type="button" value="Print Thread" onClick="openWindow(\'gforum.cgi?do=post_view_printable;post=<%if post_root_id%><%post_root_id%><%else%><%post_id%><%endif%>;<%hidden_query%>\')" class="submit">');
+//--></script>
+<noscript>
+ <a href="gforum.cgi?do=post_view_printable;post=<%if post_root_id%><%post_root_id%><%else%><%post_id%><%endif%>;<%hidden_query%>" target="_blank"><%title_font%>Print Thread<%/title_font%></a>
+</noscript>
<input type="submit" class="submit" value="View Flat Mode" name="do=post_view_flat;sb=<%sb%>;so=<%so%>;post=<%if post_root_id%><%post_root_id%><%else%><%post_id%><%endif%>">
</td>
</tr>
Index: default/user_list.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/user_list.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- default/user_list.html 13 Mar 2002 01:00:39 -0000 1.2
+++ default/user_list.html 20 Mar 2002 19:49:27 -0000 1.3
@@ -86,7 +86,7 @@
</p>
<%if first%><%num_page_items%> users found starting with <%if first eq 'NUM'%>0 - 9<%elsif first eq 'OTHER'%>Other<%else%>'<%first%>'<%endif%>.<%endif%>
<%endif%>
-<form method="GET" action="gforum.cgi">Search for a user: <input type="text" name="search_field" value="<%if search_field%><%search_field%><%endif%>" class="button"> <select name="search_column" size="1" class="button"><option value="user_username"<%if search_column eq 'user_username'%> selected<%endif%>>Username</option><option value="user_disp_email"<%if search_column eq 'user_disp_email'%> selected<%endif%>>E-Mail Address</option><option value="user_real_name"<%if search_column eq 'user_real_name'%> selected<%endif%>>Real Name</option></select> <input type="hidden" name="do" value="user_search"><input type="submit" value="Search Users" class="submit"></form>
+<form method="GET" action="gforum.cgi"><%hidden_form%>Search for a user: <input type="text" name="search_field" value="<%if search_field%><%search_field%><%endif%>" class="button"> <select name="search_column" size="1" class="button"><option value="user_username"<%if search_column eq 'user_username'%> selected<%endif%>>Username</option><option value="user_disp_email"<%if search_column eq 'user_disp_email'%> selected<%endif%>>E-Mail Address</option><option value="user_real_name"<%if search_column eq 'user_real_name'%> selected<%endif%>>Real Name</option></select> <input type="hidden" name="do" value="user_search"><input type="submit" value="Search Users" class="submit"></form>
<%list_table%>
<%top_row%>
<td style="border-right:1px solid <%dark_beige%>" width="30%">
Index: admin/language.txt
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/language.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -b -u -r1.3 -r1.4
--- admin/language.txt 4 Mar 2002 04:02:20 -0000 1.3
+++ admin/language.txt 21 Mar 2002 04:57:47 -0000 1.4
@@ -45,5 +45,78 @@
'USERNAME_RESERVED' => 'Username is reserved for future use',
'USERNAME_TOO_LONG' => 'Username too long. The maximum length of a username is %d characters',
'USERNAME_TOO_SHORT' => 'Username too short. A username must be at least %d characters long',
- 'USERNAME_TRAILING_SPACES' => 'A username may not contain trailing spaces'
+ 'USERNAME_TRAILING_SPACES' => 'A username may not contain trailing spaces',
+ 'cat_depth' => 'Depth',
+ 'cat_desc' => 'Description',
+ 'cat_id' => 'ID',
+ 'cat_id_fk' => 'Subcategory of',
+ 'cat_name' => 'Name',
+ 'cat_root' => 'Root',
+ 'cat_show_forums' => 'Show forums in main forum list',
+ 'cat_sort_rank' => 'Sort Rank',
+ 'forum_allow_attachments' => 'Allow attachments',
+ 'forum_allow_guest_attachments' => 'Allow guest attachments',
+ 'forum_allow_user_edit' => 'Allow post edit/delete',
+ 'forum_attachments' => 'Maximum number of attachments / post',
+ 'forum_desc' => 'Description',
+ 'forum_edit_timeout' => 'Post edit/delete timeout',
+ 'forum_hard_delete' => 'Delete method',
+ 'forum_id' => 'ID',
+ 'forum_last' => 'Last Post',
+ 'forum_last_id' => 'Last Post ID',
+ 'forum_last_poster' => 'Last Poster',
+ 'forum_name' => 'Name',
+ 'forum_new_timeout' => 'Days to save new post data',
+ 'forum_sort_rank' => 'Sort Rank',
+ 'forum_style' => 'Style',
+ 'forum_total' => 'Total Posts',
+ 'forum_total_threads' => 'Total Threads',
+ 'group_id' => 'ID',
+ 'group_name' => 'Name',
+ 'user_accept_privmsg' => 'Accept Private Messages',
+ 'user_admin_validated' => 'Validated by Admin',
+ 'user_advanced_editor' => 'Use advanced editor',
+ 'user_aim' => 'AIM Name',
+ 'user_cols' => 'Default textarea cols',
+ 'user_default_message_style' => 'Default Message Style',
+ 'user_default_mh_flatpost' => 'Default Post hits / page',
+ 'user_default_mh_forum' => 'Default Forum hits / page',
+ 'user_default_mh_message' => 'Default Message hits / page',
+ 'user_default_mh_search' => 'Default Search hits / page',
+ 'user_default_post_display' => 'Default Post Display',
+ 'user_default_post_style' => 'Default Post Style',
+ 'user_default_reply_notify' => 'Default Reply Notification',
+ 'user_disp_email' => 'Display Email',
+ 'user_do_after_post' => 'After posting action',
+ 'user_email' => 'Email',
+ 'user_enabled' => 'Enabled',
+ 'user_forum_view' => 'Default forum display',
+ 'user_hidden_cats' => 'Hidden categories',
+ 'user_homepage' => 'Home page',
+ 'user_icon' => 'User Icon',
+ 'user_icq' => 'ICQ #',
+ 'user_id' => 'ID',
+ 'user_interests' => 'Interests',
+ 'user_invisible' => 'Invisible',
+ 'user_jump_to_unread' => 'Jump to first unread post',
+ 'user_last_logon' => 'Last Logon',
+ 'user_last_seen' => 'Last seen',
+ 'user_location' => 'Location',
+ 'user_message_notify' => undef,
+ 'user_msn' => 'MSN Identity',
+ 'user_occupation' => 'Occupation',
+ 'user_password' => 'Password',
+ 'user_posts' => 'Num. Posts',
+ 'user_real_name' => 'Real Name',
+ 'user_registered' => 'Date Registered',
+ 'user_rows' => 'Default textarea rows',
+ 'user_signature' => 'Signature',
+ 'user_status' => 'Status',
+ 'user_temp_pass' => 'Temp. Password',
+ 'user_template' => 'Template Set',
+ 'user_time_offset' => 'Time Offset',
+ 'user_title' => 'Title',
+ 'user_username' => 'Username',
+ 'user_val_code' => 'Validation Code',
+ 'user_yahoo' => 'Yahoo Identity'
};
Index: admin/templates_email.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/templates_email.html,v
retrieving revision 1.7
retrieving revision 1.9
diff -b -u -r1.7 -r1.9
--- admin/templates_email.html 4 Mar 2002 19:00:15 -0000 1.7
+++ admin/templates_email.html 22 Mar 2002 02:55:42 -0000 1.9
@@ -12,6 +12,17 @@
<%else%>
<%set template_file = $tpl_file%>
<%endif%>
+ <%if template_file eq 'thread_notify.eml'%>
+ <%GT::Mail::Editor::tpl_save(
+ dir => $template_root,
+ template => $tpl_dir,
+ file => $template_file,
+ header => Subject => $header_Subject,
+ header => From => $header_From,
+ extra_headers => $extra_headers,
+ body => $body
+ )%>
+ <%else%>
<%GT::Mail::Editor::tpl_save(
dir => $template_root,
template => $tpl_dir,
@@ -22,6 +33,7 @@
extra_headers => $extra_headers,
body => $body
)%>
+ <%endif%>
<%if error%>
<%set error_message = "Unable to save template:<br>"%>
<%set error_message_2 = $error%>
@@ -104,7 +116,11 @@
<table border=0 cellpadding=0 cellspacing=2 width="100%">
<tr>
<td><font size=2 face="Tahoma,Arial,Helvetica">To:</font></td>
+<%if tpl_file eq 'thread_notify.eml'%>
+ <td><font size=2 face="Tahoma,Arial,Helvetica">Undisclosed Recipients</font></td>
+<%else%>
<td><input type="text" size="<%editor_cols%>" name="header_To" value="<%if displaying_template%><%escape_html header_To%><%endif%>"></td>
+<%endunless%>
</tr>
<tr>
<td><font size=2 face="Tahoma,Arial,Helvetica">Subject:</font></td>