Index: default/category_list.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/category_list.html,v
retrieving revision 1.30
retrieving revision 1.32
diff -b -u -r1.30 -r1.32
--- default/category_list.html 2 Mar 2002 02:32:13 -0000 1.30
+++ default/category_list.html 27 Apr 2002 00:20:45 -0000 1.32
@@ -41,7 +41,8 @@
<%if current_user_id%>
Welcome, <%nbsp current_user_username%>
<%else%>
- You are not logged in. <a href="gforum.cgi?do=login;<%hidden_query%>">Click here</a> to log in.
+ You are not logged in. <a href="gforum.cgi?do=login;<%hidden_query%>">Click here</a> to log in.<br>
+ If you are not a member, <a href="gforum.cgi?do=user_signup">Sign up here</a>!
<%endif%>
<br>
<%/body_font%>
@@ -82,7 +83,7 @@
<a name="<%cat_id%>"></a>
<%header_font%>
<%if cat_depth%><img src="<%image_url%>/clear_shim.gif" height=1 width="<%cat_depth * 25%>"><%endif%><a href="gforum.cgi?category=<%cat_id%>;<%hidden_query%>"><%cat_name%></a>
- <%if current_user_id and cat_show_forums and main_page%><a href="gforum.cgi?<%if cat_hidden%>un<%endif%>hide_cat=<%cat_id%>;<%hidden_query%>"><small><%if cat_hidden%>[+]<%else%>[-]<%endif%></small></a><%endif%>
+ <%if current_user_id and cat_show_forums and main_page%><a href="gforum.cgi?<%if cat_hidden%>un<%endif%>hide_cat=<%cat_id%>;<%hidden_query%>" title="<%if cat_hidden%>Expand<%else%>Collapse<%endif%> this category"><small><%if cat_hidden%>[+]<%else%>[-]<%endif%></small></a><%endif%>
<%if cat_desc%> - <%cat_desc%><%endif%>
<%/header_font%>
</td>
Index: default/message.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/message.html,v
retrieving revision 1.16
retrieving revision 1.17
diff -b -u -r1.16 -r1.17
--- default/message.html 11 Jan 2002 23:18:57 -0000 1.16
+++ default/message.html 5 May 2002 20:52:39 -0000 1.17
@@ -57,7 +57,11 @@
</tr>
<tr>
<td colspan="2" align="left">
+<% if user_username%>
<%body_font%><font color="red">No such user: <%nbsp user_username%></font><%/body_font%><br>
+<% else%>
+ <%body_font%><font color="red">No recipient entered!</font><%/body_font%><br>
+<% endif%>
<%elsif user_no_privmsg%>
</td>
</tr>
Index: default/post_reply_write.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/post_reply_write.html,v
retrieving revision 1.25
retrieving revision 1.26
diff -b -u -r1.25 -r1.26
--- default/post_reply_write.html 10 Jan 2002 09:00:31 -0000 1.25
+++ default/post_reply_write.html 7 May 2002 00:52:26 -0000 1.26
@@ -25,8 +25,8 @@
<td valign="bottom">
<%hidden_form%>
<%title_font%>
- <%include include_title_cat_forum.html%>
- Reply to post
+ <%include include_title_cat_forum.html%><br>
+ Reply to: <a href="gforum.cgi?post=<%parent_post_id%>"><%title_font%><%parent_post_subject%><%/title_font%></a>
<%/title_font%>
</td>
<td align="right">
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.28
diff -b -u -r1.26 -r1.28
--- default/post_view_flat.html 4 Mar 2002 03:58:17 -0000 1.26
+++ default/post_view_flat.html 16 May 2002 00:49:09 -0000 1.28
@@ -26,7 +26,7 @@
<%if is_ie and ie_version >= 4%>
function postShortcut(post_id) {
- document.all.post_shortcut.value = '<%cgi_root_url%>/gforum.cgi?post=' + post_id;
+ document.all.post_shortcut.value = '<%cgi_root_url%>/gforum.cgi?post=' + post_id + '#' + post_id;
document.all.post_shortcut.createTextRange().execCommand("Copy");
}
<%endif%>
@@ -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.29
diff -b -u -r1.26 -r1.29
--- default/post_view_threaded.html 4 Mar 2002 03:58:17 -0000 1.26
+++ default/post_view_threaded.html 16 May 2002 00:49:09 -0000 1.29
@@ -26,7 +26,7 @@
<%if is_ie and ie_version >= 4%>
function postShortcut(post_id) {
- document.all.post_shortcut.value = '<%cgi_root_url%>/gforum.cgi?post=' + post_id;
+ document.all.post_shortcut.value = '<%cgi_root_url%>/gforum.cgi?post=' + post_id + '#' + post_id;
document.all.post_shortcut.createTextRange().execCommand("Copy");
}
<%endif%>
@@ -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%>
+<%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%>
- <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%>">
+<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: default/user_profile_basic.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/user_profile_basic.html,v
retrieving revision 1.31
retrieving revision 1.32
diff -b -u -r1.31 -r1.32
--- default/user_profile_basic.html 18 Dec 2001 01:47:04 -0000 1.31
+++ default/user_profile_basic.html 7 May 2002 00:52:40 -0000 1.32
@@ -167,7 +167,7 @@
</select>
</td>
</tr>
-<%-- The following section of code should be uncommented if you want users to be able to select icons. Be sure to delete the ending comment if you delete this one, 42 lines down
+<%-- The following section of code should be uncommented if you want users to be able to select icons. Be sure to delete the ending comment if you delete this one, 41 lines down
<%GForum::User::icons('with blank')%>
<tr>
<td align=right valign=top>
@@ -177,7 +177,6 @@
<table border=0 cellspacing=0 cellpadding=5 width="100%">
<tr valign=middle align=center>
<%set icon_cols = 4%>
-<%-- The first iteration of this loop is empty - it is used for a "none" option --%>
<%loop icons%>
<td>
<table border=0 cellspacing=0 cellpadding=0>
Index: default/user_view.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/user_view.html,v
retrieving revision 1.30
retrieving revision 1.33
diff -b -u -r1.30 -r1.33
--- default/user_view.html 29 Jan 2002 02:55:16 -0000 1.30
+++ default/user_view.html 17 May 2002 19:53:19 -0000 1.33
@@ -115,10 +115,21 @@
<%body_font%><b>Location:</b><%/body_font%>
</td>
<td bgcolor="<%odd_color%>" valign=top>
- <%body_font%><%if user_location%><%user_location%><%else%>No location entered.<%endif%>
+ <%body_font%><%if user_location%><%user_location%><%else%>No location entered.<%endif%><%/body_font%>
</td>
</tr>
+<%if not user_invisible or current_user_status == 3%>
+ <tr>
+ <td width="20%" align=right valign=top bgcolor="<%light_beige%>" style="border-right:1px solid <%dark_beige%>">
+ <%body_font%><b>Local Time:</b><%/body_font%>
+ </td>
+ <td bgcolor="<%odd_color%>" valign=top>
+ <%body_font%><%user_localdate%><%/body_font%>
+ </td>
+ </tr>
+<%endif%>
+
<%if user_occupation%>
<tr>
<td width="20%" align=right valign=top bgcolor="<%light_beige%>" style="border-right:1px solid <%dark_beige%>;">
@@ -166,6 +177,30 @@
<%/body_font%>
</td>
</tr>
+
+<%if current_user_id and current_user_status >= 3%>
+ <tr>
+ <td width="20%" align=right valign=top bgcolor="<%light_beige%>" style="border-right:1px solid <%dark_beige%>; border-top:1px solid <%dark_beige%>">
+ <%body_font%><b>Email:</b><%/body_font%>
+ </td>
+ <td valign=top bgcolor="<%odd_color%>" style="border-top:1px solid <%dark_beige%>">
+ <%body_font%>
+ <a href="mailto:<%user_email%>"><%user_email%></a>
+ <%/body_font%>
+ </td>
+ </tr>
+
+ <tr>
+ <td width="20%" align=right valign=top bgcolor="<%light_beige%>" style="border-right:1px solid <%dark_beige%>; border-top:1px solid <%dark_beige%>">
+ <%body_font%><b>Admin options:</b><%/body_font%>
+ </td>
+ <td valign=top bgcolor="<%odd_color%>" style="border-top:1px solid <%dark_beige%>">
+ <%body_font%>
+ <a href="admin/db.cgi?db=User;do=search_results;user_id=<%user_id%>;user_id-opt=%3D;display=details">Details</a> | <a href="admin/db.cgi?db=User;do=modify_search_results;user_id=<%user_id%>;user_id-opt=%3D">Modify</a> | <a href="admin/db.cgi?db=User;do=delete_search_results;user_id=<%user_id%>;user_id-opt=%3D">Delete</a>
+ <%/body_font%>
+ </td>
+ </tr>
+<%endif%>
<%if user_icq%>
<tr>
Index: default/whos_online.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default/whos_online.html,v
retrieving revision 1.17
retrieving revision 1.20
diff -b -u -r1.17 -r1.20
--- default/whos_online.html 4 Mar 2002 03:52:16 -0000 1.17
+++ default/whos_online.html 17 May 2002 01:50:20 -0000 1.20
@@ -88,7 +88,7 @@
</td>
<% endif%>
<td>
- <%body_font%><%online_date%><%/body_font%>
+ <%body_font%><%online_date%><%if user_time_offset != $current_user_time_offset%> (<%GT::Date::date_get($user_localtime, '%h%:%MM% %tt%')%>)<%endif%><%/body_font%>
</td>
</tr>
<% endloop%>
Index: default_top/include_post_display.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/default_top/include_post_display.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -b -u -r1.10 -r1.11
--- default_top/include_post_display.html 4 Mar 2002 03:50:09 -0000 1.10
+++ default_top/include_post_display.html 23 Apr 2002 15:28:53 -0000 1.11
@@ -76,7 +76,7 @@
<a href="gforum.cgi?do=forum_ban_write;forum=<%forum_id%>;ban_type=ban_ip;ban_value=<%post_ip%>;<%hidden_query%>">IP</a>
<%if current_user_status = 3%><%-- An administrator --%>
|
- <a href="gforum.cgi?do=ban_ip;redo=<%this_do%>;so=<%so%>;sb=<%sb%>;ip=<%post_ip%>;<%hidden_query%>">Site IP</a>
+ <a href="gforum.cgi?do=ban_ip;redo=<%this_do%>;post=<%post_id%>;so=<%so%>;sb=<%sb%>;ip=<%post_ip%>;<%hidden_query%>">Site IP</a>
<big><b>|</b></big>
Index: admin/language.txt
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/language.txt,v
retrieving revision 1.3
retrieving revision 1.5
diff -b -u -r1.3 -r1.5
--- admin/language.txt 4 Mar 2002 04:02:20 -0000 1.3
+++ admin/language.txt 20 Apr 2002 09:29:49 -0000 1.5
@@ -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' => 'Private message notification',
+ '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/setup_disabled.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/setup_disabled.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -b -u -r1.5 -r1.6
--- admin/setup_disabled.html 9 Nov 2001 20:56:04 -0000 1.5
+++ admin/setup_disabled.html 11 Apr 2002 20:09:25 -0000 1.6
@@ -8,23 +8,23 @@
<%set font_tag = '<font face="Tahoma,Arial,Helvetica" size=2>'%>
<%if disable_forum%>
-<%GForum::Utils::disable_forum($disabled_message)%>
-<%elsif enable_forum%>
-<%GForum::Utils::enable_forum%>
-<%elsif disabled_message%>
-<%GForum::Utils::disabled_message($disabled_message)%>
+<%GForum::Utils::disable_forum($forum_disabled, $disabled_message)%>
<%endif%>
<%GForum::Config::tpl_get(disabled, disabled_message)%>
<%if disabled%>
-<%set header_title = 'Enable Forum'%>
-<%set header_description = 'You can enable or change the disabled reason from this page'%>
-<%set error_message = 'The forum is currently disabled:<br>'%>
-<%set error_message_2 = $disabled_message%>
+ <%set header_title = 'Enable Forum'%>
+ <%set header_description = 'You can enable or change the disabled reason from this page'%>
+ <%if disabled == 2%>
+ <%set error_message = 'The forum is currently disabled for all users except admins:<br>'%>
+ <%else%>
+ <%set error_message = 'The forum is currently disabled for all users:<br>'%>
+ <%endif%>
+ <%set error_message_2 = $disabled_message%>
<%else%>
-<%set header_title = 'Disable Forum'%>
-<%set header_description = 'You can disable the forum from this page'%>
-<%set success_message = 'The forum is currently enabled'%>
+ <%set header_title = 'Disable Forum'%>
+ <%set header_description = 'You can disable the forum from this page'%>
+ <%set success_message = 'The forum is currently enabled'%>
<%endif%>
<%include admin_header.html%>
@@ -49,10 +49,20 @@
<tr>
<td colspan=2 align=center>
<%font_tag%>
-<%if disabled%> <input type=submit name="enable_forum=1" value="Enable forum">
- <input type=submit name="disable_forum=1" value="Change message">
-<%else%> <input type=submit name="disable_forum=1" value="Disable forum">
-<%endif%> </font>
+ <select name="forum_disabled" size="1">
+<%if disabled%>
+ <option value="0">Enable All</option>
+<%endif%>
+<%if disabled != 1%>
+ <option value="1">Disable All</option>
+<%endif%>
+<%if disabled != 2%>
+ <option value="2">Allow Admins</option>
+<%endif%>
+ <option value="<%disabled%>">Save Message</option>
+ </select>
+ <input type="submit" name="disable_forum" value="Submit">
+ </font>
</td>
</tr>
</table>
@@ -60,4 +70,3 @@
</tr>
</table>
</form>
-
Index: admin/setup_posts.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/setup_posts.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -r1.6 -r1.7
--- admin/setup_posts.html 4 Mar 2002 04:03:02 -0000 1.6
+++ admin/setup_posts.html 11 Apr 2002 02:14:40 -0000 1.7
@@ -76,6 +76,22 @@
</td>
</tr>
<tr>
+ <td width="100%" colspan="2"><font face="Tahoma,Arial,Helvetica" size="2">This option
+ controls the position of the 'Re:' text. You can specify either that 'Re:' (set in the
+ language variables) show up at the beginning (eg. Re: subject) or at the end of the subject
+ (eg. subject - Re). Note that setting this to "End" will alter the behaviour of the "After Re:"
+ setting above to make it come between the subject and the "Re:"</font></td>
+ </tr>
+ <tr>
+ <td width="16%"><font face="Tahoma,Arial,Helvetica" size="2"><b>post_reply_position</b></font></td>
+ <td width="84%"><font face="Tahoma,Arial,Helvetica" size="2">
+ <select name="post_reply_position" size=1>
+ <option value="beginning"<%if cfg_post_reply_position ne end%> selected<%endif%>>Beginning</option>
+ <option value="end"<% if cfg_post_reply_position eq end%> selected<%endif%>>End</option>
+ </select>
+ </td>
+ </tr>
+ <tr>
<td width="100%" colspan="2"><font face="Tahoma,Arial,Helvetica" size="2">If set, users
will be forced to enter a subject when posting.</font></td>
</tr>
Index: admin/setup_users.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/setup_users.html,v
retrieving revision 1.12
retrieving revision 1.15
diff -b -u -r1.12 -r1.15
--- admin/setup_users.html 13 Mar 2002 01:23:56 -0000 1.12
+++ admin/setup_users.html 27 May 2002 19:42:31 -0000 1.15
@@ -19,7 +19,7 @@
<td width="100%">
<table border="0" cellpadding="2" cellspacing="3" width="100%">
<tr>
- <td width="100%" colspan="2" bgcolor="#DDDDDD"><b><font size="2" face="Verdana,Arial,Helvetica">Misc
+ <td width="100%" colspan="2" bgcolor="#DDDDDD"><b><font size="2" face="Verdana,Arial,Helvetica">User
Options:</font></b></td>
</tr>
<tr>
@@ -80,7 +80,7 @@
<tr>
<td width="16%"><b><font size="2" face="Tahoma,Arial,Helvetica">user_private_fields</font></b></td>
<td width="84%">
- <input type="text" size="40" value="<%cfg_user_private_fields%>">
+ <input type="text" name="user_private_fields" size="40" value="<%cfg_user_private_fields%>">
</td>
</tr>
<tr>
@@ -89,7 +89,7 @@
<tr>
<td width="16%"><b><font size="2" face="Tahoma,Arial,Helvetica">user_search_allowed</font></b></td>
<td width="84%">
- <input type="text" size="40" value="<%cfg_user_search_allowed%>">
+ <input type="text" name="user_search_allowed" size="40" value="<%cfg_user_search_allowed%>">
</td>
</tr>
<tr>
@@ -112,6 +112,21 @@
<tr>
<td width="16%"><b><font size="2" face="Tahoma,Arial,Helvetica">username_min_length</font></b></td>
<td width="84%"><font face="Tahoma,Arial,Helvetica" size="2"><input type="text" name="username_min_length" value="<%cfg_username_min_length%>" size="40"></font></td>
+ </tr>
+ <tr>
+ <td width="100%" colspan="2"><font face="Tahoma,Arial,Helvetica" size="2">By default, new users will be taken to the main page the first time they log in. You can, optionally, take them directly into one of the profile pages using this option.</font></td>
+ </tr>
+ <tr>
+ <td width="16%"><b><font size="2" face="Tahoma,Arial,Helvetica">user_first_action</font></b></td>
+ <td width="84%"><font face="Tahoma,Arial,Helvetica" size="2">
+ <select name="user_first_action" size="1">
+ <option value="cat_list"<%if cfg_user_first_action eq 'cat_list' or not cfg_user_first_action%> selected<%endif%>>Main category list page</option>
+ <option value="user_profile"<% if cfg_user_first_action eq 'user_profile'%> selected<%endif%>>Edit profile</option>
+ <option value="user_profile_basic"<% if cfg_user_first_action eq 'user_profile_basic'%> selected<%endif%>>Profile: User Profile</option>
+ <option value="user_profile_display"<%if cfg_user_first_action eq 'user_profile_display'%> selected<%endif%>>Profile: Display Settings</option>
+ <option value="user_profile_email"<% if cfg_user_first_action eq 'user_profile_email'%> selected<%endif%>>Profile: Subscriptions</option>
+ </select>
+ </font></td>
</tr>
<tr>
<td width="100%" colspan="2"><font face="Tahoma,Arial,Helvetica" size="2">This option, if enabled, allows users to change their username.</font></td>
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.10
diff -b -u -r1.7 -r1.10
--- admin/templates_email.html 4 Mar 2002 19:00:15 -0000 1.7
+++ admin/templates_email.html 3 Apr 2002 00:35:23 -0000 1.10
@@ -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%>
@@ -87,6 +99,7 @@
<%loop dir_select%>
<option value="<%directory%>"<%if dir_selected%> selected<%endif%>><%directory%></option>
<%endloop%>
+ </select>
<input type=submit value=Change name=load_template>
</font></p>
@@ -104,7 +117,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>
Index: admin/templates_globals.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/templates_globals.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -b -u -r1.6 -r1.7
--- admin/templates_globals.html 4 Mar 2002 19:00:15 -0000 1.6
+++ admin/templates_globals.html 12 May 2002 01:07:03 -0000 1.7
@@ -44,6 +44,7 @@
<%loop dir_select%>
<option value="<%directory%>"<%if dir_selected%> selected<%endif%>><%directory%></option>
<%endloop%>
+ </select>
<input type="submit" value="Change" name="change"></font></p>
<p><%global_table%></p>
Index: admin/templates_language.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/templates_language.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -r1.7 -r1.8
--- admin/templates_language.html 4 Mar 2002 19:00:15 -0000 1.7
+++ admin/templates_language.html 12 Apr 2002 23:19:25 -0000 1.8
@@ -41,7 +41,7 @@
<p><font size="2" face="Tahoma,Arial,Helvetica">
<%loop prefix_list%>
-<a href="admin.cgi?do=page;page=templates_language.html;prefix=<%prefix%>"><%prefix%> (<%num_vars%>)</a>
+<a href="admin.cgi?do=page;page=templates_language.html;prefix=<%prefix%>;tpl_dir=<%tpl_dir%>"><%prefix%> (<%num_vars%>)</a>
<%endloop%>
</font></p>
Index: admin/help/help_guide_modperl.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/help/help_guide_modperl.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- admin/help/help_guide_modperl.html 4 Mar 2002 19:00:15 -0000 1.2
+++ admin/help/help_guide_modperl.html 18 Apr 2002 23:24:18 -0000 1.3
@@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Links SQL Help: Plug Ins</title>
+<title>Gossamer Forum Help: Plug Ins</title>
</head>
<body>
Index: admin/help/help_templates_guide.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/help/help_templates_guide.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- admin/help/help_templates_guide.html 4 Mar 2002 19:00:15 -0000 1.2
+++ admin/help/help_templates_guide.html 18 Apr 2002 23:24:18 -0000 1.3
@@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Links SQL Help: Admin</title>
+<title>Gossamer Forum Help: Admin</title>
</head>
<body>
Index: admin/help/help_templates_syntax.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/help/help_templates_syntax.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- admin/help/help_templates_syntax.html 4 Mar 2002 19:00:15 -0000 1.2
+++ admin/help/help_templates_syntax.html 18 Apr 2002 23:24:18 -0000 1.3
@@ -2,7 +2,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Links SQL Help: Admin</title>
+<title>Gossamer Forum Help: Admin</title>
</head>
<body>
Index: admin/help/help_templates_tags.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/admin/help/help_templates_tags.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -b -u -r1.2 -r1.3
--- admin/help/help_templates_tags.html 4 Mar 2002 19:00:15 -0000 1.2
+++ admin/help/help_templates_tags.html 18 Apr 2002 23:24:18 -0000 1.3
@@ -2,12 +2,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
-<title>Links SQL Help: Admin</title>
+<title>Gossamer Forum Help: Admin</title>
</head>
<body>
-<H1><font face="Verdana, Arial, Helvetica">Links SQL Help</font></H1>
+<H1><font face="Verdana, Arial, Helvetica">Gossamer Forum Help</font></H1>
<TABLE width=100%>
<TR>
Index: common/editor.js
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/common/editor.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -b -u -r1.7 -r1.8
--- common/editor.js 11 Jan 2002 23:18:19 -0000 1.7
+++ common/editor.js 15 May 2002 02:03:36 -0000 1.8
@@ -2,7 +2,7 @@
* =================================================================
* HTML Editor - A wysiwyg web based editor for IE5.5+
* Website : http://gossamer-threads.com/
- * Revision : $Id: editor.js,v 1.7 2002/01/11 23:18:19 jagerman Exp $
+ * Revision : $Id: editor.js,v 1.8 2002/05/15 02:03:36 jagerman Exp $
*
* Copyright (c) 2002 Gossamer Threads Inc. All Rights Reserved.
* Redistribution in part or in whole strictly prohibited. Please
@@ -15,7 +15,8 @@
/* -- Javascript needed to write a post -- */
-var url = window.location.protocol + '//' + window.location.hostname + window.location.pathname + '?<%hidden_query%>';
+var port = (window.location.port == 0) ? '' : ':' + window.location.port;
+var url = window.location.protocol + '//' + window.location.hostname + port + window.location.pathname + '?<%hidden_query%>';
var image_url = '<%escape_js image_url%>';
Index: common/editor_font.html
===================================================================
RCS file: /usr/local/gossamer/gforum/cgi/admin/templates/common/editor_font.html,v
retrieving revision 1.3
retrieving revision 1.5
diff -b -u -r1.3 -r1.5
--- common/editor_font.html 11 Jan 2002 23:18:19 -0000 1.3
+++ common/editor_font.html 1 May 2002 22:01:39 -0000 1.5
@@ -184,20 +184,20 @@
<div style="position: absolute; top: 233px; left: 25px">Color:</div>
<select id="colorList" size="1" style="font-face: 8pt; width: 80; position: absolute; top: 253px; left: 25px" onchange="setColor(this.value)">
<option value="black">Black</option>
- <option value="gray">Gray</option>
+ <option value="#808080">Gray</option>
<option value="silver">Silver</option>
<option value="white">White</option>
- <option value="lime">Lime</option>
+ <option value="#00FF00">Lime</option>
<option value="green">Green</option>
<option value="yellow">Yellow</option>
- <option value="olive">Olive</option>
+ <option value="#808000">Olive</option>
<option value="red">Red</option>
- <option value="maroon">Maroon</option>
- <option value="fuchsia">Fuchsia</option>
+ <option value="#800000">Maroon</option>
+ <option value="#FF00FF">Fuchsia</option>
<option value="purple">Purple</option>
- <option value="aqua">Aqua</option>
- <option value="teal">Teal</option>
- <option value="navy">Navy</option>
+ <option value="#00FFFF">Aqua</option>
+ <option value="#008080">Teal</option>
+ <option value="#000080">Navy</option>
<option value="blue">Blue</option>
<option value="">Custom</option>
</select>